ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MH: Alzey Diverses

Browse Source
This commit is contained in:
HirschleM
2025-08-01 11:07:09 +02:00
parent cc3758a51a
commit 464c6081c2
4 changed files with 3 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ReportImp/AlzeyTeilhabe/AlzeyTeilhabe.csproj
View File

@@ -101,12 +101,6 @@
<Compile Include="StundenzettelBi2.Designer.cs"> <Compile Include="StundenzettelBi2.Designer.cs">
<DependentUpon>StundenzettelBi2.cs</DependentUpon> <DependentUpon>StundenzettelBi2.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="StundenzettelBi.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="StundenzettelBi.Designer.cs">
<DependentUpon>StundenzettelBi.cs</DependentUpon>
</Compile>
<Compile Include="StundenzettelSoziotherapie.cs"> <Compile Include="StundenzettelSoziotherapie.cs">
<SubType>Component</SubType> <SubType>Component</SubType>
</Compile> </Compile>
@@ -170,9 +164,6 @@
<EmbeddedResource Include="StundenzettelBi2.resx"> <EmbeddedResource Include="StundenzettelBi2.resx">
<DependentUpon>StundenzettelBi2.cs</DependentUpon> <DependentUpon>StundenzettelBi2.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="StundenzettelBi.resx">
<DependentUpon>StundenzettelBi.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="StundenzettelSoziotherapie.resx"> <EmbeddedResource Include="StundenzettelSoziotherapie.resx">
<DependentUpon>StundenzettelSoziotherapie.cs</DependentUpon> <DependentUpon>StundenzettelSoziotherapie.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>

2
ReportImp/AlzeyTeilhabe/CustomReportCreator.cs
View File

@@ -108,7 +108,7 @@ namespace AlzeyTeilhabe
} }
} }
if (kt == "Kreisverwaltung Mainz-Bingen") if (kt == "Kreisverwaltung Mainz-Bingen" && ro.StartDate.Date <= new DateTime(2025, 07, 31))
report = new AlzeyTeilhabe.StundenzettelBi2(); report = new AlzeyTeilhabe.StundenzettelBi2();
if (report == null && function == "Kostenträger Soziotherapie") if (report == null && function == "Kostenträger Soziotherapie")

10
ReportImp/AlzeyTeilhabe/RechnungPa.cs
View File

@@ -55,15 +55,7 @@ namespace AlzeyTeilhabe
DateTime start = pRO.AccountingPeriodStart; DateTime start = pRO.AccountingPeriodStart;
DateTime end = pRO.AccountingPeriodEnd; DateTime end = pRO.AccountingPeriodEnd;
var salutation = "Guten Tag " + pRO.RecipientContactPerson + ","; var salutation = "Sehr geehrte Damen und Herren,";
if (pRO.InvoiceBase != null && pRO.InvoiceBase.RecipientPersonOid.HasValue)
{
var person = DAOFactory.GenericDAO.GetByID<Person>(pRO.InvoiceBase.RecipientPersonOid.Value);
if (person != null && person.Sex != null && person.Sex == BS.Shared.Sex.Male)
salutation = "Sehr geehrter Herr " + person.LastName + ",";
else if (person != null && person.Sex != null && person.Sex == BS.Shared.Sex.Female)
salutation = "Sehr geehrte Frau " + person.LastName + ",";
}
if (pRO.CustomerSalutation == "Herr") if (pRO.CustomerSalutation == "Herr")
lblAbrechnungstext.Text = string.Format("{0}\n\nfür die Betreuung unseres Klienten Herr {1}, geboren am {2:dd.MM.yyyy}," + lblAbrechnungstext.Text = string.Format("{0}\n\nfür die Betreuung unseres Klienten Herr {1}, geboren am {2:dd.MM.yyyy}," +

2
ReportImp/AlzeyTeilhabe/StundenzettelWo.cs
View File

@@ -148,7 +148,7 @@ namespace AlzeyTeilhabe
{ {
var list = DAOFactory.GenericDAO.GetAllActive<ServiceDescription>(); var list = DAOFactory.GenericDAO.GetAllActive<ServiceDescription>();
var wegepauschale = list.FirstOrDefault(s => s.ServiceCategory.Name == "EGH_2025 neuer LRV" && s.Name == "Wegepauschale" || var wegepauschale = list.FirstOrDefault(s => s.ServiceCategory.Name == "EGH_2025 neuer LRV" && s.Name == "Wegepauschale" ||
s.ServiceCategory.Name == "EGH_2025 neuer LVR" && s.Name == "Wegepauschale"); s.ServiceCategory.Name == "Eingliederungshilfe" && s.Name == "Wegepauschale (WP)");
if (wegepauschale != null && wegepauschale.CostRatePeriods != null && wegepauschale.CostRatePeriods.Count > 0) if (wegepauschale != null && wegepauschale.CostRatePeriods != null && wegepauschale.CostRatePeriods.Count > 0)
{ {
var crpList = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(wegepauschale.CostRatePeriods); var crpList = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(wegepauschale.CostRatePeriods);