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