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

HshCologne - Finetuning für Erftstadt

Browse Source
This commit is contained in:
Alexandra
2025-11-27 11:34:04 +01:00
parent f4b829dcf0
commit e1c3797b7e
3 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ReportImp/HshCologne/Invoicing/CustomInvoiceCreation.cs
View File

@@ -144,12 +144,12 @@ namespace HshCologne.Invoicing
{
var ii = base.CreateInvoiceItem(iServiceRecord, scap, calc);
ii.UnitDescription = "Fachkraft";
//if (iServiceRecord.CostBearer.Name.Contains("Erftstadt")) // brauchen explizite Zeitangaben, aber Einheit sind 45 min
//{
// ii.UnitCount = Math.Round((decimal)(ii.UnitCount / 45 * 60), 2, MidpointRounding.AwayFromZero);
// ii.AmountTotal = ii.AmountPerUnit * ii.UnitCount;
// ii.GrossAmountTotal = ii.AmountPerUnit * ii.UnitCount;
//}
if (iServiceRecord.CostBearer.Name.Contains("Erftstadt")) // brauchen explizite Zeitangaben, aber Einheit sind 45 min
{
ii.UnitCount = Math.Round((decimal)(ii.UnitCount / 45 * 60), 2, MidpointRounding.AwayFromZero);
ii.AmountTotal = ii.AmountPerUnit * ii.UnitCount;
ii.GrossAmountTotal = ii.AmountPerUnit * ii.UnitCount;
}
if (iServiceRecord.GroupOid.HasValue)
{
ii.Notice = "x";

26
ReportImp/HshCologne/LeistungsnachweisFamilienhilfe.cs
View File

@@ -17,26 +17,18 @@ namespace HshCologne
public void SetReportDataSource(ServicesOverviewRO pRO)
{
Organisation org = null;
cellDatum.Text = String.Format("Datum {0:dd.MM.yyyy}", DateTime.Now);
this.lblHeader.Text = "Leistungsnachweis";
this.lblHeader.Text = "Leistungsnachweis";
if (pRO.CostBearer2SupportConceptList != null && pRO.CostBearer2SupportConceptList.Count > 0)
{
var c2s = pRO.CostBearer2SupportConceptList[0];
var org = c2s.CostBearer.Organisation;
org = c2s.CostBearer.Organisation;
if (org.Name.Contains("Jugendamt"))
{
this.lblHeader.Text = "Leistungsnachweis\r\nfür das ";
//var name = org.Name.Replace("Jugendamt", "").Trim();
this.lblHeader.Text += org.Name;
}
if (c2s.CostBearerContactPerson != null)
@@ -48,7 +40,6 @@ namespace HshCologne
if (pRO.CustomerOid > 0)
{
var c = DAOFactory.GenericDAO.LoadByID<Customer>(pRO.CustomerOid);
cellKinder.Text = c.Childs;
}
@@ -60,18 +51,18 @@ namespace HshCologne
foreach (ServicesOverviewRO.ServiceDetail s in pRO.Services)
{
//if (s.IsBillable)
// servicesBillable.Add(s);
if (!empDict.ContainsKey(s.EmployeeFullname))
{
empDict.Add(s.EmployeeFullname, s.EmployeeFullname);
}
// es werden überall nur die FLS als Dauer direkt in 45 Min Einheiten erfasst, außer Erftstadt
if (pRO.StartDate > new DateTime(2025,10,31) && org != null && org.Name.Contains("Erftstadt"))
{
s.Minutes = Math.Round((s.Minutes / 45 * 60), 2, MidpointRounding.AwayFromZero);
}
emp = s.EmployeeFullname;
s.TimeRangeString = String.Format("{0:ddd}./{0:dd.MM.}", s.StartDate);
}
//pRO.Services = servicesBillable;
}
if (empDict.Count == 1)
@@ -89,6 +80,5 @@ namespace HshCologne
}
this.bindingSource1.DataSource = pRO;
}
}
}

2
ReportImp/HshCologne/LeistungsnachweisSchulbegleitung.cs
View File

@@ -121,7 +121,5 @@ namespace HshCologne
this.bindingSource1.DataSource = pRO;
}
}
}