Merge branch 'ADMIN' of https://verag.visualstudio.com/ADMIN/_git/ADMIN into ADMIN

initATLASAufschubkonten/frmStartOptions.vb

@@ -521,10 +521,11 @@ Public Class frmStartOptions
 
             Case "ABGLEICH_KUNDENUEMSAETZE"
                 VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
-                Dim lastyears = 2
+                Dim lastyears As Integer = 2
                 If DELETE_Kundenumsaetze(lastyears) Then
                     INSERT_Kundenumsaetze(lastyears)
                 End If
+                closeMe()
 
             Case "AMBAR_VERAG_BUCHUNGEN"
                 VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
@@ -4358,7 +4359,7 @@ Public Class frmStartOptions
 
         Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
         VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cbxTestsystem.Checked
-        txtBatchNr.Text = CInt(SQL.getValueTxtBySql("SELECT max([batch_seq_nr]) FROM [VERAG].[dbo].[tblMSETransactions] ", "FMZOLL",,, 0))
+        cbxMSEBatchNr.DataSource = SQL.loadCboBySql("SELECT distinct([batch_seq_nr]) FROM [VERAG].[dbo].[tblMSETransactions]", "FMZOLL")
 
     End Sub
 
@@ -4427,7 +4428,6 @@ Public Class frmStartOptions
         Catch ex As Exception
             VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL)
             Return False
-
         End Try
     End Function
 
@@ -4525,7 +4525,7 @@ Public Class frmStartOptions
         If fehler <> "" Then
             MsgBox(fehler)
         Else
-            fehler = mse.getInvoices(token, invoice, datVon.Value, datVon.Value)
+            fehler = mse.getInvoices(token, invoice, datVon.Value, datVon.Value, cbxUploadDA.Checked)
             If fehler <> "" Then
                 MsgBox(fehler)
                 Me.Visible = True
@@ -4618,9 +4618,13 @@ Public Class frmStartOptions
 
     Private Sub LinkLabel57_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel57.LinkClicked
 
+        If txtBatchNr.Text <> "" Then
+            If Not IsNumeric(txtBatchNr.Text) Then Exit Sub
+            If CInt(txtBatchNr.Text) < 1 AndAlso CInt(txtBatchNr.Text) > 1000 Then Exit Sub
+        End If
 
-        If Not IsNumeric(txtBatchNr.Text) Then Exit Sub
-        If CInt(txtBatchNr.Text) < 1 AndAlso CInt(txtBatchNr.Text) > 100 Then Exit Sub
+        If Not IsNumeric(cbxMSEBatchNr._value) Then Exit Sub
+        If CInt(cbxMSEBatchNr._value) < 1 AndAlso CInt(cbxMSEBatchNr._value) > 1000 Then Exit Sub
 
         Me.Visible = False
         VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cbxTestsystem.Checked
@@ -4636,7 +4640,7 @@ Public Class frmStartOptions
         Else
 
             Dim totalPages = 1
-            Dim batchrequestNr = CInt(txtBatchNr.Text)
+            Dim batchrequestNr = IIf(txtBatchNr.Text <> "", CInt(txtBatchNr.Text), CInt(cbxMSEBatchNr._value))
 
             fehler = mse.getTransactionsFromBatchNrAndPage(token, transactions, batchrequestNr, totalPages, 0)
             If fehler <> "" Then
@@ -4743,7 +4747,7 @@ Public Class frmStartOptions
 
             ElseIf sender Is LinkLabel61 Then
 
-                dtTransactionID = SQL.loadDgvBySql("select [transaction_id], CAST(1 AS BIT) as found FROM [VERAG].[dbo].[tblMSESettlements] where [invoice_date] = '" & datVon.Value & "' AND [transaction_id] not in (select [transaction_id] from [VERAG].[dbo].[tblMSETransactions])", "FMZOLL")
+                dtTransactionID = SQL.loadDgvBySql("select [transaction_id], CAST(1 AS BIT) as found FROM [VERAG].[dbo].[tblMSESettlements] where [invoice_date] = '" & Date.Parse(datVon.Value).ToShortDateString & "' AND [transaction_id] not in (select [transaction_id] from [VERAG].[dbo].[tblMSETransactions])", "FMZOLL")
                 If dtTransactionID.Rows.Count = 0 Then
                     MsgBox("Zu diesem Rechnungsdatum gibt es keine Rechnung!")
                     Me.Visible = True