From 40f5a87a115fe9d0f1c0b18e6b2f492394cb65da Mon Sep 17 00:00:00 2001 From: Alexandra Date: Fri, 10 Oct 2025 11:27:27 +0200 Subject: [PATCH] AkkuratDienstleistungsgesellschaft/Export/AddisonExporter - Debitor von HP, sofern hinterlegt sonst von Klient --- .../Export/AddisonExporter.cs | 8 ++++---- .../Translation/TranslationDictionary.cs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ReportImp/AkkuratDienstleistungsgesellschaft/Export/AddisonExporter.cs b/ReportImp/AkkuratDienstleistungsgesellschaft/Export/AddisonExporter.cs index a42fde11a..0ea0d783f 100644 --- a/ReportImp/AkkuratDienstleistungsgesellschaft/Export/AddisonExporter.cs +++ b/ReportImp/AkkuratDienstleistungsgesellschaft/Export/AddisonExporter.cs @@ -309,9 +309,9 @@ namespace Akkurat.Export FROM ( (SELECT - IF(crpRateFactor.`CostRateValue` is null, ROUND((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)), + IF(crpRateFactor.`CostRateValue` is null, ROUND(ROUND((sr.`GeleisteteFLM` / 60), 2) * (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), ROUND(ROUND((sr.`GeleisteteFLM` / 60), 2) * (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 ) *((100 + crpRateFactor.`CostRateValue`)/ 100), 2)) AS 'Betrag', - c.DebitorNumber, + IFNULL(cb2sc.KontoHilfeplan, c.DebitorNumber) AS DebitorNumber, cb2sc.Notice AS 'Kostenstelle', CONCAT(p.`LastName`, ', ', p.`FirstName`) as 'Verwendung', cb2sc.Auswahlbezeichnung, @@ -335,8 +335,8 @@ namespace Akkurat.Export WHERE c.`IsActive` <> 0 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 )) AS 'Betrag', - c.DebitorNumber, + ROUND(0.8 * ROUND((sr.`GeleisteteFLM` / 60), 2) * (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', + IFNULL(cb2sc.KontoHilfeplan, c.DebitorNumber) AS DebitorNumber, cb2sc.Notice AS 'Kostenstelle', CONCAT(p.`LastName`, ', ', p.`FirstName`) as 'Verwendung', cb2sc.Auswahlbezeichnung, diff --git a/ReportImp/AkkuratDienstleistungsgesellschaft/Translation/TranslationDictionary.cs b/ReportImp/AkkuratDienstleistungsgesellschaft/Translation/TranslationDictionary.cs index f13c28d02..cbf7553d6 100644 --- a/ReportImp/AkkuratDienstleistungsgesellschaft/Translation/TranslationDictionary.cs +++ b/ReportImp/AkkuratDienstleistungsgesellschaft/Translation/TranslationDictionary.cs @@ -20,7 +20,7 @@ namespace Akkurat.Translation var dict = base.GetTranslationDictionary(); AddOrReplaceTranslation(dict, "Bezeichnung", "Vertragsnummer"); AddOrReplaceTranslation(dict, "HilfeplanNotiz", "Erlöskto,KostenSt."); - AddOrReplaceTranslation(dict, "KontoHilfeplan", "Notiz"); + AddOrReplaceTranslation(dict, "KontoHilfeplan", "Debitornummer"); AddOrReplaceTranslation(dict, "KostenstelleHilfeplan", "Bemerkung"); return dict; }