diff --git a/ReportImp/LebenshilfeBadKreuznach/Export/SageExporter.cs b/ReportImp/LebenshilfeBadKreuznach/Export/SageExporter.cs index 351856dcf..d5da49455 100644 --- a/ReportImp/LebenshilfeBadKreuznach/Export/SageExporter.cs +++ b/ReportImp/LebenshilfeBadKreuznach/Export/SageExporter.cs @@ -88,10 +88,10 @@ ib.AccountingPeriodEnd, sb.Append(";"); sb.Append(String.Format("{0}", row[1])); sb.Append(";"); - String buchungstext = String.Format("AR {0} {1:MM}/{1:yyyy} {2}", row[5], row[4], row[6]); + String buchungstext = String.Format("AR {0} {1:MM}/{1:yyyy} {2}", row[5], row[11], row[6]); sb.Append(buchungstext); sb.Append(";"); - sb.Append(String.Format("{0}", row[7])); // Sollkonto - Kundennr. Kostenträger + sb.Append(String.Format("{0}", row[2])); // Sollkonto - Debitornr. Klient //bis 06/2025 Kundennr. Kostenträger sb.Append(";"); String hbnKto = "S82026"; // Habenkonto für BG1 und BG" if (row[8].ToString().Contains("Wegevergütung")) @@ -103,7 +103,13 @@ ib.AccountingPeriodEnd, sb.Append(String.Format("{0:0.00}", row[3])); sb.Append(";EUR;;;"); sb.Append(String.Format("{0}", row[9])); - sb.Append(";;;;;11"); + sb.Append(";;;;;"); + String kreis = "11"; // Buchungskreis für Team Inklusionsdienst oder KEIN Team = 12 sonst 11 + if (row[12].ToString().Contains("Inklusionsdienst") || row[12].ToString() == null) + { + kreis = "12"; + } + sb.Append(String.Format("{0}", kreis)); } return sb.ToString(); @@ -117,7 +123,7 @@ SELECT cb2sc.Oid, ib.InvoiceNumber, c.DebitorNumber, -Round(ii.AmountTotal, 2) AS 'Betrag', +Round(ii.GrossAmountTotal, 2) AS 'Betrag', ib.InvoiceDate, org.Name AS 'VerwendungOrg', CONCAT(p.`LastName`, ', ', p.`FirstName`) as 'VerwendungPerson', @@ -126,7 +132,7 @@ ii.ItemDescription, c.CostCenter, ib.Oid, ib.AccountingPeriodEnd, -(select t.name from team t inner join team2customer t2c on t2c.teamoid = t.oid where t2c.customeroid = c.Oid limit 1) +(select t.name from team t inner join team2customer t2c on t2c.teamoid = t.oid where t2c.customeroid = c.Oid limit 1) AS Team FROM `supportconcept` sc INNER JOIN `costbearer2supportconcept` cb2sc ON sc.`Oid` = cb2sc.`SupportConceptOid` INNER JOIN `costbearer` cb ON cb2sc.`CostBearerOid` = cb.`Oid`