diff --git a/ReportImp/BeWoGuen/Properties/licenses.licx b/ReportImp/BeWoGuen/Properties/licenses.licx index e69de29bb..d59547a61 100644 --- a/ReportImp/BeWoGuen/Properties/licenses.licx +++ b/ReportImp/BeWoGuen/Properties/licenses.licx @@ -0,0 +1 @@ +DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/ReportImp/BeWoGuen/SettlementReport.Designer.cs b/ReportImp/BeWoGuen/SettlementReport.Designer.cs index 4d650ebef..a68a8a59d 100644 --- a/ReportImp/BeWoGuen/SettlementReport.Designer.cs +++ b/ReportImp/BeWoGuen/SettlementReport.Designer.cs @@ -28,7 +28,6 @@ namespace BeWoGuen.Alt /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung)); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); @@ -71,7 +70,7 @@ namespace BeWoGuen.Alt this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.bindingSource1 = new System.Windows.Forms.BindingSource(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); this.xrTable5 = new DevExpress.XtraReports.UI.XRTable(); @@ -116,7 +115,7 @@ namespace BeWoGuen.Alt // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrLabel7}); - this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F); + this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); this.ReportHeader.HeightF = 200F; this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; @@ -130,8 +129,8 @@ namespace BeWoGuen.Alt this.xrLabel7.SizeF = new System.Drawing.SizeF(317F, 180F); this.xrLabel7.StylePriority.UseFont = false; this.xrLabel7.Text = "BeWo Gün\r\nAmbulant Betreutes Wohnen\r\nDipl. Sozialpädagogin\r\nNiehler Kirchweg 41\r\n" + - "50733 Köln\r\nTel: 0221/22201970\r\nFax: 0221/22201971\r\nMobil: 01525/5479141\r\nbewo.g" + - "uen@gmail.com"; + "50733 Köln\r\nTel: 0221/22201970\r\nFax: 0221/22201971\r\nMobil: 01525/5479141\r\ninfo@b" + + "ewoguen.de"; // // xrLabel8 // @@ -184,7 +183,7 @@ namespace BeWoGuen.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; @@ -227,7 +226,7 @@ namespace BeWoGuen.Alt // 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.Font = new DevExpress.Drawing.DXFont("Verdana", 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); @@ -300,7 +299,7 @@ namespace BeWoGuen.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, 206.7708F); this.xrLabel4.Multiline = true; this.xrLabel4.Name = "xrLabel4"; @@ -315,7 +314,7 @@ namespace BeWoGuen.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, 190.7708F); this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -329,7 +328,7 @@ namespace BeWoGuen.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, 173.7708F); this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -401,7 +400,7 @@ namespace BeWoGuen.Alt this.xrTable3, this.xrLabel12, this.xrLabel11}); - this.ReportFooter.Font = new System.Drawing.Font("Verdana", 10F); + this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); this.ReportFooter.HeightF = 161.6042F; this.ReportFooter.KeepTogether = true; this.ReportFooter.Name = "ReportFooter"; @@ -533,7 +532,7 @@ namespace BeWoGuen.Alt this.xrLabel6, this.xrTable1, this.xrLabel8}); - this.GroupHeader1.Font = new System.Drawing.Font("Verdana", 10F); + this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); this.GroupHeader1.HeightF = 425.1041F; this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.StylePriority.UseFont = false; @@ -555,7 +554,7 @@ namespace BeWoGuen.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; @@ -616,7 +615,7 @@ namespace BeWoGuen.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; @@ -816,7 +815,7 @@ namespace BeWoGuen.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; @@ -840,14 +839,15 @@ namespace BeWoGuen.Alt this.GroupFooter1}); this.DataSource = this.bindingSource1; this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; - this.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.ruleRateFactorNull}); - this.Margins = new System.Drawing.Printing.Margins(75, 74, 50, 90); + this.Margins = new DevExpress.Drawing.DXMargins(75F, 74F, 50F, 90F); 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(); diff --git a/ReportImp/BeWoGuen/SettlementReport.resx b/ReportImp/BeWoGuen/SettlementReport.resx index 3b9821114..12ca204c5 100644 --- a/ReportImp/BeWoGuen/SettlementReport.resx +++ b/ReportImp/BeWoGuen/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 diff --git a/ReportImp/BeWoGuen/SettlementReport2.Designer.cs b/ReportImp/BeWoGuen/SettlementReport2.Designer.cs index 6d45e55e2..1691d054d 100644 --- a/ReportImp/BeWoGuen/SettlementReport2.Designer.cs +++ b/ReportImp/BeWoGuen/SettlementReport2.Designer.cs @@ -28,7 +28,6 @@ namespace BeWoGuen /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung)); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); @@ -71,7 +70,7 @@ namespace BeWoGuen this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.bindingSource1 = new System.Windows.Forms.BindingSource(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); this.xrTable5 = new DevExpress.XtraReports.UI.XRTable(); @@ -116,7 +115,7 @@ namespace BeWoGuen // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrLabel7}); - this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F); + this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); this.ReportHeader.HeightF = 200F; this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; @@ -130,8 +129,8 @@ namespace BeWoGuen this.xrLabel7.SizeF = new System.Drawing.SizeF(317F, 180F); this.xrLabel7.StylePriority.UseFont = false; this.xrLabel7.Text = "BeWo Gün\r\nAmbulant Betreutes Wohnen\r\nDipl. Sozialpädagogin\r\nNiehler Kirchweg 41\r\n" + - "50733 Köln\r\nTel: 0221/22201970\r\nFax: 0221/22201971\r\nMobil: 01525/5479141\r\nbewo.g" + - "uen@gmail.com"; + "50733 Köln\r\nTel: 0221/22201970\r\nFax: 0221/22201971\r\nMobil: 01525/5479141\r\ninfo@b" + + "ewoguen.de"; // // xrLabel8 // @@ -183,7 +182,7 @@ namespace BeWoGuen 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; @@ -226,7 +225,7 @@ namespace BeWoGuen // 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.Font = new DevExpress.Drawing.DXFont("Verdana", 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); @@ -299,7 +298,7 @@ namespace BeWoGuen // 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, 209.8958F); this.xrLabel4.Multiline = true; this.xrLabel4.Name = "xrLabel4"; @@ -314,7 +313,7 @@ namespace BeWoGuen // 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, 193.8958F); this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -328,7 +327,7 @@ namespace BeWoGuen // 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, 176.8958F); this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -400,7 +399,7 @@ namespace BeWoGuen this.xrTable3, this.xrLabel12, this.xrLabel11}); - this.ReportFooter.Font = new System.Drawing.Font("Verdana", 10F); + this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); this.ReportFooter.HeightF = 158.4792F; this.ReportFooter.KeepTogether = true; this.ReportFooter.Name = "ReportFooter"; @@ -532,7 +531,7 @@ namespace BeWoGuen this.xrLabel6, this.xrTable1, this.xrLabel8}); - this.GroupHeader1.Font = new System.Drawing.Font("Verdana", 10F); + this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); this.GroupHeader1.HeightF = 428.2291F; this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.StylePriority.UseFont = false; @@ -554,7 +553,7 @@ namespace BeWoGuen // 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; @@ -615,7 +614,7 @@ namespace BeWoGuen // 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; @@ -816,7 +815,7 @@ namespace BeWoGuen | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell58.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Claim", "{0:c}")}); - 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; @@ -839,14 +838,15 @@ namespace BeWoGuen this.GroupFooter1}); this.DataSource = this.bindingSource1; this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; - this.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.ruleRateFactorNull}); - this.Margins = new System.Drawing.Printing.Margins(75, 74, 50, 90); + this.Margins = new DevExpress.Drawing.DXMargins(75F, 74F, 50F, 90F); 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(); diff --git a/ReportImp/BeWoGuen/SettlementReport2.resx b/ReportImp/BeWoGuen/SettlementReport2.resx index 3b9821114..12ca204c5 100644 --- a/ReportImp/BeWoGuen/SettlementReport2.resx +++ b/ReportImp/BeWoGuen/SettlementReport2.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