MS

SchaumKommiCollo/KommiCollo/frmAbschluss.vb

@@ -180,17 +180,33 @@
         End Try
     End Function
     Private Sub tsbtcheck_all_Click(sender As System.Object, e As System.EventArgs) Handles tsbtcheck_all.Click
-        Dim DT As DataTable = MyDataset.VWKOMMCOLLI_ABSCHLUSS_PAKET
-        For Each DR As DataRow In DT.Rows
-            DR.Item("Auswahl") = True
-        Next
+        If cmbMandant.Text = "GLS" Then
+            Dim DT As DataTable = MyDataset.VWKOMMCOLLI_ABSCHLUSS_PAKET
+            For Each DR As DataRow In DT.Rows
+                DR.Item("Auswahl") = True
+            Next
+        Else
+            Dim DT As DataTable = MyDataset.VWHUP_REPORT1
+            For Each DR As DataRow In DT.Rows
+                DR.Item("Selected") = True
+            Next
+        End If
+
     End Sub
 
     Private Sub tsbtde_check_all_Click(sender As System.Object, e As System.EventArgs) Handles tsbtde_check_all.Click
-        Dim DT As DataTable = MyDataset.VWKOMMCOLLI_ABSCHLUSS_PAKET
-        For Each DR As DataRow In DT.Rows
-            DR.Item("Auswahl") = False
-        Next
+        If cmbMandant.Text = "GLS" Then
+            Dim DT As DataTable = MyDataset.VWKOMMCOLLI_ABSCHLUSS_PAKET
+            For Each DR As DataRow In DT.Rows
+                DR.Item("Auswahl") = False
+            Next
+        Else
+            Dim DT As DataTable = MyDataset.VWHUP_REPORT1
+            For Each DR As DataRow In DT.Rows
+                DR.Item("Selected") = False
+            Next
+        End If
+
     End Sub
     Sub Load_Pakete(vMandant As String)
 
@@ -305,6 +321,7 @@
     Private Sub bw_Tagesabschluss_RunWorkerCompleted(sender As Object, e As System.ComponentModel.RunWorkerCompletedEventArgs) Handles bw_Tagesabschluss.RunWorkerCompleted
         If e.Result = True Then
             MsgBox("Abschluss erfolgreich ausgeführt.", MsgBoxStyle.Information, "Tagesabschluss")
+            Load_Sendungen()
         Else
             MsgBox("Fehler bei Abschluss, bitte Log prüfen.")
         End If
@@ -313,7 +330,7 @@
     Private Sub Load_Sendungen()
         Try
             Me.VWHUP_REPORT1TableAdapter.Connection.ConnectionString = My.Settings.ConfigConnectionString
-            Me.VWHUP_REPORT1TableAdapter.Fill(Me.MyDataset.VWHUP_REPORT1, True)
+            Me.VWHUP_REPORT1TableAdapter.Fill(Me.MyDataset.VWHUP_REPORT1, True, False)
         Catch ex As System.Exception
             MsgBox("Fehler bei Load_Sendungen: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try