HPHBersenbrueck/Export/MicosExporter - Ergänzung Sachkonto je nach Kostenträger

This commit is contained in:
2024-03-22 10:39:45 +01:00
parent c77be50b24
commit 16adc28bd3
3 changed files with 60 additions and 6 deletions

View File

@@ -164,7 +164,8 @@ CONCAT(p.`LastName`, ', ', p.`FirstName`, ' ', IF(cb2sc.CustomerRefenrenceNumber
betrag = "0" + betrag;
}
sb.Append(betrag);
sb.Append("0004040");
sb.Append("000");
sb.Append(data.Sachkonto);
sb.Append(" ");
sb.Append(String.Format("{0:ddMMyy}", data.RechnungsDatum)); // Belegdatum
String belegnummer = data.Belegnummer; // Belegnummer
@@ -321,11 +322,36 @@ CONCAT(p.`LastName`, ', ', p.`FirstName`, ' ', IF(cb2sc.CustomerRefenrenceNumber
}
String belegnummer = String.Format("{0}", row[1]); // Belegnummer
String kostenstelle = GetKostenstelle(row);
String buchungstext = String.Format("{0}", row[5]); // Verwendungszweck
String artikel = String.Format("{0}", row[6]); // Verwendungszweck
//Sachkonten aus Organisation - Debitornummer - Versicherung gegen Fehleintragungen...
String sachkonto = "4000";
if (row[10] != null)
{
var konto = String.Format("{0}", row[10]);
if (konto.Length == 4)
{
sachkonto = konto;
}
else if (konto.Contains("4000"))
{
sachkonto = "4000";
}
else if (konto.Contains("4010"))
{
sachkonto = "4010";
}
else if (konto.Contains("4020"))
{
sachkonto = "4020";
}
else if (konto.Contains("4040"))
{
sachkonto = "4040";
}
}
MicosDatensatz md = null;
String key = String.Format("{0}_{1}", oid, artikel);
@@ -345,14 +371,13 @@ CONCAT(p.`LastName`, ', ', p.`FirstName`, ' ', IF(cb2sc.CustomerRefenrenceNumber
md.Debitor = debitornr;
md.Datum = abrechnungsEnddatum;
md.RechnungsDatum = rd;
md.Sachkonto = sachkonto;
key2Datensatz.Add(key, md);
list.Add(md);
}
md.Betrag += betrag;
}
return list;
@@ -417,7 +442,8 @@ CONCAT(p.`LastName`, ', ', p.`FirstName`, ' ', org.Name) as 'Verwendung',
ii.ItemDescription,
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),
org.Debitornumber
FROM `supportconcept` sc
INNER JOIN `costbearer2supportconcept` cb2sc ON sc.`Oid` = cb2sc.`SupportConceptOid`
INNER JOIN `costbearer` cb ON cb2sc.`CostBearerOid` = cb.`Oid`
@@ -484,5 +510,7 @@ ORDER BY p.`LastName`, p.`FirstName`, cb2sc.`ApprovedStartDate`
public String Buchungstext { get; set; }
public String Artikelbezeichnung { get; set; }
public String Sachkonto { get; set; }
}
}

View File

@@ -134,6 +134,7 @@
<DependentUpon>Teamauslastung.cs</DependentUpon>
</Compile>
<Compile Include="HphAuslastungBerechnung.cs" />
<Compile Include="Translation\TranslationDictionary.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="CustomerDataReport.resx">

View File

@@ -0,0 +1,25 @@
using System;
using System.Collections.Generic;
using System.Linq;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Service.DCEntityMapper;
using BeWo.Service.Plugins;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
namespace HPHBersenbrueck.Translation
{
public class CustomTranslationDictionary : TranslationDictionary
{
public override Dictionary<String, String> GetTranslationDictionary()
{
var dict = base.GetTranslationDictionary();
AddOrReplaceTranslation(dict, "Kundennummer", "Sachkonto");
return dict;
}
}
}