From ea56f46fb024652c309cbc713c8a3e91f4c97ea7 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Wed, 17 Dec 2025 16:59:37 +0100 Subject: [PATCH] =?UTF-8?q?LWLDigga=20-=20Korrektur=20bei=20Entgeltzeitr?= =?UTF-8?q?=C3=A4umen=20f=C3=BCrs=20Enddatum?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BudgetnachweisAnhangDigga.Designer.cs | 304 +++++++++--------- Service/Invoicing/LWLDiggaBerechnung.cs | 2 +- 2 files changed, 152 insertions(+), 154 deletions(-) diff --git a/Report/DefaultReports/BudgetnachweisAnhangDigga.Designer.cs b/Report/DefaultReports/BudgetnachweisAnhangDigga.Designer.cs index 8b8016414..b74bc1190 100644 --- a/Report/DefaultReports/BudgetnachweisAnhangDigga.Designer.cs +++ b/Report/DefaultReports/BudgetnachweisAnhangDigga.Designer.cs @@ -106,6 +106,7 @@ this.xrTableCell103 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell104 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupFooter3 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.xrLine1 = new DevExpress.XtraReports.UI.XRLine(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable9 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow14 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -132,8 +133,18 @@ this.xrTableCell123 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell124 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell125 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); + this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow11 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell55 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -150,15 +161,6 @@ this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow11 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell55 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrTable10 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow12 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -169,16 +171,14 @@ this.xrTableCell74 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell75 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell76 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - this.xrLine1 = new DevExpress.XtraReports.UI.XRLine(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable9)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable10)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable10)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -964,6 +964,13 @@ this.GroupFooter3.HeightF = 120F; this.GroupFooter3.Name = "GroupFooter3"; // + // xrLine1 + // + this.xrLine1.LineWidth = 2F; + this.xrLine1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrLine1.Name = "xrLine1"; + this.xrLine1.SizeF = new System.Drawing.SizeF(724.0001F, 2.099991F); + // // xrLabel3 // this.xrLabel3.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) @@ -1369,6 +1376,10 @@ this.xrTableCell125.Text = "FLS + Fehlkontakt"; this.xrTableCell125.Weight = 0.42571603167468697D; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.BudgetnachweisAnhangDiggaRO); + // // DetailReport // this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1387,6 +1398,128 @@ this.Detail1.HeightF = 20F; this.Detail1.Name = "Detail1"; // + // xrTable4 + // + this.xrTable4.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable4.Name = "xrTable4"; + this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow11}); + this.xrTable4.SizeF = new System.Drawing.SizeF(724.0001F, 20F); + this.xrTable4.StylePriority.UseBorders = false; + this.xrTable4.StylePriority.UseFont = false; + this.xrTable4.StylePriority.UseTextAlignment = false; + this.xrTable4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // + // xrTableRow11 + // + this.xrTableRow11.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell29, + this.xrTableCell35, + this.xrTableCell36, + this.xrTableCell37, + this.xrTableCell38, + this.xrTableCell39, + this.xrTableCell55}); + this.xrTableRow11.Name = "xrTableRow11"; + this.xrTableRow11.StylePriority.UseBorders = false; + this.xrTableRow11.Weight = 0.47999994140625707D; + // + // xrTableCell29 + // + this.xrTableCell29.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top))); + this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entgeltzeitraeume.Index")}); + this.xrTableCell29.Name = "xrTableCell29"; + this.xrTableCell29.StylePriority.UseBorders = false; + this.xrTableCell29.StylePriority.UsePadding = false; + this.xrTableCell29.StylePriority.UseTextAlignment = false; + this.xrTableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell29.Weight = 0.25384557577279909D; + // + // xrTableCell35 + // + this.xrTableCell35.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top))); + this.xrTableCell35.Multiline = true; + this.xrTableCell35.Name = "xrTableCell35"; + this.xrTableCell35.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F); + this.xrTableCell35.StylePriority.UseBorders = false; + this.xrTableCell35.StylePriority.UsePadding = false; + this.xrTableCell35.StylePriority.UseTextAlignment = false; + this.xrTableCell35.Text = "[Entgeltzeitraeume.Start!dd.MM.yyyy] bis [Entgeltzeitraeume.Ende!dd.MM.yyyy]"; + this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell35.Weight = 0.70192353175236644D; + // + // xrTableCell36 + // + this.xrTableCell36.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top))); + this.xrTableCell36.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entgeltzeitraeume.SummeFLStunden", "{0:0.00}")}); + this.xrTableCell36.Multiline = true; + this.xrTableCell36.Name = "xrTableCell36"; + this.xrTableCell36.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F); + this.xrTableCell36.StylePriority.UseBorders = false; + this.xrTableCell36.StylePriority.UsePadding = false; + this.xrTableCell36.StylePriority.UseTextAlignment = false; + this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell36.Weight = 0.40486156170184751D; + // + // xrTableCell37 + // + this.xrTableCell37.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top))); + this.xrTableCell37.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entgeltzeitraeume.SummeFaktorStunden", "{0:0.00}")}); + this.xrTableCell37.Name = "xrTableCell37"; + this.xrTableCell37.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F); + this.xrTableCell37.StylePriority.UseBorders = false; + this.xrTableCell37.StylePriority.UsePadding = false; + this.xrTableCell37.StylePriority.UseTextAlignment = false; + this.xrTableCell37.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell37.Weight = 0.3941383303128756D; + // + // xrTableCell38 + // + this.xrTableCell38.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top))); + this.xrTableCell38.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entgeltzeitraeume.SummeGesamtStunden")}); + this.xrTableCell38.Name = "xrTableCell38"; + this.xrTableCell38.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F); + this.xrTableCell38.StylePriority.UseBorders = false; + this.xrTableCell38.StylePriority.UsePadding = false; + this.xrTableCell38.StylePriority.UseTextAlignment = false; + this.xrTableCell38.Text = "xrTableCell63"; + this.xrTableCell38.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell38.Weight = 0.5298458172724797D; + // + // xrTableCell39 + // + this.xrTableCell39.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top))); + this.xrTableCell39.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entgeltzeitraeume.SummeFehlkontakteStunden", "{0:0.00}")}); + this.xrTableCell39.Name = "xrTableCell39"; + this.xrTableCell39.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F); + this.xrTableCell39.StylePriority.UseBorders = false; + this.xrTableCell39.StylePriority.UsePadding = false; + this.xrTableCell39.StylePriority.UseTextAlignment = false; + this.xrTableCell39.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell39.Weight = 0.39230769377488361D; + // + // xrTableCell55 + // + this.xrTableCell55.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell55.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entgeltzeitraeume.SummeGesamtStundenMitFK", "{0:0.00}")}); + this.xrTableCell55.Name = "xrTableCell55"; + this.xrTableCell55.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F); + this.xrTableCell55.StylePriority.UseBorders = false; + this.xrTableCell55.StylePriority.UsePadding = false; + this.xrTableCell55.StylePriority.UseTextAlignment = false; + this.xrTableCell55.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell55.Weight = 0.49826857640193067D; + // // GroupHeader2 // this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -1594,130 +1727,6 @@ this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell28.Weight = 0.49826857487381743D; // - // xrTable4 - // - this.xrTable4.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.xrTable4.Name = "xrTable4"; - this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow11}); - this.xrTable4.SizeF = new System.Drawing.SizeF(724.0001F, 20F); - this.xrTable4.StylePriority.UseBorders = false; - this.xrTable4.StylePriority.UseFont = false; - this.xrTable4.StylePriority.UseTextAlignment = false; - this.xrTable4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // - // xrTableRow11 - // - this.xrTableRow11.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell29, - this.xrTableCell35, - this.xrTableCell36, - this.xrTableCell37, - this.xrTableCell38, - this.xrTableCell39, - this.xrTableCell55}); - this.xrTableRow11.Name = "xrTableRow11"; - this.xrTableRow11.StylePriority.UseBorders = false; - this.xrTableRow11.Weight = 0.47999994140625707D; - // - // xrTableCell29 - // - this.xrTableCell29.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top))); - this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "LWLDiggaBerechnung.Entgeltzeitraeume.Index")}); - this.xrTableCell29.Name = "xrTableCell29"; - this.xrTableCell29.StylePriority.UseBorders = false; - this.xrTableCell29.StylePriority.UsePadding = false; - this.xrTableCell29.StylePriority.UseTextAlignment = false; - this.xrTableCell29.Text = "xrTableCell45"; - this.xrTableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell29.Weight = 0.25384557577279909D; - // - // xrTableCell35 - // - this.xrTableCell35.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top))); - this.xrTableCell35.Multiline = true; - this.xrTableCell35.Name = "xrTableCell35"; - this.xrTableCell35.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F); - this.xrTableCell35.StylePriority.UseBorders = false; - this.xrTableCell35.StylePriority.UsePadding = false; - this.xrTableCell35.StylePriority.UseTextAlignment = false; - this.xrTableCell35.Text = "[LWLDiggaBerechnung.Entgeltzeitraeume.Start!dd.MM.yyyy] bis [LWLDiggaBerechnung.E" + - "ntgeltzeitraeume.Ende!dd.MM.yyyy]"; - this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell35.Weight = 0.70192353175236644D; - // - // xrTableCell36 - // - this.xrTableCell36.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top))); - this.xrTableCell36.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entgeltzeitraeume.SummeFLStunden", "{0:0.00}")}); - this.xrTableCell36.Multiline = true; - this.xrTableCell36.Name = "xrTableCell36"; - this.xrTableCell36.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F); - this.xrTableCell36.StylePriority.UseBorders = false; - this.xrTableCell36.StylePriority.UsePadding = false; - this.xrTableCell36.StylePriority.UseTextAlignment = false; - this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell36.Weight = 0.40486156170184751D; - // - // xrTableCell37 - // - this.xrTableCell37.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top))); - this.xrTableCell37.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entgeltzeitraeume.SummeFaktorStunden", "{0:0.00}")}); - this.xrTableCell37.Name = "xrTableCell37"; - this.xrTableCell37.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F); - this.xrTableCell37.StylePriority.UseBorders = false; - this.xrTableCell37.StylePriority.UsePadding = false; - this.xrTableCell37.StylePriority.UseTextAlignment = false; - this.xrTableCell37.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell37.Weight = 0.3941383303128756D; - // - // xrTableCell38 - // - this.xrTableCell38.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top))); - this.xrTableCell38.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entgeltzeitraeume.SummeGesamtStunden")}); - this.xrTableCell38.Name = "xrTableCell38"; - this.xrTableCell38.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F); - this.xrTableCell38.StylePriority.UseBorders = false; - this.xrTableCell38.StylePriority.UsePadding = false; - this.xrTableCell38.StylePriority.UseTextAlignment = false; - this.xrTableCell38.Text = "xrTableCell63"; - this.xrTableCell38.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell38.Weight = 0.5298458172724797D; - // - // xrTableCell39 - // - this.xrTableCell39.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top))); - this.xrTableCell39.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entgeltzeitraeume.SummeFehlkontakteStunden", "{0:0.00}")}); - this.xrTableCell39.Name = "xrTableCell39"; - this.xrTableCell39.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F); - this.xrTableCell39.StylePriority.UseBorders = false; - this.xrTableCell39.StylePriority.UsePadding = false; - this.xrTableCell39.StylePriority.UseTextAlignment = false; - this.xrTableCell39.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell39.Weight = 0.39230769377488361D; - // - // xrTableCell55 - // - this.xrTableCell55.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell55.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entgeltzeitraeume.SummeGesamtStundenMitFK", "{0:0.00}")}); - this.xrTableCell55.Name = "xrTableCell55"; - this.xrTableCell55.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F); - this.xrTableCell55.StylePriority.UseBorders = false; - this.xrTableCell55.StylePriority.UsePadding = false; - this.xrTableCell55.StylePriority.UseTextAlignment = false; - this.xrTableCell55.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell55.Weight = 0.49826857640193067D; - // // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -1865,18 +1874,7 @@ this.xrTableCell76.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell76.Weight = 0.5243716694758489D; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.BudgetnachweisAnhangDiggaRO); - // - // xrLine1 - // - this.xrLine1.LineWidth = 2F; - this.xrLine1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.xrLine1.Name = "xrLine1"; - this.xrLine1.SizeF = new System.Drawing.SizeF(724.0001F, 2.099991F); - // - // BudgetnachweisAnhangDigi + // BudgetnachweisAnhangDigga // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { this.Detail, @@ -1907,10 +1905,10 @@ ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable8)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable9)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable10)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable10)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } diff --git a/Service/Invoicing/LWLDiggaBerechnung.cs b/Service/Invoicing/LWLDiggaBerechnung.cs index 926e7bf98..a983c08de 100644 --- a/Service/Invoicing/LWLDiggaBerechnung.cs +++ b/Service/Invoicing/LWLDiggaBerechnung.cs @@ -143,7 +143,7 @@ namespace BeWo.Service.Invoicing { if (!cr.EndDate.HasValue) { - cr.EndDate = this.BewilligtEnde.AddDays(1); + cr.EndDate = this.BewilligtEnde.AddDays(1).AddMilliseconds(-1); if (cr.StartDate.HasValue && cr.StartDate.Value > cr.EndDate.Value) //manchmal werden schon aberwitzige Preise in der Zukunft hinterlegt { cr.EndDate = cr.StartDate.Value.AddMonths(1);