From ab8b36bcb10cbfd4af72e464d8f60aa7f6b85a89 Mon Sep 17 00:00:00 2001
From: Marcel Hirschle <marcel.hirschle@ownsoft.de>
Date: Thu, 19 Sep 2024 14:12:59 +0200
Subject: [PATCH] MH: BetreutesWohnenWoellReports RateFaktor Spitzabrechnung

---
 .../Properties/licenses.licx                  |  1 +
 .../SettlementReport2.cs                      | 34 +++++++++++++++----
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/ReportImp/BetreutesWohnenWoellReports/Properties/licenses.licx b/ReportImp/BetreutesWohnenWoellReports/Properties/licenses.licx
index e69de29bb..d59547a61 100644
--- a/ReportImp/BetreutesWohnenWoellReports/Properties/licenses.licx
+++ b/ReportImp/BetreutesWohnenWoellReports/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/BetreutesWohnenWoellReports/SettlementReport2.cs b/ReportImp/BetreutesWohnenWoellReports/SettlementReport2.cs
index dbf704e5e..9ece9ea1f 100644
--- a/ReportImp/BetreutesWohnenWoellReports/SettlementReport2.cs
+++ b/ReportImp/BetreutesWohnenWoellReports/SettlementReport2.cs
@@ -6,6 +6,7 @@ using DevExpress.XtraReports.UI;
 using BeWo.Report.ReportObjects;
 using BeWo.Report;
 using BS.Shared.Extensions;
+using System.Linq;
 
 namespace BeWo.BetreutesWohnenWoellReports
 {
@@ -19,15 +20,34 @@ namespace BeWo.BetreutesWohnenWoellReports
         public void SetReportDataSource(Settlement2RO pRO)
         {
 			decimal rateFactor = 1;
-            bool assistenzRechnung = false; 
+            bool assistenzRechnung = false;
 
-			foreach (var ii in pRO.InvoiceItems)
+            if (pRO.InvoiceItems.Any(ii => ii.RateFactor.HasValue))
+            {
+                if (pRO.InvoiceItems.Any(ii => ii.RateFactor.Value == 20))
+                {
+                    rateFactor = 1.2m;
+                    pRO.RateFactorText2 = String.Format("{0:0.00}", rateFactor);
+                }
+                else if (pRO.InvoiceItems.Any(ii => ii.RateFactor.Value == 0))
+                {
+                    rateFactor = 1m;
+                    pRO.RateFactorText2 = String.Format("{0:0.00}", rateFactor);
+                }
+            }
+            else
+            {
+                rateFactor = 1m;
+                pRO.RateFactorText2 = String.Format("{0:0.00}", rateFactor);
+            }
+
+            foreach (var ii in pRO.InvoiceItems)
 			{
-				if (ii.RateFactor.HasValue)
-				{
-					rateFactor = (100 + ii.RateFactor.Value) / 100;
-					pRO.RateFactorText2 = String.Format("{0:0.00}", rateFactor);
-				}
+				//if (ii.RateFactor.HasValue)
+				//{
+				//	rateFactor = (100 + ii.RateFactor.Value) / 100;
+				//	pRO.RateFactorText2 = String.Format("{0:0.00}", rateFactor);
+				//}
 
                 if (!pRO.FehlkontakteString.IsNullOrEmpty() && ii.RateFactor == 0)
                 {