From 0c3ca2400115bf2aad2474134dc91a2486517664 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Mon, 11 Nov 2024 17:54:16 +0100 Subject: [PATCH] CaritasAhlen/SettlementReportBeWo67 - Integration pauschaler Faktor in Preise --- ReportImp/CaritasAhlen/CaritasAhlen.csproj | 1 + .../Invoicing/SettlementInvoiceCreation.cs | 80 ++++++++++++++ .../CaritasAhlen/SettlementReportBeWo67.cs | 17 +++ .../SettlementReportBeWo67.designer.cs | 100 +++++++++++------- .../CaritasAhlen/SettlementReportBeWo67.resx | 3 - 5 files changed, 157 insertions(+), 44 deletions(-) create mode 100644 ReportImp/CaritasAhlen/Invoicing/SettlementInvoiceCreation.cs diff --git a/ReportImp/CaritasAhlen/CaritasAhlen.csproj b/ReportImp/CaritasAhlen/CaritasAhlen.csproj index f1dc83e6d..149bb6d16 100644 --- a/ReportImp/CaritasAhlen/CaritasAhlen.csproj +++ b/ReportImp/CaritasAhlen/CaritasAhlen.csproj @@ -73,6 +73,7 @@ + Component diff --git a/ReportImp/CaritasAhlen/Invoicing/SettlementInvoiceCreation.cs b/ReportImp/CaritasAhlen/Invoicing/SettlementInvoiceCreation.cs new file mode 100644 index 000000000..360770495 --- /dev/null +++ b/ReportImp/CaritasAhlen/Invoicing/SettlementInvoiceCreation.cs @@ -0,0 +1,80 @@ +using BeWo.Data.Access; +using BeWo.Data.Entities; +using BeWo.Service.Invoicing; +using BS.Shared.DataContracts; +using BS.Shared.Services; +using System; +using System.Collections.Generic; +using System.Linq; + +namespace CaritasAhlen +{ + public class CustomSettlementInvoiceCreation : LWLBeWo67SettlementInvoiceCreation + { + + public override List CreateInvoiceItems(Settlement2DC si, IList apList) + { + List iiList = new List(); + decimal rf = 0; + if (si.RateFactor.HasValue && si.RateFactor.Value != 0) + { + rf = si.RateFactor.Value; + } + var apsByHourlyRate = new Dictionary>(); + + foreach (var ap in apList) + { + IList list = null; + if (apsByHourlyRate.ContainsKey(ap.AmountPerUnit)) + { + list = apsByHourlyRate[ap.AmountPerUnit]; + } + else + { + list = new List(); + apsByHourlyRate[ap.AmountPerUnit] = list; + } + + list.Add(ap); + } + foreach (var hr in apsByHourlyRate.Keys) + { + IList list = apsByHourlyRate[hr]; + var ii = new InvoiceItemDC(); + + decimal minutesTotal = 0; + DateTime start = DateTime.MaxValue; + DateTime end = DateTime.MinValue; + + foreach (var approvalPeriod in list) + { + minutesTotal += approvalPeriod.RecordedMinutes; + if (approvalPeriod.PeriodStartDate < start) + start = approvalPeriod.PeriodStartDate; + if (approvalPeriod.PeriodEndDate > end) + end = approvalPeriod.PeriodEndDate; + } + ii.ItemPeriodStart = start; + ii.ItemPeriodEnd = end; + ii.RateFactor = si.RateFactor; + decimal hours = minutesTotal / 60m; + hours = Math.Round(hours, 2, MidpointRounding.AwayFromZero); + ii.UnitCount = hours; + ii.AmountPerUnit = hr; + if (ii.AmountPerUnit.HasValue) + { + if (ii.RateFactor.HasValue && ii.RateFactor.Value != 0) // Rundung von Stundensatz mit Faktor + { + ii.AmountPerUnit = Math.Round(ii.AmountPerUnit.Value * ((100m + ii.RateFactor.Value) / 100m), 2, MidpointRounding.AwayFromZero); + } + ii.AmountTotal = Math.Round(ii.UnitCount.Value * ii.AmountPerUnit.Value, 2, MidpointRounding.AwayFromZero); + ii.GrossAmountTotal = ii.AmountTotal; + } + + iiList.Add(ii); + } + + return iiList.OrderBy(ii => ii.ItemPeriodStart).ToList(); + } + } +} diff --git a/ReportImp/CaritasAhlen/SettlementReportBeWo67.cs b/ReportImp/CaritasAhlen/SettlementReportBeWo67.cs index ec1a9d256..22e1d37e7 100644 --- a/ReportImp/CaritasAhlen/SettlementReportBeWo67.cs +++ b/ReportImp/CaritasAhlen/SettlementReportBeWo67.cs @@ -76,6 +76,23 @@ namespace IbpEingliederungshilfe } lblGesamtbetrag.Text = String.Format("{0:c}", totalEURGesamt); + //ab 11/2024 keine Aufsplittung mehr + if (fahrZeiten == null && fehlkontakte == null) + { + xrTableCell14.Visible = false; + xrTableCell15.Visible = false; + xrTableCell17.Visible = false; + xrTableCell19.Visible = false; + xrTableCell20.Visible = false; + xrTableCell21.Visible = false; + xrTableCell12.Visible = false; + lblFahrtzeitenBetrag.Visible = false; + xrTableCell3.Visible = false; + lblAusfallzeitenBetrag.Visible = false; + xrTableCell9.Visible = false; + lblGesamtbetrag.Visible = false; + } + if (pRO.TerminationDate.HasValue) { chkBetreuungBeendet.Text = String.Format("Die Betreuung wurde am {0:dd.MM.yyyy} beendet.", pRO.TerminationDate); diff --git a/ReportImp/CaritasAhlen/SettlementReportBeWo67.designer.cs b/ReportImp/CaritasAhlen/SettlementReportBeWo67.designer.cs index 47c51073c..cb1422a12 100644 --- a/ReportImp/CaritasAhlen/SettlementReportBeWo67.designer.cs +++ b/ReportImp/CaritasAhlen/SettlementReportBeWo67.designer.cs @@ -31,6 +31,7 @@ namespace IbpEingliederungshilfe { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SpitzabrechnungBeWo67)); + DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); @@ -58,7 +59,6 @@ namespace IbpEingliederungshilfe this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail2 = new DevExpress.XtraReports.UI.DetailBand(); this.xrTable20 = new DevExpress.XtraReports.UI.XRTable(); @@ -121,7 +121,7 @@ namespace IbpEingliederungshilfe this.xrTableRow88 = new DevExpress.XtraReports.UI.XRTableRow(); this.lblFLSErbracht = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell109 = new DevExpress.XtraReports.UI.XRTableCell(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable20)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable22)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable21)).BeginInit(); @@ -132,6 +132,7 @@ namespace IbpEingliederungshilfe ((System.ComponentModel.ISupportInitialize)(this.xrTable23)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable24)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable25)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -193,7 +194,8 @@ namespace IbpEingliederungshilfe // this.xrLabel3.BackColor = System.Drawing.Color.Transparent; this.xrLabel3.CanShrink = true; - this.xrLabel3.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 12F, 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, 149.625F); this.xrLabel3.Multiline = true; this.xrLabel3.Name = "xrLabel3"; @@ -267,7 +269,7 @@ namespace IbpEingliederungshilfe this.chkBetreuungDauertAn, this.xrLabel10, this.xrLabel6}); - this.ReportFooter.Font = new System.Drawing.Font("Arial", 10F); + this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.ReportFooter.HeightF = 209.0001F; this.ReportFooter.KeepTogether = true; this.ReportFooter.Name = "ReportFooter"; @@ -275,7 +277,7 @@ namespace IbpEingliederungshilfe // // chkBetreuungBeendet // - this.chkBetreuungBeendet.Font = new System.Drawing.Font("Arial", 11F); + this.chkBetreuungBeendet.Font = new DevExpress.Drawing.DXFont("Arial", 11F); this.chkBetreuungBeendet.LocationFloat = new DevExpress.Utils.PointFloat(0.958252F, 0F); this.chkBetreuungBeendet.Name = "chkBetreuungBeendet"; this.chkBetreuungBeendet.SizeF = new System.Drawing.SizeF(353.3333F, 21.875F); @@ -284,7 +286,7 @@ namespace IbpEingliederungshilfe // // chkBetreuungDauertAn // - this.chkBetreuungDauertAn.Font = new System.Drawing.Font("Arial", 11F); + this.chkBetreuungDauertAn.Font = new DevExpress.Drawing.DXFont("Arial", 11F); this.chkBetreuungDauertAn.LocationFloat = new DevExpress.Utils.PointFloat(354.2915F, 0F); this.chkBetreuungDauertAn.Name = "chkBetreuungDauertAn"; this.chkBetreuungDauertAn.SizeF = new System.Drawing.SizeF(211.0832F, 21.875F); @@ -294,7 +296,7 @@ namespace IbpEingliederungshilfe // xrLabel10 // this.xrLabel10.BackColor = System.Drawing.Color.Transparent; - this.xrLabel10.Font = new System.Drawing.Font("Arial", 11F); + this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Arial", 11F); this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0.958252F, 57.71319F); this.xrLabel10.Multiline = true; this.xrLabel10.Name = "xrLabel10"; @@ -307,7 +309,7 @@ namespace IbpEingliederungshilfe // xrLabel6 // this.xrLabel6.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrLabel6.Font = new System.Drawing.Font("Arial", 11F); + this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Arial", 11F); this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 192.0001F); this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -318,7 +320,6 @@ namespace IbpEingliederungshilfe // // topMarginBand1 // - this.topMarginBand1.HeightF = 100F; this.topMarginBand1.Name = "topMarginBand1"; // // bottomMarginBand1 @@ -391,7 +392,8 @@ namespace IbpEingliederungshilfe // this.xrLabel5.BackColor = System.Drawing.Color.Transparent; this.xrLabel5.CanShrink = true; - this.xrLabel5.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0.958252F, 284.1251F); this.xrLabel5.Name = "xrLabel5"; this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -405,7 +407,8 @@ namespace IbpEingliederungshilfe // this.xrLabel14.BackColor = System.Drawing.Color.Transparent; this.xrLabel14.CanShrink = true; - this.xrLabel14.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0.958252F, 268.125F); this.xrLabel14.Name = "xrLabel14"; this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -419,7 +422,8 @@ namespace IbpEingliederungshilfe // this.xrLabel13.BackColor = System.Drawing.Color.Transparent; this.xrLabel13.CanShrink = true; - this.xrLabel13.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0.958252F, 236.125F); this.xrLabel13.Name = "xrLabel13"; this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -433,7 +437,8 @@ namespace IbpEingliederungshilfe // this.xrLabel8.BackColor = System.Drawing.Color.Transparent; this.xrLabel8.CanShrink = true; - this.xrLabel8.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0.958252F, 220.125F); this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -443,10 +448,6 @@ namespace IbpEingliederungshilfe this.xrLabel8.Text = "Name Klient / in:"; this.xrLabel8.WordWrap = false; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO); - // // DetailReport1 // this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -472,7 +473,7 @@ namespace IbpEingliederungshilfe this.xrTable20.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTable20.Font = new System.Drawing.Font("Arial", 11F); + this.xrTable20.Font = new DevExpress.Drawing.DXFont("Arial", 11F); this.xrTable20.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTable20.Name = "xrTable20"; this.xrTable20.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { @@ -523,7 +524,7 @@ namespace IbpEingliederungshilfe // this.xrTable22.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTable22.Font = new System.Drawing.Font("Arial", 9.5F); + this.xrTable22.Font = new DevExpress.Drawing.DXFont("Arial", 9.5F); this.xrTable22.LocationFloat = new DevExpress.Utils.PointFloat(509.9998F, 0F); this.xrTable22.Name = "xrTable22"; this.xrTable22.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 8, 0, 0, 100F); @@ -549,7 +550,7 @@ namespace IbpEingliederungshilfe this.xrTableCell81.CanGrow = false; this.xrTableCell81.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.GrossAmountTotal", "{0:c}")}); - this.xrTableCell81.Font = new System.Drawing.Font("Arial", 11F); + this.xrTableCell81.Font = new DevExpress.Drawing.DXFont("Arial", 11F); this.xrTableCell81.Name = "xrTableCell81"; this.xrTableCell81.StylePriority.UseBorders = false; this.xrTableCell81.StylePriority.UseFont = false; @@ -561,7 +562,8 @@ namespace IbpEingliederungshilfe // this.xrTable21.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTable21.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTable21.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTable21.LocationFloat = new DevExpress.Utils.PointFloat(230F, 0F); this.xrTable21.Name = "xrTable21"; this.xrTable21.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 8, 0, 0, 100F); @@ -619,7 +621,8 @@ namespace IbpEingliederungshilfe // this.xrLabel23.BackColor = System.Drawing.Color.Transparent; this.xrLabel23.CanShrink = true; - this.xrLabel23.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel23.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrLabel23.Name = "xrLabel23"; this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -661,7 +664,8 @@ namespace IbpEingliederungshilfe this.xrTableCell10.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell10.CanGrow = false; - this.xrTableCell10.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell10.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell10.Multiline = true; this.xrTableCell10.Name = "xrTableCell10"; this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F); @@ -678,7 +682,8 @@ namespace IbpEingliederungshilfe this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell11.CanGrow = false; - this.xrTableCell11.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell11.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell11.Multiline = true; this.xrTableCell11.Name = "xrTableCell11"; this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F); @@ -716,7 +721,8 @@ namespace IbpEingliederungshilfe // xrTableCell46 // this.xrTableCell46.CanGrow = false; - this.xrTableCell46.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell46.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell46.Name = "xrTableCell46"; this.xrTableCell46.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F); this.xrTableCell46.StylePriority.UseBackColor = false; @@ -754,7 +760,8 @@ namespace IbpEingliederungshilfe // xrTableCell27 // this.xrTableCell27.CanGrow = false; - this.xrTableCell27.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell27.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell27.Multiline = true; this.xrTableCell27.Name = "xrTableCell27"; this.xrTableCell27.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F); @@ -769,7 +776,8 @@ namespace IbpEingliederungshilfe // xrTableCell26 // this.xrTableCell26.CanGrow = false; - this.xrTableCell26.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell26.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell26.Name = "xrTableCell26"; this.xrTableCell26.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F); this.xrTableCell26.StylePriority.UseBackColor = false; @@ -794,10 +802,11 @@ namespace IbpEingliederungshilfe // this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTable1.Font = new System.Drawing.Font("Arial", 9.5F); + this.xrTable1.Font = new DevExpress.Drawing.DXFont("Arial", 9.5F); this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 34F); this.xrTable1.Name = "xrTable1"; this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(8, 8, 0, 0, 100F); + this.xrTable1.ProcessHiddenCellMode = DevExpress.XtraReports.UI.ProcessHiddenCellMode.DecreaseTableWidth; this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow16, this.xrTableRow18, @@ -837,7 +846,7 @@ namespace IbpEingliederungshilfe // this.xrTableCell15.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell15.Font = new System.Drawing.Font("Arial", 11F); + this.xrTableCell15.Font = new DevExpress.Drawing.DXFont("Arial", 11F); this.xrTableCell15.Name = "xrTableCell15"; this.xrTableCell15.StylePriority.UseBorders = false; this.xrTableCell15.StylePriority.UseFont = false; @@ -869,7 +878,7 @@ namespace IbpEingliederungshilfe // this.xrTableCell19.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell19.Font = new System.Drawing.Font("Arial", 11F); + this.xrTableCell19.Font = new DevExpress.Drawing.DXFont("Arial", 11F); this.xrTableCell19.Name = "xrTableCell19"; this.xrTableCell19.StylePriority.UseBorders = false; this.xrTableCell19.StylePriority.UseFont = false; @@ -901,7 +910,7 @@ namespace IbpEingliederungshilfe // this.xrTableCell21.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell21.Font = new System.Drawing.Font("Arial", 11F); + this.xrTableCell21.Font = new DevExpress.Drawing.DXFont("Arial", 11F); this.xrTableCell21.Name = "xrTableCell21"; this.xrTableCell21.StylePriority.UseBorders = false; this.xrTableCell21.StylePriority.UseFont = false; @@ -913,7 +922,7 @@ namespace IbpEingliederungshilfe this.xrTable23.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTable23.Font = new System.Drawing.Font("Arial", 11F); + this.xrTable23.Font = new DevExpress.Drawing.DXFont("Arial", 11F); this.xrTable23.LocationFloat = new DevExpress.Utils.PointFloat(0F, 17F); this.xrTable23.Name = "xrTable23"; this.xrTable23.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { @@ -947,10 +956,12 @@ namespace IbpEingliederungshilfe // this.xrTable24.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTable24.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTable24.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTable24.LocationFloat = new DevExpress.Utils.PointFloat(510F, 17F); this.xrTable24.Name = "xrTable24"; this.xrTable24.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 8, 0, 0, 100F); + this.xrTable24.ProcessHiddenCellMode = DevExpress.XtraReports.UI.ProcessHiddenCellMode.DecreaseTableWidth; this.xrTable24.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow83, this.xrTableRow11, @@ -1007,7 +1018,7 @@ namespace IbpEingliederungshilfe // lblFahrtzeitenBetrag // this.lblFahrtzeitenBetrag.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.lblFahrtzeitenBetrag.Font = new System.Drawing.Font("Arial", 11F); + this.lblFahrtzeitenBetrag.Font = new DevExpress.Drawing.DXFont("Arial", 11F); this.lblFahrtzeitenBetrag.Name = "lblFahrtzeitenBetrag"; this.lblFahrtzeitenBetrag.StylePriority.UseBorders = false; this.lblFahrtzeitenBetrag.StylePriority.UseFont = false; @@ -1038,7 +1049,7 @@ namespace IbpEingliederungshilfe // lblAusfallzeitenBetrag // this.lblAusfallzeitenBetrag.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.lblAusfallzeitenBetrag.Font = new System.Drawing.Font("Arial", 11F); + this.lblAusfallzeitenBetrag.Font = new DevExpress.Drawing.DXFont("Arial", 11F); this.lblAusfallzeitenBetrag.Name = "lblAusfallzeitenBetrag"; this.lblAusfallzeitenBetrag.StylePriority.UseBorders = false; this.lblAusfallzeitenBetrag.StylePriority.UseFont = false; @@ -1069,7 +1080,7 @@ namespace IbpEingliederungshilfe // lblGesamtbetrag // this.lblGesamtbetrag.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.lblGesamtbetrag.Font = new System.Drawing.Font("Arial", 11F); + this.lblGesamtbetrag.Font = new DevExpress.Drawing.DXFont("Arial", 11F); this.lblGesamtbetrag.Name = "lblGesamtbetrag"; this.lblGesamtbetrag.StylePriority.UseBorders = false; this.lblGesamtbetrag.StylePriority.UseFont = false; @@ -1081,7 +1092,7 @@ namespace IbpEingliederungshilfe this.xrTable25.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTable25.Font = new System.Drawing.Font("Arial", 9.5F); + this.xrTable25.Font = new DevExpress.Drawing.DXFont("Arial", 9.5F); this.xrTable25.LocationFloat = new DevExpress.Utils.PointFloat(230F, 17F); this.xrTable25.Name = "xrTable25"; this.xrTable25.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 8, 0, 0, 100F); @@ -1119,6 +1130,10 @@ namespace IbpEingliederungshilfe this.xrTableCell109.StylePriority.UseBorders = false; this.xrTableCell109.Weight = 1.826086956521739D; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO); + // // SpitzabrechnungBeWo67 // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1131,15 +1146,17 @@ namespace IbpEingliederungshilfe this.DetailReport1}); this.DataSource = this.bindingSource1; this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; - this.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Font = new DevExpress.Drawing.DXFont("Arial", 12F, 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(70, 70, 100, 40); + this.Margins = new DevExpress.Drawing.DXMargins(70F, 70F, 100F, 40F); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; - this.Version = "17.1"; - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + this.Version = "23.2"; + xrWatermark1.Id = "Watermark1"; + this.Watermarks.Add(xrWatermark1); ((System.ComponentModel.ISupportInitialize)(this.xrTable20)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable22)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable21)).EndInit(); @@ -1150,6 +1167,7 @@ namespace IbpEingliederungshilfe ((System.ComponentModel.ISupportInitialize)(this.xrTable23)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable24)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable25)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } diff --git a/ReportImp/CaritasAhlen/SettlementReportBeWo67.resx b/ReportImp/CaritasAhlen/SettlementReportBeWo67.resx index b18e35fd4..19a7aba74 100644 --- a/ReportImp/CaritasAhlen/SettlementReportBeWo67.resx +++ b/ReportImp/CaritasAhlen/SettlementReportBeWo67.resx @@ -123,7 +123,4 @@ barung nach §§ 75 ff. SGB XII eingehalten wurden und alle hier gemachten Angab vorgehaltenen Quittierungsbelege sowie der Betreuungsdokumentation jederzeit nachgewiesen werden können. - - 17, 17 - \ No newline at end of file