From 3d6748673470a116620c623bd0823d752e10499f Mon Sep 17 00:00:00 2001 From: HirschleM Date: Tue, 14 Apr 2026 08:53:15 +0200 Subject: [PATCH] MH: SBBMainzReports Storno Erweiterung --- .../ServiceInvoiceReport.Designer.cs | 40 +++++++++---------- .../SBBMainzReports/ServiceInvoiceReport.cs | 3 ++ 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/ReportImp/SBBMainzReports/ServiceInvoiceReport.Designer.cs b/ReportImp/SBBMainzReports/ServiceInvoiceReport.Designer.cs index 5937e5873..e2fbca200 100644 --- a/ReportImp/SBBMainzReports/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/SBBMainzReports/ServiceInvoiceReport.Designer.cs @@ -50,7 +50,7 @@ namespace SBBMainzReports this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); this.lblRechnungsnummer = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblTitel = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -171,7 +171,7 @@ namespace SBBMainzReports this.xrLabel10, this.xrLabel11, this.lblRechnungsnummer, - this.xrLabel7, + this.lblTitel, this.xrTable1, this.lblAdresse, this.xrLabel2, @@ -333,22 +333,22 @@ namespace SBBMainzReports this.lblRechnungsnummer.Text = "[InvoiceNumber]"; this.lblRechnungsnummer.WordWrap = false; // - // xrLabel7 + // lblTitel // - this.xrLabel7.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + this.lblTitel.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel7.Font = new DevExpress.Drawing.DXFont("arial", 24F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(10.00004F, 232.2917F); - 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(688.3749F, 35.45842F); - this.xrLabel7.StylePriority.UseBorders = false; - this.xrLabel7.StylePriority.UseFont = false; - this.xrLabel7.StylePriority.UseTextAlignment = false; - this.xrLabel7.Text = "RECHNUNG"; - this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.lblTitel.Font = new DevExpress.Drawing.DXFont("arial", 24F, DevExpress.Drawing.DXFontStyle.Bold); + this.lblTitel.LocationFloat = new DevExpress.Utils.PointFloat(10.00004F, 232.2917F); + this.lblTitel.Multiline = true; + this.lblTitel.Name = "lblTitel"; + this.lblTitel.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblTitel.SizeF = new System.Drawing.SizeF(688.3749F, 35.45842F); + this.lblTitel.StylePriority.UseBorders = false; + this.lblTitel.StylePriority.UseFont = false; + this.lblTitel.StylePriority.UseTextAlignment = false; + this.lblTitel.Text = "RECHNUNG"; + this.lblTitel.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; // // xrTable1 // @@ -539,7 +539,7 @@ namespace SBBMainzReports this.xrTableCell7, this.xrTableCell13}); this.xrTableRow5.Name = "xrTableRow5"; - this.xrTableRow5.Weight = 0.13245033112582783D; + this.xrTableRow5.Weight = 0.13245033112582782D; // // xrTableCell7 // @@ -571,7 +571,7 @@ namespace SBBMainzReports this.xrTableCell10, this.xrTableCell11}); this.xrTableRow4.Name = "xrTableRow4"; - this.xrTableRow4.Weight = 0.13245033112582783D; + this.xrTableRow4.Weight = 0.13245033112582782D; // // xrTableCell10 // @@ -603,7 +603,7 @@ namespace SBBMainzReports this.xrTableCell14, this.xrTableCell8}); this.xrTableRow3.Name = "xrTableRow3"; - this.xrTableRow3.Weight = 0.13245033112582783D; + this.xrTableRow3.Weight = 0.13245033112582782D; // // xrTableCell14 // @@ -635,7 +635,7 @@ namespace SBBMainzReports this.xrTableCell15, this.xrTableCell1}); this.xrTableRow1.Name = "xrTableRow1"; - this.xrTableRow1.Weight = 0.13245033112582783D; + this.xrTableRow1.Weight = 0.13245033112582782D; // // xrTableCell15 // @@ -976,7 +976,7 @@ namespace SBBMainzReports private DevExpress.XtraReports.UI.XRLabel xrLabel10; private DevExpress.XtraReports.UI.XRLabel xrLabel11; private DevExpress.XtraReports.UI.XRLabel lblRechnungsnummer; - private DevExpress.XtraReports.UI.XRLabel xrLabel7; + private DevExpress.XtraReports.UI.XRLabel lblTitel; private DevExpress.XtraReports.UI.XRLabel xrLabel3; private DevExpress.XtraReports.UI.XRLabel xrLabel4; private DevExpress.XtraReports.UI.XRLabel xrLabel16; diff --git a/ReportImp/SBBMainzReports/ServiceInvoiceReport.cs b/ReportImp/SBBMainzReports/ServiceInvoiceReport.cs index 3308acecc..04475d165 100644 --- a/ReportImp/SBBMainzReports/ServiceInvoiceReport.cs +++ b/ReportImp/SBBMainzReports/ServiceInvoiceReport.cs @@ -17,6 +17,9 @@ namespace SBBMainzReports public void SetReportDataSource(ServiceInvoiceRO pRO) { + if (pRO.InvoiceBase.InvoiceTypeText != null && pRO.InvoiceBase.InvoiceTypeText.Contains("Storno")) + lblTitel.Text = "Stornorechnung"; + DateTime start = pRO.AccountingPeriodStart; DateTime end = pRO.AccountingPeriodEnd; lblReName.Text = String.Format("{0}, {1}. - {2} -{3:MM.yy}", pRO.CustomerLastName, pRO.CustomerFirstName.Substring(0,1), pRO.InvoiceNumber, end);