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

MH: MoveAUT Selbstzahlerrechnung

Browse Source
This commit is contained in:
Marcel Hirschle
2023-10-06 13:15:58 +02:00
parent 5b0a57ac6c
commit 417eaf1197
4 changed files with 19 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ReportImp/AutismusKoelnBonn/BasisRechnung.cs
View File

@@ -116,6 +116,8 @@ namespace AutismusKoelnBonn
{
foreach (var ii in sip.ServiceInvoiceItems)
{
if (ii.ServiceDescription.ToLower().Contains("fehlkontakt"))
continue;
if (ii.ServiceDescription != "Fallpauschale")
ii.ServiceDescription = "Fachleistungsstunden";
}

2
ReportImp/AutismusKoelnBonn/BudgetnachweisAnhang.Designer.cs generated
View File

@@ -1042,7 +1042,7 @@
this.xrTableCell15.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SettlementDC.CustomerReferenceNumber", "Az LWL: {0}")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SettlementDC.CustomerReferenceNumber", "Az: {0}")});
this.xrTableCell15.Name = "xrTableCell15";
this.xrTableCell15.StylePriority.UseBorders = false;
this.xrTableCell15.StylePriority.UsePadding = false;

19
ReportImp/AutismusKoelnBonn/BudgetnachweisAnhang.cs
View File

@@ -21,27 +21,16 @@ namespace BeWo.Report.DefaultReports
{
var costrate = pRO.Entgeltzeitraeume[item.Entgeltzeitraum - 1].CostRatePeriod.CostRateValue;
var betragFLS = (item.SummeMinuten / 60) * costrate.Value * (pRO.RateFactor / 100 + 1);
var betragFehlkontakte = (item.SummeFehlkontakte / 60) * costrate.Value * 0.8m;
var betragFLS = (decimal)Math.Round((double)(item.SummeMinuten / 60), 2,MidpointRounding.AwayFromZero) * costrate.Value * (pRO.RateFactor / 100 + 1);
var betragFehlkontakte = (decimal)Math.Round((double)(item.SummeFehlkontakte / 60), 2, MidpointRounding.AwayFromZero) * costrate.Value * 0.8m;
item.Betrag = betragFLS + betragFehlkontakte;
summeBetragFLS += betragFLS.Value;
summeBetragFehlkontakt += betragFehlkontakte.Value;
summeBetragFLS += betragFLS;
summeBetragFehlkontakt += betragFehlkontakte;
}
tcBetragFLS.Text = string.Format("{0:c}", summeBetragFLS);
tcBetragFehlkontakte.Text = string.Format("{0:c}", summeBetragFehlkontakt);
if (!String.IsNullOrEmpty(pRO.CustomerDC.LastName))
{
//pRO.CustomerDC.LastName = pRO.CustomerDC.LastName.Replace("/", "").Replace("LWL Psych", "").Replace("LWL Sucht", "").Trim();
}
//if (pRO.Transaktionen != null)
//{
// pRO.Transaktionen = pRO.Transaktionen.OrderBy(o => o.Belegdatum).ToList();
//}
bindingSource1.DataSource = pRO;
}

24
ReportImp/AutismusKoelnBonn/Invoicing/SelbstzahlerInvoiceCreation.cs
View File

@@ -157,11 +157,11 @@ namespace AutismusKoelnBonn.Invoicing
{
if (!iServiceRecord.AlreadyAccounted)
{
if (abrechenbarkeiten["Ausfallzeiten"] == false && iServiceRecord.ServiceDescription.Name.ToLower() == "fehlkontakt")
{
iServiceRecord.AlreadyAccounted = true;
continue;
}
//if (abrechenbarkeiten["Ausfallzeiten"] == false && iServiceRecord.ServiceDescription.Name.ToLower() == "fehlkontakt")
//{
// iServiceRecord.AlreadyAccounted = true;
// continue;
//}
if (abrechenbarkeiten["Mittelbar"] == true && iServiceRecord.ServiceDescription.Category.IsBillable == false)
{
iServiceRecord.ServiceDescription.Category.IsBillable = true;
@@ -189,12 +189,13 @@ namespace AutismusKoelnBonn.Invoicing
var invoiceItem = new InvoiceItem();
BillingData bd = calc.GetBillingData(iServiceRecord);
//if (iServiceRecord.ServiceDescription.Name.ToLower() == "wegezeit")
//{
// bd.AmountPerUnit = AbrechenbarkeitenHelper.GetWegezeitBetrag(scap.CostBearer2SupportConcept.CostBearer.Organisation.VarFieldValueList);
// bd.AmountTotal = bd.UnitCount * bd.AmountPerUnit;
// bd.GrossAmountTotal = bd.AmountTotal;
//}
if (iServiceRecord.ServiceDescription.Name.ToLower().Contains("fehlkontakt"))
{
bd.RateFactor = null;
bd.AmountTotal = bd.UnitCount * bd.AmountPerUnit;
bd.GrossAmountTotal = bd.AmountTotal;
}
invoiceItem.AmountPerUnit = bd.AmountPerUnit;
invoiceItem.UnitCount = bd.UnitCount;
@@ -210,7 +211,6 @@ namespace AutismusKoelnBonn.Invoicing
invoiceItem.SupportConceptApprovalPeriodOid = scap.Oid;
if (iServiceRecord.ServiceDescription.Name.ToLower().Contains("fehlkontakt") || (iServiceRecord.ServiceDescription.ProzentAbrechnung.HasValue && iServiceRecord.ServiceDescription.ProzentAbrechnung.Value < 100))
{
invoiceItem.RateFactor = null;
invoiceItem.GrossAmountTotal = invoiceItem.AmountTotal;
}