diff --git a/ReportImp/HshCologne/Invoicing/CustomInvoiceCreation.cs b/ReportImp/HshCologne/Invoicing/CustomInvoiceCreation.cs index 23a151742..6e4fc92a0 100644 --- a/ReportImp/HshCologne/Invoicing/CustomInvoiceCreation.cs +++ b/ReportImp/HshCologne/Invoicing/CustomInvoiceCreation.cs @@ -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"; diff --git a/ReportImp/HshCologne/LeistungsnachweisFamilienhilfe.cs b/ReportImp/HshCologne/LeistungsnachweisFamilienhilfe.cs index 587d5dcb8..f0b8feaef 100644 --- a/ReportImp/HshCologne/LeistungsnachweisFamilienhilfe.cs +++ b/ReportImp/HshCologne/LeistungsnachweisFamilienhilfe.cs @@ -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(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; } - } } diff --git a/ReportImp/HshCologne/LeistungsnachweisSchulbegleitung.cs b/ReportImp/HshCologne/LeistungsnachweisSchulbegleitung.cs index b0a3f8705..d95f2fe2d 100644 --- a/ReportImp/HshCologne/LeistungsnachweisSchulbegleitung.cs +++ b/ReportImp/HshCologne/LeistungsnachweisSchulbegleitung.cs @@ -121,7 +121,5 @@ namespace HshCologne this.bindingSource1.DataSource = pRO; } - - } }