DatenvearbeitungMDM

SDL/mdm/frmMDMDatenverarbetiung.vb

@@ -1,6 +1,7 @@
 Imports System.Data.OleDb
 Imports System.IO
 Imports com.sun.xml.internal.rngom
+Imports DocumentFormat.OpenXml.Drawing.Diagrams
 Imports itextsharp.text.pdf
 Imports MDM_Worker
 Imports VERAG_PROG_ALLGEMEIN
@@ -115,6 +116,10 @@ Public Class frmMDMDatenverarbetiung
                     End If
                 End If
             Case "IDS"
+                If cbxIDSmitVerag.Checked Then
+                    MsgBox("Abrechnung ohne VERAG/VERAG360 !")
+                    Exit Sub
+                End If
                 showIDSContextMenu()
             Case "MSE"
                 Dim mseParam As New cMSEAPI(LIEFERANT)
@@ -875,7 +880,7 @@ Public Class frmMDMDatenverarbetiung
                               left join tbl_IDS_Kunden as Kunde on Kunde.CustomerCode = trans.CustomerCode And Kunde.KdNrAlt = 0
                               left join tbl_IDS_Kunden_ohne_Rabatt as KundeOhneR on KundeOhneR.CustomerCode = trans.CustomerCode
                               left join tbl_IDS_Produkte as prod on prod.ProductTypeCode = trans.ProductTypeCode
-                              where cast(trans.YearMonthDay as Date) =  '" & DateTimePicker2.Text & "' and isnull(trans.charged,0) = 0 AND trans.[UStVAn_ID] is null and Kunde.KdNrVERAG not in (756150, 711104) ", "FMZOLL")
+                              where cast(trans.YearMonthDay as Date) =  '" & DateTimePicker2.Text & "' and isnull(trans.charged,0) = 0 AND trans.[UStVAn_ID] is null " & IIf(cbxIDSmitVerag.Checked, " ", "and Kunde.KdNrVERAG not in (756150, 711104) "), "FMZOLL")
 
             .LOAD()
 
@@ -915,7 +920,15 @@ Public Class frmMDMDatenverarbetiung
             Dim sumTr As Double = 0
             For Each r As DataGridViewRow In .Rows
                 sumGes += If(IsNumeric(r.Cells("Gesamtbetrag").Value), CDbl(r.Cells("Gesamtbetrag").Value), 0)
-                sumTr += If(IsNumeric(r.Cells("Liter").Value), CDbl(r.Cells("Liter").Value), 0)
+
+                If (IsNumeric(r.Cells("Liter").Value)) Then
+                    sumTr += CDbl(r.Cells("Liter").Value)
+                Else
+                    sumTr += 0
+                End If
+
+
+
                 sumFee += If(IsNumeric(r.Cells("Net").Value), CDbl(r.Cells("Net").Value), 0)
             Next
 
@@ -1013,6 +1026,7 @@ Public Class frmMDMDatenverarbetiung
         Panel4.Visible = False
         Panel5.Visible = False
         cbxKopie.Visible = False
+        cbxIDSmitVerag.Visible = False
 
 
         Select Case Me.LIEFERANT
@@ -1038,6 +1052,7 @@ Public Class frmMDMDatenverarbetiung
                 c.Dock = DockStyle.Fill
                 pnlIDS.Visible = True
                 cbxKopie.Visible = True
+                cbxIDSmitVerag.Visible = True
 
             Case "MSE"
                 Panel5.Visible = True
@@ -4826,4 +4841,8 @@ RabattBerechnen:
 
 
     End Function
+
+    Private Sub cbxIDSmitVerag_CheckedChanged(sender As Object, e As EventArgs) Handles cbxIDSmitVerag.CheckedChanged
+        initDgv_IDS()
+    End Sub
 End Class