diff --git a/ReportImp/BUGeVReports/Properties/licenses.licx b/ReportImp/BUGeVReports/Properties/licenses.licx index e69de29bb..f98ef57fd 100644 --- a/ReportImp/BUGeVReports/Properties/licenses.licx +++ b/ReportImp/BUGeVReports/Properties/licenses.licx @@ -0,0 +1 @@ +DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/ReportImp/BUGeVReports/SettlementReport2.cs b/ReportImp/BUGeVReports/SettlementReport2.cs index 198b12585..c4eac363e 100644 --- a/ReportImp/BUGeVReports/SettlementReport2.cs +++ b/ReportImp/BUGeVReports/SettlementReport2.cs @@ -29,9 +29,11 @@ namespace BeWo.BUGeVReports if (pRO.FehlkontakteString != null && pRO.FehlkontakteString.Length > 0 && ii.RateFactor == 0) { - ii.UnitCount = ii.UnitCount / ((2 - Convert.ToDecimal(pRO.RateFactor)) * 100) * 100; - ii.AmountPerUnit = ii.AmountPerUnit / 100 * ((2 - Convert.ToDecimal(pRO.RateFactor)) * 100); - + if (pRO.InvoiceDate < new DateTime(2024, 1, 1)) + { + ii.UnitCount = ii.UnitCount / ((2 - Convert.ToDecimal(pRO.RateFactor)) * 100) * 100; + ii.AmountPerUnit = ii.AmountPerUnit / 100 * ((2 - Convert.ToDecimal(pRO.RateFactor)) * 100); + } Zwischensumme.Visible = true; ii.DetailDescription = String.Format("{0:dd.MM.yyyy} bis {1:dd.MM.yyyy}: {2:0.##} h x {3:c}", ii.PeriodStartDate, ii.PeriodEndDate, ii.UnitCount, ii.AmountPerUnit); ii.ItemDescription = "Fehlkontakte";