diff --git a/ReportImp/Ruhrstern/Export/DatevExporter.cs b/ReportImp/Ruhrstern/Export/DatevExporter.cs index bb9a2312b..485a30a3a 100644 --- a/ReportImp/Ruhrstern/Export/DatevExporter.cs +++ b/ReportImp/Ruhrstern/Export/DatevExporter.cs @@ -83,7 +83,14 @@ namespace Ruhrstern.Export sb.Append(";S;"); sb.Append(String.Format("{0}", row[1])); //Debitornr sb.Append(";"); - sb.Append("8100"); // Erlöskonto + if (row[6] != null && row[6].ToString().Contains("Essen")) + { + sb.Append("8102"); // Erlöskonto für Jugenhilfe + } + else + { + sb.Append("8100"); // Erlöskonto + } sb.Append(";"); sb.Append(String.Format("{0:dd}{0:MM}", row[2])); //Belegdatum sb.Append(";"); @@ -124,6 +131,7 @@ namespace Ruhrstern.Export var dt = ExecuteQuery(sql, date); StringBuilder sb = new StringBuilder(); + int i = 1; foreach (DataRow row in dt.Rows) { if (sb.Length > 0) @@ -140,7 +148,7 @@ namespace Ruhrstern.Export sb.Append(";"); sb.Append(String.Format("{0:dd}{0:MM}", lastDate)); //Belegdatum sb.Append(";"); - //sb.Append(String.Format("{0:MM}{0:yy}", row[3])); //Belegnr + sb.Append(String.Format("{0:yy}{0:MM}{1:D3}", lastDate, i)); //Belegnr sb.Append(";"); sb.Append(String.Format("{0:dd}{0:MM}{0:yy}", lastDate)); sb.Append(";"); @@ -148,6 +156,7 @@ namespace Ruhrstern.Export sb.Append(buchungstext); sb.Append(";"); sb.Append("99999"); + i++; } return sb.ToString(); @@ -158,22 +167,25 @@ namespace Ruhrstern.Export String sql = @" select - sip.Claim, -c.DebitorNumber, + SUM(sip.Claim), + c.DebitorNumber, ib.InvoiceDate, ib.invoicenumber, c.CostCenter, -c2s.Oid, -ib.InvoiceId + c2s.Oid, + org.Name, + 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 organisation org on org.costbeareroid = c2s.CostBearerOid 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.`AccountingPeriodEnd` >= ':Monat_Start' AND ib.`AccountingPeriodEnd` < ':Monat_End' and ib.IsActive = 1 +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 ";