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

MH: Anpassung für varo

Browse Source
This commit is contained in:
Marcel Hirschle
2022-08-03 10:50:36 +02:00
parent 97fcc669c1
commit 9de3d0f7a0
3 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ReportImp/VaroSozialagentur/Invoicing/CustomInvoiceCreation.cs
View File

@@ -126,7 +126,7 @@ namespace VaroSozialagentur.Invoicing
{
foreach (var sa in scap.CostBearer2SupportConcept.SupportConcept.ServiceAccountings)
{
if (sa.ServiceDescription != null && sa.ServiceDescription.Name.Contains("Zone"))
if (sa.ServiceDescription != null && sa.ServiceDescription.Name.Contains("Zone") || sa.ServiceDescription != null && sa.ServiceDescription.Name.ToLower().Contains("wegzeitenpauschale"))
{
var crlist = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(sa.ServiceDescription.CostRatePeriods);
@@ -137,7 +137,11 @@ namespace VaroSozialagentur.Invoicing
int count = 0;
foreach (var sr in serviceRecordsInPeriod)
{
if (!sr.ServiceDescription.CategoryName.Contains("Fahrt"))
//if (!sr.ServiceDescription.CategoryName.Contains("Fahrt"))
//{
// count++;
//}
if (sr.ServiceDescription.Name.Contains("face to face"))
{
count++;
}

8
ReportImp/VaroSozialagentur/QuittierungsbelegHannover.Designer.cs generated
View File

@@ -290,7 +290,7 @@ namespace VaroSozialagentur
this.xrTableCell50.StylePriority.UseFont = false;
this.xrTableCell50.StylePriority.UsePadding = false;
this.xrTableCell50.StylePriority.UseTextAlignment = false;
this.xrTableCell50.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell50.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell50.Weight = 0.12744986651559134D;
//
// GroupHeader1
@@ -640,7 +640,7 @@ namespace VaroSozialagentur
this.xrLabel5.StylePriority.UseFont = false;
this.xrLabel5.StylePriority.UsePadding = false;
this.xrLabel5.StylePriority.UseTextAlignment = false;
this.xrLabel5.Text = "incl. dieser Abrechnung";
this.xrLabel5.Text = "excl. dieser Abrechnung";
this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
// xrLabel3
@@ -1018,8 +1018,8 @@ namespace VaroSozialagentur
this.xrLabel16.StylePriority.UseFont = false;
this.xrLabel16.StylePriority.UseForeColor = false;
this.xrLabel16.StylePriority.UseTextAlignment = false;
this.xrLabel16.Text = "Muster -Leistungsnachweis Assistenz beim Wohnen außerhalb der besonderen Wohnfor" +
"m i.S.d. § 42 a Abs.2 Nr. 2 SGB XII im Falle einer Monatsabrechnung";
this.xrLabel16.Text = "Leistungsnachweis Assistenz beim Wohnen außerhalb der besonderen Wohnform i.S.d. " +
"§ 42 a Abs.2 Nr. 2 SGB XII";
this.xrLabel16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrPictureBox1

20
ReportImp/VaroSozialagentur/QuittierungsbelegHannover.cs
View File

@@ -2,6 +2,7 @@ using System;
using System.Collections.Generic;
using System.Drawing;
using System.IO;
using System.Linq;
using System.Text.RegularExpressions;
using BeWo.Report;
using BeWo.Report.ReportObjects;
@@ -30,6 +31,11 @@ namespace VaroSozialagentur
bool hatGruppen = false;
double minuten = 0;
var cr = pRO.CostBearer2SupportConceptList[0].CostBearer.CostRatePeriods.Where(p => p.CostRateType == CostRatePeriodType.MinutesPerServiceUnit).OrderBy(c => c.EndDate).ToList();
var currentFLSUnit = cr.FirstOrDefault(c => c.EndDate >= pRO.EndDate);
if (currentFLSUnit == null)
currentFLSUnit = cr[0];
if (pRO.Services != null)
{
List<ServicesOverviewRO.ServiceDetail> servicesBillable = new List<ServicesOverviewRO.ServiceDetail>();
@@ -55,6 +61,7 @@ namespace VaroSozialagentur
if (sd.ServiceCategory.ToLower() == "fachleistungsstunde" && sd.ServiceDescription.ToLower() == "face to face")
{
sd.Notice4 = "1";
summeWegepauschalen++;
}
else
sd.Notice4 = "";
@@ -92,16 +99,13 @@ namespace VaroSozialagentur
pRO.TotalFLMBillable = minuten;
lblRestbudget.Text = String.Format("{0:0.00}", pRO.ApprovedFLSTotal - ((pRO.MinutenGeleistetGesamt + Convert.ToDecimal(minuten)) / 60));
foreach (var s in pRO.Services)
s.FLSQualified = s.MinutesQualified / Convert.ToDouble(currentFLSUnit.CostRateValue);
pRO.TotalFLSQualified = pRO.TotalFLMQualified / Convert.ToDouble(currentFLSUnit.CostRateValue);
lblRestbudget.Text = String.Format("{0:0.00}", pRO.ApprovedFLSTotal - pRO.MinutenGeleistetGesamt / currentFLSUnit.CostRateValue);
//if (String.IsNullOrWhiteSpace(pRO.AbsenceTimes))
// lblHatAbwesenheiten.Text = "X";
//if (!hatGruppen)
// lblHatGruppen.Text = "X";
//ErstelleAbwesenheitenTabelle(pRO);
bindingSource1.DataSource = pRO;
}