HshCologne/Export/FibuExporter - Finish nach Rücksprache Buchhaltung

ReportImp/HshCologne/Export/FibuExporter.cs

@@ -30,13 +30,10 @@ namespace HshCologne.Export
         {
             //geklaut von SKFLeverkusen Jugendhilfe, sollte Sammelrechnung nötig sein, von da wiederholen
             StringBuilder sb = new StringBuilder();
-            sb.AppendLine("Umsatz Euro;BU Gkto;Beleg1;Beleg2;Datum;Konto;Buchungstext");
+            sb.AppendLine("Umsatz in Euro;Gegenkonto;Beleg1;Beleg2;Datum;Konto;Buchungstext");
             var s = GetMonatlicheRechnungenString(date);
             if (!String.IsNullOrWhiteSpace(s))
             {
-                if (sb.Length > 0)
-                    sb.AppendLine();
-
                 sb.Append(s);
             }
 
@@ -94,25 +91,22 @@ namespace HshCologne.Export
         {
             
             String sql = @"
- select 
- sip.Claim,
+select 
+ SUM(sip.Claim),
  org.DebitorNumber,
  ib.InvoiceDate,
  ib.invoicenumber,
-org.Name,
-CONCAT('Abrechnung ', p.`LastName`, ' ', p.`FirstName`),
-ib.InvoiceId
- 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
+SUBSTRING_INDEX(org.Name2, ';', 1) AS JA,
+SUBSTRING_INDEX(org.Name2, ';', -1) AS BTxt,
+ib.Oid
+ FROM
+invoicebase ib
+inner join serviceinvoice si on si.invoicebaseoid = ib.oid
+inner join serviceinvoiceperiod sip on sip.serviceinvoiceoid = si.oid
+inner join costbearer cb on ib.recipientcostbeareroid = cb.oid
+inner join organisation org on org.costbeareroid = cb.oid
 WHERE ib.`AccountingPeriodEnd` >= ':Monat_Start' AND ib.`AccountingPeriodEnd` < ':Monat_End' and ib.IsActive = 1 AND ib.`IsExported` = 0
+GROUP BY ib.Oid
 order by ib.invoicenumber 
 ";