From 19d0a5699bd416efced3f8e22fe619dd825fec99 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Mon, 5 Sep 2022 16:56:32 +0200 Subject: [PATCH] AKGG Invoicing --- .../AKGG/Invoicing/CustomInvoiceCreation.cs | 77 ++- .../AKGG/Invoicing/CustomInvoiceCreationPK.cs | 40 ++ .../AKGG/ServiceInvoiceReport.Designer.cs | 431 +++++++-------- .../AKGG/ServiceInvoiceReportPK.Designer.cs | 516 +++++++++--------- ReportImp/AKGG/ServiceInvoiceReportPK.cs | 7 +- 5 files changed, 580 insertions(+), 491 deletions(-) diff --git a/ReportImp/AKGG/Invoicing/CustomInvoiceCreation.cs b/ReportImp/AKGG/Invoicing/CustomInvoiceCreation.cs index 88a5e088d..bb64fee3b 100644 --- a/ReportImp/AKGG/Invoicing/CustomInvoiceCreation.cs +++ b/ReportImp/AKGG/Invoicing/CustomInvoiceCreation.cs @@ -5,6 +5,7 @@ using System.Text; using BeWo.Data.Access; using BeWo.Data.Entities; using BeWo.Service.Invoicing; +using BeWo.Service.Plugins; using BS.Shared.Core; using BS.Shared.DataContracts; using BS.Shared.Services; @@ -62,12 +63,74 @@ namespace Akgg.Invoicing base.SetRecipientInformation(serviceInvoice, costBearer); } - //public override void SetInvoiceId(ServiceInvoice invoice) - //{ - // { - // invoice.InvoiceBase.InvoiceId = "PK"; - // invoice.InvoiceBase.InvoiceTypeText = "Pflegekasse"; - // } - //} + public override InvoiceItem CreateInvoiceItem(ServiceRecordDC iServiceRecord, SupportConceptApprovalPeriod scap, Calculations calc) + { + if (iServiceRecord.ServiceDescription.CategoryName.Contains("UWA")) + return null; + else + { + var ii = base.CreateInvoiceItem(iServiceRecord, scap, calc); + + if (iServiceRecord.ServiceDescription.CategoryName.Contains("Selbstzahler")) + { + if (iServiceRecord.ServiceDescription.Name.Contains("Gruppe")) + { + if (iServiceRecord.ServiceDescription.Name.Contains("Erw.")) + ii.ItemDescription = "Betreuungsstunden - Erw. Gruppe"; + else + ii.ItemDescription = "Betreuungsstunden - KiJu. Gruppe"; + } + else if (iServiceRecord.ServiceDescription.Name.Contains("FLS")) + ii.ItemDescription = "Fachleistungsstunde - Fachkraft Einzelbetreuung"; + else if (iServiceRecord.ServiceDescription.Name.Contains("Ass")) + ii.ItemDescription = "Fachleistungsstunde - Assistenzleistung"; + } + + else + { + if (iServiceRecord.ServiceDescription.CategoryName.Contains("Gruppe")) + { + if (iServiceRecord.ServiceDescription.CategoryName.Contains("Erw.")) + ii.ItemDescription = "Betreuungsstunden - Erw. Gruppe"; + else + ii.ItemDescription = "Betreuungsstunden - KiJu. Gruppe"; + } + else if (iServiceRecord.ServiceDescription.CategoryName.Contains("FLS")) + ii.ItemDescription = "Fachleistungsstunde - Fachkraft Einzelbetreuung"; + else if (iServiceRecord.ServiceDescription.CategoryName.Contains("Ass")) + ii.ItemDescription = "Fachleistungsstunde - Assistenzleistung"; + } + + return ii; + } + } + + public override void CreateFixedAmounts(ServiceInvoicePeriod serviceInvoicePeriod, SupportConceptApprovalPeriodDC supportConceptApprovalPeriod, CostBearer2SupportConcept cb2sc) + { + var calc = PluginLoader.FindClass(_SpecificID) ?? Calculations.GetInstance(_SpecificID); + var data = calc.GetFixedBillingData(supportConceptApprovalPeriod, serviceInvoicePeriod.Start, serviceInvoicePeriod.End); + string bezeichnung; + if (supportConceptApprovalPeriod.ServiceCategory.Name.Contains("FLS")) + bezeichnung = "UWA - Fachkraftstunden"; + else if (supportConceptApprovalPeriod.ServiceCategory.Name.Contains("Ass")) + bezeichnung = "UWA - Assistenzstunden"; + else + bezeichnung = supportConceptApprovalPeriod.ServiceCategory.Name; + + foreach (var billingData in data) + { + serviceInvoicePeriod.InvoiceItemList.Add(new InvoiceItem + { + AmountTotal = billingData.AmountTotal, + GrossAmountTotal = billingData.GrossAmountTotal, + ItemPeriodStart = billingData.BillingPeriodStart, + ItemPeriodEnd = billingData.BillingPeriodEnd, + AccountingInterval = billingData.AccountingInterval, + AmountPerUnit = billingData.AmountPerUnit, + UnitCount = billingData.UnitCount, + ItemDescription = bezeichnung + }); ; + } + } } } diff --git a/ReportImp/AKGG/Invoicing/CustomInvoiceCreationPK.cs b/ReportImp/AKGG/Invoicing/CustomInvoiceCreationPK.cs index cbc3506bd..683005612 100644 --- a/ReportImp/AKGG/Invoicing/CustomInvoiceCreationPK.cs +++ b/ReportImp/AKGG/Invoicing/CustomInvoiceCreationPK.cs @@ -6,6 +6,7 @@ using BeWo.Data.Access; using BeWo.Data.Entities; using BeWo.Service.DCEntityMapper; using BeWo.Service.Invoicing; +using BeWo.Service.Plugins; using BS.Shared; using BS.Shared.Core; using BS.Shared.DataContracts; @@ -57,6 +58,17 @@ namespace Akgg.Invoicing return list; } + public override InvoiceItem CreateInvoiceItem(ServiceRecordDC iServiceRecord, SupportConceptApprovalPeriod scap, Calculations calc) + { + if (iServiceRecord.ServiceDescription.CategoryName.Contains("UWA")) + return null; + else + { + var ii = base.CreateInvoiceItem(iServiceRecord, scap, calc); + return ii; + } + } + private InvoiceItem CreateFahrkostenInvoiceItem(List serviceRecordsInPeriod, SupportConceptApprovalPeriod scap, Calculations calc) { int km = 0; @@ -109,6 +121,34 @@ namespace Akgg.Invoicing return 0; } + public override void CreateFixedAmounts(ServiceInvoicePeriod serviceInvoicePeriod, SupportConceptApprovalPeriodDC supportConceptApprovalPeriod, CostBearer2SupportConcept cb2sc) + { + var calc = PluginLoader.FindClass(_SpecificID) ?? Calculations.GetInstance(_SpecificID); + var data = calc.GetFixedBillingData(supportConceptApprovalPeriod, serviceInvoicePeriod.Start, serviceInvoicePeriod.End); + string bezeichnung; + if (supportConceptApprovalPeriod.ServiceCategory.Name.Contains("FLS")) + bezeichnung = "UWA - Fachkraftstunden"; + else if (supportConceptApprovalPeriod.ServiceCategory.Name.Contains("Ass")) + bezeichnung = "UWA - Assistenzstunden"; + else + bezeichnung = supportConceptApprovalPeriod.ServiceCategory.Name; + + foreach (var billingData in data) + { + serviceInvoicePeriod.InvoiceItemList.Add(new InvoiceItem + { + AmountTotal = billingData.AmountTotal, + GrossAmountTotal = billingData.GrossAmountTotal, + ItemPeriodStart = billingData.BillingPeriodStart, + ItemPeriodEnd = billingData.BillingPeriodEnd, + AccountingInterval = billingData.AccountingInterval, + AmountPerUnit = billingData.AmountPerUnit, + UnitCount = billingData.UnitCount, + ItemDescription = bezeichnung + }); ; + } + } + public override void SetRecipientInformation(ServiceInvoice serviceInvoice, CostBearer costBearer) { if (costBearer.Organisation.Name.Contains("Selbsteinreicher")) diff --git a/ReportImp/AKGG/ServiceInvoiceReport.Designer.cs b/ReportImp/AKGG/ServiceInvoiceReport.Designer.cs index 4db519b1c..8a95e1cd5 100644 --- a/ReportImp/AKGG/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/AKGG/ServiceInvoiceReport.Designer.cs @@ -61,9 +61,17 @@ namespace Akgg this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); this.lblAbrechnungszeitraum = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); + this.DetailReport2 = new DevExpress.XtraReports.UI.DetailReportBand(); + this.Detail3 = new DevExpress.XtraReports.UI.DetailBand(); + this.xrTable6 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow25 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell42 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); this.lblKategorie = new DevExpress.XtraReports.UI.XRLabel(); @@ -73,29 +81,25 @@ namespace Akgg this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell(); - this.DetailReport2 = new DevExpress.XtraReports.UI.DetailReportBand(); - this.Detail3 = new DevExpress.XtraReports.UI.DetailBand(); - this.xrTable6 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow25 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell42 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); - this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); - this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); - this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); - this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); + this.PageFooter = new DevExpress.XtraReports.UI.PageFooterBand(); this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); + this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail // - this.Detail.HeightF = 0F; + this.Detail.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel22, + this.xrLabel3, + this.lblKategorie, + this.xrTable5}); + this.Detail.HeightF = 153.125F; this.Detail.Name = "Detail"; this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; @@ -291,14 +295,14 @@ namespace Akgg this.xrLabel8, this.lblAbrechnungszeitraum}); this.Page1.Font = new System.Drawing.Font("Verdana", 10F); - this.Page1.HeightF = 260.625F; + this.Page1.HeightF = 284.5833F; this.Page1.Name = "Page1"; this.Page1.StylePriority.UseFont = false; // // xrLabel19 // this.xrLabel19.Font = new System.Drawing.Font("Lato", 9.749999F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(513.3755F, 172F); + this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(513.3755F, 195.9584F); this.xrLabel19.Name = "xrLabel19"; this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel19.SizeF = new System.Drawing.SizeF(51.58301F, 23F); @@ -446,8 +450,8 @@ namespace Akgg // // lblAdresse // - this.lblAdresse.Font = new System.Drawing.Font("Lato", 11F); - this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 17.00001F); + this.lblAdresse.Font = new System.Drawing.Font("Lato", 10F); + this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25.29163F); this.lblAdresse.Multiline = true; this.lblAdresse.Name = "lblAdresse"; this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -457,7 +461,7 @@ namespace Akgg // xrLabel5 // this.xrLabel5.Font = new System.Drawing.Font("Lato", 10F); - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 178F); + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 201.9584F); this.xrLabel5.Name = "xrLabel5"; this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel5.SizeF = new System.Drawing.SizeF(317F, 17F); @@ -469,7 +473,7 @@ namespace Akgg this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")}); this.xrLabel8.Font = new System.Drawing.Font("Lato", 9.749999F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(564.9586F, 172F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(564.9586F, 195.9584F); this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel8.SizeF = new System.Drawing.SizeF(91.04114F, 23F); @@ -481,7 +485,7 @@ namespace Akgg // lblAbrechnungszeitraum // this.lblAbrechnungszeitraum.Font = new System.Drawing.Font("Lato", 10F); - this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 211.3333F); + this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 235.2917F); this.lblAbrechnungszeitraum.Multiline = true; this.lblAbrechnungszeitraum.Name = "lblAbrechnungszeitraum"; this.lblAbrechnungszeitraum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -489,19 +493,6 @@ namespace Akgg this.lblAbrechnungszeitraum.StylePriority.UseFont = false; this.lblAbrechnungszeitraum.Text = "vielen Dank für Ihr Vertrauen!\r\nWir stellen Ihnen folgende Leistungen unseres Fac" + "hdienstes in Melsungen in Rechnung:"; - // - // xrLabel15 - // - this.xrLabel15.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Dash; - this.xrLabel15.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrLabel15.Font = new System.Drawing.Font("Verdana", 10F); - this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(565.3751F, 120.2084F); - this.xrLabel15.Name = "xrLabel15"; - this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel15.SizeF = new System.Drawing.SizeF(90.62494F, 9.708344F); - this.xrLabel15.StylePriority.UseBorderDashStyle = false; - this.xrLabel15.StylePriority.UseBorders = false; - this.xrLabel15.StylePriority.UseFont = false; // // DetailReport // @@ -515,18 +506,123 @@ namespace Akgg // // Detail1 // - this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel22, - this.xrLabel3, - this.lblKategorie, - this.xrTable5}); - this.Detail1.HeightF = 148.8751F; + this.Detail1.HeightF = 0F; this.Detail1.Name = "Detail1"; // + // DetailReport2 + // + this.DetailReport2.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail3}); + this.DetailReport2.DataMember = "ServiceInvoicePeriods.ServiceInvoiceItems"; + this.DetailReport2.DataSource = this.bindingSource1; + this.DetailReport2.Level = 0; + this.DetailReport2.Name = "DetailReport2"; + // + // Detail3 + // + this.Detail3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable6}); + this.Detail3.HeightF = 18F; + this.Detail3.Name = "Detail3"; + // + // xrTable6 + // + this.xrTable6.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable6.Name = "xrTable6"; + this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow25}); + this.xrTable6.SizeF = new System.Drawing.SizeF(658F, 18F); + this.xrTable6.StylePriority.UseFont = false; + // + // xrTableRow25 + // + this.xrTableRow25.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell42, + this.xrTableCell44, + this.xrTableCell45, + this.xrTableCell47}); + this.xrTableRow25.Name = "xrTableRow25"; + this.xrTableRow25.Weight = 0.72000000000000008D; + // + // xrTableCell42 + // + this.xrTableCell42.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell42.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell42.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.ServiceDescription", "{0}")}); + this.xrTableCell42.Font = new System.Drawing.Font("Lato", 10F); + this.xrTableCell42.Name = "xrTableCell42"; + this.xrTableCell42.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell42.StylePriority.UseBorderColor = false; + this.xrTableCell42.StylePriority.UseBorders = false; + this.xrTableCell42.StylePriority.UseFont = false; + this.xrTableCell42.StylePriority.UsePadding = false; + this.xrTableCell42.StylePriority.UseTextAlignment = false; + this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell42.Weight = 1.7821272380809439D; + // + // xrTableCell44 + // + this.xrTableCell44.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell44.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell44.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.Hours", "{0:0.00}")}); + this.xrTableCell44.Font = new System.Drawing.Font("Lato", 10F); + this.xrTableCell44.Name = "xrTableCell44"; + this.xrTableCell44.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell44.StylePriority.UseBorderColor = false; + this.xrTableCell44.StylePriority.UseBorders = false; + this.xrTableCell44.StylePriority.UseFont = false; + this.xrTableCell44.StylePriority.UsePadding = false; + this.xrTableCell44.StylePriority.UseTextAlignment = false; + this.xrTableCell44.Text = "xrTableCell44"; + this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell44.Weight = 0.35856769762410717D; + // + // xrTableCell45 + // + this.xrTableCell45.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell45.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell45.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.HourlyRate", "{0:0.00} €")}); + this.xrTableCell45.Font = new System.Drawing.Font("Lato", 10F); + this.xrTableCell45.Name = "xrTableCell45"; + this.xrTableCell45.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell45.StylePriority.UseBorderColor = false; + this.xrTableCell45.StylePriority.UseBorders = false; + this.xrTableCell45.StylePriority.UseFont = false; + this.xrTableCell45.StylePriority.UsePadding = false; + this.xrTableCell45.StylePriority.UseTextAlignment = false; + this.xrTableCell45.Text = "xrTableCell45"; + this.xrTableCell45.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell45.Weight = 0.36466023342806564D; + // + // xrTableCell47 + // + this.xrTableCell47.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell47.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell47.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.GrossAmount")}); + this.xrTableCell47.Font = new System.Drawing.Font("Lato", 10F); + this.xrTableCell47.Name = "xrTableCell47"; + this.xrTableCell47.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell47.StylePriority.UseBorderColor = false; + this.xrTableCell47.StylePriority.UseBorders = false; + this.xrTableCell47.StylePriority.UseFont = false; + this.xrTableCell47.StylePriority.UsePadding = false; + this.xrTableCell47.StylePriority.UseTextAlignment = false; + this.xrTableCell47.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell47.Weight = 0.41045005378786176D; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); + // // xrLabel22 // this.xrLabel22.Font = new System.Drawing.Font("Lato", 10F); - this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(3.999996F, 112.2084F); + this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(0F, 119.5417F); this.xrLabel22.Multiline = true; this.xrLabel22.Name = "xrLabel22"; this.xrLabel22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -537,7 +633,7 @@ namespace Akgg // xrLabel3 // this.xrLabel3.Font = new System.Drawing.Font("Lato", 10F); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 74.29167F); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 87.87495F); this.xrLabel3.Multiline = true; this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -548,7 +644,7 @@ namespace Akgg // lblKategorie // this.lblKategorie.Font = new System.Drawing.Font("Lato", 10F); - this.lblKategorie.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F); + this.lblKategorie.LocationFloat = new DevExpress.Utils.PointFloat(0F, 38.58329F); this.lblKategorie.Multiline = true; this.lblKategorie.Name = "lblKategorie"; this.lblKategorie.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -646,122 +742,48 @@ namespace Akgg this.xrTableCell34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell34.Weight = 0.41045005378786176D; // - // DetailReport2 + // PageFooter // - this.DetailReport2.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { - this.Detail3, - this.GroupFooter1, - this.ReportFooter}); - this.DetailReport2.DataMember = "ServiceInvoicePeriods.ServiceInvoiceItems"; - this.DetailReport2.DataSource = this.bindingSource1; - this.DetailReport2.Level = 0; - this.DetailReport2.Name = "DetailReport2"; - this.DetailReport2.PageBreak = DevExpress.XtraReports.UI.PageBreak.AfterBand; - // - // Detail3 - // - this.Detail3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrTable6}); - this.Detail3.HeightF = 18F; - this.Detail3.Name = "Detail3"; - // - // xrTable6 - // - this.xrTable6.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.xrTable6.Name = "xrTable6"; - this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow25}); - this.xrTable6.SizeF = new System.Drawing.SizeF(658F, 18F); - this.xrTable6.StylePriority.UseFont = false; - // - // xrTableRow25 - // - this.xrTableRow25.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell42, - this.xrTableCell44, - this.xrTableCell45, - this.xrTableCell47}); - this.xrTableRow25.Name = "xrTableRow25"; - this.xrTableRow25.Weight = 0.72000000000000008D; - // - // xrTableCell42 - // - this.xrTableCell42.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell42.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrTableCell42.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.Duration", "{0}")}); - this.xrTableCell42.Font = new System.Drawing.Font("Lato", 10F); - this.xrTableCell42.Name = "xrTableCell42"; - this.xrTableCell42.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell42.StylePriority.UseBorderColor = false; - this.xrTableCell42.StylePriority.UseBorders = false; - this.xrTableCell42.StylePriority.UseFont = false; - this.xrTableCell42.StylePriority.UsePadding = false; - this.xrTableCell42.StylePriority.UseTextAlignment = false; - this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell42.Weight = 1.7821272380809439D; - // - // xrTableCell44 - // - this.xrTableCell44.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell44.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrTableCell44.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.Hours", "{0:0.##}")}); - this.xrTableCell44.Font = new System.Drawing.Font("Lato", 10F); - this.xrTableCell44.Name = "xrTableCell44"; - this.xrTableCell44.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell44.StylePriority.UseBorderColor = false; - this.xrTableCell44.StylePriority.UseBorders = false; - this.xrTableCell44.StylePriority.UseFont = false; - this.xrTableCell44.StylePriority.UsePadding = false; - this.xrTableCell44.StylePriority.UseTextAlignment = false; - this.xrTableCell44.Text = "xrTableCell44"; - this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell44.Weight = 0.35856769762410717D; - // - // xrTableCell45 - // - this.xrTableCell45.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell45.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrTableCell45.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.HourlyRate", "{0:0.00}")}); - this.xrTableCell45.Font = new System.Drawing.Font("Lato", 10F); - this.xrTableCell45.Name = "xrTableCell45"; - this.xrTableCell45.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell45.StylePriority.UseBorderColor = false; - this.xrTableCell45.StylePriority.UseBorders = false; - this.xrTableCell45.StylePriority.UseFont = false; - this.xrTableCell45.StylePriority.UsePadding = false; - this.xrTableCell45.StylePriority.UseTextAlignment = false; - this.xrTableCell45.Text = "xrTableCell45"; - this.xrTableCell45.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell45.Weight = 0.36466023342806564D; - // - // xrTableCell47 - // - this.xrTableCell47.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell47.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrTableCell47.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.GrossAmount")}); - this.xrTableCell47.Font = new System.Drawing.Font("Lato", 10F); - this.xrTableCell47.Name = "xrTableCell47"; - this.xrTableCell47.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell47.StylePriority.UseBorderColor = false; - this.xrTableCell47.StylePriority.UseBorders = false; - this.xrTableCell47.StylePriority.UseFont = false; - this.xrTableCell47.StylePriority.UsePadding = false; - this.xrTableCell47.StylePriority.UseTextAlignment = false; - this.xrTableCell47.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell47.Weight = 0.41045005378786176D; - // - // GroupFooter1 - // - this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.PageFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrPageInfo2, + this.xrLabel14, + this.xrLabel9, this.xrLabel1, this.xrLabel15}); - this.GroupFooter1.HeightF = 137.2501F; - this.GroupFooter1.Name = "GroupFooter1"; + this.PageFooter.HeightF = 221.875F; + this.PageFooter.Name = "PageFooter"; + // + // xrPageInfo2 + // + this.xrPageInfo2.Font = new System.Drawing.Font("Lato", 10F); + this.xrPageInfo2.Format = "Seite {0}"; + this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(537.9582F, 174.375F); + this.xrPageInfo2.Name = "xrPageInfo2"; + this.xrPageInfo2.SizeF = new System.Drawing.SizeF(85.04144F, 20.00002F); + this.xrPageInfo2.StylePriority.UseFont = false; + this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + // + // xrLabel14 + // + this.xrLabel14.Font = new System.Drawing.Font("Lato", 10F); + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 174.375F); + this.xrLabel14.Multiline = true; + this.xrLabel14.Name = "xrLabel14"; + this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel14.SizeF = new System.Drawing.SizeF(317F, 20.00002F); + this.xrLabel14.StylePriority.UseFont = false; + this.xrLabel14.Text = "Steuernummer 02525070602; Finanzamt Kassel I"; + // + // xrLabel9 + // + this.xrLabel9.Font = new System.Drawing.Font("Lato", 10F, System.Drawing.FontStyle.Bold); + this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 141.0417F); + this.xrLabel9.Multiline = true; + this.xrLabel9.Name = "xrLabel9"; + this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel9.SizeF = new System.Drawing.SizeF(511.7883F, 20F); + this.xrLabel9.StylePriority.UseFont = false; + this.xrLabel9.Text = "Zahlung innerhalb von 14 Tagen ab Rechnungseingang ohne Abzüge"; // // xrLabel1 // @@ -770,7 +792,7 @@ namespace Akgg this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim")}); this.xrLabel1.Font = new System.Drawing.Font("Lato", 10F, System.Drawing.FontStyle.Bold); - this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(565.3751F, 90.95834F); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(563.3747F, 10.00001F); this.xrLabel1.Name = "xrLabel1"; this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F); this.xrLabel1.SizeF = new System.Drawing.SizeF(92.625F, 25F); @@ -782,51 +804,18 @@ namespace Akgg this.xrLabel1.Text = "xrLabel1"; this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; // - // ReportFooter + // xrLabel15 // - this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel9, - this.xrLabel14, - this.xrPageInfo2}); - this.ReportFooter.HeightF = 100F; - this.ReportFooter.Name = "ReportFooter"; - this.ReportFooter.PrintAtBottom = true; - // - // xrLabel9 - // - this.xrLabel9.Font = new System.Drawing.Font("Lato", 10F, System.Drawing.FontStyle.Bold); - this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(4F, 23.3333F); - this.xrLabel9.Multiline = true; - this.xrLabel9.Name = "xrLabel9"; - this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel9.SizeF = new System.Drawing.SizeF(511.7883F, 20F); - this.xrLabel9.StylePriority.UseFont = false; - this.xrLabel9.Text = "Zahlung innerhalb von 14 Tagen ab Rechnungseingang ohne Abzüge"; - // - // xrLabel14 - // - this.xrLabel14.Font = new System.Drawing.Font("Lato", 10F); - this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(4F, 56.66669F); - this.xrLabel14.Multiline = true; - this.xrLabel14.Name = "xrLabel14"; - this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel14.SizeF = new System.Drawing.SizeF(317F, 20.00002F); - this.xrLabel14.StylePriority.UseFont = false; - this.xrLabel14.Text = "Steuernummer 02525070602; Finanzamt Kassel I"; - // - // xrPageInfo2 - // - this.xrPageInfo2.Font = new System.Drawing.Font("Lato", 10F); - this.xrPageInfo2.Format = "Seite {0}"; - this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(543.9586F, 56.66669F); - this.xrPageInfo2.Name = "xrPageInfo2"; - this.xrPageInfo2.SizeF = new System.Drawing.SizeF(85.04144F, 20.00002F); - this.xrPageInfo2.StylePriority.UseFont = false; - this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); + this.xrLabel15.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Dash; + this.xrLabel15.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.xrLabel15.Font = new System.Drawing.Font("Verdana", 10F); + this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(563.3747F, 39.25009F); + this.xrLabel15.Name = "xrLabel15"; + this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel15.SizeF = new System.Drawing.SizeF(90.62494F, 9.708344F); + this.xrLabel15.StylePriority.UseBorderDashStyle = false; + this.xrLabel15.StylePriority.UseBorders = false; + this.xrLabel15.StylePriority.UseFont = false; // // ServiceInvoiceReport // @@ -836,7 +825,8 @@ namespace Akgg this.topMarginBand1, this.bottomMarginBand1, this.Page1, - this.DetailReport}); + this.DetailReport, + this.PageFooter}); this.DataSource = this.bindingSource1; this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; this.Font = new System.Drawing.Font("Verdana", 10F); @@ -847,9 +837,9 @@ namespace Akgg this.PageWidth = 827; this.PaperKind = System.Drawing.Printing.PaperKind.A4; this.Version = "17.1"; - ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -865,15 +855,8 @@ namespace Akgg private DevExpress.XtraReports.UI.XRLabel xrLabel5; private DevExpress.XtraReports.UI.XRLabel xrLabel8; private DevExpress.XtraReports.UI.XRLabel lblAbrechnungszeitraum; - private DevExpress.XtraReports.UI.XRLabel xrLabel15; private DevExpress.XtraReports.UI.DetailReportBand DetailReport; private DevExpress.XtraReports.UI.DetailBand Detail1; - private DevExpress.XtraReports.UI.XRTable xrTable5; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow23; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell37; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell33; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell36; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell34; private DevExpress.XtraReports.UI.DetailReportBand DetailReport2; private DevExpress.XtraReports.UI.DetailBand Detail3; private DevExpress.XtraReports.UI.XRTable xrTable6; @@ -883,8 +866,6 @@ namespace Akgg private DevExpress.XtraReports.UI.XRTableCell xrTableCell45; private DevExpress.XtraReports.UI.XRTableCell xrTableCell47; private DevExpress.XtraReports.UI.XRLabel lblAdresse; - private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; - private DevExpress.XtraReports.UI.XRLabel xrLabel1; private DevExpress.XtraReports.UI.XRLabel xrLabel6; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; private DevExpress.XtraReports.UI.XRLabel xrLabel19; @@ -897,9 +878,6 @@ namespace Akgg private DevExpress.XtraReports.UI.XRLabel xrLabel12; private DevExpress.XtraReports.UI.XRLabel xrLabel11; private DevExpress.XtraReports.UI.XRLabel xrLabel10; - private DevExpress.XtraReports.UI.XRLabel xrLabel22; - private DevExpress.XtraReports.UI.XRLabel xrLabel3; - private DevExpress.XtraReports.UI.XRLabel lblKategorie; private DevExpress.XtraReports.UI.XRLabel xrLabel33; private DevExpress.XtraReports.UI.XRLabel xrLabel31; private DevExpress.XtraReports.UI.XRLabel xrLabel32; @@ -909,9 +887,20 @@ namespace Akgg private DevExpress.XtraReports.UI.XRLabel xrLabel27; private DevExpress.XtraReports.UI.XRLabel xrLabel26; private DevExpress.XtraReports.UI.XRLabel xrLabel25; - private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter; - private DevExpress.XtraReports.UI.XRLabel xrLabel9; - private DevExpress.XtraReports.UI.XRLabel xrLabel14; + private DevExpress.XtraReports.UI.XRLabel xrLabel22; + private DevExpress.XtraReports.UI.XRLabel xrLabel3; + private DevExpress.XtraReports.UI.XRLabel lblKategorie; + private DevExpress.XtraReports.UI.XRTable xrTable5; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow23; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell37; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell33; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell36; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell34; + private DevExpress.XtraReports.UI.PageFooterBand PageFooter; private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo2; + private DevExpress.XtraReports.UI.XRLabel xrLabel14; + private DevExpress.XtraReports.UI.XRLabel xrLabel9; + private DevExpress.XtraReports.UI.XRLabel xrLabel1; + private DevExpress.XtraReports.UI.XRLabel xrLabel15; } } diff --git a/ReportImp/AKGG/ServiceInvoiceReportPK.Designer.cs b/ReportImp/AKGG/ServiceInvoiceReportPK.Designer.cs index 7f352e9e8..c4499f10a 100644 --- a/ReportImp/AKGG/ServiceInvoiceReportPK.Designer.cs +++ b/ReportImp/AKGG/ServiceInvoiceReportPK.Designer.cs @@ -61,19 +61,8 @@ namespace Akgg this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); this.lblAbrechnungszeitraum = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); - this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); - this.lblKategorie = new DevExpress.XtraReports.UI.XRLabel(); - this.xrTable5 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow23 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell(); this.DetailReport2 = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail3 = new DevExpress.XtraReports.UI.DetailBand(); this.xrTable6 = new DevExpress.XtraReports.UI.XRTable(); @@ -82,23 +71,41 @@ namespace Akgg this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); - this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); - this.xrLabel23 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); - this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrTable5 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow23 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell(); + this.lblKategorie = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel(); + this.PageFooter = new DevExpress.XtraReports.UI.PageFooterBand(); this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.lblEinreichung = new DevExpress.XtraReports.UI.XRLabel(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); + this.xrLabel23 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail // - this.Detail.HeightF = 0F; + this.Detail.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable5, + this.lblKategorie, + this.xrLabel3, + this.xrLabel4, + this.xrLabel22}); + this.Detail.HeightF = 137.5F; + this.Detail.KeepTogether = true; + this.Detail.KeepTogetherWithDetailReports = true; this.Detail.Name = "Detail"; this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; @@ -157,7 +164,7 @@ namespace Akgg this.xrLabel27, this.xrLabel26, this.xrLabel25}); - this.bottomMarginBand1.HeightF = 102F; + this.bottomMarginBand1.HeightF = 100.8748F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // // xrLabel33 @@ -294,14 +301,14 @@ namespace Akgg this.xrLabel8, this.lblAbrechnungszeitraum}); this.Page1.Font = new System.Drawing.Font("Verdana", 10F); - this.Page1.HeightF = 260.625F; + this.Page1.HeightF = 281.4583F; this.Page1.Name = "Page1"; this.Page1.StylePriority.UseFont = false; // // xrLabel19 // this.xrLabel19.Font = new System.Drawing.Font("Lato", 9.749999F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(513.3755F, 172F); + this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(513.3755F, 192.8334F); this.xrLabel19.Name = "xrLabel19"; this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel19.SizeF = new System.Drawing.SizeF(51.58301F, 23F); @@ -450,7 +457,7 @@ namespace Akgg // lblAdresse // this.lblAdresse.Font = new System.Drawing.Font("Lato", 11F); - this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 17.00001F); + this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25.29163F); this.lblAdresse.Multiline = true; this.lblAdresse.Name = "lblAdresse"; this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -460,7 +467,7 @@ namespace Akgg // xrLabel5 // this.xrLabel5.Font = new System.Drawing.Font("Lato", 10F); - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 178F); + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 198.8334F); this.xrLabel5.Name = "xrLabel5"; this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel5.SizeF = new System.Drawing.SizeF(317F, 17F); @@ -472,7 +479,7 @@ namespace Akgg this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")}); this.xrLabel8.Font = new System.Drawing.Font("Lato", 9.749999F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(564.9586F, 172F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(564.9586F, 192.8334F); this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel8.SizeF = new System.Drawing.SizeF(91.04114F, 23F); @@ -484,7 +491,7 @@ namespace Akgg // lblAbrechnungszeitraum // this.lblAbrechnungszeitraum.Font = new System.Drawing.Font("Lato", 10F); - this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 211.3333F); + this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 232.1667F); this.lblAbrechnungszeitraum.Multiline = true; this.lblAbrechnungszeitraum.Name = "lblAbrechnungszeitraum"; this.lblAbrechnungszeitraum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -492,19 +499,6 @@ namespace Akgg this.lblAbrechnungszeitraum.StylePriority.UseFont = false; this.lblAbrechnungszeitraum.Text = "vielen Dank für Ihr Vertrauen!\r\nWir stellen Ihnen folgende Leistungen unseres Fac" + "hdienstes in Melsungen in Rechnung:"; - // - // xrLabel15 - // - this.xrLabel15.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Dash; - this.xrLabel15.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrLabel15.Font = new System.Drawing.Font("Verdana", 10F); - this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(563.3748F, 181.6667F); - this.xrLabel15.Name = "xrLabel15"; - this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel15.SizeF = new System.Drawing.SizeF(90.62494F, 9.708344F); - this.xrLabel15.StylePriority.UseBorderDashStyle = false; - this.xrLabel15.StylePriority.UseBorders = false; - this.xrLabel15.StylePriority.UseFont = false; // // DetailReport // @@ -518,155 +512,13 @@ namespace Akgg // // Detail1 // - this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel22, - this.xrLabel4, - this.xrLabel3, - this.lblKategorie, - this.xrTable5}); - this.Detail1.HeightF = 143.75F; + this.Detail1.HeightF = 0F; this.Detail1.Name = "Detail1"; // - // xrLabel22 - // - this.xrLabel22.Font = new System.Drawing.Font("Lato", 10F); - this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(0F, 105.9584F); - this.xrLabel22.Multiline = true; - this.xrLabel22.Name = "xrLabel22"; - this.xrLabel22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel22.SizeF = new System.Drawing.SizeF(300.33F, 20F); - this.xrLabel22.StylePriority.UseFont = false; - this.xrLabel22.Text = "Zeitraum: [AccountingPeriod]"; - // - // xrLabel4 - // - this.xrLabel4.Font = new System.Drawing.Font("Lato", 10F); - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 75.54169F); - this.xrLabel4.Multiline = true; - this.xrLabel4.Name = "xrLabel4"; - this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel4.SizeF = new System.Drawing.SizeF(300.33F, 20F); - this.xrLabel4.StylePriority.UseFont = false; - this.xrLabel4.Text = "KV-Nr. : [CustomerReferenceNumber]"; - // - // xrLabel3 - // - this.xrLabel3.Font = new System.Drawing.Font("Lato", 10F); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 55.54168F); - this.xrLabel3.Multiline = true; - this.xrLabel3.Name = "xrLabel3"; - this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(300.33F, 20F); - this.xrLabel3.StylePriority.UseFont = false; - this.xrLabel3.Text = "[CustomerName], geb. [CustomerBirthdate!dd.MM.yyyy]"; - // - // lblKategorie - // - this.lblKategorie.Font = new System.Drawing.Font("Lato", 10F); - this.lblKategorie.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F); - this.lblKategorie.Multiline = true; - this.lblKategorie.Name = "lblKategorie"; - this.lblKategorie.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblKategorie.SizeF = new System.Drawing.SizeF(300.33F, 20F); - this.lblKategorie.StylePriority.UseFont = false; - this.lblKategorie.Text = "Verhinderungspflege gem. § 39 SGB XI"; - // - // xrTable5 - // - this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.xrTable5.Name = "xrTable5"; - this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow23}); - this.xrTable5.SizeF = new System.Drawing.SizeF(658F, 25F); - // - // xrTableRow23 - // - this.xrTableRow23.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell37, - this.xrTableCell33, - this.xrTableCell36, - this.xrTableCell34}); - this.xrTableRow23.Name = "xrTableRow23"; - this.xrTableRow23.Weight = 1D; - // - // xrTableCell37 - // - this.xrTableCell37.BackColor = System.Drawing.Color.Gainsboro; - this.xrTableCell37.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell37.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrTableCell37.Font = new System.Drawing.Font("Lato", 10F, System.Drawing.FontStyle.Bold); - this.xrTableCell37.Name = "xrTableCell37"; - this.xrTableCell37.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell37.StylePriority.UseBackColor = false; - this.xrTableCell37.StylePriority.UseBorderColor = false; - this.xrTableCell37.StylePriority.UseBorders = false; - this.xrTableCell37.StylePriority.UseFont = false; - this.xrTableCell37.StylePriority.UsePadding = false; - this.xrTableCell37.StylePriority.UseTextAlignment = false; - this.xrTableCell37.Text = "Bezeichnung"; - this.xrTableCell37.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell37.Weight = 1.7821272380809439D; - // - // xrTableCell33 - // - this.xrTableCell33.BackColor = System.Drawing.Color.Gainsboro; - this.xrTableCell33.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell33.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrTableCell33.Font = new System.Drawing.Font("Lato", 10F, System.Drawing.FontStyle.Bold); - this.xrTableCell33.Name = "xrTableCell33"; - this.xrTableCell33.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell33.StylePriority.UseBackColor = false; - this.xrTableCell33.StylePriority.UseBorderColor = false; - this.xrTableCell33.StylePriority.UseBorders = false; - this.xrTableCell33.StylePriority.UseFont = false; - this.xrTableCell33.StylePriority.UsePadding = false; - this.xrTableCell33.StylePriority.UseTextAlignment = false; - this.xrTableCell33.Text = "Menge"; - this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell33.Weight = 0.35856769762410717D; - // - // xrTableCell36 - // - this.xrTableCell36.BackColor = System.Drawing.Color.Gainsboro; - this.xrTableCell36.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell36.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrTableCell36.Font = new System.Drawing.Font("Lato", 10F, System.Drawing.FontStyle.Bold); - this.xrTableCell36.Name = "xrTableCell36"; - this.xrTableCell36.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell36.StylePriority.UseBackColor = false; - this.xrTableCell36.StylePriority.UseBorderColor = false; - this.xrTableCell36.StylePriority.UseBorders = false; - this.xrTableCell36.StylePriority.UseFont = false; - this.xrTableCell36.StylePriority.UsePadding = false; - this.xrTableCell36.StylePriority.UseTextAlignment = false; - this.xrTableCell36.Text = "Einzelpreis"; - this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell36.Weight = 0.36466023342806564D; - // - // xrTableCell34 - // - this.xrTableCell34.BackColor = System.Drawing.Color.Gainsboro; - this.xrTableCell34.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell34.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrTableCell34.Font = new System.Drawing.Font("Lato", 10F, System.Drawing.FontStyle.Bold); - this.xrTableCell34.Name = "xrTableCell34"; - this.xrTableCell34.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell34.StylePriority.UseBackColor = false; - this.xrTableCell34.StylePriority.UseBorderColor = false; - this.xrTableCell34.StylePriority.UseBorders = false; - this.xrTableCell34.StylePriority.UseFont = false; - this.xrTableCell34.StylePriority.UsePadding = false; - this.xrTableCell34.StylePriority.UseTextAlignment = false; - this.xrTableCell34.Text = "Gesamt"; - this.xrTableCell34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell34.Weight = 0.41045005378786176D; - // // DetailReport2 // this.DetailReport2.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { - this.Detail3, - this.GroupFooter1, - this.ReportFooter}); + this.Detail3}); this.DetailReport2.DataMember = "ServiceInvoicePeriods.ServiceInvoiceItems"; this.DetailReport2.DataSource = this.bindingSource1; this.DetailReport2.Level = 0; @@ -770,20 +622,205 @@ namespace Akgg this.xrTableCell47.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell47.Weight = 0.41045005378786176D; // - // GroupFooter1 + // bindingSource1 // - this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); + // + // xrTable5 + // + this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable5.Name = "xrTable5"; + this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow23}); + this.xrTable5.SizeF = new System.Drawing.SizeF(658F, 25F); + // + // xrTableRow23 + // + this.xrTableRow23.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell37, + this.xrTableCell33, + this.xrTableCell36, + this.xrTableCell34}); + this.xrTableRow23.Name = "xrTableRow23"; + this.xrTableRow23.Weight = 1D; + // + // xrTableCell37 + // + this.xrTableCell37.BackColor = System.Drawing.Color.Gainsboro; + this.xrTableCell37.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell37.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell37.Font = new System.Drawing.Font("Lato", 10F, System.Drawing.FontStyle.Bold); + this.xrTableCell37.Name = "xrTableCell37"; + this.xrTableCell37.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell37.StylePriority.UseBackColor = false; + this.xrTableCell37.StylePriority.UseBorderColor = false; + this.xrTableCell37.StylePriority.UseBorders = false; + this.xrTableCell37.StylePriority.UseFont = false; + this.xrTableCell37.StylePriority.UsePadding = false; + this.xrTableCell37.StylePriority.UseTextAlignment = false; + this.xrTableCell37.Text = "Bezeichnung"; + this.xrTableCell37.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell37.Weight = 1.7821272380809439D; + // + // xrTableCell33 + // + this.xrTableCell33.BackColor = System.Drawing.Color.Gainsboro; + this.xrTableCell33.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell33.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell33.Font = new System.Drawing.Font("Lato", 10F, System.Drawing.FontStyle.Bold); + this.xrTableCell33.Name = "xrTableCell33"; + this.xrTableCell33.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell33.StylePriority.UseBackColor = false; + this.xrTableCell33.StylePriority.UseBorderColor = false; + this.xrTableCell33.StylePriority.UseBorders = false; + this.xrTableCell33.StylePriority.UseFont = false; + this.xrTableCell33.StylePriority.UsePadding = false; + this.xrTableCell33.StylePriority.UseTextAlignment = false; + this.xrTableCell33.Text = "Menge"; + this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell33.Weight = 0.35856769762410717D; + // + // xrTableCell36 + // + this.xrTableCell36.BackColor = System.Drawing.Color.Gainsboro; + this.xrTableCell36.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell36.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell36.Font = new System.Drawing.Font("Lato", 10F, System.Drawing.FontStyle.Bold); + this.xrTableCell36.Name = "xrTableCell36"; + this.xrTableCell36.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell36.StylePriority.UseBackColor = false; + this.xrTableCell36.StylePriority.UseBorderColor = false; + this.xrTableCell36.StylePriority.UseBorders = false; + this.xrTableCell36.StylePriority.UseFont = false; + this.xrTableCell36.StylePriority.UsePadding = false; + this.xrTableCell36.StylePriority.UseTextAlignment = false; + this.xrTableCell36.Text = "Einzelpreis"; + this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell36.Weight = 0.36466023342806564D; + // + // xrTableCell34 + // + this.xrTableCell34.BackColor = System.Drawing.Color.Gainsboro; + this.xrTableCell34.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell34.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell34.Font = new System.Drawing.Font("Lato", 10F, System.Drawing.FontStyle.Bold); + this.xrTableCell34.Name = "xrTableCell34"; + this.xrTableCell34.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell34.StylePriority.UseBackColor = false; + this.xrTableCell34.StylePriority.UseBorderColor = false; + this.xrTableCell34.StylePriority.UseBorders = false; + this.xrTableCell34.StylePriority.UseFont = false; + this.xrTableCell34.StylePriority.UsePadding = false; + this.xrTableCell34.StylePriority.UseTextAlignment = false; + this.xrTableCell34.Text = "Gesamt"; + this.xrTableCell34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell34.Weight = 0.41045005378786176D; + // + // lblKategorie + // + this.lblKategorie.Font = new System.Drawing.Font("Lato", 10F); + this.lblKategorie.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F); + this.lblKategorie.Multiline = true; + this.lblKategorie.Name = "lblKategorie"; + this.lblKategorie.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblKategorie.SizeF = new System.Drawing.SizeF(300.33F, 20F); + this.lblKategorie.StylePriority.UseFont = false; + this.lblKategorie.Text = "Verhinderungspflege gem. § 39 SGB XI"; + // + // xrLabel3 + // + this.xrLabel3.Font = new System.Drawing.Font("Lato", 10F); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 55.54168F); + this.xrLabel3.Multiline = true; + this.xrLabel3.Name = "xrLabel3"; + this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(300.33F, 20F); + this.xrLabel3.StylePriority.UseFont = false; + this.xrLabel3.Text = "[CustomerName], geb. [CustomerBirthdate!dd.MM.yyyy]"; + // + // xrLabel4 + // + this.xrLabel4.Font = new System.Drawing.Font("Lato", 10F); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 75.54169F); + this.xrLabel4.Multiline = true; + this.xrLabel4.Name = "xrLabel4"; + this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel4.SizeF = new System.Drawing.SizeF(300.33F, 20F); + this.xrLabel4.StylePriority.UseFont = false; + this.xrLabel4.Text = "KV-Nr. : [CustomerReferenceNumber]"; + // + // xrLabel22 + // + this.xrLabel22.Font = new System.Drawing.Font("Lato", 10F); + this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(0F, 105.9584F); + this.xrLabel22.Multiline = true; + this.xrLabel22.Name = "xrLabel22"; + this.xrLabel22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel22.SizeF = new System.Drawing.SizeF(300.33F, 20F); + this.xrLabel22.StylePriority.UseFont = false; + this.xrLabel22.Text = "Zeitraum: [AccountingPeriod]"; + // + // PageFooter + // + this.PageFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel9, + this.xrLabel14, + this.xrPageInfo2, this.lblEinreichung, this.xrLabel23, this.xrLabel1, this.xrLabel15}); - this.GroupFooter1.HeightF = 200.7918F; - this.GroupFooter1.Name = "GroupFooter1"; + this.PageFooter.HeightF = 233.4375F; + this.PageFooter.Name = "PageFooter"; + // + // xrLabel9 + // + this.xrLabel9.Font = new System.Drawing.Font("Lato", 10F, System.Drawing.FontStyle.Bold); + this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 157.1874F); + this.xrLabel9.Multiline = true; + this.xrLabel9.Name = "xrLabel9"; + this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel9.SizeF = new System.Drawing.SizeF(511.7883F, 20F); + this.xrLabel9.StylePriority.UseFont = false; + this.xrLabel9.Text = "Zahlung innerhalb von 14 Tagen ab Rechnungseingang ohne Abzüge"; + // + // xrLabel14 + // + this.xrLabel14.Font = new System.Drawing.Font("Lato", 10F); + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 190.5209F); + this.xrLabel14.Multiline = true; + this.xrLabel14.Name = "xrLabel14"; + this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel14.SizeF = new System.Drawing.SizeF(317F, 20.00002F); + this.xrLabel14.StylePriority.UseFont = false; + this.xrLabel14.Text = "Steuernummer 02525070602; Finanzamt Kassel I"; + // + // xrPageInfo2 + // + this.xrPageInfo2.Font = new System.Drawing.Font("Lato", 10F); + this.xrPageInfo2.Format = "Seite {0}"; + this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(539.9586F, 190.5209F); + this.xrPageInfo2.Name = "xrPageInfo2"; + this.xrPageInfo2.SizeF = new System.Drawing.SizeF(85.04144F, 20.00002F); + this.xrPageInfo2.StylePriority.UseFont = false; + this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + // + // lblEinreichung + // + this.lblEinreichung.Font = new System.Drawing.Font("Lato", 10F); + this.lblEinreichung.LocationFloat = new DevExpress.Utils.PointFloat(0F, 58.87502F); + this.lblEinreichung.Multiline = true; + this.lblEinreichung.Name = "lblEinreichung"; + this.lblEinreichung.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblEinreichung.SizeF = new System.Drawing.SizeF(382.3775F, 40.83334F); + this.lblEinreichung.StylePriority.UseFont = false; + this.lblEinreichung.Text = "DIESE RECHNUNG KÖNNEN SIE ZUR ERSTATTUNG BEI IHRER PFLEGEKASSE EINREICHEN!"; + this.lblEinreichung.Visible = false; // // xrLabel23 // this.xrLabel23.Font = new System.Drawing.Font("Lato", 10F); - this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(0F, 49.58331F); + this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(0F, 23.95833F); this.xrLabel23.Multiline = true; this.xrLabel23.Name = "xrLabel23"; this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -798,7 +835,7 @@ namespace Akgg this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim")}); this.xrLabel1.Font = new System.Drawing.Font("Lato", 10F, System.Drawing.FontStyle.Bold); - this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(563.3748F, 152.4167F); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(563.3747F, 97.6251F); this.xrLabel1.Name = "xrLabel1"; this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F); this.xrLabel1.SizeF = new System.Drawing.SizeF(92.625F, 25F); @@ -810,63 +847,18 @@ namespace Akgg this.xrLabel1.Text = "xrLabel1"; this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; // - // ReportFooter + // xrLabel15 // - this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel9, - this.xrLabel14, - this.xrPageInfo2}); - this.ReportFooter.HeightF = 100F; - this.ReportFooter.Name = "ReportFooter"; - this.ReportFooter.PrintAtBottom = true; - // - // xrLabel9 - // - this.xrLabel9.Font = new System.Drawing.Font("Lato", 10F, System.Drawing.FontStyle.Bold); - this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(4F, 23.3333F); - this.xrLabel9.Multiline = true; - this.xrLabel9.Name = "xrLabel9"; - this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel9.SizeF = new System.Drawing.SizeF(511.7883F, 20F); - this.xrLabel9.StylePriority.UseFont = false; - this.xrLabel9.Text = "Zahlung innerhalb von 14 Tagen ab Rechnungseingang ohne Abzüge"; - // - // xrLabel14 - // - this.xrLabel14.Font = new System.Drawing.Font("Lato", 10F); - this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(4F, 56.66669F); - this.xrLabel14.Multiline = true; - this.xrLabel14.Name = "xrLabel14"; - this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel14.SizeF = new System.Drawing.SizeF(317F, 20.00002F); - this.xrLabel14.StylePriority.UseFont = false; - this.xrLabel14.Text = "Steuernummer 02525070602; Finanzamt Kassel I"; - // - // xrPageInfo2 - // - this.xrPageInfo2.Font = new System.Drawing.Font("Lato", 10F); - this.xrPageInfo2.Format = "Seite {0}"; - this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(543.9586F, 56.66669F); - this.xrPageInfo2.Name = "xrPageInfo2"; - this.xrPageInfo2.SizeF = new System.Drawing.SizeF(85.04144F, 20.00002F); - this.xrPageInfo2.StylePriority.UseFont = false; - this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); - // - // lblEinreichung - // - this.lblEinreichung.Font = new System.Drawing.Font("Lato", 10F); - this.lblEinreichung.LocationFloat = new DevExpress.Utils.PointFloat(0F, 95.95833F); - this.lblEinreichung.Multiline = true; - this.lblEinreichung.Name = "lblEinreichung"; - this.lblEinreichung.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblEinreichung.SizeF = new System.Drawing.SizeF(382.3775F, 40.83334F); - this.lblEinreichung.StylePriority.UseFont = false; - this.lblEinreichung.Text = "DIESE RECHNUNG KÖNNEN SIE ZUR ERSTATTUNG BEI IHRER PFLEGEKASSE EINREICHEN!"; - this.lblEinreichung.Visible = false; + this.xrLabel15.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Dash; + this.xrLabel15.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.xrLabel15.Font = new System.Drawing.Font("Verdana", 10F); + this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(563.3747F, 126.8751F); + this.xrLabel15.Name = "xrLabel15"; + this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel15.SizeF = new System.Drawing.SizeF(92.625F, 9.708328F); + this.xrLabel15.StylePriority.UseBorderDashStyle = false; + this.xrLabel15.StylePriority.UseBorders = false; + this.xrLabel15.StylePriority.UseFont = false; // // ServiceInvoiceReportPK // @@ -876,20 +868,21 @@ namespace Akgg this.topMarginBand1, this.bottomMarginBand1, this.Page1, - this.DetailReport}); + this.DetailReport, + this.PageFooter}); this.DataSource = this.bindingSource1; this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; this.Font = new System.Drawing.Font("Verdana", 10F); this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.ruleRateFactorNull}); - this.Margins = new System.Drawing.Printing.Margins(94, 75, 209, 102); + this.Margins = new System.Drawing.Printing.Margins(94, 75, 209, 101); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = System.Drawing.Printing.PaperKind.A4; this.Version = "17.1"; - ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -905,15 +898,8 @@ namespace Akgg private DevExpress.XtraReports.UI.XRLabel xrLabel5; private DevExpress.XtraReports.UI.XRLabel xrLabel8; private DevExpress.XtraReports.UI.XRLabel lblAbrechnungszeitraum; - private DevExpress.XtraReports.UI.XRLabel xrLabel15; private DevExpress.XtraReports.UI.DetailReportBand DetailReport; private DevExpress.XtraReports.UI.DetailBand Detail1; - private DevExpress.XtraReports.UI.XRTable xrTable5; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow23; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell37; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell33; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell36; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell34; private DevExpress.XtraReports.UI.DetailReportBand DetailReport2; private DevExpress.XtraReports.UI.DetailBand Detail3; private DevExpress.XtraReports.UI.XRTable xrTable6; @@ -923,8 +909,6 @@ namespace Akgg private DevExpress.XtraReports.UI.XRTableCell xrTableCell45; private DevExpress.XtraReports.UI.XRTableCell xrTableCell47; private DevExpress.XtraReports.UI.XRLabel lblAdresse; - private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; - private DevExpress.XtraReports.UI.XRLabel xrLabel1; private DevExpress.XtraReports.UI.XRLabel xrLabel6; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; private DevExpress.XtraReports.UI.XRLabel xrLabel19; @@ -937,11 +921,6 @@ namespace Akgg private DevExpress.XtraReports.UI.XRLabel xrLabel12; private DevExpress.XtraReports.UI.XRLabel xrLabel11; private DevExpress.XtraReports.UI.XRLabel xrLabel10; - private DevExpress.XtraReports.UI.XRLabel xrLabel22; - private DevExpress.XtraReports.UI.XRLabel xrLabel4; - private DevExpress.XtraReports.UI.XRLabel xrLabel3; - private DevExpress.XtraReports.UI.XRLabel lblKategorie; - private DevExpress.XtraReports.UI.XRLabel xrLabel23; private DevExpress.XtraReports.UI.XRLabel xrLabel33; private DevExpress.XtraReports.UI.XRLabel xrLabel31; private DevExpress.XtraReports.UI.XRLabel xrLabel32; @@ -951,10 +930,23 @@ namespace Akgg private DevExpress.XtraReports.UI.XRLabel xrLabel27; private DevExpress.XtraReports.UI.XRLabel xrLabel26; private DevExpress.XtraReports.UI.XRLabel xrLabel25; - private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter; + private DevExpress.XtraReports.UI.XRTable xrTable5; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow23; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell37; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell33; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell36; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell34; + private DevExpress.XtraReports.UI.XRLabel lblKategorie; + private DevExpress.XtraReports.UI.XRLabel xrLabel3; + private DevExpress.XtraReports.UI.XRLabel xrLabel4; + private DevExpress.XtraReports.UI.XRLabel xrLabel22; + private DevExpress.XtraReports.UI.PageFooterBand PageFooter; private DevExpress.XtraReports.UI.XRLabel xrLabel9; private DevExpress.XtraReports.UI.XRLabel xrLabel14; private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo2; private DevExpress.XtraReports.UI.XRLabel lblEinreichung; + private DevExpress.XtraReports.UI.XRLabel xrLabel23; + private DevExpress.XtraReports.UI.XRLabel xrLabel1; + private DevExpress.XtraReports.UI.XRLabel xrLabel15; } } diff --git a/ReportImp/AKGG/ServiceInvoiceReportPK.cs b/ReportImp/AKGG/ServiceInvoiceReportPK.cs index 42270e9e4..508b5bdd5 100644 --- a/ReportImp/AKGG/ServiceInvoiceReportPK.cs +++ b/ReportImp/AKGG/ServiceInvoiceReportPK.cs @@ -1,4 +1,5 @@ using System; +using System.Linq; using System.Text; using BeWo.Report; using BeWo.Report.ReportObjects; @@ -66,10 +67,14 @@ namespace Akgg ii.Duration = ii.ServiceDescription; else if (ii.ServiceRecord != null && ii.ServiceRecord.ServiceDescription.CategoryName.Contains("Entlastung")) ii.Duration = String.Format("Betreuungsstunden {0}", ii.Duration.Substring(0, 8)); - else // (ii.ServiceRecord != null && ii.ServiceRecord.ServiceDescription.CategoryName.Contains("Verhinderung")) + else if (ii.ServiceRecord != null && ii.ServiceRecord.ServiceDescription.CategoryName.Contains("Verhinderung")) ii.Duration = String.Format("Pflegestunden {0}", ii.Duration.Substring(0, 8)); + else + ii.Duration = ii.ServiceDescription; } + sip.ServiceInvoiceItems = sip.ServiceInvoiceItems.OrderBy(i => i.Duration).ToList(); } + if (pRO.ServiceInvoicePeriods[0].ServiceInvoiceItems[0].Duration.Contains("Betreuung")) lblKategorie.Text = "Entlastungsbetrag gem. § 45 SGB XI";