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

Merge branch 'master' of ssh://float.ownsoft.de/git/beyondSoft/BeWo

Browse Source
This commit is contained in:
HirschleM
2025-03-20 08:12:38 +01:00
parent 27679f549b eac53214e8
commit 0a29a0ee28
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ReportImp/DiakonieKKKleve/Finanzauswertung.cs
View File

@@ -270,7 +270,7 @@ namespace BeWo.DiakonieKKKleve
}
else
{
if (!sr.ServiceDescription.Name.ToLower().Contains("telefon"))
if (sr.ServiceDescription.Name.ToLower().Contains("aufsuchend"))
{
if (!hatHBimZeitraum && sr.Start >= start && sr.Start < end.Date.AddDays(1))
{

26
ReportImp/DiakonieKKKleve/Invoicing/DiakonieKKKleveSoziotherapieInvoiceCreation.cs
View File

@@ -1,7 +1,9 @@
using BeWo.Data.Entities;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Service.Invoicing;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Services;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -14,8 +16,26 @@ namespace DiakonieKKKleve.Invoicing
{
public override InvoiceItem CreateInvoiceItem(ServiceRecordDC iServiceRecord, SupportConceptApprovalPeriod scap, BS.Shared.Services.Calculations calc)
{
var ii = base.CreateInvoiceItem(iServiceRecord, scap, calc);
var ii= new InvoiceItem();
BillingData bd = calc.GetBillingData(iServiceRecord);
ii.AmountPerUnit = bd.AmountPerUnit;
ii.UnitCount = bd.UnitCount;
ii.AmountTotal = bd.AmountTotal;
ii.ItemPeriodStart = bd.BillingPeriodStart;
ii.ItemPeriodEnd = bd.BillingPeriodEnd;
ii.RateFactor = bd.RateFactor;
ii.GrossAmountTotal = bd.GrossAmountTotal;
ii.AccountingInterval = bd.AccountingInterval;
ii.ItemDescription = iServiceRecord.ServiceDescription.Name;
ii.ServiceRecord = DAOFactory.GenericDAO.LoadByID<ServiceRecord>(iServiceRecord.ServiceRecordOid.Value);
if (scap != null)
ii.SupportConceptApprovalPeriodOid = scap.Oid;
if (iServiceRecord.ServiceDescription.Name.ToLower().Contains("fehlkontakt") || (iServiceRecord.ServiceDescription.ProzentAbrechnung.HasValue && iServiceRecord.ServiceDescription.ProzentAbrechnung.Value < 100))
{
ii.RateFactor = null;
ii.GrossAmountTotal = ii.AmountTotal;
}
if (ii.ItemDescription.ToLower().Contains("probe"))
{
ii.UnitDescription = "GPos: 2001607";