From ee9fbcb1bc031ef3849fc340313d60ea3702bfa4 Mon Sep 17 00:00:00 2001
From: Alexandra <alexandra.becker@ownsoft.de>
Date: Mon, 4 May 2026 13:29:46 +0200
Subject: [PATCH] =?UTF-8?q?SBBMainzReports/Export/FibuExporter=20-=20?=
 =?UTF-8?q?=C3=84nderung=20f=C3=BCr=20Auswahl=20bei=20Stornorg=20SupportOI?=
 =?UTF-8?q?D=3D161521?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SBBMainzReports/Export/FibuExporter.cs    | 85 ++++++++++---------
 1 file changed, 45 insertions(+), 40 deletions(-)

diff --git a/ReportImp/SBBMainzReports/Export/FibuExporter.cs b/ReportImp/SBBMainzReports/Export/FibuExporter.cs
index f79b99c77..00dafc87f 100644
--- a/ReportImp/SBBMainzReports/Export/FibuExporter.cs
+++ b/ReportImp/SBBMainzReports/Export/FibuExporter.cs
@@ -135,47 +135,52 @@ namespace SBBMainzReports.Export
         private static String GetMonatlicheRechnungenSql(DateTime date)
         {
             String sql = @"
-                 select 
-                '8000' as 'Gegenkonto',
-                Round(ii.AmountTotal, 2) AS 'Betrag',
-                sums.Gesamtbetrag,
-                ib.invoicenumber,
-                ib.InvoiceDate,
-                c.DebitorNumber,
-                c.CostCenter,
-                org.Name,
-                CONCAT(p.`FirstName`, ' ',p.`LastName`) as 'Verwendung',
-                ii.ItemDescription,
-                ib.Oid
-                from
-                person p
-                inner join customer c on c.personoid = p.oid
-                inner join supportconcept sc on sc.customeroid = c.oid
-                inner join costbearer2supportconcept c2s on c2s.supportconceptoid = sc.oid
-                inner join costbearer cb on c2s.costbeareroid = cb.oid
-                inner join organisation org on org.costbeareroid = cb.oid
-                inner join invoicebase ib on ib.costbearer2supportconceptoid = c2s.oid
-                inner join serviceinvoice si on si.invoicebaseoid = ib.oid
-                inner join serviceinvoiceperiod sip on sip.serviceinvoiceoid = si.oid
-                inner join invoiceitem ii on ii.serviceinvoiceperiodoid = sip.oid
+                select 
+               '8000' as 'Gegenkonto',
+               Round(ii.AmountTotal, 2) AS 'Betrag',
+               sums.Gesamtbetrag,
+               ib.invoicenumber,
+               ib.InvoiceDate,
+               c.DebitorNumber,
+               c.CostCenter,
+               org.Name,
+               CONCAT(p.`FirstName`, ' ',p.`LastName`) as 'Verwendung',
+               ii.ItemDescription,
+               ib.Oid
+               from
+               person p
+               inner join customer c on c.personoid = p.oid
+               inner join supportconcept sc on sc.customeroid = c.oid
+               inner join costbearer2supportconcept c2s on c2s.supportconceptoid = sc.oid
+               inner join costbearer cb on c2s.costbeareroid = cb.oid
+               inner join organisation org on org.costbeareroid = cb.oid
+               inner join invoicebase ib on ib.costbearer2supportconceptoid = c2s.oid
+               inner join serviceinvoice si on si.invoicebaseoid = ib.oid
+               inner join serviceinvoiceperiod sip on sip.serviceinvoiceoid = si.oid
+               inner join invoiceitem ii on ii.serviceinvoiceperiodoid = sip.oid
 
-                join
-                (select SUM(sip.Claim) AS Gesamtbetrag,
-                ib.oid
-                from
-                person p
-                inner join customer c on c.personoid = p.oid
-                inner join supportconcept sc on sc.customeroid = c.oid
-                inner join costbearer2supportconcept c2s on c2s.supportconceptoid = sc.oid
-                inner join costbearer cb on c2s.costbeareroid = cb.oid
-                inner join organisation org on org.costbeareroid = cb.oid
-                inner join invoicebase ib on ib.costbearer2supportconceptoid = c2s.oid
-                inner join serviceinvoice si on si.invoicebaseoid = ib.oid
-                inner join serviceinvoiceperiod sip on sip.serviceinvoiceoid = si.oid
-                Group by ib.oid) sums
-                on ib.oid = sums.oid
-                WHERE ib.`AccountingPeriodEnd` >= ':Monat_Start' AND ib.`AccountingPeriodEnd` < ':Monat_End' and ib.IsActive = 1 and ib.IsExported = 0
-                order by ib.invoicenumber 
+               join
+               (select SUM(sip.Claim) AS Gesamtbetrag,
+               ib.oid
+               from
+               person p
+               inner join customer c on c.personoid = p.oid
+               inner join supportconcept sc on sc.customeroid = c.oid
+               inner join costbearer2supportconcept c2s on c2s.supportconceptoid = sc.oid
+               inner join costbearer cb on c2s.costbeareroid = cb.oid
+               inner join organisation org on org.costbeareroid = cb.oid
+               inner join invoicebase ib on ib.costbearer2supportconceptoid = c2s.oid
+               inner join serviceinvoice si on si.invoicebaseoid = ib.oid
+               inner join serviceinvoiceperiod sip on sip.serviceinvoiceoid = si.oid
+               WHERE ib.IsActive = 1 and ib.IsExported = 0
+               AND (((ib.InvoiceTypeText != 'Storno' OR ib.InvoiceTypeText IS NULL) AND ib.`AccountingPeriodEnd` >= ':Monat_Start' AND ib.`AccountingPeriodEnd` < ':Monat_End')
+                    OR (ib.InvoiceTypeText = 'Storno' AND ib.`InvoiceDate` >= ':Monat_Start' AND ib.`InvoiceDate` < ':Monat_End'))
+               Group by ib.oid) sums
+               on ib.oid = sums.oid
+               WHERE ib.IsActive = 1 and ib.IsExported = 0
+               AND (((ib.InvoiceTypeText != 'Storno' OR ib.InvoiceTypeText IS NULL) AND ib.`AccountingPeriodEnd` >= ':Monat_Start' AND ib.`AccountingPeriodEnd` < ':Monat_End')
+                    OR (ib.InvoiceTypeText = 'Storno' AND ib.`InvoiceDate` >= ':Monat_Start' AND ib.`InvoiceDate` < ':Monat_End'))
+               order by ib.invoicenumber 
                 ";
 
             return sql;