diff --git a/ReportImp/AbwKlassen/SettlementReport.Designer.cs b/ReportImp/AbwKlassen/SettlementReport.Designer.cs index de215d760..4d3e09642 100644 --- a/ReportImp/AbwKlassen/SettlementReport.Designer.cs +++ b/ReportImp/AbwKlassen/SettlementReport.Designer.cs @@ -96,6 +96,7 @@ namespace AbwKlassen.Alt this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -119,7 +120,7 @@ namespace AbwKlassen.Alt this.xrLabel4, this.xrLabel3, this.xrLabel2}); - this.ReportHeader.Font = new System.Drawing.Font("Arial", 10F); + this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.ReportHeader.HeightF = 661.75F; this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; @@ -196,7 +197,7 @@ namespace AbwKlassen.Alt // // xrTableCell6 // - this.xrTableCell6.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.xrTableCell6.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell6.Name = "xrTableCell6"; this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell6.StylePriority.UseBorderColor = false; @@ -217,7 +218,7 @@ namespace AbwKlassen.Alt // // xrTableCell20 // - this.xrTableCell20.Font = new System.Drawing.Font("Arial", 10F); + this.xrTableCell20.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrTableCell20.FormattingRules.Add(this.ruleRateFactorNull); this.xrTableCell20.Name = "xrTableCell20"; this.xrTableCell20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -235,7 +236,7 @@ namespace AbwKlassen.Alt // // xrTableCell7 // - this.xrTableCell7.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.xrTableCell7.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell7.FormattingRules.Add(this.ruleRateFactorNull); this.xrTableCell7.Name = "xrTableCell7"; this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -543,7 +544,7 @@ namespace AbwKlassen.Alt // // xrTableCell17 // - this.xrTableCell17.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.xrTableCell17.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell17.Name = "xrTableCell17"; this.xrTableCell17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell17.StylePriority.UseBorderColor = false; @@ -568,7 +569,7 @@ namespace AbwKlassen.Alt // xrLabel4 // this.xrLabel4.CanShrink = true; - this.xrLabel4.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 333F); this.xrLabel4.Multiline = true; this.xrLabel4.Name = "xrLabel4"; @@ -582,7 +583,7 @@ namespace AbwKlassen.Alt // xrLabel3 // this.xrLabel3.CanShrink = true; - this.xrLabel3.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 317F); this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -595,7 +596,7 @@ namespace AbwKlassen.Alt // xrLabel2 // this.xrLabel2.CanShrink = true; - this.xrLabel2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 300F); this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -608,12 +609,13 @@ namespace AbwKlassen.Alt // ReportFooter // this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel5, this.xrTable3, this.xrLabel10, this.xrLabel12, this.xrLabel7}); - this.ReportFooter.Font = new System.Drawing.Font("Arial", 10F); - this.ReportFooter.HeightF = 177.4584F; + this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.ReportFooter.HeightF = 200.0834F; this.ReportFooter.KeepTogether = true; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; @@ -712,7 +714,7 @@ namespace AbwKlassen.Alt // // xrLabel10 // - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 100.3333F); + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 126.3749F); this.xrLabel10.Name = "xrLabel10"; this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel10.SizeF = new System.Drawing.SizeF(175F, 17F); @@ -721,8 +723,8 @@ namespace AbwKlassen.Alt // // xrLabel12 // - this.xrLabel12.Font = new System.Drawing.Font("Arial", 11F); - this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 147.2084F); + this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Arial", 11F); + this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 173.2501F); this.xrLabel12.Name = "xrLabel12"; this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel12.SizeF = new System.Drawing.SizeF(225F, 17F); @@ -731,7 +733,7 @@ namespace AbwKlassen.Alt // // xrLabel7 // - this.xrLabel7.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Italic); + this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Italic); this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrLabel7.Name = "xrLabel7"; this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -753,6 +755,15 @@ namespace AbwKlassen.Alt // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO); // + // xrLabel5 + // + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 96.79159F); + this.xrLabel5.Name = "xrLabel5"; + this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel5.SizeF = new System.Drawing.SizeF(273.9583F, 17F); + this.xrLabel5.StylePriority.UseFont = false; + this.xrLabel5.Text = "zahlbar innerhalb von 30 Tagen"; + // // Spitzabrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -765,11 +776,11 @@ namespace AbwKlassen.Alt this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.ruleRateFactorNull}); - this.Margins = new System.Drawing.Printing.Margins(85, 75, 125, 35); + this.Margins = new DevExpress.Drawing.DXMargins(85F, 75F, 125F, 35F); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; - this.Version = "17.1"; + this.Version = "23.2"; ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); @@ -845,5 +856,6 @@ namespace AbwKlassen.Alt private DevExpress.XtraReports.UI.XRTableCell xrTableCell18; private DevExpress.XtraReports.UI.XRTableRow xrTableRow22; private DevExpress.XtraReports.UI.XRTableCell xrTableCell29; + private DevExpress.XtraReports.UI.XRLabel xrLabel5; } } diff --git a/ReportImp/AbwKlassen/SettlementReport.resx b/ReportImp/AbwKlassen/SettlementReport.resx index d25f3eba2..d58980a38 100644 --- a/ReportImp/AbwKlassen/SettlementReport.resx +++ b/ReportImp/AbwKlassen/SettlementReport.resx @@ -117,7 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - \ No newline at end of file diff --git a/ReportImp/AbwKlassen/SettlementReport2.Designer.cs b/ReportImp/AbwKlassen/SettlementReport2.Designer.cs index 2716a8a6b..c17e99fb1 100644 --- a/ReportImp/AbwKlassen/SettlementReport2.Designer.cs +++ b/ReportImp/AbwKlassen/SettlementReport2.Designer.cs @@ -64,8 +64,6 @@ namespace AbwKlassen this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow22 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); @@ -83,6 +81,7 @@ namespace AbwKlassen this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.xrTable5 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow31 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -100,14 +99,16 @@ namespace AbwKlassen this.xrTableRow37 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell59 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell60 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -327,12 +328,13 @@ namespace AbwKlassen // ReportFooter // this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrTable3, - this.xrLabel10, this.xrLabel12, + this.xrLabel10, + this.xrLabel5, + this.xrTable3, this.xrLabel7}); this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.ReportFooter.HeightF = 177.4584F; + this.ReportFooter.HeightF = 200.5833F; this.ReportFooter.KeepTogether = true; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; @@ -429,25 +431,6 @@ namespace AbwKlassen this.xrTableCell29.Text = "xrTableCell4"; this.xrTableCell29.Weight = 3D; // - // xrLabel10 - // - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 100.3333F); - this.xrLabel10.Name = "xrLabel10"; - this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel10.SizeF = new System.Drawing.SizeF(175F, 17F); - this.xrLabel10.StylePriority.UseFont = false; - this.xrLabel10.Text = "Mit freundlichen Grüßen"; - // - // xrLabel12 - // - this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Arial", 11F); - this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 147.2084F); - this.xrLabel12.Name = "xrLabel12"; - this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel12.SizeF = new System.Drawing.SizeF(225F, 17F); - this.xrLabel12.StylePriority.UseFont = false; - this.xrLabel12.Text = "[CreatorName]"; - // // xrLabel7 // this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Italic); @@ -629,6 +612,10 @@ namespace AbwKlassen this.xrTableCell13.StylePriority.UsePadding = false; this.xrTableCell13.Weight = 3D; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); + // // xrTable5 // this.xrTable5.BorderColor = System.Drawing.SystemColors.ControlLight; @@ -813,10 +800,6 @@ namespace AbwKlassen this.xrTableCell60.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell60.Weight = 0.16397432767427886D; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); - // // GroupFooter2 // this.GroupFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -826,6 +809,34 @@ namespace AbwKlassen this.GroupFooter2.Name = "GroupFooter2"; this.GroupFooter2.StylePriority.UseFont = false; // + // xrLabel12 + // + this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Arial", 11F); + this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 172.9584F); + this.xrLabel12.Name = "xrLabel12"; + this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel12.SizeF = new System.Drawing.SizeF(225F, 17F); + this.xrLabel12.StylePriority.UseFont = false; + this.xrLabel12.Text = "[CreatorName]"; + // + // xrLabel10 + // + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 126.0832F); + this.xrLabel10.Name = "xrLabel10"; + this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel10.SizeF = new System.Drawing.SizeF(175F, 17F); + this.xrLabel10.StylePriority.UseFont = false; + this.xrLabel10.Text = "Mit freundlichen Grüßen"; + // + // xrLabel5 + // + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 96.49989F); + this.xrLabel5.Name = "xrLabel5"; + this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel5.SizeF = new System.Drawing.SizeF(273.9583F, 17F); + this.xrLabel5.StylePriority.UseFont = false; + this.xrLabel5.Text = "zahlbar innerhalb von 30 Tagen"; + // // Spitzabrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -851,8 +862,8 @@ namespace AbwKlassen ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -868,7 +879,6 @@ namespace AbwKlassen private DevExpress.XtraReports.UI.XRLabel xrLabel2; private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter; private DevExpress.XtraReports.UI.XRLabel xrLabel7; - private DevExpress.XtraReports.UI.XRLabel xrLabel12; private DevExpress.XtraReports.UI.XRTable xrTable1; private DevExpress.XtraReports.UI.XRTableRow xrTableRow9; private DevExpress.XtraReports.UI.XRTableCell xrTableCell19; @@ -876,7 +886,6 @@ namespace AbwKlassen private DevExpress.XtraReports.UI.XRTableCell xrTableCell20; private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; - private DevExpress.XtraReports.UI.XRLabel xrLabel10; private DevExpress.XtraReports.UI.FormattingRule ruleRateFactorNull; private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1; private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1; @@ -929,5 +938,8 @@ namespace AbwKlassen private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter2; + private DevExpress.XtraReports.UI.XRLabel xrLabel12; + private DevExpress.XtraReports.UI.XRLabel xrLabel10; + private DevExpress.XtraReports.UI.XRLabel xrLabel5; } }