ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AkkuratDienstleistungsgesellschaft/Export/AddisonExporter - Debitor von HP, sofern hinterlegt sonst von Klient

Browse Source
This commit is contained in:
Alexandra
2025-10-10 11:27:27 +02:00
parent 0db8101f7a
commit 40f5a87a11
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ReportImp/AkkuratDienstleistungsgesellschaft/Export/AddisonExporter.cs
View File

@@ -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,

2
ReportImp/AkkuratDienstleistungsgesellschaft/Translation/TranslationDictionary.cs
View File

@@ -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;
}