diff --git a/SDL/Reports/frmPrintLayout.vb b/SDL/Reports/frmPrintLayout.vb index 247f3266..be3de6f5 100644 --- a/SDL/Reports/frmPrintLayout.vb +++ b/SDL/Reports/frmPrintLayout.vb @@ -203,7 +203,7 @@ Public Class frmPrintLayout End Sub Private Sub exportMenu_Click(sender As Object, e As EventArgs) Handles exportMenu.Click - Exportieren(Viewer.Document, "Auswertung offene Anträge mit Vorauszahlung") + Exportieren(Viewer.Document, Me.Text) End Sub diff --git a/SDL/mdm/frmMDMDatenverarbetiung.vb b/SDL/mdm/frmMDMDatenverarbetiung.vb index 08d09f13..6da66ce7 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.vb @@ -34,11 +34,11 @@ Public Class frmMDMDatenverarbetiung Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click Select Case LIEFERANT - Case "PLOSE" : genSummenbericht_PLOSE() : genSummenbericht_nachLand_PLOSE() : genSummenbericht_nachLeistungsNr_PLOSE() - Case "ASFINAG" : genSummenbericht_ASFINAG() - Case "UTA" : genSummenbericht_UTA() - Case "IDS" : genSummenbericht_IDS(17, cbxIDSmitVerag.Checked) : genSummenbericht_IDS(21, cbxIDSmitVerag.Checked) - Case "MSE" : genSummenbericht_MSE() + Case "PLOSE" : genSummenbericht_PLOSE(LIEFERANT & "_Summenbericht_" & Now.ToShortDateString) : genSummenbericht_nachLand_PLOSE(LIEFERANT & "_Summenbericht_nachLand_" & Now.ToShortDateString) : genSummenbericht_nachLeistungsNr_PLOSE(LIEFERANT & "_Summenbericht_nachLeistungsNr_" & Now.ToShortDateString) + Case "ASFINAG" : genSummenbericht_ASFINAG(LIEFERANT & "_Summenbericht_" & Now.ToShortDateString) + Case "UTA" : genSummenbericht_UTA(LIEFERANT & "_Summenbericht_" & Now.ToShortDateString) + Case "IDS" : genSummenbericht_IDS(LIEFERANT & "_Summenbericht_" & Now.ToShortDateString, 17, cbxIDSmitVerag.Checked) : genSummenbericht_IDS(LIEFERANT & "_Summenbericht_" & Now.ToShortDateString, 21, cbxIDSmitVerag.Checked) + Case "MSE" : genSummenbericht_MSE(LIEFERANT & "_Summenbericht_" & Now.ToShortDateString) Case Else : MsgBox("Nicht verfügbar!") End Select End Sub @@ -209,7 +209,7 @@ Public Class frmMDMDatenverarbetiung - Sub genSummenbericht_PLOSE() + Sub genSummenbericht_PLOSE(Berichtsname As String) Dim displayFilter = False Dim sqlstr As String = "" sqlstr &= " SELECT count(*) Anzahl ,plose_ProduktCode" @@ -235,13 +235,15 @@ Public Class frmMDMDatenverarbetiung Dim print As New frmPrintLayout - print.Text = "PLOSE" + print.Text = Berichtsname Dim rpt As New rptPLOSE_TransaktionenSumary rpt.DataSource = dt + + 'If cbxProdukt.Checked Then ' rpt.GroupHeader2.DataField = "prod_descr" 'Else @@ -303,7 +305,7 @@ Public Class frmMDMDatenverarbetiung print.Show() End Sub - Sub genSummenbericht_nachLand_PLOSE() + Sub genSummenbericht_nachLand_PLOSE(Berichtsname As String) Dim displayFilter = False Dim sqlstr As String = "" sqlstr = "SELECT @@ -333,10 +335,11 @@ Public Class frmMDMDatenverarbetiung Dim print As New frmPrintLayout - print.Text = "PLOSE" + print.Text = Berichtsname Dim rpt As New rptPLOSE_TransaktionenSumary + rpt.DataSource = dt @@ -397,7 +400,7 @@ Public Class frmMDMDatenverarbetiung print.Show() End Sub - Sub genSummenbericht_nachLeistungsNr_PLOSE() + Sub genSummenbericht_nachLeistungsNr_PLOSE(Berichtsname As String) Dim displayFilter = False Dim sqlstr As String = "" sqlstr = " SELECT count(*) Anzahl ,plp_LeistungsNr @@ -420,10 +423,11 @@ Public Class frmMDMDatenverarbetiung Dim print As New frmPrintLayout - print.Text = "PLOSE" + print.Text = Berichtsname Dim rpt As New rptPLOSE_TransaktionenSumary + rpt.DataSource = dt @@ -484,7 +488,7 @@ Public Class frmMDMDatenverarbetiung print.Show() End Sub - Sub genSummenbericht_ASFINAG() + Sub genSummenbericht_ASFINAG(Berichtsname As String) Dim displayFilter = False Dim sqlstr As String = "" @@ -510,10 +514,11 @@ Public Class frmMDMDatenverarbetiung Dim print As New frmPrintLayout - print.Text = "ASFINAG" + print.Text = Berichtsname Dim rpt As New rptASFINAG_TransaktionenSumary + rpt.DataSource = dt @@ -584,7 +589,7 @@ Public Class frmMDMDatenverarbetiung print.Show() End Sub - Sub genSummenbericht_UTA() + Sub genSummenbericht_UTA(Berichtsname As String) Dim displayFilter = False Dim sqlstr As String = "" @@ -626,10 +631,11 @@ Public Class frmMDMDatenverarbetiung Dim print As New frmPrintLayout - print.Text = "uta" + print.Text = Berichtsname Dim rpt As New rptASFINAG_TransaktionenSumary + rpt.DataSource = dt @@ -696,7 +702,7 @@ Public Class frmMDMDatenverarbetiung print.Show() End Sub - Sub genSummenbericht_MSE() + Sub genSummenbericht_MSE(Berichtsname As String) Dim displayFilter = False Dim sqlstr As String = "" @@ -718,10 +724,11 @@ Public Class frmMDMDatenverarbetiung Dim print As New frmPrintLayout - print.Text = "mse" + print.Text = Berichtsname Dim rpt As New rptASFINAG_TransaktionenSumary + rpt.DataSource = dt 'If cbxProdukt.Checked Then @@ -793,7 +800,7 @@ Public Class frmMDMDatenverarbetiung End Sub - Sub genSummenbericht_IDS(typ As Integer, mitVerag360_VeragAG As Boolean) + Sub genSummenbericht_IDS(Berichtsname As String, typ As Integer, mitVerag360_VeragAG As Boolean) Dim displayFilter = False Dim sqlstr As String = "" @@ -816,10 +823,11 @@ Public Class frmMDMDatenverarbetiung Dim print As New frmPrintLayout - print.Text = "IDS" + print.Text = Berichtsname & "_" & typ Dim rpt As New rptASFINAG_TransaktionenSumary + rpt.DataSource = dt 'If cbxProdukt.Checked Then