BeWoNordeifel: Fehlkontakt-Support eingebaut für QB und Spitzabrechnung

ReportImp/BeWoNordeifel/Quittierungsbeleg.cs

@@ -27,14 +27,19 @@ namespace BeWoNordeifel
 
                 foreach (var sd in pRO.Services)
                 {
-                    if (sd.IsBillable)
+                    if (sd.IsBillable || sd.ServiceDescription.ToLower().Contains("fehlkontakt") || sd.ServiceCategory.ToLower().Contains("fehlkontakt"))
                     {
                         ServicesOverviewRO.CreateSignatureString(sd);
+                        sd.Notice5 = "E";
                         if (sd.IsGroup)
                         {
-                            //sd.Notice5 = String.Format("{0} Teilnehmer", sd.CustomerCount);
+                            sd.Notice5 = "GR";
                             hatGruppen = true;
                         }
+                        if (sd.ServiceDescription.ToLower().Contains("fehlkontakt") || sd.ServiceCategory.ToLower().Contains("fehlkontakt"))
+                        {
+                            sd.Notice5 = "F";
+                        }
                         servicesBillable.Add(sd);
                     }
                 }

ReportImp/BeWoNordeifel/SettlementReport2.cs

@@ -1,11 +1,8 @@
 using System;
-using System.Collections.Generic;
-using BeWo.Data.Access;
-using BeWo.Data.Entities;
 using BeWo.Report;
 using BeWo.Report.ReportObjects;
-using BS.Shared.DataContracts;
-
+using BS.Shared.Extensions;
+
 namespace BeWoNordeifel.Neu
 {
     public partial class Spitzabrechnung : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<Settlement2RO>
@@ -17,27 +14,34 @@ namespace BeWoNordeifel.Neu
 
         public void SetReportDataSource(Settlement2RO pRO)
         {
-	        
-
 			if (String.IsNullOrEmpty(pRO.Notice))
 			{
 				lblNotice.Visible = false;
 			}
 
+			decimal rateFactor = 1;
 
-			if (pRO.InvoiceItems != null)
+			foreach (var ii in pRO.InvoiceItems)
 			{
-				foreach (var ii in pRO.InvoiceItems)
+				if (ii.RateFactor.HasValue)
 				{
-					ii.ItemDescription = String.Format("{0:dd.MM.yyyy} bis {1:dd.MM.yyyy}: {2:0.##} FLS {3}x {4:c}",
-						ii.PeriodStartDate, ii.PeriodEndDate,
-						ii.UnitCount, ii.RateFactor == 0 ? "" : "x " + pRO.RateFactorText2 + " ",
-						ii.AmountPerUnit);
+					rateFactor = (100 + ii.RateFactor.Value) / 100;
+				}
+
+				if (!pRO.FehlkontakteString.IsNullOrEmpty() && ii.RateFactor == 0)
+				{
+					Zwischensumme.Visible = true;
+					ii.AbrechnungsText = ii.AbrechnungsText.Replace("FLS", "Std.");
+					ii.ItemDescription = "Fehlkontakte";
+				}
+				else if (ii.ItemDescription.IsNullOrEmpty())
+				{
+					ii.ItemDescription = "Fachleistungsstunden";
 				}
 			}
-	        
-
-	        this.bindingSource1.DataSource = pRO;
+			pRO.RateFactor = (double)rateFactor;
+
+			this.bindingSource1.DataSource = pRO;
         }
 
     }