From 2dd4c4667c689cfc7fba4e5435f08feb551f4dec Mon Sep 17 00:00:00 2001 From: Kojo Date: Sun, 2 Jun 2024 19:45:19 +0200 Subject: [PATCH] =?UTF-8?q?AkkuratDienstleistungsgesellschaft:=20Anpassung?= =?UTF-8?q?en=20Spitzabrechnung=20(Rechnungsnummer=20nur=20anzeigen=20wenn?= =?UTF-8?q?=20gesetzt,=20keine=20feste=20E-mail,=20Fu=C3=9Fzeile=20etwas?= =?UTF-8?q?=20kleiner=20und=20h=C3=B6her)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SettlementReport2.Designer.cs | 126 +++++++++--------- .../SettlementReport2.cs | 9 +- .../SettlementReport2.resx | 11 +- 3 files changed, 74 insertions(+), 72 deletions(-) diff --git a/ReportImp/AkkuratDienstleistungsgesellschaft/SettlementReport2.Designer.cs b/ReportImp/AkkuratDienstleistungsgesellschaft/SettlementReport2.Designer.cs index 29fb668e0..6f651f0d1 100644 --- a/ReportImp/AkkuratDienstleistungsgesellschaft/SettlementReport2.Designer.cs +++ b/ReportImp/AkkuratDienstleistungsgesellschaft/SettlementReport2.Designer.cs @@ -32,6 +32,7 @@ namespace Akkurat this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung)); DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); @@ -46,13 +47,14 @@ namespace Akkurat this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblRechnungsnummer = new DevExpress.XtraReports.UI.XRLabel(); this.RecipientPostCodeAndTown = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel_RecipientStreet = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel_RecipientDivision = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel_RecipientContactPerson = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); + this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow20 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -73,6 +75,8 @@ namespace Akkurat this.lblNotice = new DevExpress.XtraReports.UI.XRLabel(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); @@ -92,7 +96,6 @@ namespace Akkurat this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrTable5 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow31 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -111,15 +114,13 @@ namespace Akkurat this.xrTableRow37 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell59 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell60 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox(); - this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -274,19 +275,19 @@ namespace Akkurat "rthday] - AZ: [CustomerReferenceNumber]"; this.xrLabel3.WordWrap = false; // - // xrLabel2 + // lblRechnungsnummer // - this.xrLabel2.BackColor = System.Drawing.Color.Transparent; - this.xrLabel2.CanShrink = true; - this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 188.0833F); - this.xrLabel2.Name = "xrLabel2"; - this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel2.SizeF = new System.Drawing.SizeF(650F, 18F); - this.xrLabel2.StylePriority.UseBackColor = false; - this.xrLabel2.StylePriority.UseFont = false; - this.xrLabel2.Text = "Rechnung Nr. [InvoiceNumber]"; - this.xrLabel2.WordWrap = false; + this.lblRechnungsnummer.BackColor = System.Drawing.Color.Transparent; + this.lblRechnungsnummer.CanShrink = true; + this.lblRechnungsnummer.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold); + this.lblRechnungsnummer.LocationFloat = new DevExpress.Utils.PointFloat(0F, 188.0833F); + this.lblRechnungsnummer.Name = "lblRechnungsnummer"; + this.lblRechnungsnummer.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblRechnungsnummer.SizeF = new System.Drawing.SizeF(650F, 18F); + this.lblRechnungsnummer.StylePriority.UseBackColor = false; + this.lblRechnungsnummer.StylePriority.UseFont = false; + this.lblRechnungsnummer.Text = "Rechnung Nr. [InvoiceNumber]"; + this.lblRechnungsnummer.WordWrap = false; // // RecipientPostCodeAndTown // @@ -352,15 +353,26 @@ namespace Akkurat this.xrLabel12, this.lblNotice}); this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); - this.ReportFooter.HeightF = 301.875F; + this.ReportFooter.HeightF = 291.2083F; this.ReportFooter.KeepTogether = true; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; // + // xrLabel11 + // + this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 9F); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 129.6666F); + this.xrLabel11.Multiline = true; + this.xrLabel11.Name = "xrLabel11"; + this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel11.SizeF = new System.Drawing.SizeF(649.9998F, 82.58342F); + this.xrLabel11.StylePriority.UseFont = false; + this.xrLabel11.Text = resources.GetString("xrLabel11.Text"); + // // xrLabel10 // this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 230F); + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 218F); this.xrLabel10.Name = "xrLabel10"; this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel10.SizeF = new System.Drawing.SizeF(175F, 17F); @@ -491,7 +503,7 @@ namespace Akkurat // xrLabel12 // this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 282F); + this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 269F); this.xrLabel12.Name = "xrLabel12"; this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel12.SizeF = new System.Drawing.SizeF(225F, 17F); @@ -521,6 +533,27 @@ namespace Akkurat this.bottomMarginBand1.HeightF = 99.91665F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // + // xrLabel15 + // + this.xrLabel15.BackColor = System.Drawing.Color.Transparent; + this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Arial", 8F); + this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrLabel15.Multiline = true; + this.xrLabel15.Name = "xrLabel15"; + this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel15.SizeF = new System.Drawing.SizeF(460.8335F, 69.12498F); + this.xrLabel15.StylePriority.UseBackColor = false; + this.xrLabel15.StylePriority.UseFont = false; + this.xrLabel15.Text = resources.GetString("xrLabel15.Text"); + // + // xrPictureBox2 + // + this.xrPictureBox2.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox2.ImageSource")); + this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(482.9583F, 0F); + this.xrPictureBox2.Name = "xrPictureBox2"; + this.xrPictureBox2.SizeF = new System.Drawing.SizeF(190F, 65F); + this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + // // GroupHeader1 // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -532,7 +565,7 @@ namespace Akkurat this.xrLabel_RecipientDivision, this.xrLabel_RecipientStreet, this.RecipientPostCodeAndTown, - this.xrLabel2, + this.lblRechnungsnummer, this.xrLabel3, this.xrLabel4, this.xrLabel5, @@ -553,7 +586,7 @@ namespace Akkurat this.xrLabel14.SizeF = new System.Drawing.SizeF(237.1665F, 83.74997F); this.xrLabel14.StylePriority.UseTextAlignment = false; this.xrLabel14.Text = "[SenderContactPerson]\r\nTel.: 0 24 54 / 935940 00\r\nFax: 0 24 54 / 935940 02\r\nE-Mai" + - "l:[SenderContactPersonMail]lhouben@heinrichs-gruppe.de"; + "l:[SenderContactPersonMail]"; this.xrLabel14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // // xrLabel13 @@ -569,10 +602,11 @@ namespace Akkurat // // lblAbsender // - this.lblAbsender.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.lblAbsender.Font = new DevExpress.Drawing.DXFont("Arial", 8F); + this.lblAbsender.LocationFloat = new DevExpress.Utils.PointFloat(0F, 3F); this.lblAbsender.Name = "lblAbsender"; this.lblAbsender.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblAbsender.SizeF = new System.Drawing.SizeF(367.0001F, 17F); + this.lblAbsender.SizeF = new System.Drawing.SizeF(382.6251F, 17F); this.lblAbsender.StylePriority.UseFont = false; this.lblAbsender.Text = "AKKURAT – Dienstleistungsgesellschaft mbH, Hauptstr. 15, 52538 Gangelt"; // @@ -750,10 +784,6 @@ namespace Akkurat this.xrTableCell7.StylePriority.UsePadding = false; this.xrTableCell7.Weight = 3D; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); - // // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -956,37 +986,9 @@ namespace Akkurat this.xrTableCell60.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell60.Weight = 0.16397432767427886D; // - // xrPictureBox2 + // bindingSource1 // - this.xrPictureBox2.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox2.ImageSource")); - this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(478.7917F, 0F); - this.xrPictureBox2.Name = "xrPictureBox2"; - this.xrPictureBox2.SizeF = new System.Drawing.SizeF(198.9998F, 80.58332F); - this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; - // - // xrLabel15 - // - this.xrLabel15.BackColor = System.Drawing.Color.Transparent; - this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Arial", 8F); - this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.xrLabel15.Multiline = true; - this.xrLabel15.Name = "xrLabel15"; - this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel15.SizeF = new System.Drawing.SizeF(460.8335F, 80.58332F); - this.xrLabel15.StylePriority.UseBackColor = false; - this.xrLabel15.StylePriority.UseFont = false; - this.xrLabel15.Text = resources.GetString("xrLabel15.Text"); - // - // xrLabel11 - // - this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 128.6666F); - this.xrLabel11.Multiline = true; - this.xrLabel11.Name = "xrLabel11"; - this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel11.SizeF = new System.Drawing.SizeF(649.9998F, 101.3334F); - this.xrLabel11.StylePriority.UseFont = false; - this.xrLabel11.Text = resources.GetString("xrLabel11.Text"); + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); // // Spitzabrechnung // @@ -1010,12 +1012,14 @@ namespace Akkurat this.PageWidth = 827; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; this.Version = "23.2"; + xrWatermark1.Id = "Watermark1"; + this.Watermarks.Add(xrWatermark1); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -1029,7 +1033,7 @@ namespace Akkurat private DevExpress.XtraReports.UI.XRLabel xrLabel5; private DevExpress.XtraReports.UI.XRLabel xrLabel4; private DevExpress.XtraReports.UI.XRLabel xrLabel3; - private DevExpress.XtraReports.UI.XRLabel xrLabel2; + private DevExpress.XtraReports.UI.XRLabel lblRechnungsnummer; private DevExpress.XtraReports.UI.XRLabel RecipientPostCodeAndTown; private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientStreet; private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientDivision; diff --git a/ReportImp/AkkuratDienstleistungsgesellschaft/SettlementReport2.cs b/ReportImp/AkkuratDienstleistungsgesellschaft/SettlementReport2.cs index 1c930d9ea..4675c564a 100644 --- a/ReportImp/AkkuratDienstleistungsgesellschaft/SettlementReport2.cs +++ b/ReportImp/AkkuratDienstleistungsgesellschaft/SettlementReport2.cs @@ -19,6 +19,11 @@ namespace Akkurat public void SetReportDataSource(Settlement2RO pRO) { + if (String.IsNullOrEmpty(pRO.InvoiceNumber)) + { + lblRechnungsnummer.Visible = false; + } + if (String.IsNullOrEmpty(pRO.Notice)) { lblNotice.Visible = false; @@ -36,10 +41,6 @@ namespace Akkurat if (!pRO.FehlkontakteString.IsNullOrEmpty() && ii.RateFactor == 0) { Zwischensumme.Visible = true; - //if (!ii.ItemDescription.IsNullOrEmpty()) - //{ - //ii.AbrechnungsText = Regex.Replace(ii.DetailDescription, ii.ItemDescription, "Fehlkontakte"); - //} ii.AbrechnungsText = ii.AbrechnungsText.Replace("FLS", "Std."); ii.ItemDescription = "Fehlkontakte"; } diff --git a/ReportImp/AkkuratDienstleistungsgesellschaft/SettlementReport2.resx b/ReportImp/AkkuratDienstleistungsgesellschaft/SettlementReport2.resx index 9d34bb3da..74e825091 100644 --- a/ReportImp/AkkuratDienstleistungsgesellschaft/SettlementReport2.resx +++ b/ReportImp/AkkuratDienstleistungsgesellschaft/SettlementReport2.resx @@ -123,20 +123,17 @@ nachstehend haben wir die Abrechnung für den o.g. Betreuungszeitraum erstellt: -Insgesamt bewilligte Fachleistungsstunden: [ApprovedFLSTotal] Stunden -Insgesamt geleistete Fachleistungsstunden: [RecordedFlsTotal] Stunden +Insgesamt bewilligte Fachleistungsstunden: [ApprovedFLSTotal!0.##] Stunden +Insgesamt geleistete Fachleistungsstunden: [RecordedFlsTotal!0.##] Stunden Eventuell stattgefundene Gruppenangebote wurden bei der Berechnung der Fachleistungsstunden bereits durch die Teilnehmerzahl dividiert und der jeweilige Anteil im Leistungsnachweis des Klienten erfasst. Somit handelt es sich um die tatsächlich erbrachte Stundenzahl des Klienten. Während stationärer Aufenthalte wurden maximal 2 Fachleistungsstunden pro Woche geleistet. -Wir bitten um Ãœberweisung auf unser Konto bei der Volksbank Heinsberg eG, -IBAN: DE57 3706 9412 2901 7010 35. +Wir bitten um Ãœberweisung auf unser Konto bei der Volksbank Heinsberg, IBAN: DE57 3706 9412 2901 7010 35. Ein Unternehmen der Heinrichs-Gruppe, Sitz: Hauptstr. 15, 52538 Gangelt -Handelsregister: AG Aachen HRB 9401 - +Handelsregister: AG Aachen HRB 9401, Ust-Id Nr. DE 157250638 Volksbank Heinsberg eG, BIC: GENODED1HRB, IBAN: DE57 3706 9412 2901 7010 35 -Ust-Id Nr. DE 157250638 Geschäftsführung: Johannes Heinrichs, Karin Heinrichs, Anna-Lena Damm, Til Heinrichs www.heinrichs-gruppe.de