From 8b3b2b7a148e9f288ef209827a73dc34b90e4623 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Thu, 30 Jul 2026 11:26:28 +0200 Subject: [PATCH] =?UTF-8?q?SKFLeverkusen/Export/DatevExporter.cs=20-=20auc?= =?UTF-8?q?h=20archivierte=20Hilfepl=C3=A4ne=20in=20Abgrenzung=20SupportOI?= =?UTF-8?q?D=3D169329?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ReportImp/SKFLeverkusen/Export/DatevExporter.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ReportImp/SKFLeverkusen/Export/DatevExporter.cs b/ReportImp/SKFLeverkusen/Export/DatevExporter.cs index 2a70c1fdc..43f0d0949 100644 --- a/ReportImp/SKFLeverkusen/Export/DatevExporter.cs +++ b/ReportImp/SKFLeverkusen/Export/DatevExporter.cs @@ -215,7 +215,7 @@ LEFT JOIN INNER JOIN `servicecategory` sc ON sd.`ServiceCategoryOid` = sc.`Oid` WHERE sr2.`StartDate` >= ':Monat_Start' AND sr2.`StartDate` < ':Monat_End' AND sc.`Billable` = 1 AND sd.Name <> 'Fehlkontakt' GROUP BY sr2.`CostBearer2SupportConceptOid`) AS sr ON sr.`CostBearer2SupportConceptOid` = cb2sc.`Oid` -WHERE c.`IsActive` = 1 AND sc.`IsActive` = 1 and (sr.`GeleisteteFLM` is not null)) +WHERE c.`IsActive` = 1 AND sc.`IsActive` <> 0 and (sr.`GeleisteteFLM` is not null)) UNION (SELECT ROUND(0.8 * (sr.`GeleisteteFLM` / 60) * (SELECT crp.`CostRateValue` FROM `costrateperiod` crp WHERE crp.`ObjectTid` = 22 AND crp.`CostRateType` = 0 AND crp.`ObjectOid` = cb2sc.`CostBearerOid` AND (crp.`EndDate` is null or crp.`EndDate` > ':Monat_Start') order by IF(crp.`EndDate` is null, MAKEDATE(9999,365),crp.`EndDate`) LIMIT 1 ),2) AS 'Betrag', @@ -235,7 +235,7 @@ LEFT JOIN INNER JOIN `servicecategory` sc ON sd.`ServiceCategoryOid` = sc.`Oid` WHERE sr2.`StartDate` >= ':Monat_Start' AND sr2.`StartDate` < ':Monat_End' AND sc.`Billable` = 1 and sd.Name = 'Fehlkontakt' GROUP BY sr2.`CostBearer2SupportConceptOid`) AS sr ON sr.`CostBearer2SupportConceptOid` = cb2sc.`Oid` -WHERE c.`IsActive` = 1 AND sc.`IsActive` = 1 and (sr.`GeleisteteFLM` is not null)) +WHERE c.`IsActive` = 1 AND sc.`IsActive` <> 0 and (sr.`GeleisteteFLM` is not null)) )qry GROUP BY qry.Oid ORDER BY qry.Verwendung