diff --git a/ReportImp/BUGeVReports/SettlementReport2.Designer.cs b/ReportImp/BUGeVReports/SettlementReport2.Designer.cs
index 987298277..666a639c2 100644
--- a/ReportImp/BUGeVReports/SettlementReport2.Designer.cs
+++ b/ReportImp/BUGeVReports/SettlementReport2.Designer.cs
@@ -32,6 +32,7 @@ namespace BeWo.BUGeVReports
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung));
DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary();
+ 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.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
@@ -59,12 +60,14 @@ namespace BeWo.BUGeVReports
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow();
this.cellStart = new DevExpress.XtraReports.UI.XRTableCell();
this.cellEnd = new DevExpress.XtraReports.UI.XRTableCell();
this.cellHourlyRate = new DevExpress.XtraReports.UI.XRTableCell();
this.cellFLS = new DevExpress.XtraReports.UI.XRTableCell();
+ this.cellFK = new DevExpress.XtraReports.UI.XRTableCell();
this.cellGesondertBewilligt = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
@@ -98,15 +101,13 @@ namespace BeWo.BUGeVReports
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
- this.cellFK = new DevExpress.XtraReports.UI.XRTableCell();
- this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.GroupFooter4 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
this.xrCheckBox1 = new DevExpress.XtraReports.UI.XRCheckBox();
this.xrCheckBox2 = new DevExpress.XtraReports.UI.XRCheckBox();
this.xrLabel35 = new DevExpress.XtraReports.UI.XRLabel();
+ this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tableGeleisteteFLS)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
@@ -194,7 +195,7 @@ namespace BeWo.BUGeVReports
//
this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
this.xrLabel4.CanShrink = true;
- this.xrLabel4.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+ this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 236.25F);
this.xrLabel4.Multiline = true;
this.xrLabel4.Name = "xrLabel4";
@@ -209,7 +210,7 @@ namespace BeWo.BUGeVReports
//
this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
this.xrLabel3.CanShrink = true;
- this.xrLabel3.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+ this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 219.25F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -224,7 +225,7 @@ namespace BeWo.BUGeVReports
//
this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
this.xrLabel2.CanShrink = true;
- this.xrLabel2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+ this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 201.6667F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -241,7 +242,6 @@ namespace BeWo.BUGeVReports
//
// bottomMarginBand1
//
- this.bottomMarginBand1.HeightF = 100F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// GroupHeader1
@@ -255,7 +255,7 @@ namespace BeWo.BUGeVReports
this.xrLabel6,
this.xrTable1,
this.xrLabel8});
- this.GroupHeader1.Font = new System.Drawing.Font("Arial", 10F);
+ this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.GroupHeader1.HeightF = 392.7497F;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.StylePriority.UseFont = false;
@@ -273,7 +273,7 @@ namespace BeWo.BUGeVReports
//
// xrLabel18
//
- this.xrLabel18.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrLabel18.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLabel18.Multiline = true;
this.xrLabel18.Name = "xrLabel18";
@@ -322,7 +322,7 @@ namespace BeWo.BUGeVReports
this.xrLabel16,
this.xrLabel15,
this.xrLabel18});
- this.GroupFooter3.Font = new System.Drawing.Font("Arial", 11F);
+ this.GroupFooter3.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
this.GroupFooter3.HeightF = 368.6249F;
this.GroupFooter3.Level = 1;
this.GroupFooter3.Name = "GroupFooter3";
@@ -397,6 +397,14 @@ namespace BeWo.BUGeVReports
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell5.Weight = 0.42056080414465352D;
//
+ // xrTableCell8
+ //
+ this.xrTableCell8.Name = "xrTableCell8";
+ this.xrTableCell8.StylePriority.UseTextAlignment = false;
+ this.xrTableCell8.Text = "Anzahl FK";
+ this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+ this.xrTableCell8.Weight = 0.42056080414465363D;
+ //
// xrTableCell14
//
this.xrTableCell14.Name = "xrTableCell14";
@@ -435,6 +443,11 @@ namespace BeWo.BUGeVReports
this.cellFLS.Name = "cellFLS";
this.cellFLS.Weight = 0.42056080414465352D;
//
+ // cellFK
+ //
+ this.cellFK.Name = "cellFK";
+ this.cellFK.Weight = 0.42056080414465363D;
+ //
// cellGesondertBewilligt
//
this.cellGesondertBewilligt.Name = "cellGesondertBewilligt";
@@ -444,7 +457,7 @@ namespace BeWo.BUGeVReports
//
this.xrLabel7.BackColor = System.Drawing.Color.Transparent;
this.xrLabel7.CanShrink = true;
- this.xrLabel7.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
+ this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 220.2915F);
this.xrLabel7.Multiline = true;
this.xrLabel7.Name = "xrLabel7";
@@ -459,7 +472,7 @@ namespace BeWo.BUGeVReports
//
this.xrLabel14.BackColor = System.Drawing.Color.Transparent;
this.xrLabel14.CanShrink = true;
- this.xrLabel14.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
+ this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 200.2916F);
this.xrLabel14.Multiline = true;
this.xrLabel14.Name = "xrLabel14";
@@ -486,7 +499,7 @@ namespace BeWo.BUGeVReports
//
this.xrLabel16.BackColor = System.Drawing.Color.Transparent;
this.xrLabel16.CanShrink = true;
- this.xrLabel16.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
+ this.xrLabel16.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(0F, 143.9583F);
this.xrLabel16.Name = "xrLabel16";
this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -500,7 +513,7 @@ namespace BeWo.BUGeVReports
//
this.xrLabel15.BackColor = System.Drawing.Color.Transparent;
this.xrLabel15.CanShrink = true;
- this.xrLabel15.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
+ this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 180.2915F);
this.xrLabel15.Name = "xrLabel15";
this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -517,7 +530,7 @@ namespace BeWo.BUGeVReports
this.xrLabel13,
this.xrLabel11,
this.xrLabel1});
- this.GroupFooter2.Font = new System.Drawing.Font("Arial", 10F);
+ this.GroupFooter2.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.GroupFooter2.HeightF = 147.9167F;
this.GroupFooter2.Name = "GroupFooter2";
this.GroupFooter2.StylePriority.UseFont = false;
@@ -538,7 +551,7 @@ namespace BeWo.BUGeVReports
//
this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable3});
- this.Detail1.Font = new System.Drawing.Font("Arial", 10F);
+ this.Detail1.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.Detail1.HeightF = 17.00001F;
this.Detail1.Name = "Detail1";
this.Detail1.SortFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] {
@@ -597,7 +610,7 @@ namespace BeWo.BUGeVReports
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable4});
- this.GroupFooter1.Font = new System.Drawing.Font("Arial", 10F);
+ this.GroupFooter1.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.GroupFooter1.HeightF = 81.00005F;
this.GroupFooter1.Level = 1;
this.GroupFooter1.Name = "GroupFooter1";
@@ -712,7 +725,7 @@ namespace BeWo.BUGeVReports
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell47.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Claim", "{0:c}")});
- this.xrTableCell47.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+ this.xrTableCell47.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell47.Name = "xrTableCell47";
this.xrTableCell47.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell47.StylePriority.UseBorderColor = false;
@@ -759,7 +772,8 @@ namespace BeWo.BUGeVReports
//
this.xrTableCell3.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell3.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTableCell3.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrTableCell3.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+ new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTableCell3.Name = "xrTableCell3";
this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell3.StylePriority.UseBorderColor = false;
@@ -776,7 +790,8 @@ namespace BeWo.BUGeVReports
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.GrossAmountTotal")});
- this.xrTableCell6.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrTableCell6.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+ new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell6.StylePriority.UseBorderColor = false;
@@ -802,7 +817,8 @@ namespace BeWo.BUGeVReports
this.xrTableCell7.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTableCell7.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrTableCell7.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+ new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell7.StylePriority.UseBorderColor = false;
@@ -811,23 +827,6 @@ namespace BeWo.BUGeVReports
this.xrTableCell7.StylePriority.UsePadding = false;
this.xrTableCell7.Weight = 3D;
//
- // xrTableCell8
- //
- this.xrTableCell8.Name = "xrTableCell8";
- this.xrTableCell8.StylePriority.UseTextAlignment = false;
- this.xrTableCell8.Text = "Anzahl FK";
- this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
- this.xrTableCell8.Weight = 0.42056080414465363D;
- //
- // cellFK
- //
- this.cellFK.Name = "cellFK";
- this.cellFK.Weight = 0.42056080414465363D;
- //
- // bindingSource1
- //
- this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
- //
// GroupFooter4
//
this.GroupFooter4.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -836,8 +835,9 @@ namespace BeWo.BUGeVReports
this.xrCheckBox1,
this.xrCheckBox2,
this.xrLabel35});
- this.GroupFooter4.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.GroupFooter4.HeightF = 395.0417F;
+ this.GroupFooter4.Font = new DevExpress.Drawing.DXFont("Arial", 11.25F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+ new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+ this.GroupFooter4.HeightF = 330.4583F;
this.GroupFooter4.Level = 2;
this.GroupFooter4.Name = "GroupFooter4";
this.GroupFooter4.StylePriority.UseFont = false;
@@ -857,7 +857,7 @@ namespace BeWo.BUGeVReports
// xrLabel17
//
this.xrLabel17.BackColor = System.Drawing.Color.Transparent;
- this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 367.9583F);
+ this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 303.375F);
this.xrLabel17.Multiline = true;
this.xrLabel17.Name = "xrLabel17";
this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -884,7 +884,7 @@ namespace BeWo.BUGeVReports
//
this.xrLabel35.BackColor = System.Drawing.Color.Transparent;
this.xrLabel35.Borders = DevExpress.XtraPrinting.BorderSide.Top;
- this.xrLabel35.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
+ this.xrLabel35.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel35.LocationFloat = new DevExpress.Utils.PointFloat(0F, 217.7084F);
this.xrLabel35.Multiline = true;
this.xrLabel35.Name = "xrLabel35";
@@ -896,6 +896,10 @@ namespace BeWo.BUGeVReports
this.xrLabel35.Text = "Stempel / Unterschrift";
this.xrLabel35.WordWrap = false;
//
+ // bindingSource1
+ //
+ this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
+ //
// Spitzabrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -911,11 +915,13 @@ namespace BeWo.BUGeVReports
this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull});
- this.Margins = new System.Drawing.Printing.Margins(100, 50, 230, 100);
+ this.Margins = new DevExpress.Drawing.DXMargins(100F, 50F, 230F, 100F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
- this.Version = "17.1";
+ this.Version = "23.2";
+ xrWatermark1.Id = "Watermark1";
+ this.Watermarks.Add(xrWatermark1);
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tableGeleisteteFLS)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
diff --git a/ReportImp/BUGeVReports/SettlementReport2.cs b/ReportImp/BUGeVReports/SettlementReport2.cs
index 16d2eb1b5..e3451c4f2 100644
--- a/ReportImp/BUGeVReports/SettlementReport2.cs
+++ b/ReportImp/BUGeVReports/SettlementReport2.cs
@@ -23,7 +23,11 @@ namespace BeWo.BUGeVReports
foreach (var ii in pRO.InvoiceItems)
{
ii.DetailDescription = String.Format("{0:dd.MM.yyyy} bis {1:dd.MM.yyyy}", ii.PeriodStartDate, ii.PeriodEndDate);
- ii.DetailDescription += String.Format(": {0:0.##} FLS x {1:c}", ii.UnitCount, ii.AmountPerUnit);
+
+ if (pRO.InvoiceDate >= new DateTime(2024, 08, 08)) // Nötig durch Änderungen in der LWLInvoiceCreationBasis
+ ii.DetailDescription += String.Format(": {0:0.##} FLS x {1:c}", ii.UnitCount, ii.AmountPerUnit);
+ else
+ ii.DetailDescription += String.Format(": {0:0.##} FLS {1}x {2:c}", ii.UnitCount, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", ii.AmountPerUnit);
ii.ItemDescription = "Fachleistungsstunden";
@@ -39,14 +43,14 @@ namespace BeWo.BUGeVReports
ii.ItemDescription = "Fehlkontakte";
}
- AddTatsaechlichGeleisteteFLS(ii, idx);
+ AddTatsaechlichGeleisteteFLS(ii, idx, pRO.InvoiceDate);
idx++;
}
this.bindingSource1.DataSource = pRO;
}
- private void AddTatsaechlichGeleisteteFLS(Settlement2RO.SettlementInvoiceItemRO ii, int rowIndex)
+ private void AddTatsaechlichGeleisteteFLS(Settlement2RO.SettlementInvoiceItemRO ii, int rowIndex, DateTime invoiceDate)
{
decimal rateFactor = 0;
if (ii.RateFactor.HasValue && ii.RateFactor != 0)
@@ -73,7 +77,10 @@ namespace BeWo.BUGeVReports
}
else
{
- row.Cells[3].Text = String.Format("{0:0.00}", ii.UnitCount/* * rateFactor*/);
+ if (invoiceDate >= new DateTime(2024, 08, 08)) // Nötig durch Änderungen in der LWLInvoiceCreationBasis
+ row.Cells[3].Text = String.Format("{0:0.00}", ii.UnitCount);
+ else
+ row.Cells[3].Text = String.Format("{0:0.00}", ii.UnitCount * rateFactor);
}
}
diff --git a/ReportImp/BUGeVReports/SettlementReport2.resx b/ReportImp/BUGeVReports/SettlementReport2.resx
index 5e23acada..47de8d1e4 100644
--- a/ReportImp/BUGeVReports/SettlementReport2.resx
+++ b/ReportImp/BUGeVReports/SettlementReport2.resx
@@ -120,9 +120,6 @@
anbei sende ich Ihnen die Nachweise über die im Rahmen des Betreuten Wohnens für [Salutation2] [CustomerFirstName] [CustomerLastName] erbrachten Leistungen zu. Nach unserer Berechnung ergeben sich für den [AccountingPeriod] hieraus:
-
- 17, 17
-
Hiermit wird erklärt, dass die Verpflichtungen aus der Leistungs-, Prüfungs- und Vergütungsvereinbarung nach §§ 123 ff. SGB IX eingehalten wurden und alle hier gemachten Angaben anhand der vorgehaltenen Quittierungsbelege sowie der Betreuungsdokumentation jederzeit nachgewiesen werden können.