From 938a193ab99344aa7ff6234cdce96fd48643b22d Mon Sep 17 00:00:00 2001 From: Marcel Hirschle Date: Fri, 19 Jul 2024 09:05:55 +0200 Subject: [PATCH] MH: Suchtkrankenhilfe Ostfriesland Rechnung anpassen --- .../Invoicing/CustomInvoiceCreation.cs | 2 +- .../ServiceInvoiceReport.Designer.cs | 92 ++++++++++--------- .../ServiceInvoiceReport.resx | 3 - 3 files changed, 49 insertions(+), 48 deletions(-) diff --git a/ReportImp/SuchtkrankenhilfeOstfriesland/Invoicing/CustomInvoiceCreation.cs b/ReportImp/SuchtkrankenhilfeOstfriesland/Invoicing/CustomInvoiceCreation.cs index 29525bada..40353c2eb 100644 --- a/ReportImp/SuchtkrankenhilfeOstfriesland/Invoicing/CustomInvoiceCreation.cs +++ b/ReportImp/SuchtkrankenhilfeOstfriesland/Invoicing/CustomInvoiceCreation.cs @@ -150,7 +150,7 @@ namespace SuchtkrankenhilfeOstfriesland.Invoicing if (cat == "FLS") { - invoiceItem.ItemDescription = "face-to-face"; + invoiceItem.ItemDescription = "qualifizierte Assistenz"; invoiceItem.UnitDescription = "Fachleistungsstunde (FLS)"; } else diff --git a/ReportImp/SuchtkrankenhilfeOstfriesland/ServiceInvoiceReport.Designer.cs b/ReportImp/SuchtkrankenhilfeOstfriesland/ServiceInvoiceReport.Designer.cs index 1e10163fc..bd845e3c3 100644 --- a/ReportImp/SuchtkrankenhilfeOstfriesland/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/SuchtkrankenhilfeOstfriesland/ServiceInvoiceReport.Designer.cs @@ -106,7 +106,7 @@ namespace SuchtkrankenhilfeOstfriesland // // ReportHeader // - this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F); + this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); this.ReportHeader.HeightF = 0F; this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; @@ -138,7 +138,7 @@ namespace SuchtkrankenhilfeOstfriesland this.xrLabel8, this.lblAbrechnungszeitraum, this.xrTable2}); - this.Page1.Font = new System.Drawing.Font("Verdana", 10F); + this.Page1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); this.Page1.HeightF = 354.0833F; this.Page1.Name = "Page1"; this.Page1.StylePriority.UseFont = false; @@ -158,7 +158,8 @@ namespace SuchtkrankenhilfeOstfriesland // this.xrLabel4.BackColor = System.Drawing.Color.Transparent; this.xrLabel4.CanShrink = true; - this.xrLabel4.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 235F); this.xrLabel4.Multiline = true; this.xrLabel4.Name = "xrLabel4"; @@ -173,7 +174,8 @@ namespace SuchtkrankenhilfeOstfriesland // this.xrLabel3.BackColor = System.Drawing.Color.Transparent; this.xrLabel3.CanShrink = true; - this.xrLabel3.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 215F); this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -187,7 +189,8 @@ namespace SuchtkrankenhilfeOstfriesland // this.xrLabel2.BackColor = System.Drawing.Color.Transparent; this.xrLabel2.CanShrink = true; - this.xrLabel2.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 195F); this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -371,7 +374,7 @@ namespace SuchtkrankenhilfeOstfriesland // // xrLabel15 // - this.xrLabel15.Font = new System.Drawing.Font("Verdana", 10F); + this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 114.5833F); this.xrLabel15.Name = "xrLabel15"; this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -381,7 +384,7 @@ namespace SuchtkrankenhilfeOstfriesland // // xrTable4 // - this.xrTable4.Font = new System.Drawing.Font("Verdana", 10F); + this.xrTable4.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 68.75F); this.xrTable4.Name = "xrTable4"; this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { @@ -423,7 +426,7 @@ namespace SuchtkrankenhilfeOstfriesland // this.xrLabel14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "CreatorName")}); - this.xrLabel14.Font = new System.Drawing.Font("Verdana", 10F); + this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 189.5833F); this.xrLabel14.Name = "xrLabel14"; this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -433,7 +436,7 @@ namespace SuchtkrankenhilfeOstfriesland // // xrLabel9 // - this.xrLabel9.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Italic); + this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Italic); this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 43.75F); this.xrLabel9.Name = "xrLabel9"; this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -483,8 +486,8 @@ namespace SuchtkrankenhilfeOstfriesland // this.xrTableCell32.BackColor = System.Drawing.Color.Gainsboro; this.xrTableCell32.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell32.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTableCell32.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell32.Name = "xrTableCell32"; this.xrTableCell32.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); @@ -501,8 +504,8 @@ namespace SuchtkrankenhilfeOstfriesland // this.xrTableCell37.BackColor = System.Drawing.Color.Gainsboro; this.xrTableCell37.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell37.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTableCell37.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell37.Name = "xrTableCell37"; this.xrTableCell37.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); @@ -513,14 +516,14 @@ namespace SuchtkrankenhilfeOstfriesland this.xrTableCell37.StylePriority.UseTextAlignment = false; this.xrTableCell37.Text = "Leistung"; this.xrTableCell37.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell37.Weight = 0.85081236260328186D; + this.xrTableCell37.Weight = 0.78009598927800716D; // // xrTableCell35 // this.xrTableCell35.BackColor = System.Drawing.Color.Gainsboro; this.xrTableCell35.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell35.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTableCell35.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell35.Name = "xrTableCell35"; this.xrTableCell35.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); @@ -531,14 +534,14 @@ namespace SuchtkrankenhilfeOstfriesland this.xrTableCell35.StylePriority.UseTextAlignment = false; this.xrTableCell35.Text = "Satz"; this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell35.Weight = 0.23245943032832414D; + this.xrTableCell35.Weight = 0.28932781022267656D; // // xrTableCell33 // this.xrTableCell33.BackColor = System.Drawing.Color.Gainsboro; this.xrTableCell33.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell33.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTableCell33.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell33.Name = "xrTableCell33"; this.xrTableCell33.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); @@ -547,16 +550,16 @@ namespace SuchtkrankenhilfeOstfriesland this.xrTableCell33.StylePriority.UseBorders = false; this.xrTableCell33.StylePriority.UsePadding = false; this.xrTableCell33.StylePriority.UseTextAlignment = false; - this.xrTableCell33.Text = "Stunden"; + this.xrTableCell33.Text = "Einheiten"; this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell33.Weight = 0.2893277257020575D; + this.xrTableCell33.Weight = 0.31019201236426208D; // // xrTableCell36 // this.xrTableCell36.BackColor = System.Drawing.Color.Gainsboro; this.xrTableCell36.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell36.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTableCell36.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell36.Name = "xrTableCell36"; this.xrTableCell36.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); @@ -567,14 +570,14 @@ namespace SuchtkrankenhilfeOstfriesland this.xrTableCell36.StylePriority.UseTextAlignment = false; this.xrTableCell36.Text = "Betrag"; this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell36.Weight = 0.26310971709438763D; + this.xrTableCell36.Weight = 0.2560934238631053D; // // xrTableCell38 // this.xrTableCell38.BackColor = System.Drawing.Color.Gainsboro; this.xrTableCell38.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell38.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTableCell38.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell38.Name = "xrTableCell38"; this.xrTableCell38.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); @@ -591,8 +594,8 @@ namespace SuchtkrankenhilfeOstfriesland // this.xrTableCell34.BackColor = System.Drawing.Color.Gainsboro; this.xrTableCell34.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell34.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTableCell34.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell34.Name = "xrTableCell34"; this.xrTableCell34.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); @@ -625,7 +628,8 @@ namespace SuchtkrankenhilfeOstfriesland // // xrTable6 // - this.xrTable6.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTable6.Font = new DevExpress.Drawing.DXFont("Verdana", 8.25F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTable6.Name = "xrTable6"; this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { @@ -649,7 +653,7 @@ namespace SuchtkrankenhilfeOstfriesland // xrTableCell40 // this.xrTableCell40.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell40.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTableCell40.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell40.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.Duration")}); @@ -665,7 +669,7 @@ namespace SuchtkrankenhilfeOstfriesland // xrTableCell42 // this.xrTableCell42.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell42.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTableCell42.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell42.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.ServiceDescription")}); @@ -676,12 +680,12 @@ namespace SuchtkrankenhilfeOstfriesland this.xrTableCell42.StylePriority.UsePadding = false; this.xrTableCell42.StylePriority.UseTextAlignment = false; this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell42.Weight = 0.85081229498678679D; + this.xrTableCell42.Weight = 0.78009598927800727D; // // xrTableCell43 // this.xrTableCell43.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell43.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTableCell43.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell43.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.HourlyRate", "{0:0.00}")}); @@ -693,12 +697,12 @@ namespace SuchtkrankenhilfeOstfriesland this.xrTableCell43.StylePriority.UseTextAlignment = false; this.xrTableCell43.Text = "xrTableCell43"; this.xrTableCell43.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell43.Weight = 0.23245943032832414D; + this.xrTableCell43.Weight = 0.28932774260618144D; // // xrTableCell44 // this.xrTableCell44.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell44.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTableCell44.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell44.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.Hours", "{0:0.##}")}); @@ -710,12 +714,12 @@ namespace SuchtkrankenhilfeOstfriesland this.xrTableCell44.StylePriority.UseTextAlignment = false; this.xrTableCell44.Text = "xrTableCell44"; this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell44.Weight = 0.2893277257020575D; + this.xrTableCell44.Weight = 0.31019187713127183D; // // xrTableCell45 // this.xrTableCell45.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell45.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTableCell45.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell45.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.NetAmount", "{0:0.00}")}); @@ -727,12 +731,12 @@ namespace SuchtkrankenhilfeOstfriesland this.xrTableCell45.StylePriority.UseTextAlignment = false; this.xrTableCell45.Text = "xrTableCell45"; this.xrTableCell45.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell45.Weight = 0.26310971709438763D; + this.xrTableCell45.Weight = 0.25609355909609555D; // // xrTableCell46 // this.xrTableCell46.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell46.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTableCell46.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell46.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.RateFactor")}); @@ -748,7 +752,7 @@ namespace SuchtkrankenhilfeOstfriesland // xrTableCell47 // this.xrTableCell47.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell47.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTableCell47.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell47.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.GrossAmount")}); @@ -776,7 +780,7 @@ namespace SuchtkrankenhilfeOstfriesland // this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim", "Gesamtsumme: {0}")}); - this.xrLabel1.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Bold); + this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Verdana", 9F, DevExpress.Drawing.DXFontStyle.Bold); this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(420.9999F, 0F); this.xrLabel1.Name = "xrLabel1"; this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F); @@ -802,14 +806,14 @@ namespace SuchtkrankenhilfeOstfriesland this.DetailReport}); this.DataSource = this.bindingSource1; this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; - this.Font = new System.Drawing.Font("Verdana", 10F); + this.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.ruleRateFactorNull}); - this.Margins = new System.Drawing.Printing.Margins(75, 75, 158, 50); + this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 157.5F, 50F); 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.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); diff --git a/ReportImp/SuchtkrankenhilfeOstfriesland/ServiceInvoiceReport.resx b/ReportImp/SuchtkrankenhilfeOstfriesland/ServiceInvoiceReport.resx index d25f3eba2..d58980a38 100644 --- a/ReportImp/SuchtkrankenhilfeOstfriesland/ServiceInvoiceReport.resx +++ b/ReportImp/SuchtkrankenhilfeOstfriesland/ServiceInvoiceReport.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