Storno- und Differenzrechnung für SettlementReport und SettlementReport2

Report/DefaultReports/SettlementReport.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using BeWo.Data.Access;
 using BeWo.Data.Entities;
 using BeWo.Report;
@@ -24,7 +25,6 @@ namespace BeWo.Report.DefaultReports.Alt
 			{
 				lblNotice.Visible = false;
 			}
-
 	        if (pRO.InvoiceItems != null && pRO.InvoiceItems.Count == 1)
 	        {
 		        var ii = pRO.InvoiceItems[0];
@@ -35,7 +35,7 @@ namespace BeWo.Report.DefaultReports.Alt
 	        }
 	        if (!isDefaultSpitzabrechnung)
 	        {
-		        if (pRO.DifferentHourlyRateCount > 0 && pRO.HourlyRateNew.HasValue)
+		        if (pRO.DifferentHourlyRateCount > 0 && pRO.HourlyRateNew.HasValue && !pRO.InvoiceItems.Any(d => d.ItemDescription != null && d.ItemDescription.Contains("Storno")))
 		        {
 			        isDefaultSpitzabrechnung = true;
 		        }
@@ -70,11 +70,19 @@ namespace BeWo.Report.DefaultReports.Alt
 					{
 						foreach (var ii in pRO.InvoiceItems)
 						{
-							ii.ItemDescription = String.Format("{0:dd.MM.yyyy} bis {1:dd.MM.yyyy}: {2:0.00##} FLS {3}x {4:c}",
+                            if (ii.ItemDescription != null && ii.ItemDescription.Contains("Storno"))
+                            {
+                                ii.ItemDescription = String.Format("Ausbuchung zur vorherigen Rechnung - {0:dd.MM.yyyy} bis {1:dd.MM.yyyy}",
+								ii.ItemPeriodStart, ii.ItemPeriodEnd);
+                            }
+							else
+							{
+                                ii.ItemDescription = String.Format("{0:dd.MM.yyyy} bis {1:dd.MM.yyyy}: {2:0.00##} FLS {3}x {4:c}",
 								ii.ItemPeriodStart, ii.ItemPeriodEnd,
 								ii.UnitCount, ii.RateFactor == 0 ? "" : "x " + pRO.RateFactorText2 + " ",
 								ii.AmountPerUnit);
-						}
+                            }
+                        }
 					}
 				}
 	        }