Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo

ReportImp/PerspektivenEV/CustomReportCreator.cs

@@ -60,7 +60,6 @@ namespace PerspektivenEV
                     {
                         invoice = invoices.Where(i => i.InvoiceBase.RecipientOrganisation == "Landeswohlfahrtsverband Hessen"
                         && i.InvoiceBase.InvoiceId == "SammelrechnungBthg").OrderByDescending(b => b.InvoiceBase.Oid).Skip(1).FirstOrDefault();
-
                     }
                     if (invoice != null)
                     {
@@ -99,7 +98,7 @@ namespace PerspektivenEV
             anhang.CreateDocument();
             //invoiceReport = anhang;
 
-            return anhang as XtraReport;
+            return anhang;
         }
 
         public override XtraReport CreateServiceInvoiceReport(string dcIds, long? invoiceBaseOid)
@@ -114,7 +113,6 @@ namespace PerspektivenEV
             {
 
                 var dcList = new List<ServiceInvoiceDC>();
-
                 var dcidStrs = dcIds.Split(';');
 
                 foreach (var oidStr in dcidStrs)
@@ -149,7 +147,6 @@ namespace PerspektivenEV
 
                     var seite1 = new ServiceInvoiceReport();
                     var ro = ServiceInvoiceRO.Create(iDC);
-
                     seite1.SetReportDataSource(ro);
                     seite1.CreateDocument();
 

ReportImp/PerspektivenEV/Invoicing/CollectiveInvoiceCreationBthg.cs

@@ -435,7 +435,7 @@ namespace PerspektivenEV.Invoicing
                 }
                 else if (approvedBEPerInterval == null || approvedBEPerInterval.Value < 84)
                 {
-                    lg = 93;
+                    lg = 90;
                 }
                 else if (approvedBEPerInterval.Value < 106) 
                 {