diff --git a/SDL/mdm/PLOSE/rptPLOSE_Anhang.Designer.vb b/SDL/mdm/PLOSE/rptPLOSE_Anhang.Designer.vb index f123ff35..d6afed6a 100644 --- a/SDL/mdm/PLOSE/rptPLOSE_Anhang.Designer.vb +++ b/SDL/mdm/PLOSE/rptPLOSE_Anhang.Designer.vb @@ -295,7 +295,7 @@ Partial Public Class rptPLOSE_Anhang 'ReportHeader1 ' Me.ReportHeader1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.lblRgDatum, Me.txtKunde, Me.Label16, Me.Picture1, Me.picVERAG, Me.lblUeberschriftRG_GS, Me.Line3, Me.lblFirmaOrt, Me.lblFirmaStrasse, Me.lblFirmaTel, Me.lblFirmaFax, Me.lblFirmaEmail, Me.lblFirmaWeb, Me.Label18, Me.Label1, Me.TextBox1, Me.Label2, Me.Label3, Me.Label4}) - Me.ReportHeader1.Height = 1.185761! + Me.ReportHeader1.Height = 1.301575! Me.ReportHeader1.Name = "ReportHeader1" ' 'lblRgDatum @@ -314,12 +314,12 @@ Partial Public Class rptPLOSE_Anhang ' Me.txtKunde.Height = 0.1574802! Me.txtKunde.HyperLink = Nothing - Me.txtKunde.Left = 5.115748! + Me.txtKunde.Left = 5.111811! Me.txtKunde.Name = "txtKunde" - Me.txtKunde.Style = "font-size: 8pt; font-weight: bold; text-align: right; vertical-align: middle; ddo" & - "-char-set: 1" + Me.txtKunde.Style = "font-size: 8pt; font-weight: bold; text-align: left; vertical-align: middle; ddo-" & + "char-set: 1" Me.txtKunde.Text = "1000000 TEST" - Me.txtKunde.Top = 0.9866142! + Me.txtKunde.Top = 0.8291339! Me.txtKunde.Width = 2.354331! ' 'Label16 @@ -330,8 +330,8 @@ Partial Public Class rptPLOSE_Anhang Me.Label16.Name = "Label16" Me.Label16.Style = "font-size: 8pt; font-weight: normal; text-align: left; vertical-align: middle; dd" & "o-char-set: 1" - Me.Label16.Text = "VERAG-Kunde:" - Me.Label16.Top = 0.9866142! + Me.Label16.Text = "Kunde:" + Me.Label16.Top = 0.8291339! Me.Label16.Width = 0.8114175! ' 'Picture1 @@ -439,19 +439,19 @@ Partial Public Class rptPLOSE_Anhang Me.lblFirmaEmail.Style = "font-size: 7pt; font-weight: normal; text-align: right; vertical-align: middle; d" & "do-char-set: 1" Me.lblFirmaEmail.Text = "s.kriegner@verag.ag" - Me.lblFirmaEmail.Top = 0.7503937! + Me.lblFirmaEmail.Top = 0.868504! Me.lblFirmaEmail.Width = 1.436614! ' 'lblFirmaWeb ' - Me.lblFirmaWeb.Height = 0.1181103! + Me.lblFirmaWeb.Height = 0.1181102! Me.lblFirmaWeb.HyperLink = Nothing Me.lblFirmaWeb.Left = 2.492913! Me.lblFirmaWeb.Name = "lblFirmaWeb" Me.lblFirmaWeb.Style = "font-size: 7pt; font-weight: normal; text-align: right; vertical-align: middle; d" & "do-char-set: 1" Me.lblFirmaWeb.Text = "www.verag.ag" - Me.lblFirmaWeb.Top = 0.8685042! + Me.lblFirmaWeb.Top = 0.7503937! Me.lblFirmaWeb.Width = 1.436614! ' 'Label18 @@ -485,7 +485,7 @@ Partial Public Class rptPLOSE_Anhang Me.TextBox1.Style = "font-size: 8pt; font-weight: bold; text-align: right; vertical-align: middle; ddo" & "-char-set: 1" Me.TextBox1.Text = "1000000" - Me.TextBox1.Top = 0.8291339! + Me.TextBox1.Top = 0.9866142! Me.TextBox1.Width = 0.8688979! ' 'Label2 @@ -497,7 +497,7 @@ Partial Public Class rptPLOSE_Anhang Me.Label2.Style = "font-size: 8pt; font-weight: normal; text-align: left; vertical-align: middle; dd" & "o-char-set: 1" Me.Label2.Text = "Partner-Kunden-Nr:" - Me.Label2.Top = 0.8291339! + Me.Label2.Top = 0.9866142! Me.Label2.Width = 1.020079! ' 'Label3 @@ -509,25 +509,25 @@ Partial Public Class rptPLOSE_Anhang Me.Label3.Style = "font-size: 8pt; font-weight: normal; text-align: left; vertical-align: middle; dd" & "o-char-set: 1" Me.Label3.Text = "Zeitraum bis:" - Me.Label3.Top = 0.8291339! + Me.Label3.Top = 0.9866142! Me.Label3.Width = 0.6905512! ' 'Label4 ' Me.Label4.Height = 0.1574803! Me.Label4.HyperLink = Nothing - Me.Label4.Left = 6.674016! + Me.Label4.Left = 6.670079! Me.Label4.Name = "Label4" Me.Label4.Style = "font-size: 8pt; font-weight: bold; text-align: right; vertical-align: middle; ddo" & "-char-set: 1" Me.Label4.Text = "01.01.2019" - Me.Label4.Top = 0.8291339! + Me.Label4.Top = 0.9866142! Me.Label4.Width = 0.7960634! ' 'ReportFooter1 ' Me.ReportFooter1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.txtBruttoGesSum, Me.txtNettoGesSum, Me.txtMWSTGEsSum, Me.lblGessumme, Me.Line7, Me.Line8}) - Me.ReportFooter1.Height = 0.2515748! + Me.ReportFooter1.Height = 0.6578248! Me.ReportFooter1.KeepTogether = True Me.ReportFooter1.Name = "ReportFooter1" ' @@ -1032,6 +1032,6 @@ Partial Public Class rptPLOSE_Anhang Public WithEvents Label1 As GrapeCity.ActiveReports.SectionReportModel.Label Public WithEvents TextBox1 As GrapeCity.ActiveReports.SectionReportModel.TextBox Public WithEvents Label2 As GrapeCity.ActiveReports.SectionReportModel.Label - Private WithEvents Label3 As GrapeCity.ActiveReports.SectionReportModel.Label + Public WithEvents Label3 As GrapeCity.ActiveReports.SectionReportModel.Label Public WithEvents Label4 As GrapeCity.ActiveReports.SectionReportModel.Label End Class diff --git a/SDL/mdm/PLOSE/rptPLOSE_LaenderGesamt.Designer.vb b/SDL/mdm/PLOSE/rptPLOSE_LaenderGesamt.Designer.vb index b5c1e3ed..e884f0dd 100644 --- a/SDL/mdm/PLOSE/rptPLOSE_LaenderGesamt.Designer.vb +++ b/SDL/mdm/PLOSE/rptPLOSE_LaenderGesamt.Designer.vb @@ -480,7 +480,7 @@ Partial Public Class rptPLOSE_LaenderGesamt Public WithEvents lblSumBrutto As GrapeCity.ActiveReports.SectionReportModel.Label Public WithEvents lblSumMwst As GrapeCity.ActiveReports.SectionReportModel.Label Public WithEvents lblSumNetto As GrapeCity.ActiveReports.SectionReportModel.Label - Private WithEvents Label7 As GrapeCity.ActiveReports.SectionReportModel.Label + Public WithEvents Label7 As GrapeCity.ActiveReports.SectionReportModel.Label Public WithEvents lblEU As GrapeCity.ActiveReports.SectionReportModel.Label Public WithEvents lblLand As GrapeCity.ActiveReports.SectionReportModel.Label End Class diff --git a/SDL/seriendruck/usrCntlFakturierung.vb b/SDL/seriendruck/usrCntlFakturierung.vb index 10fe0543..cb932963 100644 --- a/SDL/seriendruck/usrCntlFakturierung.vb +++ b/SDL/seriendruck/usrCntlFakturierung.vb @@ -37,6 +37,8 @@ Public Class usrcntlFakturierung PathMautberichte = (New SQL).getValueTxtBySql("SELECT TOP 1 [Param_value] FROM [tblPartnersystem_Paramter] WHERE Param_system='GESAMTMAUT' AND [Param_name]='ANLAGE_PFAD' AND Param_testsystem = " & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, 1, 0), "FMZOLL") + 'PathMautberichte = "C:\Users\d.breimaier\Desktop\MDM\Mautgesamtberichte\" + Dim countCSV = 0 Dim countPDF = 0 If Directory.Exists(PathMautberichte) Then @@ -1261,7 +1263,15 @@ Public Class usrcntlFakturierung Dim dt_PDF_selected = dtBerichtkunden_PDF.Select("[Customer No] ='" & pdf.Item(0) & "'").CopyToDataTable - createPDFMautbericht(pdf.Item(0), dt_PDF_selected, cbxDateMautbericht._value, PathMautberichte) + Dim dtLaender As DataTable = (New SQL).loadDgvBySql("SELECT tblMautbericht.[Customer No], tblMautbericht.[Transaction Country], sum(tblMautbericht.[Net Amount]) as Netto, sum(tblMautbericht.[VAT Amount]) as MWST, sum(tblMautbericht.[Total Amount]) as Brutto + FROM tblMautbericht WHERE [Customer No] ='" & pdf.Item(0) & "' + GROUP BY [Customer No], [Transaction Country] + ORDER BY tblMautbericht.[Customer No], tblMautbericht.[Transaction Country]", "FMZOLL") + + + + + createPDFMautbericht(pdf.Item(0), dt_PDF_selected, cbxDateMautbericht._value, PathMautberichte, dtLaender) @@ -1310,7 +1320,7 @@ Public Class usrcntlFakturierung End Try End Sub - Private Function createPDFMautbericht(kdnr As Integer, dt As DataTable, anhangsdatum As Date, path As String) As String + Private Function createPDFMautbericht(kdnr As Integer, dt As DataTable, anhangsdatum As Date, path As String, dtLaender As DataTable) As String Dim rpt As New rptPLOSE_Anhang Dim sql As New VERAG_PROG_ALLGEMEIN.SQL @@ -1323,17 +1333,17 @@ Public Class usrcntlFakturierung rpt.GroupHeaderKz.DataField = "Licence Plate Number" - rpt.txtNettoKzSum.Visible = False - rpt.txtNettoGesSum.Visible = False - rpt.txtNetto.Visible = False - rpt.txtNettoKatSum.Visible = False - rpt.lblNetto.Visible = False + 'rpt.txtNettoKzSum.Visible = False + 'rpt.txtNettoGesSum.Visible = False + 'rpt.txtNetto.Visible = False + 'rpt.txtNettoKatSum.Visible = False + 'rpt.lblNetto.Visible = False - rpt.txtMWSTKzSum.Visible = False - rpt.txtMWSTGEsSum.Visible = False - rpt.txtMWST.Visible = False - rpt.txtMWSTKatSum.Visible = False - rpt.lblMWST.Visible = False + 'rpt.txtMWSTKzSum.Visible = False + 'rpt.txtMWSTGEsSum.Visible = False + 'rpt.txtMWST.Visible = False + 'rpt.txtMWSTKatSum.Visible = False + 'rpt.lblMWST.Visible = False 'rpt.lblBrutto.Text = "Total Amount ( EUR )" 'rpt.Label4.Text = bis.ToShortDateString @@ -1344,6 +1354,15 @@ Public Class usrcntlFakturierung rpt.lblSummeKennzeichen.Visible = False rpt.lblService.Visible = False + rpt.Label2.Visible = False + rpt.TextBox1.Visible = False + rpt.Label3.Visible = False + rpt.Label4.Visible = False + + rpt.lblFirmaFax.Visible = False + rpt.lblFirmaEmail.Visible = False + rpt.Label16.Visible = False + 'rpt.lblSummeKennzeichen.Location = New PointF(rpt.lblSummeKennzeichen.Location.X + 4.5, rpt.lblSummeKennzeichen.Location.Y) 'rpt.lblSumKategorie.Location = New PointF(rpt.lblSumKategorie.Location.X + 4.5, rpt.lblSumKategorie.Location.Y) 'rpt.lblGessumme.Location = New PointF(rpt.lblGessumme.Location.X + 4.5, rpt.lblGessumme.Location.Y) @@ -1382,8 +1401,8 @@ Public Class usrcntlFakturierung rpt.txtMWST.Text = sql.isDbnullEmptyDbl(rpt.Fields.Item("VAT Amount").Value, 2, "") rpt.txtBrutto.Text = sql.isDbnullEmptyDbl(rpt.Fields.Item("Total Amount").Value, 2, "") - sumNetto += 0 'SQL.isDbnullEmptyDbl(rpt.Fields.Item("plose_NettobetragWaehrungAbbuchung").Value, 4, 0) - sumMWST += 0 'SQL.isDbnullEmptyDbl(rpt.Fields.Item("plose_MWSTBetragWaehrungAbbuchung").Value, 4, 0) + sumNetto += sql.isDbnullEmptyDbl(rpt.Fields.Item("Net Amount").Value, 4, 0) + sumMWST += sql.isDbnullEmptyDbl(rpt.Fields.Item("VAT Amount").Value, 4, 0) sumBrutto += sql.isDbnullEmptyDbl(rpt.Fields.Item("Total Amount").Value, 4, 0) cnt += 1 End Sub @@ -1425,6 +1444,7 @@ Public Class usrcntlFakturierung rpt.txtMWSTKatSum.Text = sumMWSTKat.ToString("N2") rpt.txtBruttoKatSum.Text = sumBruttoKat.ToString("N2") cntKat += 1 + rpt.lblSumKategorie.Text = rpt.lblSumKategorie.Text.Replace("Kunde", sql.isDbnullEmpty(rpt.Fields.Item("Customer No").Value, "")) End Sub AddHandler rpt.ReportFooter1.Format, Sub() 'sumNettoGes += sumNettoKat @@ -1458,6 +1478,63 @@ Public Class usrcntlFakturierung Dim tmpPath = path & "\" & kdnr & "_Maut.pdf" Dim p As New GrapeCity.ActiveReports.Export.Pdf.Section.PdfExport rpt.Run(False) + + + + + Dim rpt2 As New rptPLOSE_LaenderGesamt + rpt2.DataSource = dtLaender + + rpt2.Label7.Visible = False + rpt2.lblEU.Visible = False + + rpt2.lblUeberschrift.Text = "Länder Gesamt" + + Dim sum = 0 + ' rpt.lblUeberschrift.Text = "PLOSE Summenbericht " & dat_Sum_Von.Text & " bis " & dat_Sum_Bis.Text + rpt2.lblSachbearbeiter.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME + 'rpt.lblMandantNiederlassung.Text = PERSONAL.Mandant & " / " & PERSONAL.Niederlassung + + 'Dim cnt As Integer = 0 + rpt2.lblDat.Text = Now.ToLongDateString + + + Dim sumPreis As Double = 0 + Dim sumNettoLaender As Double = 0 + Dim sumMWSTLaender As Double = 0 + Dim sumBruttoLaender As Double = 0 + Dim sumBruttoAlleLeistungen As Double = 0 + Dim sumMenge As Double = 0 + + AddHandler rpt2.Detail.Format, Sub() + rpt2.lblLand.Text = sql.isDbnullEmpty(rpt2.Fields.Item("Transaction Country").Value, "") + rpt2.lblEU.Text = "" 'sql.isDbnullEmpty(rpt.Fields.Item("EU").Value, "") + + rpt2.lblNetto.Text = sql.isDbnullEmptyDbl(rpt2.Fields.Item("Netto").Value, 2, "") + rpt2.lblMWST.Text = sql.isDbnullEmptyDbl(rpt2.Fields.Item("MWST").Value, 2, "") + rpt2.lblBrutto.Text = sql.isDbnullEmptyDbl(rpt2.Fields.Item("Brutto").Value, 2, "") + + sumNetto += sql.isDbnullEmptyDbl(rpt2.Fields.Item("Netto").Value, 4, 0) + sumMWST += sql.isDbnullEmptyDbl(rpt2.Fields.Item("MWST").Value, 4, 0) + sumBrutto += sql.isDbnullEmptyDbl(rpt2.Fields.Item("Brutto").Value, 4, 0) + + + + End Sub + + + AddHandler rpt2.ReportFooter1.Format, Sub() + rpt2.lblSumNetto.Text = sumNetto.ToString("N2") + rpt2.lblSumMwst.Text = sumMWST.ToString("N2") + rpt2.lblSumBrutto.Text = sumBrutto.ToString("N2") + + End Sub + rpt2.Run() + + For i = 0 To rpt2.Document.Pages.Count - 1 + rpt.Document.Pages.Add(rpt2.Document.Pages(i)) + Next + p.NeverEmbedFonts = "" p.Export(rpt.Document, tmpPath)