diff --git a/SDL/Fakturierung/frmFaktEmail.vb b/SDL/Fakturierung/frmFaktEmail.vb index 2970abc5..88189c78 100644 --- a/SDL/Fakturierung/frmFaktEmail.vb +++ b/SDL/Fakturierung/frmFaktEmail.vb @@ -913,6 +913,32 @@ Public Class frmFaktEmail If ATTACHMENTS.Count = 0 Then Exit Sub Try + Dim PATH_Org As String = "" + Dim PATH As String = "" + + For Each a In ATTACHMENTS + If a.Pfad.ToString.Contains("POS_LISTE") Or a.Pfad.ToString.Contains("POS-LISTE") Then + + PATH_Org = a.Pfad + + Dim pdfReader As itextsharp.text.pdf.PdfReader = New itextsharp.text.pdf.PdfReader(PATH_Org) + Dim fm As New VERAG_PROG_ALLGEMEIN.cFormularManager + Dim listTowrite As New List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues) + For page As Integer = 1 To pdfReader.NumberOfPages + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(RECHNUNG.RechnungsNr, 7, 23.5, 100, 20, "bold", 12, , itextsharp.text.Element.ALIGN_LEFT, page)) + Next + + pdfReader.Close() + + a.Pfad = fm.fillPDFVorhandenesLokalesPDF_Path(PATH_Org, listTowrite, , ,, False) + PATH = a.Pfad + End If + + Next + + + + If MergePDF And ATTACHMENTS.Count > 1 Then Dim extension = ".pdf" @@ -927,9 +953,9 @@ Public Class frmFaktEmail Dim myListLiefereranten As New List(Of String) Dim myListPOSLIST As New List(Of String) For Each a In ATTACHMENTS - If a.Pfad.ToString.Contains("VERAG") Or a.Pfad.ToString.Contains("IDS") Or a.Pfad.ToString.Contains("MSE") Or a.Pfad.ToString.Contains("UTA") Or a.Pfad.ToString.Contains("PLOSE") Or a.Pfad.ToString.Contains("RMC") Then + If a.Pfad.ToString.Contains("VERAG") Or a.Pfad.ToString.Contains("IDS") Or a.Pfad.ToString.Contains("MSE") Or a.Pfad.ToString.Contains("UTA") Or a.Pfad.ToString.Contains("PLOSE") Or a.Pfad.ToString.Contains("RMC") Or a.Pfad.ToString.Contains("USTVA_") Then myListLiefereranten.Add(a.Pfad) - ElseIf a.Pfad.ToString.Contains("POS_LISTE") Or a.Pfad.ToString.Contains("POS-LISTE") Then + ElseIf a.Pfad.ToString.Contains("POS_LISTE") Or a.Pfad.ToString.Contains("POS-LISTE") Or (a.Pfad = PATH AndAlso PATH <> "" AndAlso (PATH_Org.Contains("POS-LISTE") Or PATH_Org.Contains("POS_LISTE"))) Then myListPOSLIST.Add(a.Pfad) Else myList.Add(a.Pfad) diff --git a/SDL/Reports/MDM/rptMWSTListe.Designer.vb b/SDL/Reports/MDM/rptMWSTListe.Designer.vb index ad557e3b..d31bf5ab 100644 --- a/SDL/Reports/MDM/rptMWSTListe.Designer.vb +++ b/SDL/Reports/MDM/rptMWSTListe.Designer.vb @@ -46,6 +46,14 @@ Partial Public Class rptMWSTListe Me.lblVatNo = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.lblCompanyname = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.Label1 = New GrapeCity.ActiveReports.SectionReportModel.Label() + Me.Line13 = New GrapeCity.ActiveReports.SectionReportModel.Line() + Me.Line21 = New GrapeCity.ActiveReports.SectionReportModel.Line() + Me.Line23 = New GrapeCity.ActiveReports.SectionReportModel.Line() + Me.Line24 = New GrapeCity.ActiveReports.SectionReportModel.Line() + Me.Line25 = New GrapeCity.ActiveReports.SectionReportModel.Line() + Me.Line26 = New GrapeCity.ActiveReports.SectionReportModel.Line() + Me.Label3 = New GrapeCity.ActiveReports.SectionReportModel.Label() + Me.Line22 = New GrapeCity.ActiveReports.SectionReportModel.Line() Me.ReportFooter1 = New GrapeCity.ActiveReports.SectionReportModel.ReportFooter() Me.GroupHeader1 = New GrapeCity.ActiveReports.SectionReportModel.GroupHeader() Me.Label5 = New GrapeCity.ActiveReports.SectionReportModel.Label() @@ -68,12 +76,6 @@ Partial Public Class rptMWSTListe Me.GroupHeader2 = New GrapeCity.ActiveReports.SectionReportModel.GroupHeader() Me.lblFirma = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.GroupFooter2 = New GrapeCity.ActiveReports.SectionReportModel.GroupFooter() - Me.Line13 = New GrapeCity.ActiveReports.SectionReportModel.Line() - Me.Line21 = New GrapeCity.ActiveReports.SectionReportModel.Line() - Me.Line22 = New GrapeCity.ActiveReports.SectionReportModel.Line() - Me.Line23 = New GrapeCity.ActiveReports.SectionReportModel.Line() - Me.Line24 = New GrapeCity.ActiveReports.SectionReportModel.Line() - Me.Line25 = New GrapeCity.ActiveReports.SectionReportModel.Line() CType(Me.lblNumber, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblGoods, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblName, System.ComponentModel.ISupportInitialize).BeginInit() @@ -89,6 +91,7 @@ Partial Public Class rptMWSTListe CType(Me.lblVatNo, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblCompanyname, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Label1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.Label3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Label5, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextBox12, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextBox17, System.ComponentModel.ISupportInitialize).BeginInit() @@ -364,73 +367,73 @@ Partial Public Class rptMWSTListe ' 'ReportHeader1 ' - Me.ReportHeader1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.picVERAG, Me.lblUeberschrift, Me.Label2, Me.lblVatNo, Me.lblCompanyname, Me.Label1, Me.Line13, Me.Line21, Me.Line22, Me.Line23, Me.Line24, Me.Line25}) - Me.ReportHeader1.Height = 1.05315! + Me.ReportHeader1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.picVERAG, Me.lblUeberschrift, Me.Label2, Me.lblVatNo, Me.lblCompanyname, Me.Label1, Me.Line13, Me.Line21, Me.Line23, Me.Line24, Me.Line25, Me.Line26, Me.Label3, Me.Line22}) + Me.ReportHeader1.Height = 1.344817! Me.ReportHeader1.Name = "ReportHeader1" ' 'picVERAG ' - Me.picVERAG.Height = 0.4169292! + Me.picVERAG.Height = 0.3751969! Me.picVERAG.HyperLink = Nothing Me.picVERAG.ImageBase64String = resources.GetString("picVERAG.ImageBase64String") - Me.picVERAG.Left = 5.964961! + Me.picVERAG.Left = 0! Me.picVERAG.Name = "picVERAG" Me.picVERAG.SizeMode = GrapeCity.ActiveReports.SectionReportModel.SizeModes.Zoom Me.picVERAG.Top = 0! - Me.picVERAG.Width = 2.198425! + Me.picVERAG.Width = 2.240158! ' 'lblUeberschrift ' Me.lblUeberschrift.Height = 0.2311024! Me.lblUeberschrift.HyperLink = Nothing - Me.lblUeberschrift.Left = 0.01023622! + Me.lblUeberschrift.Left = 1.322441! Me.lblUeberschrift.Name = "lblUeberschrift" Me.lblUeberschrift.Style = "font-size: 12pt; font-weight: normal; text-align: left; ddo-char-set: 0" Me.lblUeberschrift.Text = "VAT No." - Me.lblUeberschrift.Top = 0.1338583! - Me.lblUeberschrift.Width = 1.696063! + Me.lblUeberschrift.Top = 0.4377953! + Me.lblUeberschrift.Width = 1.493701! ' 'Label2 ' Me.Label2.Height = 0.2311024! Me.Label2.HyperLink = Nothing - Me.Label2.Left = 1.216929! + Me.Label2.Left = 2.893701! Me.Label2.Name = "Label2" Me.Label2.Style = "font-size: 12pt; font-weight: normal; text-align: left; ddo-char-set: 0" Me.Label2.Text = "Name/Company" - Me.Label2.Top = 0.1338583! - Me.Label2.Width = 4.294882! + Me.Label2.Top = 0.4377953! + Me.Label2.Width = 5.315749! ' 'lblVatNo ' Me.lblVatNo.DataField = "" Me.lblVatNo.Height = 0.2311024! Me.lblVatNo.HyperLink = Nothing - Me.lblVatNo.Left = 0! + Me.lblVatNo.Left = 1.322441! Me.lblVatNo.Name = "lblVatNo" Me.lblVatNo.Style = "color: Black; font-size: 12pt; font-weight: bold; text-align: left; ddo-char-set:" & " 1" Me.lblVatNo.Text = "VAT No." - Me.lblVatNo.Top = 0.4169292! - Me.lblVatNo.Width = 1.696063! + Me.lblVatNo.Top = 0.7208663! + Me.lblVatNo.Width = 1.493701! ' 'lblCompanyname ' Me.lblCompanyname.DataField = "" Me.lblCompanyname.Height = 0.2311024! Me.lblCompanyname.HyperLink = Nothing - Me.lblCompanyname.Left = 1.216929! + Me.lblCompanyname.Left = 2.893701! Me.lblCompanyname.Name = "lblCompanyname" Me.lblCompanyname.Style = "color: Black; font-size: 12pt; font-weight: bold; text-align: left; ddo-char-set:" & " 1" Me.lblCompanyname.Text = "Name/Company" - Me.lblCompanyname.Top = 0.4169292! - Me.lblCompanyname.Width = 4.294882! + Me.lblCompanyname.Top = 0.7208663! + Me.lblCompanyname.Width = 5.315749! ' 'Label1 ' Me.Label1.DataField = "" - Me.Label1.Height = 0.4051182! + Me.Label1.Height = 0.3322834! Me.Label1.HyperLink = Nothing Me.Label1.Left = 0.0102362! Me.Label1.Name = "Label1" @@ -438,9 +441,111 @@ Partial Public Class rptMWSTListe "ign: middle; ddo-char-set: 1" Me.Label1.Text = "Statement itemising VAT amounts relating to the period covered by this applicatio" & "n" - Me.Label1.Top = 0.6480315! + Me.Label1.Top = 1.003937! Me.Label1.Width = 8.287402! ' + 'Line13 + ' + Me.Line13.Height = 0! + Me.Line13.Left = 0.03937008! + Me.Line13.LineWeight = 1.0! + Me.Line13.Name = "Line13" + Me.Line13.Top = 0.6996064! + Me.Line13.Width = 8.228346! + Me.Line13.X1 = 0.03937008! + Me.Line13.X2 = 8.267716! + Me.Line13.Y1 = 0.6996064! + Me.Line13.Y2 = 0.6996064! + ' + 'Line21 + ' + Me.Line21.Height = 0! + Me.Line21.Left = 0.03937008! + Me.Line21.LineWeight = 1.0! + Me.Line21.Name = "Line21" + Me.Line21.Top = 0.9519686! + Me.Line21.Width = 8.228346! + Me.Line21.X1 = 0.03937008! + Me.Line21.X2 = 8.267716! + Me.Line21.Y1 = 0.9519686! + Me.Line21.Y2 = 0.9519686! + ' + 'Line23 + ' + Me.Line23.Height = 0.5141732! + Me.Line23.Left = 8.267717! + Me.Line23.LineWeight = 1.0! + Me.Line23.Name = "Line23" + Me.Line23.Top = 0.4377954! + Me.Line23.Width = 0! + Me.Line23.X1 = 8.267717! + Me.Line23.X2 = 8.267717! + Me.Line23.Y1 = 0.9519686! + Me.Line23.Y2 = 0.4377954! + ' + 'Line24 + ' + Me.Line24.Height = 0.514173! + Me.Line24.Left = 2.851575! + Me.Line24.LineWeight = 1.0! + Me.Line24.Name = "Line24" + Me.Line24.Top = 0.4377955! + Me.Line24.Width = 0! + Me.Line24.X1 = 2.851575! + Me.Line24.X2 = 2.851575! + Me.Line24.Y1 = 0.9519686! + Me.Line24.Y2 = 0.4377955! + ' + 'Line25 + ' + Me.Line25.Height = 0.514173! + Me.Line25.Left = 1.280709! + Me.Line25.LineWeight = 1.0! + Me.Line25.Name = "Line25" + Me.Line25.Top = 0.4377956! + Me.Line25.Width = 0! + Me.Line25.X1 = 1.280709! + Me.Line25.X2 = 1.280709! + Me.Line25.Y1 = 0.9519686! + Me.Line25.Y2 = 0.4377956! + ' + 'Line26 + ' + Me.Line26.Height = 0.5141732! + Me.Line26.Left = 0.03937006! + Me.Line26.LineWeight = 1.0! + Me.Line26.Name = "Line26" + Me.Line26.Top = 0.4377955! + Me.Line26.Width = 0! + Me.Line26.X1 = 0.03937006! + Me.Line26.X2 = 0.03937006! + Me.Line26.Y1 = 0.9519686! + Me.Line26.Y2 = 0.4377955! + ' + 'Label3 + ' + Me.Label3.Height = 0.2311024! + Me.Label3.HyperLink = Nothing + Me.Label3.Left = 0.05118108! + Me.Label3.Name = "Label3" + Me.Label3.Style = "font-size: 12pt; font-weight: normal; text-align: left; ddo-char-set: 0" + Me.Label3.Text = "Doc No." + Me.Label3.Top = 0.4377953! + Me.Label3.Width = 1.196063! + ' + 'Line22 + ' + Me.Line22.Height = 0! + Me.Line22.Left = 0.03937008! + Me.Line22.LineWeight = 1.0! + Me.Line22.Name = "Line22" + Me.Line22.Top = 0.4377953! + Me.Line22.Width = 8.228346! + Me.Line22.X1 = 0.03937008! + Me.Line22.X2 = 8.267716! + Me.Line22.Y1 = 0.4377953! + Me.Line22.Y2 = 0.4377953! + ' 'ReportFooter1 ' Me.ReportFooter1.Height = 0! @@ -696,96 +801,18 @@ Partial Public Class rptMWSTListe Me.GroupFooter2.Name = "GroupFooter2" Me.GroupFooter2.NewPage = GrapeCity.ActiveReports.SectionReportModel.NewPage.After ' - 'Line13 - ' - Me.Line13.Height = 0! - Me.Line13.Left = 0.005118132! - Me.Line13.LineWeight = 1.0! - Me.Line13.Name = "Line13" - Me.Line13.Top = 0.3956693! - Me.Line13.Width = 5.506693! - Me.Line13.X1 = 0.005118132! - Me.Line13.X2 = 5.511811! - Me.Line13.Y1 = 0.3956693! - Me.Line13.Y2 = 0.3956693! - ' - 'Line21 - ' - Me.Line21.Height = 0! - Me.Line21.Left = 0! - Me.Line21.LineWeight = 1.0! - Me.Line21.Name = "Line21" - Me.Line21.Top = 0.6480315! - Me.Line21.Width = 5.506692! - Me.Line21.X1 = 0! - Me.Line21.X2 = 5.506692! - Me.Line21.Y1 = 0.6480315! - Me.Line21.Y2 = 0.6480315! - ' - 'Line22 - ' - Me.Line22.Height = 0! - Me.Line22.Left = 0! - Me.Line22.LineWeight = 1.0! - Me.Line22.Name = "Line22" - Me.Line22.Top = 0.1338583! - Me.Line22.Width = 5.506692! - Me.Line22.X1 = 0! - Me.Line22.X2 = 5.506692! - Me.Line22.Y1 = 0.1338583! - Me.Line22.Y2 = 0.1338583! - ' - 'Line23 - ' - Me.Line23.Height = 0.5141731! - Me.Line23.Left = 5.506693! - Me.Line23.LineWeight = 1.0! - Me.Line23.Name = "Line23" - Me.Line23.Top = 0.1338584! - Me.Line23.Width = 0! - Me.Line23.X1 = 5.506693! - Me.Line23.X2 = 5.506693! - Me.Line23.Y1 = 0.6480315! - Me.Line23.Y2 = 0.1338584! - ' - 'Line24 - ' - Me.Line24.Height = 0.514173! - Me.Line24.Left = 1.185433! - Me.Line24.LineWeight = 1.0! - Me.Line24.Name = "Line24" - Me.Line24.Top = 0.1338585! - Me.Line24.Width = 0! - Me.Line24.X1 = 1.185433! - Me.Line24.X2 = 1.185433! - Me.Line24.Y1 = 0.6480315! - Me.Line24.Y2 = 0.1338585! - ' - 'Line25 - ' - Me.Line25.Height = 0.514173! - Me.Line25.Left = 0.01023626! - Me.Line25.LineWeight = 1.0! - Me.Line25.Name = "Line25" - Me.Line25.Top = 0.1338585! - Me.Line25.Width = 0! - Me.Line25.X1 = 0.01023626! - Me.Line25.X2 = 0.01023626! - Me.Line25.Y1 = 0.6480315! - Me.Line25.Y2 = 0.1338585! - ' 'rptMWSTListe ' Me.PageSettings.DefaultPaperSize = False - Me.PageSettings.Margins.Bottom = 0.3937008! + Me.PageSettings.Margins.Bottom = 0.1968504! Me.PageSettings.Margins.Left = 0.1968504! Me.PageSettings.Margins.Right = 0.1968504! - Me.PageSettings.Margins.Top = 0.3937008! + Me.PageSettings.Margins.Top = 0.1968504! Me.PageSettings.Orientation = GrapeCity.ActiveReports.Document.Section.PageOrientation.Portrait Me.PageSettings.PaperHeight = 11.69291! Me.PageSettings.PaperKind = GrapeCity.ActiveReports.Printing.PaperKind.A4 Me.PageSettings.PaperWidth = 8.267716! - Me.PrintWidth = 8.287221! + Me.PrintWidth = 8.816929! Me.Sections.Add(Me.ReportHeader1) Me.Sections.Add(Me.PageHeader) Me.Sections.Add(Me.GroupHeader2) @@ -816,6 +843,7 @@ Partial Public Class rptMWSTListe CType(Me.lblVatNo, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.lblCompanyname, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Label1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.Label3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Label5, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextBox12, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextBox17, System.ComponentModel.ISupportInitialize).EndInit() @@ -882,4 +910,6 @@ Partial Public Class rptMWSTListe Private WithEvents Line23 As GrapeCity.ActiveReports.SectionReportModel.Line Private WithEvents Line24 As GrapeCity.ActiveReports.SectionReportModel.Line Private WithEvents Line25 As GrapeCity.ActiveReports.SectionReportModel.Line + Private WithEvents Line26 As GrapeCity.ActiveReports.SectionReportModel.Line + Public WithEvents Label3 As GrapeCity.ActiveReports.SectionReportModel.Label End Class