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

Bezeichnung von Team intern/extern angepasst

Browse Source
This commit is contained in:
Christian
2026-05-07 00:49:19 +02:00
parent 88186797a8
commit 158f1b0596
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ReportImp/PraxisPusteblume/IfsSammelRechnung.cs
View File

@@ -132,7 +132,7 @@ namespace PraxisPusteblume
{
i.ServiceDescription = "";
}
if (i.ServiceDescription == "Team")
if (i.ServiceDescription == "Team" || i.ServiceDescription == "Team (intern)")
{
teamPreis += i.NetAmount ?? 0;
teamStunden += i.UnitCount ?? 0;
@@ -142,7 +142,7 @@ namespace PraxisPusteblume
investPreis += i.NetAmount ?? 0;
investStunden += i.UnitCount ?? 0;
}
else if (i.ServiceDescription.Contains("Vernetzung"))
else if (i.ServiceDescription.Contains("Vernetzung") || i.ServiceDescription == "Team (extern)")
{
vernetzungPreis += i.NetAmount ?? 0;
vernetzungStunden = 1;
@@ -166,7 +166,7 @@ namespace PraxisPusteblume
mobilPreis += GetGrossAmount(i);
mobilStunden += i.UnitCount ?? 0;
}
else if (i.ServiceRecord.ServiceDescription.Name.ToLower().Contains("ambulant"))
else
{
ambulantPreis += GetGrossAmount(i);
ambulantStunden += i.UnitCount ?? 0;
@@ -257,12 +257,13 @@ namespace PraxisPusteblume
preisInvest = GetPreis(preise, "Invest (TS)", pRO.AccountingPeriodStart);
}
preisTeam = GetPreis(preise, "Team", pRO.AccountingPeriodStart);
preisTeam = GetPreis(preise, "Team (intern)", pRO.AccountingPeriodStart);
}
if (pRO.AccountingPeriodStart >= new DateTime(2025, 09, 01))
{
var preise = DAOFactory.GenericDAO.GetAllActive<Preis>();
preisVernetzung = GetPreis(preise, "Team Vernetzung", pRO.AccountingPeriodStart);
//preisVernetzung = GetPreis(preise, "Team Vernetzung", pRO.AccountingPeriodStart);
preisVernetzung = GetPreis(preise, "Team (extern)", pRO.AccountingPeriodStart);
preisGruppeInter = 42.18m;
}

8
ReportImp/PraxisPusteblume/Invoicing/IFSSammelInvoiceCreation.cs
View File

@@ -182,7 +182,7 @@ namespace PraxisPusteblume.Invoicing
private InvoiceItem CreateVernetzungInvoiceItem(SupportConceptApprovalPeriodDC scap, DateTimeSpan invoicePeriod)
{
var preisVernetzung = base.GetPreis("Team Vernetzung", invoicePeriod.StartDate);
var preisVernetzung = base.GetPreis("Team (extern)", invoicePeriod.StartDate);
var invoiceItem = new InvoiceItem();
invoiceItem.AmountPerUnit = preisVernetzung;
invoiceItem.UnitCount = 1;
@@ -191,7 +191,7 @@ namespace PraxisPusteblume.Invoicing
invoiceItem.ItemPeriodStart = invoicePeriod.StartDate;
invoiceItem.ItemPeriodEnd = invoicePeriod.EndDate;
invoiceItem.GrossAmountTotal = invoiceItem.AmountTotal;
invoiceItem.ItemDescription = String.Format("Team Vernetzung");
invoiceItem.ItemDescription = String.Format("Team (extern)");
if (scap != null)
invoiceItem.SupportConceptApprovalPeriodOid = scap.SupportConceptApprovalPeriodOid;
@@ -229,7 +229,7 @@ namespace PraxisPusteblume.Invoicing
}
if (invoicePeriod.StartDateTime >= new DateTime(2024,08,01))
{
betrag = base.GetPreis("Team", invoicePeriod.StartDate);
betrag = base.GetPreis("Team (intern)", invoicePeriod.StartDate);
}
var invoiceItem = new InvoiceItem();
@@ -240,7 +240,7 @@ namespace PraxisPusteblume.Invoicing
invoiceItem.ItemPeriodStart = invoicePeriod.StartDate;
invoiceItem.ItemPeriodEnd = invoicePeriod.EndDate;
invoiceItem.GrossAmountTotal = invoiceItem.AmountTotal;
invoiceItem.ItemDescription = String.Format("Team");
invoiceItem.ItemDescription = String.Format("Team (intern)");
if (scap != null)
invoiceItem.SupportConceptApprovalPeriodOid = scap.SupportConceptApprovalPeriodOid;