diff --git a/ReportImp/KirschbaumManz/SettlementReport.Designer.cs b/ReportImp/KirschbaumManz/SettlementReport.Designer.cs index 6e1ec340d..cc9046e08 100644 --- a/ReportImp/KirschbaumManz/SettlementReport.Designer.cs +++ b/ReportImp/KirschbaumManz/SettlementReport.Designer.cs @@ -38,10 +38,7 @@ namespace KirschbaumManz.Alt this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); - this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow11 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell(); this.rowErbrachteLeistung = new DevExpress.XtraReports.UI.XRTableRow(); @@ -120,7 +117,7 @@ namespace KirschbaumManz.Alt // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrLabel9}); - this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F); + this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); this.ReportHeader.HeightF = 120F; this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; @@ -155,10 +152,9 @@ namespace KirschbaumManz.Alt this.xrTable1.Name = "xrTable1"; this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow9, - this.xrTableRow10, this.xrTableRow11, this.rowErbrachteLeistung}); - this.xrTable1.SizeF = new System.Drawing.SizeF(650F, 68F); + this.xrTable1.SizeF = new System.Drawing.SizeF(650F, 51F); this.xrTable1.StylePriority.UseBorderColor = false; // // xrTableRow9 @@ -187,7 +183,7 @@ namespace KirschbaumManz.Alt this.xrTableCell6.BorderColor = System.Drawing.SystemColors.ControlLight; this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell6.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold); + this.xrTableCell6.Font = new DevExpress.Drawing.DXFont("Verdana", 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; @@ -198,50 +194,12 @@ namespace KirschbaumManz.Alt this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell6.Weight = 0.21685899000901443D; // - // xrTableRow10 - // - this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell20, - this.xrTableCell7}); - this.xrTableRow10.FormattingRules.Add(this.ruleRateFactorNull); - this.xrTableRow10.Name = "xrTableRow10"; - this.xrTableRow10.Weight = 0.085D; - // - // xrTableCell20 - // - this.xrTableCell20.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTableCell20.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell20.FormattingRules.Add(this.ruleRateFactorNull); - this.xrTableCell20.Name = "xrTableCell20"; - this.xrTableCell20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell20.StylePriority.UseBorderColor = false; - this.xrTableCell20.StylePriority.UseBorders = false; - this.xrTableCell20.StylePriority.UseFont = false; - this.xrTableCell20.Text = "- zzgl. Faktor [RateFactorText2]:"; - this.xrTableCell20.Weight = 0.78314100999098568D; - // // ruleRateFactorNull // this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?"; this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False; this.ruleRateFactorNull.Name = "ruleRateFactorNull"; // - // xrTableCell7 - // - this.xrTableCell7.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell7.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold); - this.xrTableCell7.FormattingRules.Add(this.ruleRateFactorNull); - this.xrTableCell7.Name = "xrTableCell7"; - this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell7.StylePriority.UseBorderColor = false; - this.xrTableCell7.StylePriority.UseBorders = false; - this.xrTableCell7.StylePriority.UseFont = false; - this.xrTableCell7.StylePriority.UseTextAlignment = false; - this.xrTableCell7.Text = "[ApprovedFLSWithFactor]"; - this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell7.Weight = 0.21685899000901443D; - // // xrTableRow11 // this.xrTableRow11.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { @@ -303,7 +261,7 @@ namespace KirschbaumManz.Alt // this.xrLabel4.BackColor = System.Drawing.Color.Transparent; this.xrLabel4.CanShrink = true; - this.xrLabel4.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold); + this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 225F); this.xrLabel4.Multiline = true; this.xrLabel4.Name = "xrLabel4"; @@ -318,7 +276,7 @@ namespace KirschbaumManz.Alt // this.xrLabel3.BackColor = System.Drawing.Color.Transparent; this.xrLabel3.CanShrink = true; - this.xrLabel3.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold); + this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 209F); this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -332,7 +290,7 @@ namespace KirschbaumManz.Alt // this.xrLabel2.BackColor = System.Drawing.Color.Transparent; this.xrLabel2.CanShrink = true; - this.xrLabel2.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold); + this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 192F); this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -405,7 +363,7 @@ namespace KirschbaumManz.Alt this.xrLabel12, this.xrLabel11, this.lblNotice}); - this.ReportFooter.Font = new System.Drawing.Font("Verdana", 10F); + this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); this.ReportFooter.HeightF = 209F; this.ReportFooter.KeepTogether = true; this.ReportFooter.Name = "ReportFooter"; @@ -534,7 +492,7 @@ namespace KirschbaumManz.Alt // lblNotice // this.lblNotice.CanShrink = true; - this.lblNotice.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Italic); + this.lblNotice.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Italic); this.lblNotice.LocationFloat = new DevExpress.Utils.PointFloat(0F, 7.999992F); this.lblNotice.Name = "lblNotice"; this.lblNotice.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -544,12 +502,10 @@ namespace KirschbaumManz.Alt // // topMarginBand1 // - this.topMarginBand1.HeightF = 100F; this.topMarginBand1.Name = "topMarginBand1"; // // bottomMarginBand1 // - this.bottomMarginBand1.HeightF = 100F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // // GroupHeader1 @@ -567,8 +523,8 @@ namespace KirschbaumManz.Alt this.xrLabel6, this.xrTable1, this.xrLabel8}); - this.GroupHeader1.Font = new System.Drawing.Font("Verdana", 10F); - this.GroupHeader1.HeightF = 443.3333F; + this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); + this.GroupHeader1.HeightF = 426.3333F; this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.StylePriority.UseFont = false; // @@ -589,7 +545,7 @@ namespace KirschbaumManz.Alt // this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable5}); - this.Detail1.Font = new System.Drawing.Font("Verdana", 10F); + this.Detail1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); this.Detail1.HeightF = 17F; this.Detail1.Name = "Detail1"; this.Detail1.StylePriority.UseFont = false; @@ -650,7 +606,7 @@ namespace KirschbaumManz.Alt // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable4}); - this.GroupFooter1.Font = new System.Drawing.Font("Verdana", 10F); + this.GroupFooter1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); this.GroupFooter1.HeightF = 132F; this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.StylePriority.UseFont = false; @@ -850,7 +806,7 @@ namespace KirschbaumManz.Alt this.xrTableCell58.BorderColor = System.Drawing.SystemColors.ControlLight; this.xrTableCell58.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell58.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold); + this.xrTableCell58.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell58.Name = "xrTableCell58"; this.xrTableCell58.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell58.StylePriority.UseBorderColor = false; @@ -876,11 +832,11 @@ namespace KirschbaumManz.Alt this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.ruleRateFactorNull}); - this.Margins = new System.Drawing.Printing.Margins(75, 74, 100, 100); + this.Margins = new DevExpress.Drawing.DXMargins(75F, 74F, 100F, 100F); 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(); @@ -912,9 +868,6 @@ namespace KirschbaumManz.Alt private DevExpress.XtraReports.UI.XRTable xrTable1; private DevExpress.XtraReports.UI.XRTableRow xrTableRow9; private DevExpress.XtraReports.UI.XRTableCell xrTableCell19; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow10; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell20; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; private DevExpress.XtraReports.UI.XRTableRow xrTableRow11; private DevExpress.XtraReports.UI.XRTableCell xrTableCell21; private DevExpress.XtraReports.UI.XRTableRow rowErbrachteLeistung; diff --git a/ReportImp/KirschbaumManz/SettlementReport.resx b/ReportImp/KirschbaumManz/SettlementReport.resx index 3b9821114..12ca204c5 100644 --- a/ReportImp/KirschbaumManz/SettlementReport.resx +++ b/ReportImp/KirschbaumManz/SettlementReport.resx @@ -121,7 +121,4 @@ anbei sende ich Ihnen die unterschriebenen Nachweise über die im Rahmen des Betreuten Wohnens für [Salutation2] [CustomerName] erbrachten Leistungen zu. Nach unserer Berechnung ergeben sich für den Betreuungszeitraum [AccountingPeriod] hieraus: - - 17, 17 - \ No newline at end of file