From 2cec668833a43a1635938ce0477730dc64593868 Mon Sep 17 00:00:00 2001 From: Kojo Date: Mon, 13 Oct 2025 19:06:39 +0200 Subject: [PATCH 1/4] PraxisPusteblume: Auf Sammelrechnung NPE bei leerer ServiceDescription vermeiden --- .../PraxisPusteblume/SammelrechnungNachKlienten.cs | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/ReportImp/PraxisPusteblume/SammelrechnungNachKlienten.cs b/ReportImp/PraxisPusteblume/SammelrechnungNachKlienten.cs index c07eef73e..2018d4053 100644 --- a/ReportImp/PraxisPusteblume/SammelrechnungNachKlienten.cs +++ b/ReportImp/PraxisPusteblume/SammelrechnungNachKlienten.cs @@ -5,11 +5,9 @@ using BeWo.Data.Entities; using BeWo.Report; using BeWo.Report.ReportObjects; using BeWo.Service.ServiceImplementations; -using BS.Shared; using BS.Shared.Core; using BS.Shared.DataContracts; using DevExpress.XtraReports.UI; -using PraxisPusteblume.Invoicing; namespace PraxisPusteblume { @@ -98,7 +96,7 @@ namespace PraxisPusteblume { i.UnitDescription = String.Format("zu je {0:c}", i.AmountPerUnit); } - if (i.ServiceDescription.EndsWith("?")) + if (i.ServiceDescription != null && i.ServiceDescription.EndsWith("?")) { i.ServiceDescription = i.ServiceDescription.Replace("?", "€"); } @@ -118,11 +116,7 @@ namespace PraxisPusteblume if (i.Hours.HasValue) hours += i.Hours.Value; - - - } - } } @@ -149,7 +143,7 @@ namespace PraxisPusteblume { foreach (var i in p.ServiceInvoiceItems) { - if (i.ServiceDescription.EndsWith("?")) + if (i.ServiceDescription != null && i.ServiceDescription.EndsWith("?")) { i.ServiceDescription = i.ServiceDescription.Replace("?", "€"); } From 40c639d1bf949ede66dcc63dd0a978eb6b5f3718 Mon Sep 17 00:00:00 2001 From: Kojo Date: Tue, 14 Oct 2025 16:58:45 +0200 Subject: [PATCH 2/4] =?UTF-8?q?VSDHammReports:=20Spitzabrechnung=20angepas?= =?UTF-8?q?st.=20Wird=20(nur)=20f=C3=BCr=20Jugend=C3=A4mter=20verwendet.?= =?UTF-8?q?=20FK-Erkennung=20=C3=BCber=20Itemdescription.=20Auf=20Kundenwu?= =?UTF-8?q?nsch=20Seitenumbruch=20nach=20Tabelle.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SettlementReport2.Designer.cs | 353 +++++++++--------- ReportImp/VSDHammReports/SettlementReport2.cs | 3 +- 2 files changed, 185 insertions(+), 171 deletions(-) diff --git a/ReportImp/VSDHammReports/SettlementReport2.Designer.cs b/ReportImp/VSDHammReports/SettlementReport2.Designer.cs index d858e9a1f..be61a35c9 100644 --- a/ReportImp/VSDHammReports/SettlementReport2.Designer.cs +++ b/ReportImp/VSDHammReports/SettlementReport2.Designer.cs @@ -31,6 +31,7 @@ namespace VSDHammReports this.components = new System.ComponentModel.Container(); DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung)); + DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); @@ -92,18 +93,6 @@ namespace VSDHammReports this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); - this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow22 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrTable7 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable5 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow31 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -121,15 +110,28 @@ namespace VSDHammReports this.xrTableRow37 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell59 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell60 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow22 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrTable7 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); + this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable7)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -741,7 +743,7 @@ namespace VSDHammReports // GroupHeader2 // this.GroupHeader2.GroupFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] { - new DevExpress.XtraReports.UI.GroupField("RateFactor", DevExpress.XtraReports.UI.XRColumnSortOrder.Descending)}); + new DevExpress.XtraReports.UI.GroupField("ItemDescription", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)}); this.GroupHeader2.HeightF = 0F; this.GroupHeader2.Name = "GroupHeader2"; // @@ -830,167 +832,15 @@ namespace VSDHammReports 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[] { - this.xrLabel10, - this.xrTable3, - this.xrLabel7, - this.xrLabel19, - this.xrLabel21, - this.xrLabel22, - this.xrTable7, - this.xrLabel11, this.xrTable5}); this.GroupFooter1.Font = new DevExpress.Drawing.DXFont("Arial", 12F); - this.GroupFooter1.HeightF = 450.4791F; + this.GroupFooter1.HeightF = 115F; this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.StylePriority.UseFont = false; // - // xrLabel10 - // - this.xrLabel10.BackColor = System.Drawing.Color.Transparent; - this.xrLabel10.CanShrink = true; - this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Arial", 12F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline)))); - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 149.2292F); - this.xrLabel10.Name = "xrLabel10"; - this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel10.SizeF = new System.Drawing.SizeF(650F, 20F); - this.xrLabel10.StylePriority.UseBackColor = false; - this.xrLabel10.StylePriority.UseFont = false; - this.xrLabel10.Text = "Abwesenheitszeiten"; - this.xrLabel10.WordWrap = false; - // - // xrTable3 - // - this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 169.2291F); - this.xrTable3.Name = "xrTable3"; - this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow22}); - this.xrTable3.SizeF = new System.Drawing.SizeF(650F, 20F); - this.xrTable3.StylePriority.UseFont = false; - // - // xrTableRow22 - // - this.xrTableRow22.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell29}); - this.xrTableRow22.Name = "xrTableRow22"; - this.xrTableRow22.Weight = 0.47619047619047605D; - // - // xrTableCell29 - // - this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "AbsenceTimes")}); - this.xrTableCell29.Name = "xrTableCell29"; - this.xrTableCell29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell29.StylePriority.UsePadding = false; - this.xrTableCell29.Text = "xrTableCell4"; - this.xrTableCell29.Weight = 3D; - // - // xrLabel7 - // - this.xrLabel7.BackColor = System.Drawing.Color.Transparent; - this.xrLabel7.CanShrink = true; - this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 12F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline)))); - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 257.5625F); - this.xrLabel7.Name = "xrLabel7"; - this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel7.SizeF = new System.Drawing.SizeF(650F, 20F); - this.xrLabel7.StylePriority.UseBackColor = false; - this.xrLabel7.StylePriority.UseFont = false; - this.xrLabel7.Text = "Erklärung des Anbieters:"; - this.xrLabel7.WordWrap = false; - // - // xrLabel19 - // - this.xrLabel19.BackColor = System.Drawing.Color.Transparent; - this.xrLabel19.CanShrink = true; - this.xrLabel19.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(0F, 277.5625F); - this.xrLabel19.Multiline = true; - this.xrLabel19.Name = "xrLabel19"; - this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel19.SizeF = new System.Drawing.SizeF(650F, 66.66667F); - this.xrLabel19.StylePriority.UseBackColor = false; - this.xrLabel19.StylePriority.UseFont = false; - this.xrLabel19.Text = resources.GetString("xrLabel19.Text"); - // - // xrLabel21 - // - this.xrLabel21.BackColor = System.Drawing.Color.Transparent; - this.xrLabel21.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrLabel21.CanShrink = true; - this.xrLabel21.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(6.357829E-05F, 425.6874F); - this.xrLabel21.Name = "xrLabel21"; - this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel21.SizeF = new System.Drawing.SizeF(229.1667F, 20F); - this.xrLabel21.StylePriority.UseBackColor = false; - this.xrLabel21.StylePriority.UseBorders = false; - this.xrLabel21.StylePriority.UseFont = false; - this.xrLabel21.Text = "Ort, Datum"; - this.xrLabel21.WordWrap = false; - // - // xrLabel22 - // - this.xrLabel22.BackColor = System.Drawing.Color.Transparent; - this.xrLabel22.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrLabel22.CanShrink = true; - this.xrLabel22.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(303.1249F, 425.6874F); - this.xrLabel22.Name = "xrLabel22"; - this.xrLabel22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel22.SizeF = new System.Drawing.SizeF(346.8752F, 20F); - this.xrLabel22.StylePriority.UseBackColor = false; - this.xrLabel22.StylePriority.UseBorders = false; - this.xrLabel22.StylePriority.UseFont = false; - this.xrLabel22.Text = "Stempel, rechtsverbindliche Unterschrift/en"; - this.xrLabel22.WordWrap = false; - // - // xrTable7 - // - this.xrTable7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 216.521F); - this.xrTable7.Name = "xrTable7"; - this.xrTable7.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow3}); - this.xrTable7.SizeF = new System.Drawing.SizeF(650F, 20F); - this.xrTable7.StylePriority.UseFont = false; - // - // xrTableRow3 - // - this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell3}); - this.xrTableRow3.Name = "xrTableRow3"; - this.xrTableRow3.Weight = 0.47619047619047605D; - // - // xrTableCell3 - // - this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "FehlkontakteString")}); - this.xrTableCell3.Name = "xrTableCell3"; - this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell3.StylePriority.UsePadding = false; - this.xrTableCell3.Text = "xrTableCell4"; - this.xrTableCell3.Weight = 3D; - // - // xrLabel11 - // - this.xrLabel11.BackColor = System.Drawing.Color.Transparent; - this.xrLabel11.CanShrink = true; - this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 12F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline)))); - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 196.5209F); - this.xrLabel11.Name = "xrLabel11"; - this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel11.SizeF = new System.Drawing.SizeF(650F, 20F); - this.xrLabel11.StylePriority.UseBackColor = false; - this.xrLabel11.StylePriority.UseFont = false; - this.xrLabel11.Text = "Fehlkontakte"; - this.xrLabel11.WordWrap = false; - // // xrTable5 // this.xrTable5.BorderColor = System.Drawing.SystemColors.ControlLight; @@ -1182,6 +1032,165 @@ namespace VSDHammReports this.xrTableCell60.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell60.Weight = 0.21685899000901443D; // + // xrLabel10 + // + this.xrLabel10.BackColor = System.Drawing.Color.Transparent; + this.xrLabel10.CanShrink = true; + this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Arial", 12F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline)))); + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrLabel10.Name = "xrLabel10"; + this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel10.SizeF = new System.Drawing.SizeF(650F, 20F); + this.xrLabel10.StylePriority.UseBackColor = false; + this.xrLabel10.StylePriority.UseFont = false; + this.xrLabel10.Text = "Abwesenheitszeiten"; + this.xrLabel10.WordWrap = false; + // + // xrTable3 + // + this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 19.99968F); + this.xrTable3.Name = "xrTable3"; + this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow22}); + this.xrTable3.SizeF = new System.Drawing.SizeF(650F, 20F); + this.xrTable3.StylePriority.UseFont = false; + // + // xrTableRow22 + // + this.xrTableRow22.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell29}); + this.xrTableRow22.Name = "xrTableRow22"; + this.xrTableRow22.Weight = 0.47619047619047605D; + // + // xrTableCell29 + // + this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "AbsenceTimes")}); + this.xrTableCell29.Font = new DevExpress.Drawing.DXFont("Arial", 12F); + this.xrTableCell29.Name = "xrTableCell29"; + this.xrTableCell29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell29.StylePriority.UseFont = false; + this.xrTableCell29.StylePriority.UsePadding = false; + this.xrTableCell29.Text = "xrTableCell4"; + this.xrTableCell29.Weight = 3D; + // + // xrLabel7 + // + this.xrLabel7.BackColor = System.Drawing.Color.Transparent; + this.xrLabel7.CanShrink = true; + this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 12F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline)))); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 108.333F); + this.xrLabel7.Name = "xrLabel7"; + this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(650F, 20F); + this.xrLabel7.StylePriority.UseBackColor = false; + this.xrLabel7.StylePriority.UseFont = false; + this.xrLabel7.Text = "Erklärung des Anbieters:"; + this.xrLabel7.WordWrap = false; + // + // xrLabel19 + // + this.xrLabel19.BackColor = System.Drawing.Color.Transparent; + this.xrLabel19.CanShrink = true; + this.xrLabel19.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(0F, 128.3331F); + this.xrLabel19.Multiline = true; + this.xrLabel19.Name = "xrLabel19"; + this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel19.SizeF = new System.Drawing.SizeF(650F, 66.66667F); + this.xrLabel19.StylePriority.UseBackColor = false; + this.xrLabel19.StylePriority.UseFont = false; + this.xrLabel19.Text = resources.GetString("xrLabel19.Text"); + // + // xrLabel21 + // + this.xrLabel21.BackColor = System.Drawing.Color.Transparent; + this.xrLabel21.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.xrLabel21.CanShrink = true; + this.xrLabel21.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(0F, 276.4579F); + this.xrLabel21.Name = "xrLabel21"; + this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel21.SizeF = new System.Drawing.SizeF(229.1667F, 20F); + this.xrLabel21.StylePriority.UseBackColor = false; + this.xrLabel21.StylePriority.UseBorders = false; + this.xrLabel21.StylePriority.UseFont = false; + this.xrLabel21.Text = "Ort, Datum"; + this.xrLabel21.WordWrap = false; + // + // xrLabel22 + // + this.xrLabel22.BackColor = System.Drawing.Color.Transparent; + this.xrLabel22.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.xrLabel22.CanShrink = true; + this.xrLabel22.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(303.1246F, 276.4579F); + this.xrLabel22.Name = "xrLabel22"; + this.xrLabel22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel22.SizeF = new System.Drawing.SizeF(346.8752F, 20F); + this.xrLabel22.StylePriority.UseBackColor = false; + this.xrLabel22.StylePriority.UseBorders = false; + this.xrLabel22.StylePriority.UseFont = false; + this.xrLabel22.Text = "Stempel, rechtsverbindliche Unterschrift/en"; + this.xrLabel22.WordWrap = false; + // + // xrTable7 + // + this.xrTable7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 67.29162F); + this.xrTable7.Name = "xrTable7"; + this.xrTable7.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow3}); + this.xrTable7.SizeF = new System.Drawing.SizeF(650F, 20F); + this.xrTable7.StylePriority.UseFont = false; + // + // xrTableRow3 + // + this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell3}); + this.xrTableRow3.Name = "xrTableRow3"; + this.xrTableRow3.Weight = 0.47619047619047605D; + // + // xrTableCell3 + // + this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "FehlkontakteString")}); + this.xrTableCell3.Font = new DevExpress.Drawing.DXFont("Arial", 12F); + this.xrTableCell3.Name = "xrTableCell3"; + this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell3.StylePriority.UseFont = false; + this.xrTableCell3.StylePriority.UsePadding = false; + this.xrTableCell3.Text = "xrTableCell4"; + this.xrTableCell3.Weight = 3D; + // + // xrLabel11 + // + this.xrLabel11.BackColor = System.Drawing.Color.Transparent; + this.xrLabel11.CanShrink = true; + this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 12F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline)))); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 47.29155F); + this.xrLabel11.Name = "xrLabel11"; + this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel11.SizeF = new System.Drawing.SizeF(650F, 20F); + this.xrLabel11.StylePriority.UseBackColor = false; + this.xrLabel11.StylePriority.UseFont = false; + this.xrLabel11.Text = "Fehlkontakte"; + this.xrLabel11.WordWrap = false; + // + // ReportFooter + // + this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel11, + this.xrTable3, + this.xrLabel7, + this.xrLabel19, + this.xrLabel21, + this.xrLabel22, + this.xrTable7, + this.xrLabel10}); + this.ReportFooter.HeightF = 296.4579F; + this.ReportFooter.Name = "ReportFooter"; + this.ReportFooter.PageBreak = DevExpress.XtraReports.UI.PageBreak.BeforeBand; + // // Spitzabrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1190,7 +1199,8 @@ namespace VSDHammReports this.bottomMarginBand1, this.GroupHeader1, this.DetailReport, - this.GroupFooter1}); + this.GroupFooter1, + this.ReportFooter}); this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] { this.fieldApprovedFLSWithFactor}); this.DataSource = this.bindingSource1; @@ -1199,18 +1209,20 @@ namespace VSDHammReports this.ruleRateFactorNull}); this.Margins = new DevExpress.Drawing.DXMargins(77F, 39F, 100F, 27F); this.PageHeight = 1169; - this.PageWidth = 827; + this.PageWidth = 826; 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.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable8)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable7)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -1307,5 +1319,6 @@ namespace VSDHammReports private DevExpress.XtraReports.UI.XRTableRow xrTableRow3; private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; private DevExpress.XtraReports.UI.XRLabel xrLabel11; + private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter; } } diff --git a/ReportImp/VSDHammReports/SettlementReport2.cs b/ReportImp/VSDHammReports/SettlementReport2.cs index f872e9caf..5788925e1 100644 --- a/ReportImp/VSDHammReports/SettlementReport2.cs +++ b/ReportImp/VSDHammReports/SettlementReport2.cs @@ -46,7 +46,8 @@ namespace VSDHammReports ratefactor = ii.RateFactor ?? 1; - if (!pRO.FehlkontakteString.IsNullOrEmpty() && ii.RateFactor == 0) + if (!pRO.FehlkontakteString.IsNullOrEmpty() && + ii.ItemDescription != null && ii.ItemDescription.ToLower().Contains("fehlkontakt")) { Zwischensumme.Visible = true; ii.DetailDescription = ii.DetailDescription.Replace("FLS", "Std."); From 0cb02dab2fca2d5c63339fa229d8cb6a32183c94 Mon Sep 17 00:00:00 2001 From: Kojo Date: Wed, 15 Oct 2025 13:58:52 +0200 Subject: [PATCH 3/4] Mittelpunkt: Bericht Lohnliste neue Felder (under construction) --- ReportImp/Mittelpunkt/Lohnliste.cs | 40 +++++++ ReportImp/Mittelpunkt/Lohnliste.designer.cs | 119 ++++++++++++++------ 2 files changed, 122 insertions(+), 37 deletions(-) diff --git a/ReportImp/Mittelpunkt/Lohnliste.cs b/ReportImp/Mittelpunkt/Lohnliste.cs index 6b66a1dee..bd690ed58 100644 --- a/ReportImp/Mittelpunkt/Lohnliste.cs +++ b/ReportImp/Mittelpunkt/Lohnliste.cs @@ -76,6 +76,15 @@ namespace Mittelpunkt if (bruttoGehalt != null) row.Field13 = String.Format("{0:0,00} €", c.GrossSalary); } + + /* + string entgeldStufe = LeseEntgeldstufenVarfield(emp); + if (!String.IsNullOrEmpty(entgeldStufe)) + { + row.Field15 = entgeldStufe; + } + row.Field16 = emp.Notice; + */ } } } @@ -105,5 +114,36 @@ namespace Mittelpunkt } return contractNextToStartDate; } + + private string LeseEntgeldstufenVarfield(Employee employee) + { + string entgeldstufe = null; + foreach (var vv in employee.VarFieldValueList) + { + if (vv.VarFieldDefOid == 2) + { + var varFieldValue = BS.Shared.Core.Utils.XMLDeserializeFromString(vv.SerializedValue, Type.GetType(vv.TypeName)); + if (varFieldValue != null) + { + entgeldstufe = varFieldValue.ToString(); + } + + /* + var varFieldValue = BS.Shared.Core.Utils.XMLDeserializeFromString(vv.SerializedValue, Type.GetType(vv.TypeName)); + + decimal dec = 0; + if (varFieldValue != null && Decimal.TryParse(varFieldValue.ToString(), out dec)) + { + if (dec > 0) + { + return dec / 5; + } + } + */ + } + } + + return entgeldstufe; + } } } diff --git a/ReportImp/Mittelpunkt/Lohnliste.designer.cs b/ReportImp/Mittelpunkt/Lohnliste.designer.cs index fe6162a5c..7fc136e94 100644 --- a/ReportImp/Mittelpunkt/Lohnliste.designer.cs +++ b/ReportImp/Mittelpunkt/Lohnliste.designer.cs @@ -61,7 +61,9 @@ namespace Mittelpunkt this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); + this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); this.lblMonat = new DevExpress.XtraReports.UI.XRLabel(); this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand(); this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo(); @@ -73,8 +75,10 @@ namespace Mittelpunkt this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); - this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -126,7 +130,9 @@ namespace Mittelpunkt this.xrTableCell16, this.xrTableCell27, this.xrTableCell22, - this.xrTableCell23}); + this.xrTableCell23, + this.xrTableCell14, + this.xrTableCell15}); this.xrTableRowDetail.Name = "xrTableRowDetail"; this.xrTableRowDetail.Weight = 0.91999999999999993D; // @@ -141,7 +147,7 @@ namespace Mittelpunkt this.xrTableCell3.StylePriority.UseTextAlignment = false; this.xrTableCell3.Text = "xrTableCell3"; this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell3.Weight = 0.081154213605215159D; + this.xrTableCell3.Weight = 0.075214504348053712D; // // xrTableCell18 // @@ -149,7 +155,7 @@ namespace Mittelpunkt new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field4")}); this.xrTableCell18.Name = "xrTableCell18"; this.xrTableCell18.Text = "xrTableCell18"; - this.xrTableCell18.Weight = 0.14427409331147148D; + this.xrTableCell18.Weight = 0.14505660770009241D; // // xrTableCell19 // @@ -157,7 +163,7 @@ namespace Mittelpunkt new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field5")}); this.xrTableCell19.Name = "xrTableCell19"; this.xrTableCell19.Text = "xrTableCell19"; - this.xrTableCell19.Weight = 0.1442741552272071D; + this.xrTableCell19.Weight = 0.14505672261263936D; // // xrTableCell17 // @@ -165,7 +171,7 @@ namespace Mittelpunkt new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field10")}); this.xrTableCell17.Name = "xrTableCell17"; this.xrTableCell17.Text = "xrTableCell17"; - this.xrTableCell17.Weight = 0.099188430552228965D; + this.xrTableCell17.Weight = 0.096704473832498389D; // // xrTableCell20 // @@ -173,7 +179,7 @@ namespace Mittelpunkt new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field11")}); this.xrTableCell20.Name = "xrTableCell20"; this.xrTableCell20.Text = "xrTableCell20"; - this.xrTableCell20.Weight = 0.099188568142752453D; + this.xrTableCell20.Weight = 0.096704410310077343D; // // xrTableCell28 // @@ -181,7 +187,7 @@ namespace Mittelpunkt new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field12")}); this.xrTableCell28.Name = "xrTableCell28"; this.xrTableCell28.Text = "xrTableCell28"; - this.xrTableCell28.Weight = 0.0858881325201477D; + this.xrTableCell28.Weight = 0.069841960332521227D; // // xrTableCell16 // @@ -189,7 +195,7 @@ namespace Mittelpunkt new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field13")}); this.xrTableCell16.Name = "xrTableCell16"; this.xrTableCell16.Text = "xrTableCell16"; - this.xrTableCell16.Weight = 0.089044238985713439D; + this.xrTableCell16.Weight = 0.069842090826461492D; // // xrTableCell27 // @@ -197,7 +203,7 @@ namespace Mittelpunkt new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field14")}); this.xrTableCell27.Name = "xrTableCell27"; this.xrTableCell27.Text = "xrTableCell27"; - this.xrTableCell27.Weight = 0.079651319195925413D; + this.xrTableCell27.Weight = 0.06446962787806447D; // // xrTableCell22 // @@ -205,7 +211,7 @@ namespace Mittelpunkt new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field6")}); this.xrTableCell22.Name = "xrTableCell22"; this.xrTableCell22.Text = "xrTableCell22"; - this.xrTableCell22.Weight = 0.081530090276995051D; + this.xrTableCell22.Weight = 0.0644696253401557D; // // xrTableCell23 // @@ -213,7 +219,7 @@ namespace Mittelpunkt new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field7")}); this.xrTableCell23.Name = "xrTableCell23"; this.xrTableCell23.Text = "xrTableCell23"; - this.xrTableCell23.Weight = 0.095806758182343354D; + this.xrTableCell23.Weight = 0.064469632023964829D; // // DetailReport // @@ -264,7 +270,9 @@ namespace Mittelpunkt this.xrTableCell8, this.xrTableCell10, this.xrTableCell7, - this.xrTableCell11}); + this.xrTableCell11, + this.xrTableCell12, + this.xrTableCell13}); this.xrTableRowHeader.Name = "xrTableRowHeader"; this.xrTableRowHeader.Weight = 1.5916671752929685D; // @@ -281,7 +289,7 @@ namespace Mittelpunkt this.xrTableCell5.StylePriority.UseTextAlignment = false; this.xrTableCell5.Text = "Personal-\r\nNummer"; this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell5.Weight = 0.081154193187568113D; + this.xrTableCell5.Weight = 0.0752145753780782D; // // xrTableCell6 // @@ -292,7 +300,7 @@ namespace Mittelpunkt this.xrTableCell6.StylePriority.UseBackColor = false; this.xrTableCell6.StylePriority.UseFont = false; this.xrTableCell6.Text = "Name"; - this.xrTableCell6.Weight = 0.14427412551116153D; + this.xrTableCell6.Weight = 0.14505667732508212D; // // xrTableCell4 // @@ -302,7 +310,7 @@ namespace Mittelpunkt this.xrTableCell4.StylePriority.UseBackColor = false; this.xrTableCell4.StylePriority.UseFont = false; this.xrTableCell4.Text = "Vorname"; - this.xrTableCell4.Weight = 0.14427411550437502D; + this.xrTableCell4.Weight = 0.14505668107734798D; // // xrTableCell1 // @@ -312,8 +320,8 @@ namespace Mittelpunkt this.xrTableCell1.Name = "xrTableCell1"; this.xrTableCell1.StylePriority.UseBackColor = false; this.xrTableCell1.StylePriority.UseFont = false; - this.xrTableCell1.Text = "Vertragsbeginn"; - this.xrTableCell1.Weight = 0.099188459630549508D; + this.xrTableCell1.Text = "Vertrags-beginn"; + this.xrTableCell1.Weight = 0.096704450648948614D; // // xrTableCell2 // @@ -324,7 +332,7 @@ namespace Mittelpunkt this.xrTableCell2.StylePriority.UseBackColor = false; this.xrTableCell2.StylePriority.UseFont = false; this.xrTableCell2.Text = "Befristet bis"; - this.xrTableCell2.Weight = 0.099188457927753132D; + this.xrTableCell2.Weight = 0.096704446309728923D; // // xrTableCell9 // @@ -335,7 +343,7 @@ namespace Mittelpunkt this.xrTableCell9.StylePriority.UseBackColor = false; this.xrTableCell9.StylePriority.UseFont = false; this.xrTableCell9.Text = "Wochen-stunden"; - this.xrTableCell9.Weight = 0.085888242450741864D; + this.xrTableCell9.Weight = 0.069842105214787786D; // // xrTableCell8 // @@ -344,8 +352,8 @@ namespace Mittelpunkt this.xrTableCell8.Name = "xrTableCell8"; this.xrTableCell8.StylePriority.UseBackColor = false; this.xrTableCell8.StylePriority.UseFont = false; - this.xrTableCell8.Text = "Bruttogehalt"; - this.xrTableCell8.Weight = 0.089044238843273116D; + this.xrTableCell8.Text = "Brutto-gehalt"; + this.xrTableCell8.Weight = 0.069842105214368039D; // // xrTableCell10 // @@ -354,8 +362,8 @@ namespace Mittelpunkt this.xrTableCell10.Name = "xrTableCell10"; this.xrTableCell10.StylePriority.UseBackColor = false; this.xrTableCell10.StylePriority.UseFont = false; - this.xrTableCell10.Text = "Stundensatz"; - this.xrTableCell10.Weight = 0.079651267457388431D; + this.xrTableCell10.Text = "Stunden-satz"; + this.xrTableCell10.Weight = 0.064469639289381778D; // // xrTableCell7 // @@ -364,8 +372,8 @@ namespace Mittelpunkt this.xrTableCell7.Name = "xrTableCell7"; this.xrTableCell7.StylePriority.UseBackColor = false; this.xrTableCell7.StylePriority.UseFont = false; - this.xrTableCell7.Text = "Steuerklasse"; - this.xrTableCell7.Weight = 0.081530034956021277D; + this.xrTableCell7.Text = "Steuer-klasse"; + this.xrTableCell7.Weight = 0.064469648954011166D; // // xrTableCell11 // @@ -376,7 +384,7 @@ namespace Mittelpunkt this.xrTableCell11.StylePriority.UseBackColor = false; this.xrTableCell11.StylePriority.UseFont = false; this.xrTableCell11.Text = "Anzahl Kinder"; - this.xrTableCell11.Weight = 0.095806864469073424D; + this.xrTableCell11.Weight = 0.064469634349203747D; // // GroupFooter1 // @@ -393,6 +401,14 @@ namespace Mittelpunkt this.ReportHeader.HeightF = 102.3958F; this.ReportHeader.Name = "ReportHeader"; // + // xrPictureBox1 + // + this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource")); + this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(1031.917F, 0F); + this.xrPictureBox1.Name = "xrPictureBox1"; + this.xrPictureBox1.SizeF = new System.Drawing.SizeF(77.08325F, 95.52075F); + this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + // // lblMonat // this.lblMonat.Font = new DevExpress.Drawing.DXFont("Arial", 14F, DevExpress.Drawing.DXFontStyle.Bold); @@ -490,17 +506,42 @@ namespace Mittelpunkt this.bottomMarginBand1.HeightF = 30F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // - // xrPictureBox1 + // xrTableCell12 // - this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource")); - this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(1031.917F, 0F); - this.xrPictureBox1.Name = "xrPictureBox1"; - this.xrPictureBox1.SizeF = new System.Drawing.SizeF(77.08325F, 95.52075F); - this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + this.xrTableCell12.BackColor = System.Drawing.SystemColors.Control; + this.xrTableCell12.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell12.Multiline = true; + this.xrTableCell12.Name = "xrTableCell12"; + this.xrTableCell12.StylePriority.UseBackColor = false; + this.xrTableCell12.StylePriority.UseFont = false; + this.xrTableCell12.Text = "Entgeld-stufe"; + this.xrTableCell12.Weight = 0.064469634349203719D; // - // bindingSource1 + // xrTableCell13 // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.QueryRO); + this.xrTableCell13.BackColor = System.Drawing.SystemColors.Control; + this.xrTableCell13.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell13.Multiline = true; + this.xrTableCell13.Name = "xrTableCell13"; + this.xrTableCell13.StylePriority.UseBackColor = false; + this.xrTableCell13.StylePriority.UseFont = false; + this.xrTableCell13.Text = "Kommentar"; + this.xrTableCell13.Weight = 0.2353141307659099D; + // + // xrTableCell14 + // + this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field15")}); + this.xrTableCell14.Name = "xrTableCell14"; + this.xrTableCell14.Weight = 0.064469697605855886D; + // + // xrTableCell15 + // + this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field16")}); + this.xrTableCell15.Multiline = true; + this.xrTableCell15.Name = "xrTableCell15"; + this.xrTableCell15.Weight = 0.23531416355430179D; // // Lohnliste // @@ -516,7 +557,7 @@ namespace Mittelpunkt this.DataSource = this.bindingSource1; this.Landscape = true; this.Margins = new DevExpress.Drawing.DXMargins(30F, 30F, 27.08333F, 30F); - this.PageHeight = 827; + this.PageHeight = 826; this.PageWidth = 1169; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] { @@ -579,5 +620,9 @@ namespace Mittelpunkt private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; private DevExpress.XtraReports.UI.XRTableCell xrTableCell23; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell15; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; } } From e7ab32cfe985cb46c097c736a4b6132a7e2a7768 Mon Sep 17 00:00:00 2001 From: Kojo Date: Wed, 15 Oct 2025 14:03:45 +0200 Subject: [PATCH 4/4] PluginLoader: kosmetisch (doppeltes Mittelpunkt-Projekt aus Liste entfernt) --- Service/Plugins/PluginLoader.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs index 265b1edc3..fa4c06ab2 100644 --- a/Service/Plugins/PluginLoader.cs +++ b/Service/Plugins/PluginLoader.cs @@ -242,7 +242,7 @@ namespace BeWo.Service.Plugins //t = "7622428090"; // Freie gemeinnützige Beratungsstelle für Psychotherapie e.V. (BfpDus) (Panama) //t = "0206140343"; // Lebenswelt Gabriel //t = "6916712798"; // LH Rodenkirchen Bewo - t = "6255521162"; // KCM GmbH + //t = "6255521162"; // KCM GmbH //t = "2697528233"; // Diakonisches Werk Wesel //t = "2547623489"; // Sprungbrett //t = "5076807716"; // Psychosoziale Hilfen Bochum e.V. @@ -333,7 +333,7 @@ namespace BeWo.Service.Plugins //t = "7663765314"; // Christina Frommen (Frommen BeWo) //t = "5462295916"; // BeWo Dellbrueck //t = "2120989920"; // Sozialbüro Schüßler und Wilckens GbR - t = "9815376800"; // Haus Dülken GmbH + Co. KG + //t = "9815376800"; // Haus Dülken GmbH + Co. KG //t = "6917917884"; // AMBEWO Müller/Gerhards //t = "5240630948"; // Caritasverband der Diözese Rottenburg-Stuttgart e.V. - Rechtsträger der Caritas Heilbronn Hohenlohe e.V. (Projekt heißt CaritasHeilbronnHohenlohe) //t = "7748694330"; // Caritasverband der Diözese Rottenburg-Stuttgart e.V. als Rechtsträger der Caritas Ludwigsburg-Waiblingen-Enz (Projekt heißt CaritasLudwigsburgWaiblingenEnz) @@ -399,7 +399,6 @@ namespace BeWo.Service.Plugins //t = "3788859817"; // Zukunft Leben (Stephan Hekermann) //t = "2663321234"; // Aachener Laienhelfer Initiative e.V. //t = "6290975576"; // Caritasverband Kelheim - //t = "5564670353"; // Mittelpunkt //t = "1378705749"; // Ifz Internationals Familienzentrum //t = "7906907131"; // Oase e.V. //t = "3859349026"; // Lyvie Kupfer