From 8e8e88cd4036b567eafd7ff0adca6e30d86d69ff Mon Sep 17 00:00:00 2001
From: Marcel Hirschle <marcel.hirschle@ownsoft.de>
Date: Mon, 8 May 2023 14:45:41 +0200
Subject: [PATCH] MH: Sammelrechnung Fehlkontakte + AdikKleve Sammelrechnung

---
 ReportImp/AdikKleve/Invoicing/CustomInvoiceCreation.cs | 5 ++++-
 Service/Invoicing/InvoiceCreation.cs                   | 6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ReportImp/AdikKleve/Invoicing/CustomInvoiceCreation.cs b/ReportImp/AdikKleve/Invoicing/CustomInvoiceCreation.cs
index 1e187a25a..e2c31cbe3 100644
--- a/ReportImp/AdikKleve/Invoicing/CustomInvoiceCreation.cs
+++ b/ReportImp/AdikKleve/Invoicing/CustomInvoiceCreation.cs
@@ -49,6 +49,9 @@ namespace AdikKleve.Invoicing
                 }
             }
         }
-
+        public override string GetSummaryItemKey(SupportConceptApprovalPeriod scap, InvoiceItem iitem, bool summaryPerMonth)
+        {
+            return String.Format("{0}_{1}_{2}", iitem.AmountPerUnit, iitem.RateFactor, iitem.ItemDescription);
+        }
     }
 }
diff --git a/Service/Invoicing/InvoiceCreation.cs b/Service/Invoicing/InvoiceCreation.cs
index 249bf2ff0..8d3a55574 100644
--- a/Service/Invoicing/InvoiceCreation.cs
+++ b/Service/Invoicing/InvoiceCreation.cs
@@ -745,7 +745,11 @@ namespace BeWo.Service.Invoicing
             invoiceItem.ServiceRecord = DAOFactory.GenericDAO.LoadByID<ServiceRecord>(iServiceRecord.ServiceRecordOid.Value);
             if (scap != null)
                 invoiceItem.SupportConceptApprovalPeriodOid = scap.Oid;
-
+            if (iServiceRecord.ServiceDescription.Name.ToLower().Contains("fehlkontakt") || (iServiceRecord.ServiceDescription.ProzentAbrechnung.HasValue && iServiceRecord.ServiceDescription.ProzentAbrechnung.Value < 100))
+            {
+                invoiceItem.RateFactor = null;
+                invoiceItem.GrossAmountTotal = invoiceItem.AmountTotal;
+            }
             //var crs = iServiceRecord.CostBearer.CostRatePeriods;
 
             //List<long> costRatePeriodOids = new List<long>();