From 68899cef564fb8cec9fc5bc2a498edb62a28cd8e Mon Sep 17 00:00:00 2001 From: HirschleM Date: Thu, 31 Jul 2025 16:41:46 +0200 Subject: [PATCH] MH: SuchtkrankenhilfeOstfriesland Debitornummer --- .../Invoicing/CustomInvoiceCreation.cs | 4 +- .../ServiceInvoiceReport.Designer.cs | 115 +++++------------- 2 files changed, 35 insertions(+), 84 deletions(-) diff --git a/ReportImp/SuchtkrankenhilfeOstfriesland/Invoicing/CustomInvoiceCreation.cs b/ReportImp/SuchtkrankenhilfeOstfriesland/Invoicing/CustomInvoiceCreation.cs index 40353c2eb..ee3699d9d 100644 --- a/ReportImp/SuchtkrankenhilfeOstfriesland/Invoicing/CustomInvoiceCreation.cs +++ b/ReportImp/SuchtkrankenhilfeOstfriesland/Invoicing/CustomInvoiceCreation.cs @@ -158,8 +158,8 @@ namespace SuchtkrankenhilfeOstfriesland.Invoicing invoiceItem.ItemDescription = desc; invoiceItem.UnitDescription = "Stunde"; } - - } + + } return invoiceItem; } diff --git a/ReportImp/SuchtkrankenhilfeOstfriesland/ServiceInvoiceReport.Designer.cs b/ReportImp/SuchtkrankenhilfeOstfriesland/ServiceInvoiceReport.Designer.cs index bd845e3c3..8025f466a 100644 --- a/ReportImp/SuchtkrankenhilfeOstfriesland/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/SuchtkrankenhilfeOstfriesland/ServiceInvoiceReport.Designer.cs @@ -57,13 +57,6 @@ namespace SuchtkrankenhilfeOstfriesland this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow14 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); @@ -90,8 +83,9 @@ namespace SuchtkrankenhilfeOstfriesland this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -130,6 +124,7 @@ namespace SuchtkrankenhilfeOstfriesland // Page1 // this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel6, this.xrLabel7, this.xrLabel4, this.xrLabel3, @@ -372,68 +367,6 @@ namespace SuchtkrankenhilfeOstfriesland this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell5.Weight = 1D; // - // xrLabel15 - // - this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); - this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 114.5833F); - this.xrLabel15.Name = "xrLabel15"; - this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel15.SizeF = new System.Drawing.SizeF(175F, 17F); - this.xrLabel15.StylePriority.UseFont = false; - this.xrLabel15.Text = "Mit freundlichen Grüßen"; - // - // xrTable4 - // - this.xrTable4.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); - this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 68.75F); - this.xrTable4.Name = "xrTable4"; - this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow10, - this.xrTableRow14}); - this.xrTable4.SizeF = new System.Drawing.SizeF(650F, 26F); - this.xrTable4.StylePriority.UseFont = false; - // - // xrTableRow10 - // - this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell9}); - this.xrTableRow10.Name = "xrTableRow10"; - this.xrTableRow10.Weight = 0.38095238095238093D; - // - // xrTableCell9 - // - this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Notice")}); - this.xrTableCell9.Name = "xrTableCell9"; - this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell9.StylePriority.UsePadding = false; - this.xrTableCell9.Text = "xrTableCell1"; - this.xrTableCell9.Weight = 3D; - // - // xrTableRow14 - // - this.xrTableRow14.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell12}); - this.xrTableRow14.Name = "xrTableRow14"; - this.xrTableRow14.Weight = 0.23809523809523808D; - // - // xrTableCell12 - // - this.xrTableCell12.Name = "xrTableCell12"; - this.xrTableCell12.Weight = 3D; - // - // xrLabel14 - // - this.xrLabel14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "CreatorName")}); - this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); - this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 189.5833F); - this.xrLabel14.Name = "xrLabel14"; - this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel14.SizeF = new System.Drawing.SizeF(225F, 17F); - this.xrLabel14.StylePriority.UseFont = false; - this.xrLabel14.Text = "[CreatorName]"; - // // xrLabel9 // this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Italic); @@ -768,11 +701,9 @@ namespace SuchtkrankenhilfeOstfriesland // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel10, this.xrLabel1, - this.xrLabel9, - this.xrTable4, - this.xrLabel14, - this.xrLabel15}); + this.xrLabel9}); this.GroupFooter1.HeightF = 206.5833F; this.GroupFooter1.Name = "GroupFooter1"; // @@ -795,6 +726,32 @@ namespace SuchtkrankenhilfeOstfriesland // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); // + // xrLabel6 + // + this.xrLabel6.BackColor = System.Drawing.Color.Transparent; + this.xrLabel6.CanShrink = true; + this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 255F); + 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(650F, 20F); + this.xrLabel6.StylePriority.UseBackColor = false; + this.xrLabel6.StylePriority.UseFont = false; + this.xrLabel6.Text = "[DebitorNumber]"; + this.xrLabel6.WordWrap = false; + // + // xrLabel10 + // + this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 70.83334F); + this.xrLabel10.Name = "xrLabel10"; + this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel10.SizeF = new System.Drawing.SizeF(676.8332F, 17F); + this.xrLabel10.StylePriority.UseFont = false; + this.xrLabel10.Text = "Diese Rechnung wurde maschinell erstellt und ist ohne Unterschrift gültig."; + // // ServiceInvoiceReport // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -815,7 +772,6 @@ namespace SuchtkrankenhilfeOstfriesland this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; this.Version = "23.2"; ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); @@ -852,13 +808,6 @@ namespace SuchtkrankenhilfeOstfriesland private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; private DevExpress.XtraReports.UI.XRTableRow xrTableRow8; private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; - private DevExpress.XtraReports.UI.XRLabel xrLabel15; - private DevExpress.XtraReports.UI.XRTable xrTable4; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow10; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow14; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; - private DevExpress.XtraReports.UI.XRLabel xrLabel14; private DevExpress.XtraReports.UI.XRLabel xrLabel9; private DevExpress.XtraReports.UI.DetailReportBand DetailReport; private DevExpress.XtraReports.UI.DetailBand Detail1; @@ -885,5 +834,7 @@ namespace SuchtkrankenhilfeOstfriesland private DevExpress.XtraReports.UI.XRLabel xrLabel7; private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; private DevExpress.XtraReports.UI.XRLabel xrLabel1; + private DevExpress.XtraReports.UI.XRLabel xrLabel6; + private DevExpress.XtraReports.UI.XRLabel xrLabel10; } }