From be3bb93e83cb774ad1ca4239f3e7d017ccb24bdd Mon Sep 17 00:00:00 2001 From: Alexandra Date: Fri, 7 Mar 2025 13:59:35 +0100 Subject: [PATCH] =?UTF-8?q?PsychosozialerTraegervereinReports/Invoicing/?= =?UTF-8?q?=20Anpassung=20f=C3=BCr=20monatliche=20Rg=20und=20Selbstzahler?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Invoicing/CustomInvoiceFactory.cs | 8 +- .../RechnungLT24.Designer.cs | 28 +- .../RechnungLT24.resx | 3 - .../RechnungSonstige.Designer.cs | 254 ++++++++++++++---- .../RechnungSonstige.cs | 104 ++++--- .../RechnungSonstige.resx | 12 +- 6 files changed, 286 insertions(+), 123 deletions(-) diff --git a/ReportImp/PsychosozialerTraegervereinReports/Invoicing/CustomInvoiceFactory.cs b/ReportImp/PsychosozialerTraegervereinReports/Invoicing/CustomInvoiceFactory.cs index 73df6a80e..a001ab8a4 100644 --- a/ReportImp/PsychosozialerTraegervereinReports/Invoicing/CustomInvoiceFactory.cs +++ b/ReportImp/PsychosozialerTraegervereinReports/Invoicing/CustomInvoiceFactory.cs @@ -28,9 +28,7 @@ namespace PsychosozialerTraegervereinReports.Invoicing { return new Lt24InvoiceCreation(); } - - } - + } } foreach (var list in supportConcepts2ServiceRecords.Values) @@ -44,15 +42,11 @@ namespace PsychosozialerTraegervereinReports.Invoicing { return new Lt24InvoiceCreation(); } - } } - } return base.CreateInvoiceCreator(specificId, tenant, supportConcepts2ServiceRecords); - } - } } diff --git a/ReportImp/PsychosozialerTraegervereinReports/RechnungLT24.Designer.cs b/ReportImp/PsychosozialerTraegervereinReports/RechnungLT24.Designer.cs index bf1ffca3d..8cb20cf06 100644 --- a/ReportImp/PsychosozialerTraegervereinReports/RechnungLT24.Designer.cs +++ b/ReportImp/PsychosozialerTraegervereinReports/RechnungLT24.Designer.cs @@ -30,6 +30,7 @@ namespace BeWo.PsychosozialerTraegervereinReports { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RechnungLT24)); + DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); @@ -71,14 +72,14 @@ namespace BeWo.PsychosozialerTraegervereinReports // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrLabel1}); - this.ReportHeader.Font = new System.Drawing.Font("Tahoma", 8F); + this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Tahoma", 8F); this.ReportHeader.HeightF = 40F; this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; // // xrLabel1 // - this.xrLabel1.Font = new System.Drawing.Font("Tahoma", 8F, System.Drawing.FontStyle.Underline); + this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Tahoma", 8F, DevExpress.Drawing.DXFontStyle.Underline); this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrLabel1.Name = "xrLabel1"; this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -142,7 +143,8 @@ namespace BeWo.PsychosozialerTraegervereinReports // this.xrLabel4.BackColor = System.Drawing.Color.Transparent; this.xrLabel4.CanShrink = true; - this.xrLabel4.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 238.5F); this.xrLabel4.Multiline = true; this.xrLabel4.Name = "xrLabel4"; @@ -157,7 +159,8 @@ namespace BeWo.PsychosozialerTraegervereinReports // this.xrLabel3.BackColor = System.Drawing.Color.Transparent; this.xrLabel3.CanShrink = true; - this.xrLabel3.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 222.5F); this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -180,13 +183,14 @@ namespace BeWo.PsychosozialerTraegervereinReports // xrLabel8 // this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate", "Iserlohn, {0}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")}); this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(362.5F, 172.5F); this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel8.SizeF = new System.Drawing.SizeF(283F, 23F); this.xrLabel8.StylePriority.UseTextAlignment = false; this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrLabel8.TextFormatString = "Iserlohn, {0}"; // // xrTable1 // @@ -208,7 +212,8 @@ namespace BeWo.PsychosozialerTraegervereinReports this.xrTableCell2, this.xrTableCell4, this.xrTableCell6}); - this.xrTableRow1.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableRow1.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableRow1.Name = "xrTableRow1"; this.xrTableRow1.StylePriority.UseFont = false; this.xrTableRow1.Weight = 0.15D; @@ -326,16 +331,21 @@ namespace BeWo.PsychosozialerTraegervereinReports this.topMarginBand1, this.bottomMarginBand1, this.Page1}); + this.ComponentStorage.AddRange(new System.ComponentModel.IComponent[] { + this.bindingSource1}); this.DataSource = this.bindingSource1; this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; - this.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.ruleRateFactorNull}); - this.Margins = new System.Drawing.Printing.Margins(105, 50, 158, 30); + this.Margins = new DevExpress.Drawing.DXMargins(105F, 50F, 158F, 30F); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; - this.Version = "17.1"; + this.Version = "23.2"; + xrWatermark1.Id = "Watermark1"; + this.Watermarks.Add(xrWatermark1); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); diff --git a/ReportImp/PsychosozialerTraegervereinReports/RechnungLT24.resx b/ReportImp/PsychosozialerTraegervereinReports/RechnungLT24.resx index b78972679..36d2fa606 100644 --- a/ReportImp/PsychosozialerTraegervereinReports/RechnungLT24.resx +++ b/ReportImp/PsychosozialerTraegervereinReports/RechnungLT24.resx @@ -132,7 +132,4 @@ Psychosozialer Trägerverein e.V. Leitung Ambulant Betreutes Wohnen - - 17, 17 - \ No newline at end of file diff --git a/ReportImp/PsychosozialerTraegervereinReports/RechnungSonstige.Designer.cs b/ReportImp/PsychosozialerTraegervereinReports/RechnungSonstige.Designer.cs index 60a7a54e8..24c465d87 100644 --- a/ReportImp/PsychosozialerTraegervereinReports/RechnungSonstige.Designer.cs +++ b/ReportImp/PsychosozialerTraegervereinReports/RechnungSonstige.Designer.cs @@ -30,6 +30,7 @@ namespace BeWo.PsychosozialerTraegervereinReports { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RechnungSonstige)); + DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); @@ -37,11 +38,10 @@ namespace BeWo.PsychosozialerTraegervereinReports this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblAnrede = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -55,8 +55,22 @@ namespace BeWo.PsychosozialerTraegervereinReports this.cellHouryRate = new DevExpress.XtraReports.UI.XRTableCell(); this.cellClaim = new DevExpress.XtraReports.UI.XRTableCell(); this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // @@ -71,14 +85,14 @@ namespace BeWo.PsychosozialerTraegervereinReports // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrLabel1}); - this.ReportHeader.Font = new System.Drawing.Font("Tahoma", 8F); + this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Tahoma", 8F); this.ReportHeader.HeightF = 40F; this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; // // xrLabel1 // - this.xrLabel1.Font = new System.Drawing.Font("Tahoma", 8F, System.Drawing.FontStyle.Underline); + this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Tahoma", 8F, DevExpress.Drawing.DXFontStyle.Underline); this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrLabel1.Name = "xrLabel1"; this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -104,25 +118,39 @@ namespace BeWo.PsychosozialerTraegervereinReports // Page1 // this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable2, + this.xrLabel7, this.xrLabel2, this.lblAdresse, - this.xrLabel4, - this.xrLabel3, - this.xrLabel5, + this.lblAnrede, this.xrLabel8, this.xrTable1, this.xrLabel6}); - this.Page1.HeightF = 683.6249F; + this.Page1.HeightF = 822F; this.Page1.Name = "Page1"; this.Page1.StylePriority.UseFont = false; // + // xrLabel7 + // + this.xrLabel7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceNumber")}); + this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Calibri", 11F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 215.125F); + this.xrLabel7.Multiline = true; + this.xrLabel7.Name = "xrLabel7"; + this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(342.7083F, 23F); + this.xrLabel7.StylePriority.UseFont = false; + this.xrLabel7.Text = "xrLabel7"; + this.xrLabel7.TextFormatString = "Rechnung Nr. {0}"; + // // xrLabel2 // - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 455F); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 572.6251F); this.xrLabel2.Multiline = true; this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel2.SizeF = new System.Drawing.SizeF(630.4166F, 228.6249F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(630.4166F, 249.3749F); this.xrLabel2.StylePriority.UseFont = false; this.xrLabel2.StylePriority.UseTextAlignment = false; this.xrLabel2.Text = resources.GetString("xrLabel2.Text"); @@ -138,44 +166,14 @@ namespace BeWo.PsychosozialerTraegervereinReports this.lblAdresse.SizeF = new System.Drawing.SizeF(317F, 111.5F); this.lblAdresse.StylePriority.UseFont = false; // - // xrLabel4 + // lblAnrede // - this.xrLabel4.BackColor = System.Drawing.Color.Transparent; - this.xrLabel4.CanShrink = true; - this.xrLabel4.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 238.5F); - 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(650F, 17F); - this.xrLabel4.StylePriority.UseBackColor = false; - this.xrLabel4.StylePriority.UseFont = false; - this.xrLabel4.Text = "Ihr Zeichen: [CustomerReferenceNumber], Abrechnungszeitraum: [AccountingPeriod]"; - this.xrLabel4.WordWrap = false; - // - // xrLabel3 - // - this.xrLabel3.BackColor = System.Drawing.Color.Transparent; - this.xrLabel3.CanShrink = true; - this.xrLabel3.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 222.5F); - this.xrLabel3.Name = "xrLabel3"; - this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(650F, 16F); - this.xrLabel3.StylePriority.UseBackColor = false; - this.xrLabel3.StylePriority.UseFont = false; - this.xrLabel3.Text = "[CustomerLastName], [CustomerFirstName], geb. [CustomerBirthdate!dd.MM.yyyy] - Fa" + - "chleistungsstunden Ambulant Betreutes Wohnen -"; - this.xrLabel3.WordWrap = false; - // - // xrLabel5 - // - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 279.7916F); - 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); - this.xrLabel5.StylePriority.UseFont = false; - this.xrLabel5.Text = "Sehr geehrte Damen und Herren,"; + this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(0F, 410.9583F); + this.lblAnrede.Name = "lblAnrede"; + this.lblAnrede.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblAnrede.SizeF = new System.Drawing.SizeF(317F, 17F); + this.lblAnrede.StylePriority.UseFont = false; + this.lblAnrede.Text = "Sehr geehrte Damen und Herren,"; // // xrLabel8 // @@ -193,7 +191,7 @@ namespace BeWo.PsychosozialerTraegervereinReports this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 375.625F); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 493.25F); this.xrTable1.Name = "xrTable1"; this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow1, @@ -208,7 +206,8 @@ namespace BeWo.PsychosozialerTraegervereinReports this.xrTableCell2, this.xrTableCell4, this.xrTableCell6}); - this.xrTableRow1.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableRow1.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableRow1.Name = "xrTableRow1"; this.xrTableRow1.StylePriority.UseFont = false; this.xrTableRow1.Weight = 0.15D; @@ -303,17 +302,136 @@ namespace BeWo.PsychosozialerTraegervereinReports // // xrLabel6 // - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 317.2916F); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 448.4583F); this.xrLabel6.Multiline = true; this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel6.SizeF = new System.Drawing.SizeF(630.4166F, 33.66666F); this.xrLabel6.StylePriority.UseFont = false; this.xrLabel6.StylePriority.UseTextAlignment = false; - this.xrLabel6.Text = "nachstehend die Aufstellung der von uns geleisteten Fachstunden im Ambulant Betre" + - "uten Wohnen für [CustomerSalutation] [CustomerLastName]:\r\n"; + this.xrLabel6.Text = "nachstehend berechnen wir die von uns geleisteten Fachstunden in der Assistenz de" + + "r eigenen Häuslichkeit:\r\n"; this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopJustify; // + // xrTable2 + // + this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 275.7083F); + this.xrTable2.Name = "xrTable2"; + this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F); + this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow7, + this.xrTableRow2, + this.xrTableRow6, + this.xrTableRow5, + this.xrTableRow3, + this.xrTableRow4}); + this.xrTable2.SizeF = new System.Drawing.SizeF(650.0001F, 96F); + // + // xrTableRow2 + // + this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell3}); + this.xrTableRow2.Name = "xrTableRow2"; + this.xrTableRow2.Weight = 0.64D; + // + // xrTableCell3 + // + this.xrTableCell3.CanShrink = true; + this.xrTableCell3.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrTableCell3.Multiline = true; + this.xrTableCell3.Name = "xrTableCell3"; + this.xrTableCell3.StylePriority.UseFont = false; + this.xrTableCell3.Visible = false; + this.xrTableCell3.Weight = 1D; + // + // xrTableRow3 + // + this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell5}); + this.xrTableRow3.Name = "xrTableRow3"; + this.xrTableRow3.Weight = 0.64D; + // + // xrTableCell5 + // + this.xrTableCell5.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrTableCell5.Multiline = true; + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.StylePriority.UseFont = false; + this.xrTableCell5.Text = "Abrechnung Fachleistungsstunden Assistenz in eigener Häuslichkeit"; + this.xrTableCell5.Weight = 1D; + // + // xrTableRow4 + // + this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell7}); + this.xrTableRow4.Name = "xrTableRow4"; + this.xrTableRow4.Weight = 0.64D; + // + // xrTableCell7 + // + this.xrTableCell7.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrTableCell7.Multiline = true; + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.StylePriority.UseFont = false; + this.xrTableCell7.Text = "Leistungszeitraum: [AccountingPeriod]"; + this.xrTableCell7.Weight = 1D; + // + // xrTableRow5 + // + this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell8}); + this.xrTableRow5.Name = "xrTableRow5"; + this.xrTableRow5.Weight = 0.64D; + // + // xrTableCell8 + // + this.xrTableCell8.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrTableCell8.Multiline = true; + this.xrTableCell8.Name = "xrTableCell8"; + this.xrTableCell8.StylePriority.UseFont = false; + this.xrTableCell8.Visible = false; + this.xrTableCell8.Weight = 1D; + // + // xrTableRow6 + // + this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell9}); + this.xrTableRow6.Name = "xrTableRow6"; + this.xrTableRow6.Weight = 0.64D; + // + // xrTableCell9 + // + this.xrTableCell9.CanShrink = true; + this.xrTableCell9.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrTableCell9.Multiline = true; + this.xrTableCell9.Name = "xrTableCell9"; + this.xrTableCell9.StylePriority.UseFont = false; + this.xrTableCell9.Visible = false; + this.xrTableCell9.Weight = 1D; + // + // xrTableRow7 + // + this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell10}); + this.xrTableRow7.Name = "xrTableRow7"; + this.xrTableRow7.Weight = 0.64D; + // + // xrTableCell10 + // + this.xrTableCell10.CanShrink = true; + this.xrTableCell10.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrTableCell10.Multiline = true; + this.xrTableCell10.Name = "xrTableCell10"; + this.xrTableCell10.StylePriority.UseFont = false; + this.xrTableCell10.Visible = false; + this.xrTableCell10.Weight = 1D; + // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); @@ -326,18 +444,24 @@ namespace BeWo.PsychosozialerTraegervereinReports this.topMarginBand1, this.bottomMarginBand1, this.Page1}); + this.ComponentStorage.AddRange(new System.ComponentModel.IComponent[] { + this.bindingSource1}); this.DataSource = this.bindingSource1; this.DisplayName = "Rechnung"; this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; - this.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.ruleRateFactorNull}); - this.Margins = new System.Drawing.Printing.Margins(105, 50, 158, 30); + this.Margins = new DevExpress.Drawing.DXMargins(105F, 50F, 158F, 30F); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; - this.Version = "17.1"; + this.Version = "23.2"; + xrWatermark1.Id = "Watermark1"; + this.Watermarks.Add(xrWatermark1); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); @@ -351,8 +475,7 @@ namespace BeWo.PsychosozialerTraegervereinReports private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1; private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1; private DevExpress.XtraReports.UI.GroupHeaderBand Page1; - private DevExpress.XtraReports.UI.XRLabel xrLabel3; - private DevExpress.XtraReports.UI.XRLabel xrLabel5; + private DevExpress.XtraReports.UI.XRLabel lblAnrede; private DevExpress.XtraReports.UI.XRLabel xrLabel8; private DevExpress.XtraReports.UI.XRTable xrTable1; private DevExpress.XtraReports.UI.XRTableRow xrTableRow17; @@ -363,12 +486,25 @@ namespace BeWo.PsychosozialerTraegervereinReports private DevExpress.XtraReports.UI.XRTableCell cellDays; private DevExpress.XtraReports.UI.XRTableCell cellHouryRate; private DevExpress.XtraReports.UI.XRLabel xrLabel2; - private DevExpress.XtraReports.UI.XRLabel xrLabel4; private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; private DevExpress.XtraReports.UI.XRLabel xrLabel1; + private DevExpress.XtraReports.UI.XRLabel xrLabel7; + private DevExpress.XtraReports.UI.XRTable xrTable2; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow7; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow6; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow5; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow3; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow4; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; } } diff --git a/ReportImp/PsychosozialerTraegervereinReports/RechnungSonstige.cs b/ReportImp/PsychosozialerTraegervereinReports/RechnungSonstige.cs index b41f5fecb..60b8edc6f 100644 --- a/ReportImp/PsychosozialerTraegervereinReports/RechnungSonstige.cs +++ b/ReportImp/PsychosozialerTraegervereinReports/RechnungSonstige.cs @@ -18,37 +18,6 @@ namespace BeWo.PsychosozialerTraegervereinReports public void SetReportDataSource(ServiceInvoiceRO pRO) { - StringBuilder sb = new StringBuilder(); - - if (!String.IsNullOrEmpty(pRO.RecipientOrganisation)) - { - if (pRO.RecipientOrganisation.Contains("LT 24 - Inklusionsamt Soziale Teilhabe")) - { - pRO.RecipientOrganisation = "LWL\nInklusionsamt Soziale Teilhabe"; - } - sb.AppendLine(pRO.RecipientOrganisation); - } - if (!String.IsNullOrEmpty(pRO.RecipientContactPerson)) - { - sb.AppendLine(pRO.RecipientContactPerson); - } - if (!String.IsNullOrEmpty(pRO.RecipientDivision)) - { - sb.AppendLine(pRO.RecipientDivision); - } - if (!String.IsNullOrEmpty(pRO.RecipientStreet)) - { - sb.AppendLine(pRO.RecipientStreet); - - } - if (!String.IsNullOrEmpty(pRO.RecipientPostCodeAndTown)) - { - sb.AppendLine(""); - sb.AppendLine(pRO.RecipientPostCodeAndTown); - } - lblAdresse.Text = sb.ToString(); - - decimal hourlyRate = 0; decimal rateFactor = 1; decimal hours = 0; @@ -56,10 +25,8 @@ namespace BeWo.PsychosozialerTraegervereinReports { foreach (var p in pRO.ServiceInvoicePeriods) { - if (p.ServiceInvoiceItems != null && p.ServiceInvoiceItems.Count > 0) { - foreach (var i in p.ServiceInvoiceItems) { if (i.HourlyRate.HasValue) @@ -71,21 +38,15 @@ namespace BeWo.PsychosozialerTraegervereinReports var rfStr = i.RateFactor.Replace("%", "").Replace(",00", "").Trim(); int rfInt = 0; Int32.TryParse(rfStr, out rfInt); - rateFactor = (100m + rfInt)/100m; } } if (i.Hours.HasValue) hours += i.Hours.Value; - - - } - } } - } hours *= rateFactor; @@ -97,7 +58,72 @@ namespace BeWo.PsychosozialerTraegervereinReports cellHouryRate.Text = String.Format("{0:0.00}", hourlyRate); cellClaim.Text = String.Format("{0}", pRO.GrossClaim); + // Überschrift ausblenden bei Selbstzahler + if (!String.IsNullOrEmpty(pRO.RecipientOrganisation) && pRO.RecipientOrganisation.ToLower() != "selbstzahler") + { + xrTableCell10.Text = "Leistungsberechtigte/r: "; + xrTableCell9.Text = String.Format("Ihr Zeichen: {0}", pRO.CustomerReferenceNumber); + xrTableCell8.Text = ""; + xrTableCell3.Text = String.Format("{0}, {1}, geb. {2:dd.MM.yyyy}", pRO.CustomerLastName, pRO.CustomerFirstName, pRO.CustomerBirthdate); + xrTableCell10.Visible = true; + xrTableCell9.Visible = true; + xrTableCell8.Visible = true; + xrTableCell3.Visible = true; + } + else + { + if (!String.IsNullOrEmpty(pRO.CustomerSalutation) && pRO.CustomerSalutation.ToLower().Contains("herr")) + { + lblAnrede.Text = String.Format("Sehr geehrter Herr {0},", pRO.CustomerLastName); + } + else if (!String.IsNullOrEmpty(pRO.CustomerSalutation) && pRO.CustomerSalutation.ToLower().Contains("frau")) + { + lblAnrede.Text = String.Format("Sehr geehrte Frau {0},", pRO.CustomerLastName); + } + } + + SetzeAdresse(pRO); + this.bindingSource1.DataSource = pRO; } + + private void SetzeAdresse(ServiceInvoiceRO pRO) + { + StringBuilder sb = new StringBuilder(); + if (!String.IsNullOrEmpty(pRO.RecipientOrganisation) && pRO.RecipientOrganisation.ToLower() != "selbstzahler") + { + if (pRO.RecipientOrganisation.Contains("LT 24 - Inklusionsamt Soziale Teilhabe")) + { + pRO.RecipientOrganisation = "LWL\nInklusionsamt Soziale Teilhabe"; + } + sb.AppendLine(pRO.RecipientOrganisation); + } + //if (!String.IsNullOrEmpty(pRO.RecipientAddressLine1)) + //{ + // sb.AppendLine(pRO.RecipientAddressLine1); + //} + if (!String.IsNullOrEmpty(pRO.RecipientContactPerson)) + { + sb.AppendLine(pRO.RecipientContactPerson); + } + if (!String.IsNullOrEmpty(pRO.RecipientDivision) && !String.IsNullOrEmpty(pRO.RecipientOrganisation) && pRO.RecipientOrganisation.ToLower() != "selbstzahler") + { + sb.AppendLine(pRO.RecipientDivision); + } + if (!String.IsNullOrEmpty(pRO.RecipientPoBox)) + { + sb.AppendLine(pRO.RecipientPoBox); + } + else if (!String.IsNullOrEmpty(pRO.RecipientStreet)) + { + sb.AppendLine(pRO.RecipientStreet); + } + if (!String.IsNullOrEmpty(pRO.RecipientPostCodeAndTown)) + { + sb.AppendLine(""); + sb.AppendLine(pRO.RecipientPostCodeAndTown); + } + lblAdresse.Text = sb.ToString(); + } } } \ No newline at end of file diff --git a/ReportImp/PsychosozialerTraegervereinReports/RechnungSonstige.resx b/ReportImp/PsychosozialerTraegervereinReports/RechnungSonstige.resx index b78972679..002483bcd 100644 --- a/ReportImp/PsychosozialerTraegervereinReports/RechnungSonstige.resx +++ b/ReportImp/PsychosozialerTraegervereinReports/RechnungSonstige.resx @@ -118,9 +118,10 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Eine Kopie des Quittierungsbeleges liegt bei. + Eine Kopie des Quittierungsbeleges ist als Anlage beigefügt. -Wir bitten um Ãœberweisung des oben genannten Betrages auf unser Konto bei der Sparkasse Iserlohn, IBAN: DE36 4455 0045 0000 1867 34. +Den oben genannten Betrag überweisen Sie bitte innerhalb von 14 Tagen auf unser Konto bei der Sparkasse +Iserlohn, IBAN: DE36 4455 0045 0000 1867 34. Sollten Sie noch Fragen haben, können Sie sich gerne mit uns in Verbindung setzen. @@ -130,9 +131,8 @@ Mit freundlichen Grüßen Psychosozialer Trägerverein e.V. Leitung Ambulant Betreutes Wohnen - + + +Im Auftrag - - 17, 17 - \ No newline at end of file