From 8f9361abe489b6112d2e79705e54ce0976748633 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 15 Oct 2025 16:16:34 +0200 Subject: [PATCH] MDM-Summenbericht, etc. --- SDL/kunden/frmKundenblatt.Designer.vb | 6 +++--- SDL/mdm/frmMDMDatenverarbetiung.vb | 10 ++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/SDL/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb index 5c77f0e5..cf5a1a6a 100644 --- a/SDL/kunden/frmKundenblatt.Designer.vb +++ b/SDL/kunden/frmKundenblatt.Designer.vb @@ -374,7 +374,7 @@ Partial Class frmKundenblatt Me.tbcntrMain.Margin = New System.Windows.Forms.Padding(0) Me.tbcntrMain.Name = "tbcntrMain" Me.tbcntrMain.SelectedIndex = 0 - Me.tbcntrMain.Size = New System.Drawing.Size(1652, 1555) + Me.tbcntrMain.Size = New System.Drawing.Size(1652, 1538) Me.tbcntrMain.TabIndex = 3 ' 'tbAllgemein @@ -2448,7 +2448,7 @@ Partial Class frmKundenblatt Me.tbFIBU.Controls.Add(Me.txtFIBUKuerzel) Me.tbFIBU.Location = New System.Drawing.Point(4, 25) Me.tbFIBU.Name = "tbFIBU" - Me.tbFIBU.Size = New System.Drawing.Size(1644, 1526) + Me.tbFIBU.Size = New System.Drawing.Size(1644, 1509) Me.tbFIBU.TabIndex = 13 Me.tbFIBU.Text = "FIBU" Me.tbFIBU.UseVisualStyleBackColor = True @@ -3006,7 +3006,7 @@ Partial Class frmKundenblatt Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScroll = True Me.BackColor = System.Drawing.Color.White - Me.ClientSize = New System.Drawing.Size(1651, 1684) + Me.ClientSize = New System.Drawing.Size(1651, 1667) Me.Controls.Add(Me.lblAbfVerb) Me.Controls.Add(Me.btnAbfVerb) Me.Controls.Add(Me.tbcntrMain) diff --git a/SDL/mdm/frmMDMDatenverarbetiung.vb b/SDL/mdm/frmMDMDatenverarbetiung.vb index d2400a44..060e327a 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.vb @@ -30,7 +30,7 @@ Public Class frmMDMDatenverarbetiung Case "PLOSE" : genSummenbericht_PLOSE() Case "ASFINAG" : genSummenbericht_ASFINAG() Case "UTA" : genSummenbericht_UTA() - Case "IDS" : genSummenbericht_IDS(17) : genSummenbericht_IDS(21) + Case "IDS" : genSummenbericht_IDS(17, cbxIDSmitVerag.Checked) : genSummenbericht_IDS(21, cbxIDSmitVerag.Checked) Case "MSE" : genSummenbericht_MSE() Case Else : MsgBox("Nicht verfügbar!") End Select @@ -551,15 +551,17 @@ Public Class frmMDMDatenverarbetiung End Sub - Sub genSummenbericht_IDS(typ As Integer) + Sub genSummenbericht_IDS(typ As Integer, mitVerag360_VeragAG As Boolean) Dim displayFilter = False Dim sqlstr As String = "" Dim sqlwhere = "" + + Select Case typ - Case 17 : sqlwhere = "<>740543" - Case 21 : sqlwhere = " =740543" + Case 17 : sqlwhere = "<>740543" & IIf(mitVerag360_VeragAG, "", " and tblIDSTransactionsNew.KdNrVERAG not in (756150, 711104)") + Case 21 : sqlwhere = " =740543" & IIf(mitVerag360_VeragAG, "", " and tblIDSTransactionsNew.KdNrVERAG not in (756150, 711104)") End Select sqlstr &= "SELECT Adressen.AdressenNr, Adressen.[Name 1] as Name, tblIDSTransactionsNew.[CustomerCode], Sum(tblIDSTransactionsNew.[TransactionVolume]) AS Liter, Sum(tblIDSTransactionsNew.AmminclVAT) AS Brutto, Sum(tblIDSTransactionsNew.[TotalNetAmount]) AS Netto, Sum(tblIDSTransactionsNew.Rabattbetrag) AS Rabatt