diff --git a/ReportImp/SozialwerkAachenerChristen/Invoicing/AssistenzInvoiceCreation.cs b/ReportImp/SozialwerkAachenerChristen/Invoicing/AssistenzInvoiceCreation.cs index e50fca2f1..d5363c5e6 100644 --- a/ReportImp/SozialwerkAachenerChristen/Invoicing/AssistenzInvoiceCreation.cs +++ b/ReportImp/SozialwerkAachenerChristen/Invoicing/AssistenzInvoiceCreation.cs @@ -35,7 +35,7 @@ namespace SozialwerkAachenerChristen.Invoicing public override InvoiceItem CreateInvoiceItem(ServiceRecordDC iServiceRecord, SupportConceptApprovalPeriod scap, Calculations calc) { - if (iServiceRecord.ServiceDescription.CategoryName.ToLower() != "unterstützende assistenz") + if (!iServiceRecord.ServiceDescription.CategoryName.ToLower().Contains("unterstützende assistenz")) return null; return base.CreateInvoiceItem(iServiceRecord, scap, calc); diff --git a/ReportImp/SozialwerkAachenerChristen/Invoicing/CustomInvoiceFactory.cs b/ReportImp/SozialwerkAachenerChristen/Invoicing/CustomInvoiceFactory.cs index 1370ba498..cd1aa4256 100644 --- a/ReportImp/SozialwerkAachenerChristen/Invoicing/CustomInvoiceFactory.cs +++ b/ReportImp/SozialwerkAachenerChristen/Invoicing/CustomInvoiceFactory.cs @@ -16,7 +16,7 @@ namespace SozialwerkAachenerChristen.Invoicing { if (sr.CostBearer != null) { - if (sr.CostBearer.Name.StartsWith("Perönliches")) // || sr.ServiceDescription.CategoryName.ToLower().Contains("pfk")) + if (sr.CostBearer.Name.StartsWith("Persönliches")) // || sr.ServiceDescription.CategoryName.ToLower().Contains("pfk")) { return new PersBudgetInvoiceCreation(); } diff --git a/ReportImp/SozialwerkAachenerChristen/Invoicing/SettlementInvoiceCreation.cs b/ReportImp/SozialwerkAachenerChristen/Invoicing/SettlementInvoiceCreation.cs index 47adddafe..329848206 100644 --- a/ReportImp/SozialwerkAachenerChristen/Invoicing/SettlementInvoiceCreation.cs +++ b/ReportImp/SozialwerkAachenerChristen/Invoicing/SettlementInvoiceCreation.cs @@ -16,38 +16,14 @@ namespace SozialwerkAachenerChristen.Invoicing public class CustomSettlementInvoiceCreation : SettlementInvoiceCreation { - public override bool CanCreateInvoiceTheOldWay(Settlement2DC si, CostBearer2SupportConcept c2s) - { - var relDC = c2s.MapToNewDC(); - - DateTime start = si.AccountingPeriodStart.Value.Date; - DateTime end = si.AccountingPeriodEnd.Value.Date; - if (c2s.SupportConcept.Customer.TerminationDate.HasValue && - c2s.SupportConcept.Customer.TerminationDate.Value < end) - end = c2s.SupportConcept.Customer.TerminationDate.Value; - if (end > DateTime.Now) - { - var srList = c2s.ServiceRecords; - var max = srList.Max(s => s.End); - - if (max.HasValue && max < end) - end = max.Value; - } - - var hourlyRatesInSpanList = relDC.CostBearer.CostRatePeriods.GetSpans(CostRatePeriodType.HourlyRate, start, end).ToList(); - if (hourlyRatesInSpanList.Count > 3) - return false; - - var factorInSpanList = relDC.CostBearer.CostRatePeriods.GetSpans(CostRatePeriodType.RateFactor, start, end).ToList(); - if (factorInSpanList.Count > 1) - return false; - - return true; - } + public override bool CanCreateInvoiceTheOldWay(Settlement2DC si, CostBearer2SupportConcept c2s) + { + return false; // ab 18.08.2023 nur noch SettlementReport2 + } public override bool IsServiceRecordBillable(ServiceRecord iRecord) { - if (iRecord.ServiceDescription.ServiceCategory.Name.ToLower() == "unterstützenden assistenz") + if (iRecord.ServiceDescription.ServiceCategory.Name.ToLower() == "unterstützende assistenz") { return false; } @@ -61,7 +37,7 @@ namespace SozialwerkAachenerChristen.Invoicing si.ApprovedFLS = 0; foreach (var sp in relDC.ApprovalPeriodList) { - if (sp.ServiceCategory == null || !sp.ServiceCategory.Name.Contains("Assistenz")) + if (sp.ServiceCategory == null || !sp.ServiceCategory.Name.ToLower().Contains("unterstützende")) { si.ApprovedFLSWeekly += calc.GetApprovedHoursPerWeek(sp, relDC.CostBearer.CostRatePeriods) ?? 0m; @@ -72,5 +48,10 @@ namespace SozialwerkAachenerChristen.Invoicing } } } + + public override IList GetBillableServiceRecords(CostBearer2SupportConcept c2s) + { + return c2s.ServiceRecords.OrderBy(s => s.Start).Where(s => !s.ServiceDescription.ServiceCategory.Name.ToLower().Contains("unterstützende")).ToList(); + } } } diff --git a/ReportImp/SozialwerkAachenerChristen/PersBudgetRechnung.Designer.cs b/ReportImp/SozialwerkAachenerChristen/PersBudgetRechnung.Designer.cs index 465897935..f972ee96d 100644 --- a/ReportImp/SozialwerkAachenerChristen/PersBudgetRechnung.Designer.cs +++ b/ReportImp/SozialwerkAachenerChristen/PersBudgetRechnung.Designer.cs @@ -51,6 +51,15 @@ namespace SozialwerkAachenerChristen this.xrLabel35 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel36 = new DevExpress.XtraReports.UI.XRLabel(); this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); + this.lblAnrede = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel27 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel26 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel25 = new DevExpress.XtraReports.UI.XRLabel(); @@ -69,6 +78,9 @@ namespace SozialwerkAachenerChristen this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); + this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel38 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel37 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); @@ -78,14 +90,11 @@ namespace SozialwerkAachenerChristen this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow21 = new DevExpress.XtraReports.UI.XRTableRow(); this.lblAbwesenheiten = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); - this.lblAnrede = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel37 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel38 = new DevExpress.XtraReports.UI.XRLabel(); this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand(); @@ -98,21 +107,12 @@ namespace SozialwerkAachenerChristen this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell46 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText6)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -363,6 +363,148 @@ namespace SozialwerkAachenerChristen this.Page1.Name = "Page1"; this.Page1.StylePriority.UseFont = false; // + // xrTable1 + // + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 477.2258F); + this.xrTable1.Name = "xrTable1"; + this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow4}); + this.xrTable1.SizeF = new System.Drawing.SizeF(650F, 25F); + // + // xrTableRow4 + // + this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell4, + this.xrTableCell5, + this.xrTableCell6, + this.xrTableCell7, + this.xrTableCell8, + this.xrTableCell9}); + this.xrTableRow4.Name = "xrTableRow4"; + this.xrTableRow4.Weight = 1D; + // + // xrTableCell4 + // + this.xrTableCell4.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell4.BorderColor = System.Drawing.Color.Transparent; + this.xrTableCell4.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell4.Font = new System.Drawing.Font("Calibri", 11F); + this.xrTableCell4.Name = "xrTableCell4"; + this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell4.StylePriority.UseBackColor = false; + this.xrTableCell4.StylePriority.UseBorderColor = false; + this.xrTableCell4.StylePriority.UseBorders = false; + this.xrTableCell4.StylePriority.UseFont = false; + this.xrTableCell4.StylePriority.UsePadding = false; + this.xrTableCell4.StylePriority.UseTextAlignment = false; + this.xrTableCell4.Text = "Zeitraum"; + this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell4.Weight = 0.53970804593972044D; + // + // xrTableCell5 + // + this.xrTableCell5.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell5.BorderColor = System.Drawing.Color.Transparent; + this.xrTableCell5.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell5.Font = new System.Drawing.Font("Calibri", 11F); + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell5.StylePriority.UseBackColor = false; + this.xrTableCell5.StylePriority.UseBorderColor = false; + this.xrTableCell5.StylePriority.UseBorders = false; + this.xrTableCell5.StylePriority.UseFont = false; + this.xrTableCell5.StylePriority.UsePadding = false; + this.xrTableCell5.StylePriority.UseTextAlignment = false; + this.xrTableCell5.Text = "Leistung"; + this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell5.Weight = 0.93573509115732123D; + // + // xrTableCell6 + // + this.xrTableCell6.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell6.BorderColor = System.Drawing.Color.Transparent; + this.xrTableCell6.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell6.Font = new System.Drawing.Font("Calibri", 11F); + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell6.StylePriority.UseBackColor = false; + this.xrTableCell6.StylePriority.UseBorderColor = false; + this.xrTableCell6.StylePriority.UseBorders = false; + this.xrTableCell6.StylePriority.UseFont = false; + this.xrTableCell6.StylePriority.UsePadding = false; + this.xrTableCell6.StylePriority.UseTextAlignment = false; + this.xrTableCell6.Text = "Satz"; + this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell6.Weight = 0.31499805954958693D; + // + // xrTableCell7 + // + this.xrTableCell7.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell7.BorderColor = System.Drawing.Color.Transparent; + this.xrTableCell7.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell7.Font = new System.Drawing.Font("Calibri", 11F); + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell7.StylePriority.UseBackColor = false; + this.xrTableCell7.StylePriority.UseBorderColor = false; + this.xrTableCell7.StylePriority.UseBorders = false; + this.xrTableCell7.StylePriority.UseFont = false; + this.xrTableCell7.StylePriority.UsePadding = false; + this.xrTableCell7.StylePriority.UseTextAlignment = false; + this.xrTableCell7.Text = "Stunden"; + this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell7.Weight = 0.25264378973756774D; + // + // xrTableCell8 + // + this.xrTableCell8.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell8.BorderColor = System.Drawing.Color.Transparent; + this.xrTableCell8.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell8.Font = new System.Drawing.Font("Calibri", 11F); + this.xrTableCell8.Name = "xrTableCell8"; + this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell8.StylePriority.UseBackColor = false; + this.xrTableCell8.StylePriority.UseBorderColor = false; + this.xrTableCell8.StylePriority.UseBorders = false; + this.xrTableCell8.StylePriority.UseFont = false; + this.xrTableCell8.StylePriority.UsePadding = false; + this.xrTableCell8.StylePriority.UseTextAlignment = false; + this.xrTableCell8.Text = "pausch Fakt."; + this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell8.Weight = 0.37456614076474587D; + // + // xrTableCell9 + // + this.xrTableCell9.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell9.BorderColor = System.Drawing.Color.Transparent; + this.xrTableCell9.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell9.Font = new System.Drawing.Font("Calibri", 11F); + this.xrTableCell9.Name = "xrTableCell9"; + this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell9.StylePriority.UseBackColor = false; + this.xrTableCell9.StylePriority.UseBorderColor = false; + this.xrTableCell9.StylePriority.UseBorders = false; + this.xrTableCell9.StylePriority.UseFont = false; + this.xrTableCell9.StylePriority.UsePadding = false; + this.xrTableCell9.StylePriority.UseTextAlignment = false; + this.xrTableCell9.Text = "Gesamt"; + this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell9.Weight = 0.44368452634679367D; + // + // lblAnrede + // + this.lblAnrede.BackColor = System.Drawing.Color.Transparent; + this.lblAnrede.CanShrink = true; + this.lblAnrede.Font = new System.Drawing.Font("Calibri", 11.25F); + this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(0F, 383.3092F); + this.lblAnrede.Name = "lblAnrede"; + this.lblAnrede.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblAnrede.SizeF = new System.Drawing.SizeF(271.562F, 17F); + this.lblAnrede.StylePriority.UseBackColor = false; + this.lblAnrede.StylePriority.UseFont = false; + this.lblAnrede.Text = "Sehr geehrte Damen und Herren, "; + this.lblAnrede.WordWrap = false; + // // xrLabel27 // this.xrLabel27.BackColor = System.Drawing.Color.Transparent; @@ -608,6 +750,41 @@ namespace SozialwerkAachenerChristen this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; // + // xrLabel1 + // + this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim", "Gesamtbetrag: {0}")}); + this.xrLabel1.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(394.167F, 0F); + this.xrLabel1.Name = "xrLabel1"; + this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F); + this.xrLabel1.SizeF = new System.Drawing.SizeF(255.8333F, 25F); + this.xrLabel1.StylePriority.UseFont = false; + this.xrLabel1.StylePriority.UsePadding = false; + this.xrLabel1.StylePriority.UseTextAlignment = false; + this.xrLabel1.Text = "xrLabel1"; + this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + // + // xrLabel38 + // + this.xrLabel38.Font = new System.Drawing.Font("Calibri", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel38.LocationFloat = new DevExpress.Utils.PointFloat(0F, 252.2484F); + this.xrLabel38.Name = "xrLabel38"; + this.xrLabel38.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel38.SizeF = new System.Drawing.SizeF(447.7708F, 17F); + this.xrLabel38.StylePriority.UseFont = false; + this.xrLabel38.Text = "Quittierungsbeleg [AccountingPeriodEnd!MMMM yyyy] in Kopie"; + // + // xrLabel37 + // + this.xrLabel37.Font = new System.Drawing.Font("Calibri", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel37.LocationFloat = new DevExpress.Utils.PointFloat(0F, 235.2483F); + this.xrLabel37.Name = "xrLabel37"; + this.xrLabel37.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel37.SizeF = new System.Drawing.SizeF(175F, 17F); + this.xrLabel37.StylePriority.UseFont = false; + this.xrLabel37.Text = "Anlage"; + // // xrLabel18 // this.xrLabel18.Font = new System.Drawing.Font("Calibri", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -690,50 +867,6 @@ namespace SozialwerkAachenerChristen ""; this.lblAbwesenheiten.Weight = 3D; // - // xrLabel10 - // - this.xrLabel10.Font = new System.Drawing.Font("Calibri", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(1.125685F, 144.4167F); - 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); - this.xrLabel10.StylePriority.UseFont = false; - this.xrLabel10.Text = "Mit freundlichen Grüßen"; - // - // lblAnrede - // - this.lblAnrede.BackColor = System.Drawing.Color.Transparent; - this.lblAnrede.CanShrink = true; - this.lblAnrede.Font = new System.Drawing.Font("Calibri", 11.25F); - this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(0F, 383.3092F); - this.lblAnrede.Name = "lblAnrede"; - this.lblAnrede.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblAnrede.SizeF = new System.Drawing.SizeF(271.562F, 17F); - this.lblAnrede.StylePriority.UseBackColor = false; - this.lblAnrede.StylePriority.UseFont = false; - this.lblAnrede.Text = "Sehr geehrte Damen und Herren, "; - this.lblAnrede.WordWrap = false; - // - // xrLabel37 - // - this.xrLabel37.Font = new System.Drawing.Font("Calibri", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel37.LocationFloat = new DevExpress.Utils.PointFloat(0F, 235.2483F); - this.xrLabel37.Name = "xrLabel37"; - this.xrLabel37.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel37.SizeF = new System.Drawing.SizeF(175F, 17F); - this.xrLabel37.StylePriority.UseFont = false; - this.xrLabel37.Text = "Anlage"; - // - // xrLabel38 - // - this.xrLabel38.Font = new System.Drawing.Font("Calibri", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel38.LocationFloat = new DevExpress.Utils.PointFloat(0F, 252.2484F); - this.xrLabel38.Name = "xrLabel38"; - this.xrLabel38.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel38.SizeF = new System.Drawing.SizeF(447.7708F, 17F); - this.xrLabel38.StylePriority.UseFont = false; - this.xrLabel38.Text = "Quittierungsbeleg [AccountingPeriodEnd!MMMM yyyy] in Kopie"; - // // xrTableRow2 // this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { @@ -760,6 +893,16 @@ namespace SozialwerkAachenerChristen this.xrTableCell3.Text = "PAX Bank IBAN DE59 3706 0193 1004 5000 20. "; this.xrTableCell3.Weight = 3D; // + // xrLabel10 + // + this.xrLabel10.Font = new System.Drawing.Font("Calibri", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(1.125685F, 144.4167F); + 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); + this.xrLabel10.StylePriority.UseFont = false; + this.xrLabel10.Text = "Mit freundlichen Grüßen"; + // // DetailReport // this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -828,7 +971,7 @@ namespace SozialwerkAachenerChristen this.xrTableCell40.StylePriority.UsePadding = false; this.xrTableCell40.StylePriority.UseTextAlignment = false; this.xrTableCell40.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell40.Weight = 0.63561453319194572D; + this.xrTableCell40.Weight = 0.54329537056519739D; // // xrTableCell42 // @@ -845,14 +988,14 @@ namespace SozialwerkAachenerChristen this.xrTableCell42.StylePriority.UsePadding = false; this.xrTableCell42.StylePriority.UseTextAlignment = false; this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell42.Weight = 0.84963563273893317D; + this.xrTableCell42.Weight = 0.9419547953656815D; // // xrTableCell43 // this.xrTableCell43.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell43.Borders = DevExpress.XtraPrinting.BorderSide.None; this.xrTableCell43.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.HourlyRate", "{0:0.00}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.HourlyRate", "{0:0.00 €}")}); this.xrTableCell43.Font = new System.Drawing.Font("Calibri", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.xrTableCell43.Name = "xrTableCell43"; this.xrTableCell43.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); @@ -863,7 +1006,7 @@ namespace SozialwerkAachenerChristen this.xrTableCell43.StylePriority.UseTextAlignment = false; this.xrTableCell43.Text = "xrTableCell43"; this.xrTableCell43.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell43.Weight = 0.23400460247451135D; + this.xrTableCell43.Weight = 0.31709174741384738D; // // xrTableCell44 // @@ -881,7 +1024,7 @@ namespace SozialwerkAachenerChristen this.xrTableCell44.StylePriority.UseTextAlignment = false; this.xrTableCell44.Text = "xrTableCell44"; this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell44.Weight = 0.29125102619300736D; + this.xrTableCell44.Weight = 0.254322786402129D; // // xrTableCell46 // @@ -898,7 +1041,7 @@ namespace SozialwerkAachenerChristen this.xrTableCell46.StylePriority.UsePadding = false; this.xrTableCell46.StylePriority.UseTextAlignment = false; this.xrTableCell46.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell46.Weight = 0.42321544066841871D; + this.xrTableCell46.Weight = 0.37705653551996104D; // // xrTableCell47 // @@ -917,153 +1060,10 @@ namespace SozialwerkAachenerChristen this.xrTableCell47.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell47.Weight = 0.44663312263016564D; // - // xrLabel1 - // - this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim", "Gesamtbetrag: {0}")}); - this.xrLabel1.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold); - this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(394.167F, 0F); - this.xrLabel1.Name = "xrLabel1"; - this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F); - this.xrLabel1.SizeF = new System.Drawing.SizeF(255.8333F, 25F); - this.xrLabel1.StylePriority.UseFont = false; - this.xrLabel1.StylePriority.UsePadding = false; - this.xrLabel1.StylePriority.UseTextAlignment = false; - this.xrLabel1.Text = "xrLabel1"; - this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); // - // xrTable1 - // - this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 477.2258F); - this.xrTable1.Name = "xrTable1"; - this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow4}); - this.xrTable1.SizeF = new System.Drawing.SizeF(650F, 25F); - // - // xrTableRow4 - // - this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell4, - this.xrTableCell5, - this.xrTableCell6, - this.xrTableCell7, - this.xrTableCell8, - this.xrTableCell9}); - this.xrTableRow4.Name = "xrTableRow4"; - this.xrTableRow4.Weight = 1D; - // - // xrTableCell4 - // - this.xrTableCell4.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell4.BorderColor = System.Drawing.Color.Transparent; - this.xrTableCell4.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrTableCell4.Font = new System.Drawing.Font("Calibri", 11F); - this.xrTableCell4.Name = "xrTableCell4"; - this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell4.StylePriority.UseBackColor = false; - this.xrTableCell4.StylePriority.UseBorderColor = false; - this.xrTableCell4.StylePriority.UseBorders = false; - this.xrTableCell4.StylePriority.UseFont = false; - this.xrTableCell4.StylePriority.UsePadding = false; - this.xrTableCell4.StylePriority.UseTextAlignment = false; - this.xrTableCell4.Text = "Zeitraum"; - this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell4.Weight = 0.62463077449375981D; - // - // xrTableCell5 - // - this.xrTableCell5.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell5.BorderColor = System.Drawing.Color.Transparent; - this.xrTableCell5.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrTableCell5.Font = new System.Drawing.Font("Calibri", 11F); - this.xrTableCell5.Name = "xrTableCell5"; - this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell5.StylePriority.UseBackColor = false; - this.xrTableCell5.StylePriority.UseBorderColor = false; - this.xrTableCell5.StylePriority.UseBorders = false; - this.xrTableCell5.StylePriority.UseFont = false; - this.xrTableCell5.StylePriority.UsePadding = false; - this.xrTableCell5.StylePriority.UseTextAlignment = false; - this.xrTableCell5.Text = "Leistung"; - this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell5.Weight = 0.85081236260328186D; - // - // xrTableCell6 - // - this.xrTableCell6.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell6.BorderColor = System.Drawing.Color.Transparent; - this.xrTableCell6.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrTableCell6.Font = new System.Drawing.Font("Calibri", 11F); - this.xrTableCell6.Name = "xrTableCell6"; - this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell6.StylePriority.UseBackColor = false; - this.xrTableCell6.StylePriority.UseBorderColor = false; - this.xrTableCell6.StylePriority.UseBorders = false; - this.xrTableCell6.StylePriority.UseFont = false; - this.xrTableCell6.StylePriority.UsePadding = false; - this.xrTableCell6.StylePriority.UseTextAlignment = false; - this.xrTableCell6.Text = "Satz"; - this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell6.Weight = 0.23245943032832414D; - // - // xrTableCell7 - // - this.xrTableCell7.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell7.BorderColor = System.Drawing.Color.Transparent; - this.xrTableCell7.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrTableCell7.Font = new System.Drawing.Font("Calibri", 11F); - this.xrTableCell7.Name = "xrTableCell7"; - this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell7.StylePriority.UseBackColor = false; - this.xrTableCell7.StylePriority.UseBorderColor = false; - this.xrTableCell7.StylePriority.UseBorders = false; - this.xrTableCell7.StylePriority.UseFont = false; - this.xrTableCell7.StylePriority.UsePadding = false; - this.xrTableCell7.StylePriority.UseTextAlignment = false; - this.xrTableCell7.Text = "Stunden"; - this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell7.Weight = 0.2893277257020575D; - // - // xrTableCell8 - // - this.xrTableCell8.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell8.BorderColor = System.Drawing.Color.Transparent; - this.xrTableCell8.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrTableCell8.Font = new System.Drawing.Font("Calibri", 11F); - this.xrTableCell8.Name = "xrTableCell8"; - this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell8.StylePriority.UseBackColor = false; - this.xrTableCell8.StylePriority.UseBorderColor = false; - this.xrTableCell8.StylePriority.UseBorders = false; - this.xrTableCell8.StylePriority.UseFont = false; - this.xrTableCell8.StylePriority.UsePadding = false; - this.xrTableCell8.StylePriority.UseTextAlignment = false; - this.xrTableCell8.Text = "pausch Fakt."; - this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell8.Weight = 0.42042083402151886D; - // - // xrTableCell9 - // - this.xrTableCell9.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell9.BorderColor = System.Drawing.Color.Transparent; - this.xrTableCell9.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrTableCell9.Font = new System.Drawing.Font("Calibri", 11F); - this.xrTableCell9.Name = "xrTableCell9"; - this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell9.StylePriority.UseBackColor = false; - this.xrTableCell9.StylePriority.UseBorderColor = false; - this.xrTableCell9.StylePriority.UseBorders = false; - this.xrTableCell9.StylePriority.UseFont = false; - this.xrTableCell9.StylePriority.UsePadding = false; - this.xrTableCell9.StylePriority.UseTextAlignment = false; - this.xrTableCell9.Text = "Gesamt"; - this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell9.Weight = 0.44368452634679367D; - // // PersBudgetRechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1084,10 +1084,10 @@ namespace SozialwerkAachenerChristen this.PaperKind = System.Drawing.Printing.PaperKind.A4; this.Version = "17.1"; ((System.ComponentModel.ISupportInitialize)(this.xrRichText6)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } diff --git a/ReportImp/SozialwerkAachenerChristen/SettlementReport.cs b/ReportImp/SozialwerkAachenerChristen/SettlementReport.cs index 2899027b2..06df51a39 100644 --- a/ReportImp/SozialwerkAachenerChristen/SettlementReport.cs +++ b/ReportImp/SozialwerkAachenerChristen/SettlementReport.cs @@ -15,8 +15,8 @@ namespace SozialwerkAachenerChristen.Alt InitializeComponent(); } - public void SetReportDataSource(SettlementRO pRO) - { + public void SetReportDataSource(SettlementRO pRO) // ab 18.08.2023 nur noch SettlementReport2 + { bool isDefaultSpitzabrechnung = false; //if (String.IsNullOrEmpty(pRO.Notice)) diff --git a/ReportImp/SozialwerkAachenerChristen/SettlementReport2.Designer.cs b/ReportImp/SozialwerkAachenerChristen/SettlementReport2.Designer.cs index b5bd29212..5600e9859 100644 --- a/ReportImp/SozialwerkAachenerChristen/SettlementReport2.Designer.cs +++ b/ReportImp/SozialwerkAachenerChristen/SettlementReport2.Designer.cs @@ -30,6 +30,7 @@ namespace SozialwerkAachenerChristen.In { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung)); + DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); @@ -80,9 +81,10 @@ namespace SozialwerkAachenerChristen.In this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow30 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow31 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell50 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -99,15 +101,23 @@ namespace SozialwerkAachenerChristen.In this.xrTableRow36 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.Zwischensumme = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.xrTable6 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow12 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel25 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel26 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -126,7 +136,7 @@ namespace SozialwerkAachenerChristen.In // // xrLabel8 // - this.xrLabel8.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel8.Font = new System.Drawing.Font("Calibri", 11.25F); this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(503.5149F, 220.7046F); this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -200,15 +210,17 @@ namespace SozialwerkAachenerChristen.In // ReportFooter // this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel26, + this.xrLabel25, this.xrLabel10}); - this.ReportFooter.HeightF = 70.97726F; + this.ReportFooter.HeightF = 103.2689F; this.ReportFooter.KeepTogether = true; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; // // xrLabel10 // - this.xrLabel10.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel10.Font = new System.Drawing.Font("Calibri", 11.25F); this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0.9999593F, 48.43941F); this.xrLabel10.Multiline = true; this.xrLabel10.Name = "xrLabel10"; @@ -216,12 +228,12 @@ namespace SozialwerkAachenerChristen.In this.xrLabel10.SizeF = new System.Drawing.SizeF(346.097F, 22.53786F); this.xrLabel10.StylePriority.UseFont = false; this.xrLabel10.StylePriority.UsePadding = false; - this.xrLabel10.Text = "Mit freundlichen Grüßen, Manuela Cohnen"; + this.xrLabel10.Text = "Manuela Cohnen"; // // xrTable3 // this.xrTable3.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 148.0208F); + this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 128.2291F); this.xrTable3.Name = "xrTable3"; this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow22}); @@ -240,8 +252,10 @@ namespace SozialwerkAachenerChristen.In this.xrTableCell29.CanShrink = true; this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "AbsenceTimes")}); + this.xrTableCell29.Font = new System.Drawing.Font("Calibri", 11.25F); this.xrTableCell29.Name = "xrTableCell29"; this.xrTableCell29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell29.StylePriority.UseFont = false; this.xrTableCell29.StylePriority.UsePadding = false; this.xrTableCell29.Text = "xrTableCell4"; this.xrTableCell29.Weight = 3D; @@ -473,7 +487,7 @@ namespace SozialwerkAachenerChristen.In this.xrLabel13, this.xrLabel18}); this.GroupHeader1.Font = new System.Drawing.Font("Calibri", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.GroupHeader1.HeightF = 507.4828F; + this.GroupHeader1.HeightF = 473.1078F; this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.StylePriority.UseFont = false; // @@ -540,7 +554,7 @@ namespace SozialwerkAachenerChristen.In // // xrLabel3 // - this.xrLabel3.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel3.Font = new System.Drawing.Font("Calibri", 11.25F); this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(170.8893F, 317.0834F); this.xrLabel3.Multiline = true; this.xrLabel3.Name = "xrLabel3"; @@ -553,7 +567,7 @@ namespace SozialwerkAachenerChristen.In // // xrLabel2 // - this.xrLabel2.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel2.Font = new System.Drawing.Font("Calibri", 11.25F); this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 317.0834F); this.xrLabel2.Multiline = true; this.xrLabel2.Name = "xrLabel2"; @@ -565,7 +579,7 @@ namespace SozialwerkAachenerChristen.In // // xrLabel13 // - this.xrLabel13.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel13.Font = new System.Drawing.Font("Calibri", 11.25F); this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 267.2878F); this.xrLabel13.Multiline = true; this.xrLabel13.Name = "xrLabel13"; @@ -577,11 +591,11 @@ namespace SozialwerkAachenerChristen.In // // xrLabel18 // - this.xrLabel18.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel18.Font = new System.Drawing.Font("Calibri", 11.25F); this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(0F, 418.4222F); this.xrLabel18.Name = "xrLabel18"; this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel18.SizeF = new System.Drawing.SizeF(678.8752F, 56.14395F); + this.xrLabel18.SizeF = new System.Drawing.SizeF(678.8752F, 44.68564F); this.xrLabel18.StylePriority.UseFont = false; this.xrLabel18.Text = "Für unsere(n) Klient*in, [CustomerName], erlauben wir uns, im BWZ von [Accounting" + "Period] die geleisteten Fachleistungsstunden in Rechnung zu stellen:"; @@ -589,7 +603,9 @@ namespace SozialwerkAachenerChristen.In // DetailReport // this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { - this.Detail1}); + this.Detail1, + this.GroupHeader2, + this.Zwischensumme}); this.DetailReport.DataMember = "InvoiceItems"; this.DetailReport.DataSource = this.bindingSource1; this.DetailReport.Level = 0; @@ -601,6 +617,8 @@ namespace SozialwerkAachenerChristen.In this.xrTable5}); this.Detail1.HeightF = 17F; this.Detail1.Name = "Detail1"; + this.Detail1.SortFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] { + new DevExpress.XtraReports.UI.GroupField("PeriodStartDate", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)}); this.Detail1.StylePriority.UseFont = false; // // xrTable5 @@ -627,7 +645,9 @@ namespace SozialwerkAachenerChristen.In this.xrTableCell17.BorderColor = System.Drawing.SystemColors.ControlLight; this.xrTableCell17.CanShrink = true; this.xrTableCell17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.ItemDescription")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.AbrechnungsText")}); + this.xrTableCell17.Font = new System.Drawing.Font("Calibri", 11.25F); + this.xrTableCell17.Multiline = true; this.xrTableCell17.Name = "xrTableCell17"; this.xrTableCell17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell17.StylePriority.UseBorderColor = false; @@ -642,6 +662,7 @@ namespace SozialwerkAachenerChristen.In this.xrTableCell23.CanShrink = true; this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.GrossAmountTotal", "{0:c}")}); + this.xrTableCell23.Font = new System.Drawing.Font("Calibri", 11.25F); this.xrTableCell23.Name = "xrTableCell23"; this.xrTableCell23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell23.StylePriority.UseBorderColor = false; @@ -650,7 +671,7 @@ namespace SozialwerkAachenerChristen.In this.xrTableCell23.StylePriority.UsePadding = false; this.xrTableCell23.StylePriority.UseTextAlignment = false; this.xrTableCell23.Text = "xrTableCell23"; - this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomRight; this.xrTableCell23.Weight = 0.26009181878516091D; // // bindingSource1 @@ -663,11 +684,40 @@ namespace SozialwerkAachenerChristen.In this.xrTable1, this.xrTable3, this.xrTable4}); - this.GroupFooter1.HeightF = 197.5416F; + this.GroupFooter1.HeightF = 177.75F; this.GroupFooter1.KeepTogether = true; this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.StylePriority.UseFont = false; // + // xrTable1 + // + this.xrTable1.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 157.5834F); + this.xrTable1.Name = "xrTable1"; + this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow1}); + this.xrTable1.SizeF = new System.Drawing.SizeF(678.8752F, 20.16664F); + this.xrTable1.StylePriority.UseFont = false; + // + // xrTableRow1 + // + this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell1}); + this.xrTableRow1.Name = "xrTableRow1"; + this.xrTableRow1.Weight = 0.38095238095238088D; + // + // xrTableCell1 + // + this.xrTableCell1.CanShrink = true; + this.xrTableCell1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "FehlkontakteString")}); + this.xrTableCell1.Font = new System.Drawing.Font("Calibri", 11.25F); + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell1.StylePriority.UseFont = false; + this.xrTableCell1.StylePriority.UsePadding = false; + this.xrTableCell1.Weight = 3D; + // // xrTable4 // this.xrTable4.BorderColor = System.Drawing.SystemColors.ControlLight; @@ -675,33 +725,16 @@ namespace SozialwerkAachenerChristen.In this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0.9999593F, 0F); this.xrTable4.Name = "xrTable4"; this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow30, this.xrTableRow31, this.xrTableRow32, this.xrTableRow33, this.xrTableRow34, this.xrTableRow35, this.xrTableRow36}); - this.xrTable4.SizeF = new System.Drawing.SizeF(677.8753F, 132F); + this.xrTable4.SizeF = new System.Drawing.SizeF(677.8753F, 115F); this.xrTable4.StylePriority.UseBorderColor = false; this.xrTable4.StylePriority.UseFont = false; // - // xrTableRow30 - // - this.xrTableRow30.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell48}); - this.xrTableRow30.Name = "xrTableRow30"; - this.xrTableRow30.Weight = 0.085D; - // - // xrTableCell48 - // - this.xrTableCell48.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTableCell48.Name = "xrTableCell48"; - this.xrTableCell48.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell48.StylePriority.UseBorderColor = false; - this.xrTableCell48.StylePriority.UseBorders = false; - this.xrTableCell48.Weight = 1D; - // // xrTableRow31 // this.xrTableRow31.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { @@ -712,19 +745,20 @@ namespace SozialwerkAachenerChristen.In // // xrTableCell49 // + this.xrTableCell49.Font = new System.Drawing.Font("Calibri", 11.25F); this.xrTableCell49.Name = "xrTableCell49"; this.xrTableCell49.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell49.StylePriority.UseBorders = false; this.xrTableCell49.StylePriority.UseFont = false; this.xrTableCell49.StylePriority.UsePadding = false; this.xrTableCell49.Text = "insgesamt:"; - this.xrTableCell49.Weight = 0.78314100999098546D; + this.xrTableCell49.Weight = 0.81563272258425112D; // // xrTableCell50 // this.xrTableCell50.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "AmountRecordedFLSString")}); - this.xrTableCell50.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell50.Font = new System.Drawing.Font("Calibri", 11.25F, System.Drawing.FontStyle.Bold); this.xrTableCell50.Name = "xrTableCell50"; this.xrTableCell50.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell50.StylePriority.UseBorders = false; @@ -733,7 +767,7 @@ namespace SozialwerkAachenerChristen.In this.xrTableCell50.StylePriority.UseTextAlignment = false; this.xrTableCell50.Text = "[AmountRecordedFLSString]"; this.xrTableCell50.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell50.Weight = 0.21685899000901443D; + this.xrTableCell50.Weight = 0.18436727741574877D; // // xrTableRow32 // @@ -759,17 +793,19 @@ namespace SozialwerkAachenerChristen.In // xrTableCell52 // this.xrTableCell52.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell52.Font = new System.Drawing.Font("Calibri", 11.25F); this.xrTableCell52.Name = "xrTableCell52"; this.xrTableCell52.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell52.StylePriority.UseBorderColor = false; this.xrTableCell52.StylePriority.UseBorders = false; this.xrTableCell52.StylePriority.UseFont = false; this.xrTableCell52.Text = "abzüglich der geleisteten Abschlagszahlungen:"; - this.xrTableCell52.Weight = 0.78314100999098568D; + this.xrTableCell52.Weight = 0.81563272258425135D; // // xrTableCell53 // this.xrTableCell53.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell53.Font = new System.Drawing.Font("Calibri", 11.25F); this.xrTableCell53.Name = "xrTableCell53"; this.xrTableCell53.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell53.StylePriority.UseBorderColor = false; @@ -778,7 +814,7 @@ namespace SozialwerkAachenerChristen.In this.xrTableCell53.StylePriority.UseTextAlignment = false; this.xrTableCell53.Text = "[AmountAdvancedPayments!c]"; this.xrTableCell53.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell53.Weight = 0.21685899000901443D; + this.xrTableCell53.Weight = 0.18436727741574874D; // // xrTableRow34 // @@ -790,25 +826,29 @@ namespace SozialwerkAachenerChristen.In // // xrTableCell54 // + this.xrTableCell54.Font = new System.Drawing.Font("Calibri", 11.25F); this.xrTableCell54.Name = "xrTableCell54"; this.xrTableCell54.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell54.StylePriority.UseBorders = false; + this.xrTableCell54.StylePriority.UseFont = false; this.xrTableCell54.StylePriority.UsePadding = false; this.xrTableCell54.Text = "abzüglich Eigenanteil:"; - this.xrTableCell54.Weight = 0.78314100999098568D; + this.xrTableCell54.Weight = 0.81563272258425135D; // // xrTableCell55 // this.xrTableCell55.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Eigenbeteiligung", "{0:c}")}); + this.xrTableCell55.Font = new System.Drawing.Font("Calibri", 11.25F); this.xrTableCell55.Name = "xrTableCell55"; this.xrTableCell55.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell55.StylePriority.UseBorders = false; + this.xrTableCell55.StylePriority.UseFont = false; this.xrTableCell55.StylePriority.UsePadding = false; this.xrTableCell55.StylePriority.UseTextAlignment = false; this.xrTableCell55.Text = "xrTableCell15"; this.xrTableCell55.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell55.Weight = 0.21685899000901443D; + this.xrTableCell55.Weight = 0.18436727741574874D; // // xrTableRow35 // @@ -837,18 +877,19 @@ namespace SozialwerkAachenerChristen.In // xrTableCell57 // this.xrTableCell57.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell57.Font = new System.Drawing.Font("Calibri", 11.25F); this.xrTableCell57.Name = "xrTableCell57"; this.xrTableCell57.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell57.StylePriority.UseBorderColor = false; this.xrTableCell57.StylePriority.UseBorders = false; this.xrTableCell57.StylePriority.UseFont = false; this.xrTableCell57.Text = "Restforderung:"; - this.xrTableCell57.Weight = 0.78314100999098568D; + this.xrTableCell57.Weight = 0.81563272258425135D; // // xrTableCell58 // this.xrTableCell58.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTableCell58.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell58.Font = new System.Drawing.Font("Calibri", 11.25F, System.Drawing.FontStyle.Bold); this.xrTableCell58.Name = "xrTableCell58"; this.xrTableCell58.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell58.StylePriority.UseBorderColor = false; @@ -857,34 +898,116 @@ namespace SozialwerkAachenerChristen.In this.xrTableCell58.StylePriority.UseTextAlignment = false; this.xrTableCell58.Text = "[Claim!c]"; this.xrTableCell58.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell58.Weight = 0.21685899000901443D; + this.xrTableCell58.Weight = 0.18436727741574874D; // - // xrTable1 + // GroupHeader2 // - this.xrTable1.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 177.375F); - this.xrTable1.Name = "xrTable1"; - this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow1}); - this.xrTable1.SizeF = new System.Drawing.SizeF(678.8752F, 20.16664F); - this.xrTable1.StylePriority.UseFont = false; + this.GroupHeader2.GroupFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] { + new DevExpress.XtraReports.UI.GroupField("RateFactor", DevExpress.XtraReports.UI.XRColumnSortOrder.Descending)}); + this.GroupHeader2.HeightF = 0F; + this.GroupHeader2.Name = "GroupHeader2"; // - // xrTableRow1 + // Zwischensumme // - this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell1}); - this.xrTableRow1.Name = "xrTableRow1"; - this.xrTableRow1.Weight = 0.38095238095238088D; + this.Zwischensumme.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable6}); + this.Zwischensumme.HeightF = 34F; + this.Zwischensumme.Name = "Zwischensumme"; + this.Zwischensumme.Visible = false; // - // xrTableCell1 + // xrTable6 // - this.xrTableCell1.CanShrink = true; - this.xrTableCell1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "FehlkontakteString")}); - this.xrTableCell1.Name = "xrTableCell1"; - this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell1.StylePriority.UsePadding = false; - this.xrTableCell1.Weight = 3D; + this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable6.Name = "xrTable6"; + this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow12, + this.xrTableRow10}); + this.xrTable6.SizeF = new System.Drawing.SizeF(678.8754F, 34F); + this.xrTable6.StylePriority.UseFont = false; + // + // xrTableRow12 + // + this.xrTableRow12.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell9, + this.xrTableCell10}); + this.xrTableRow12.Name = "xrTableRow12"; + this.xrTableRow12.Weight = 0.40476190476190466D; + // + // xrTableCell9 + // + this.xrTableCell9.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell9.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell9.Font = new System.Drawing.Font("Calibri", 11.25F); + this.xrTableCell9.Name = "xrTableCell9"; + this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell9.StylePriority.UseBorderColor = false; + this.xrTableCell9.StylePriority.UseBorders = false; + this.xrTableCell9.StylePriority.UseFont = false; + this.xrTableCell9.StylePriority.UsePadding = false; + this.xrTableCell9.Text = "Zwischensumme [ItemDescription]:"; + this.xrTableCell9.Weight = 2.4477128761737683D; + // + // xrTableCell10 + // + this.xrTableCell10.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell10.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.GrossAmountTotal")}); + this.xrTableCell10.Font = new System.Drawing.Font("Calibri", 11.25F); + this.xrTableCell10.Name = "xrTableCell10"; + this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell10.StylePriority.UseBorderColor = false; + this.xrTableCell10.StylePriority.UseBorders = false; + this.xrTableCell10.StylePriority.UseFont = false; + this.xrTableCell10.StylePriority.UsePadding = false; + this.xrTableCell10.StylePriority.UseTextAlignment = false; + xrSummary1.FormatString = "{0:c}"; + xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell10.Summary = xrSummary1; + this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell10.Weight = 0.55228712382623169D; + // + // xrTableRow10 + // + this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell7}); + this.xrTableRow10.Name = "xrTableRow10"; + this.xrTableRow10.Weight = 0.40476190476190466D; + // + // xrTableCell7 + // + this.xrTableCell7.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell7.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell7.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + 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.UsePadding = false; + this.xrTableCell7.Weight = 3D; + // + // xrLabel25 + // + this.xrLabel25.Font = new System.Drawing.Font("Calibri", 11.25F); + this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(0F, 9.999974F); + this.xrLabel25.Multiline = true; + this.xrLabel25.Name = "xrLabel25"; + this.xrLabel25.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.xrLabel25.SizeF = new System.Drawing.SizeF(346.097F, 22.53786F); + this.xrLabel25.StylePriority.UseFont = false; + this.xrLabel25.StylePriority.UsePadding = false; + this.xrLabel25.Text = "Mit freundlichen Grüßen"; + // + // xrLabel26 + // + this.xrLabel26.Font = new System.Drawing.Font("Calibri", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel26.LocationFloat = new DevExpress.Utils.PointFloat(0.9999593F, 70.97727F); + this.xrLabel26.Name = "xrLabel26"; + this.xrLabel26.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel26.SizeF = new System.Drawing.SizeF(291.9991F, 17F); + this.xrLabel26.StylePriority.UseFont = false; + this.xrLabel26.Text = "Leitung Ambulant Betreutes Wohnen"; // // Spitzabrechnung // @@ -911,8 +1034,9 @@ namespace SozialwerkAachenerChristen.In ((System.ComponentModel.ISupportInitialize)(this.xrRichText6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -944,8 +1068,6 @@ namespace SozialwerkAachenerChristen.In private DevExpress.XtraReports.UI.XRTableCell xrTableCell23; private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; private DevExpress.XtraReports.UI.XRTable xrTable4; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow30; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell48; private DevExpress.XtraReports.UI.XRTableRow xrTableRow31; private DevExpress.XtraReports.UI.XRTableCell xrTableCell49; private DevExpress.XtraReports.UI.XRTableCell xrTableCell50; @@ -991,5 +1113,15 @@ namespace SozialwerkAachenerChristen.In private DevExpress.XtraReports.UI.XRTable xrTable1; private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; + private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2; + private DevExpress.XtraReports.UI.GroupFooterBand Zwischensumme; + private DevExpress.XtraReports.UI.XRTable xrTable6; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow12; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow10; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; + private DevExpress.XtraReports.UI.XRLabel xrLabel25; + private DevExpress.XtraReports.UI.XRLabel xrLabel26; } } diff --git a/ReportImp/SozialwerkAachenerChristen/SettlementReport2.cs b/ReportImp/SozialwerkAachenerChristen/SettlementReport2.cs index 0f3182e37..7956d3139 100644 --- a/ReportImp/SozialwerkAachenerChristen/SettlementReport2.cs +++ b/ReportImp/SozialwerkAachenerChristen/SettlementReport2.cs @@ -1,13 +1,14 @@ using System; using BeWo.Report; using BeWo.Report.ReportObjects; +using BS.Shared.Extensions; namespace SozialwerkAachenerChristen.In { - public partial class Spitzabrechnung : DevExpress.XtraReports.UI.XtraReport, IBeWoReport + public partial class Spitzabrechnung : DevExpress.XtraReports.UI.XtraReport, IBeWoReport { - public Spitzabrechnung() - { + public Spitzabrechnung() // ab 18.08.2023 nur noch SettlementReport2 + { InitializeComponent(); } @@ -25,21 +26,31 @@ namespace SozialwerkAachenerChristen.In if (ii.RateFactor.HasValue) { rateFactor = (100 + ii.RateFactor.Value) / 100; + if (rateFactor != 0) + { + pRO.RateFactorText2 = String.Format("1,{0:n0}", ii.RateFactor); + } } - } - pRO.RateFactor = (double)rateFactor; - if (pRO.InvoiceItems != null) - { - foreach (var ii in pRO.InvoiceItems) + ii.AbrechnungsText = String.Format("geleistete FLS im Betreuungszeitraum {0:dd.MM.yyyy} bis {1:dd.MM.yyyy}: {2:0.##} \n" + + "x {3:c}{4:n0}", + ii.PeriodStartDate, ii.PeriodEndDate, + ii.UnitCount, ii.AmountPerUnit, ii.RateFactor == 0 ? ":" : " x " + pRO.RateFactorText2 + " Faktor:"); + + if (!pRO.FehlkontakteString.IsNullOrEmpty() && ii.RateFactor == 0) { - ii.ItemDescription = String.Format("{0:dd.MM.yyyy} bis {1:dd.MM.yyyy}: {2:0.##} FLS {3}x {4:c}", - ii.PeriodStartDate, ii.PeriodEndDate, - ii.UnitCount, ii.RateFactor == 0 ? "" : "x " + pRO.RateFactorText2 + " ", - ii.AmountPerUnit); + Zwischensumme.Visible = true; + ii.AbrechnungsText = ii.AbrechnungsText.Replace("FLS", "Std."); + ii.ItemDescription = "Fehlkontakte"; + } + else if (ii.ItemDescription.IsNullOrEmpty()) + { + ii.ItemDescription = "Fachleistungsstunden"; } } + pRO.RateFactor = (double)rateFactor; + this.bindingSource1.DataSource = pRO; }