diff --git a/ReportImp/VkmRietberg/SettlementReport.Designer.cs b/ReportImp/VkmRietberg/SettlementReport.Designer.cs index b65139208..bdffddcaa 100644 --- a/ReportImp/VkmRietberg/SettlementReport.Designer.cs +++ b/ReportImp/VkmRietberg/SettlementReport.Designer.cs @@ -94,6 +94,7 @@ namespace VkmRietberg.Alt this.lblNotice = new DevExpress.XtraReports.UI.XRLabel(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); @@ -124,14 +125,13 @@ namespace VkmRietberg.Alt this.xrTableRow36 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -185,7 +185,7 @@ namespace VkmRietberg.Alt // xrTable1 // this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 369.0833F); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 358.0833F); this.xrTable1.Name = "xrTable1"; this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow9, @@ -316,11 +316,11 @@ namespace VkmRietberg.Alt // // xrLabel6 // - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 294.0833F); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 285.9583F); this.xrLabel6.Multiline = true; this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel6.SizeF = new System.Drawing.SizeF(642F, 67F); + this.xrLabel6.SizeF = new System.Drawing.SizeF(649.9997F, 59.39868F); this.xrLabel6.StylePriority.UseFont = false; this.xrLabel6.Text = resources.GetString("xrLabel6.Text"); // @@ -581,14 +581,14 @@ namespace VkmRietberg.Alt this.xrLabel11, this.lblNotice}); this.ReportFooter.Font = new System.Drawing.Font("Verdana", 10F); - this.ReportFooter.HeightF = 209F; + this.ReportFooter.HeightF = 206F; this.ReportFooter.KeepTogether = true; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; // // xrTable3 // - this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0.0001430511F, 32.99999F); + this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0.0001430511F, 30.99999F); this.xrTable3.Name = "xrTable3"; this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow20, @@ -708,7 +708,7 @@ namespace VkmRietberg.Alt // // xrLabel10 // - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 133.6666F); + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 130.6666F); 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); @@ -717,7 +717,7 @@ namespace VkmRietberg.Alt // // xrLabel12 // - this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 192F); + this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 189F); 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); @@ -726,7 +726,7 @@ namespace VkmRietberg.Alt // // xrLabel11 // - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(582.9999F, 192F); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(582.9999F, 189F); this.xrLabel11.Name = "xrLabel11"; this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel11.SizeF = new System.Drawing.SizeF(67F, 17F); @@ -739,7 +739,7 @@ namespace VkmRietberg.Alt // this.lblNotice.CanShrink = true; this.lblNotice.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Italic); - this.lblNotice.LocationFloat = new DevExpress.Utils.PointFloat(0F, 7.999992F); + this.lblNotice.LocationFloat = new DevExpress.Utils.PointFloat(0F, 5.999992F); this.lblNotice.Name = "lblNotice"; this.lblNotice.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.lblNotice.SizeF = new System.Drawing.SizeF(250F, 25F); @@ -758,6 +758,16 @@ namespace VkmRietberg.Alt this.bottomMarginBand1.HeightF = 94.49997F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // + // xrRichText1 + // + this.xrRichText1.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.xrRichText1.Font = new System.Drawing.Font("Verdana", 10F); + this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 13.61453F); + this.xrRichText1.Name = "xrRichText1"; + this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); + this.xrRichText1.SizeF = new System.Drawing.SizeF(652.9999F, 67.27079F); + this.xrRichText1.StylePriority.UseBorders = false; + // // GroupHeader1 // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -777,7 +787,7 @@ namespace VkmRietberg.Alt this.xrTable1, this.xrLabel8}); this.GroupHeader1.Font = new System.Drawing.Font("Verdana", 10F); - this.GroupHeader1.HeightF = 437.0833F; + this.GroupHeader1.HeightF = 426.0833F; this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.StylePriority.UseFont = false; // @@ -882,7 +892,7 @@ namespace VkmRietberg.Alt this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable4}); this.GroupFooter1.Font = new System.Drawing.Font("Verdana", 10F); - this.GroupFooter1.HeightF = 132F; + this.GroupFooter1.HeightF = 129F; this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.StylePriority.UseFont = false; // @@ -899,7 +909,7 @@ namespace VkmRietberg.Alt this.xrTableRow34, this.xrTableRow35, this.xrTableRow36}); - this.xrTable4.SizeF = new System.Drawing.SizeF(650F, 132F); + this.xrTable4.SizeF = new System.Drawing.SizeF(650F, 129F); this.xrTable4.StylePriority.UseBorderColor = false; // // xrTableRow30 @@ -1062,7 +1072,7 @@ namespace VkmRietberg.Alt this.xrTableCell57, this.xrTableCell58}); this.xrTableRow36.Name = "xrTableRow36"; - this.xrTableRow36.Weight = 0.15D; + this.xrTableRow36.Weight = 0.135D; // // xrTableCell57 // @@ -1092,16 +1102,6 @@ namespace VkmRietberg.Alt this.xrTableCell58.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell58.Weight = 0.21685899000901443D; // - // xrRichText1 - // - this.xrRichText1.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrRichText1.Font = new System.Drawing.Font("Verdana", 10F); - this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 13.61453F); - this.xrRichText1.Name = "xrRichText1"; - this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); - this.xrRichText1.SizeF = new System.Drawing.SizeF(652.9999F, 67.27079F); - this.xrRichText1.StylePriority.UseBorders = false; - // // Spitzabrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1125,10 +1125,10 @@ namespace VkmRietberg.Alt ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } diff --git a/ReportImp/VkmRietberg/SettlementReport2.Designer.cs b/ReportImp/VkmRietberg/SettlementReport2.Designer.cs index 82e4003bd..449f79891 100644 --- a/ReportImp/VkmRietberg/SettlementReport2.Designer.cs +++ b/ReportImp/VkmRietberg/SettlementReport2.Designer.cs @@ -88,6 +88,7 @@ namespace VkmRietberg this.lblNotice = new DevExpress.XtraReports.UI.XRLabel(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); @@ -125,15 +126,14 @@ namespace VkmRietberg this.xrTableRow37 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell59 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell60 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -187,7 +187,7 @@ namespace VkmRietberg // xrTable1 // this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 369.0833F); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 359.0833F); this.xrTable1.Name = "xrTable1"; this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.rowErbrachteLeistung}); @@ -224,11 +224,11 @@ namespace VkmRietberg // xrLabel6 // this.xrLabel6.BackColor = System.Drawing.Color.Transparent; - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 294.0833F); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 287.0833F); this.xrLabel6.Multiline = true; this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel6.SizeF = new System.Drawing.SizeF(642F, 67F); + this.xrLabel6.SizeF = new System.Drawing.SizeF(649.9998F, 67F); this.xrLabel6.StylePriority.UseBackColor = false; this.xrLabel6.StylePriority.UseFont = false; this.xrLabel6.Text = resources.GetString("xrLabel6.Text"); @@ -491,14 +491,14 @@ namespace VkmRietberg this.xrLabel11, this.lblNotice}); this.ReportFooter.Font = new System.Drawing.Font("Verdana", 10F); - this.ReportFooter.HeightF = 209F; + this.ReportFooter.HeightF = 203F; this.ReportFooter.KeepTogether = true; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; // // xrLabel10 // - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 133F); + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 128F); 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); @@ -507,7 +507,7 @@ namespace VkmRietberg // // xrTable3 // - this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 33F); + this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 30F); this.xrTable3.Name = "xrTable3"; this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow20, @@ -627,7 +627,7 @@ namespace VkmRietberg // // xrLabel12 // - this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 192F); + this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 186F); 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); @@ -636,7 +636,7 @@ namespace VkmRietberg // // xrLabel11 // - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(582.9999F, 192F); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(582.9999F, 186F); this.xrLabel11.Name = "xrLabel11"; this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel11.SizeF = new System.Drawing.SizeF(67F, 17F); @@ -649,7 +649,7 @@ namespace VkmRietberg // this.lblNotice.CanShrink = true; this.lblNotice.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Italic); - this.lblNotice.LocationFloat = new DevExpress.Utils.PointFloat(0F, 7.999992F); + this.lblNotice.LocationFloat = new DevExpress.Utils.PointFloat(0F, 4.999992F); this.lblNotice.Name = "lblNotice"; this.lblNotice.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.lblNotice.SizeF = new System.Drawing.SizeF(250F, 25F); @@ -668,6 +668,16 @@ namespace VkmRietberg this.bottomMarginBand1.HeightF = 89.20835F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // + // xrRichText1 + // + this.xrRichText1.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.xrRichText1.Font = new System.Drawing.Font("Verdana", 10F); + this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0.0003496806F, 11.93759F); + this.xrRichText1.Name = "xrRichText1"; + this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); + this.xrRichText1.SizeF = new System.Drawing.SizeF(649.9998F, 67.27079F); + this.xrRichText1.StylePriority.UseBorders = false; + // // GroupHeader1 // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -687,7 +697,7 @@ namespace VkmRietberg this.xrTable1, this.xrLabel8}); this.GroupHeader1.Font = new System.Drawing.Font("Verdana", 10F); - this.GroupHeader1.HeightF = 386.0833F; + this.GroupHeader1.HeightF = 376.0833F; this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.StylePriority.UseFont = false; // @@ -801,7 +811,7 @@ namespace VkmRietberg // this.Zwischensumme.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable6}); - this.Zwischensumme.HeightF = 34F; + this.Zwischensumme.HeightF = 27F; this.Zwischensumme.Name = "Zwischensumme"; this.Zwischensumme.Visible = false; // @@ -812,7 +822,7 @@ namespace VkmRietberg this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow12, this.xrTableRow10}); - this.xrTable6.SizeF = new System.Drawing.SizeF(650F, 34F); + this.xrTable6.SizeF = new System.Drawing.SizeF(650F, 27F); this.xrTable6.StylePriority.UseFont = false; // // xrTableRow12 @@ -863,7 +873,7 @@ namespace VkmRietberg this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { this.xrTableCell7}); this.xrTableRow10.Name = "xrTableRow10"; - this.xrTableRow10.Weight = 0.40476190476190466D; + this.xrTableRow10.Weight = 0.23809523809523805D; // // xrTableCell7 // @@ -888,7 +898,7 @@ namespace VkmRietberg this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable5}); this.GroupFooter1.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.GroupFooter1.HeightF = 115F; + this.GroupFooter1.HeightF = 112F; this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.StylePriority.UseFont = false; // @@ -904,7 +914,7 @@ namespace VkmRietberg this.xrTableRow35, this.xrTableRow36, this.xrTableRow37}); - this.xrTable5.SizeF = new System.Drawing.SizeF(650F, 115F); + this.xrTable5.SizeF = new System.Drawing.SizeF(650F, 112F); this.xrTable5.StylePriority.UseBorderColor = false; // // xrTableRow31 @@ -1051,7 +1061,7 @@ namespace VkmRietberg this.xrTableCell59, this.xrTableCell60}); this.xrTableRow37.Name = "xrTableRow37"; - this.xrTableRow37.Weight = 0.15D; + this.xrTableRow37.Weight = 0.13499999999999998D; // // xrTableCell59 // @@ -1082,16 +1092,6 @@ namespace VkmRietberg this.xrTableCell60.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell60.Weight = 0.16397432767427886D; // - // xrRichText1 - // - this.xrRichText1.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrRichText1.Font = new System.Drawing.Font("Verdana", 10F); - this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0.0003496806F, 11.93759F); - this.xrRichText1.Name = "xrRichText1"; - this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); - this.xrRichText1.SizeF = new System.Drawing.SizeF(649.9998F, 67.27079F); - this.xrRichText1.StylePriority.UseBorders = false; - // // Spitzabrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1117,11 +1117,11 @@ namespace VkmRietberg ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); }