diff --git a/ReportImp/AKGG/Quittierungsbeleg.cs b/ReportImp/AKGG/Quittierungsbeleg.cs index b1824f39e..21423c4af 100644 --- a/ReportImp/AKGG/Quittierungsbeleg.cs +++ b/ReportImp/AKGG/Quittierungsbeleg.cs @@ -29,6 +29,14 @@ namespace Akgg //if (pRO == null) // return; + var approved = pRO.ApprovedFLSPerWeek; + + var stats = GetStatistics(pRO); + if (stats != null) + approved = stats.MinutesApprovedPerWeek / 60; + + lblBewilligteStunden.Text = string.Format("{0:0.##} Std./wöchentlich", approved); + if (pRO.Services != null) { List servicesBillable = new List(); @@ -53,17 +61,7 @@ namespace Akgg pRO.Services = servicesBillable; } - var approved = pRO.ApprovedFLSPerWeek; - - var stats = GetStatistics(pRO); - if (stats != null) - approved = stats.MinutesApprovedPerWeek / 60; - - lblBewilligteStunden.Text = string.Format("{0:0.##} Std./wöchentlich", approved); - bindingSource1.DataSource = pRO; - - } private SupportConceptPeriodStatisticsDC GetStatistics(ServicesOverviewRO ro) diff --git a/ReportImp/AKGG/QuittierungsbelegPK.cs b/ReportImp/AKGG/QuittierungsbelegPK.cs index 387085081..e8eba3a4b 100644 --- a/ReportImp/AKGG/QuittierungsbelegPK.cs +++ b/ReportImp/AKGG/QuittierungsbelegPK.cs @@ -1,13 +1,7 @@ using System; using System.Collections.Generic; -using System.Drawing; -using System.IO; -using System.Text.RegularExpressions; using BeWo.Report; using BeWo.Report.ReportObjects; -using BeWo.Service.ServiceImplementations; -using BS.Shared.Core; -using BS.Shared.DataContracts; using DevExpress.XtraReports.UI; namespace Akgg diff --git a/ReportImp/AwoDortmund/Export/DiamantExporter.cs b/ReportImp/AwoDortmund/Export/DiamantExporter.cs index 199e5d914..1985e317f 100644 --- a/ReportImp/AwoDortmund/Export/DiamantExporter.cs +++ b/ReportImp/AwoDortmund/Export/DiamantExporter.cs @@ -97,7 +97,7 @@ namespace AwoDortmund.Export dtOffenerTreff = ExecuteQuery(otSql, date); cats = new List(); - cats.Add(50); // Offener Treff + cats.Add(50); // Soziotherapie var soziSql = GetMonatlicheAbrechnungStringForCatsSql(date, cats, null); dtSoziTreff = ExecuteQuery(soziSql, date); } @@ -121,6 +121,11 @@ namespace AwoDortmund.Export oid2Row.Add(oid, row); mergedRows.Add(row); } + //Nach Änderung der Rechnungslogik - Aushebeln des Merge für Soziotherapie und verwandte Leistungen + else if (oid2Row.ContainsKey(oid) && (c2sOid2AssiBetrag.ContainsKey(oid) || c2sOid2SoziBetrag.ContainsKey(oid))) + { + mergedRows.Add(row); + } else { var firstRow = oid2Row[oid]; diff --git a/ReportImp/AwoDortmund/Invoicing/CustomInvoiceFactory.cs b/ReportImp/AwoDortmund/Invoicing/CustomInvoiceFactory.cs index 7b279a511..c55908757 100644 --- a/ReportImp/AwoDortmund/Invoicing/CustomInvoiceFactory.cs +++ b/ReportImp/AwoDortmund/Invoicing/CustomInvoiceFactory.cs @@ -11,7 +11,6 @@ namespace AwoDortmund.Invoicing public override InvoiceCreation CreateInvoiceCreator(string specificId, string tenant, Dictionary> supportConcepts2ServiceRecords) { - // hier muss eine Differenzierung rein -> RatPlusTat -> je eine Rechnung für Sozio, Assistenz und Wohngruppenzuschlag erzeugen foreach (var list in supportConcepts2ServiceRecords.Values) { foreach (var sr in list)