diff --git a/ReportImp/InputFamilienhilfe/CustomReportCreator.cs b/ReportImp/InputFamilienhilfe/CustomReportCreator.cs index 0b68950b9..677d0c7fa 100644 --- a/ReportImp/InputFamilienhilfe/CustomReportCreator.cs +++ b/ReportImp/InputFamilienhilfe/CustomReportCreator.cs @@ -49,7 +49,7 @@ namespace InputFamilienhilfe { XtraReport invoiceReport = null; - if (iDC.ServiceInvoicePeriods.Count > 0 && iDC.ServiceInvoicePeriods[0].SupportConceptApprovalPeriod.ServiceCategory != null + if (iDC.ServiceInvoicePeriods.Count > 0 && iDC.ServiceInvoicePeriods[0].Customer.CustomerAlias != null && iDC.ServiceInvoicePeriods[0].Customer.CustomerAlias.ToLower() != "aws" && iDC.ServiceInvoicePeriods[0].Customer.CustomerAlias.ToLower() != "bjw" && @@ -230,33 +230,33 @@ namespace InputFamilienhilfe private XtraReport CreateServicesOverviewReportForRo(ServicesOverviewRO ro, long? serviceCategoryOid) { IBeWoReport report = null; - if (serviceCategoryOid != null && serviceCategoryOid == 11) - { + //if (serviceCategoryOid != null && serviceCategoryOid == 11) + //{ report = new InputFamilienhilfe.StundennachweisBetrUmgang(); - } - else if (serviceCategoryOid != null && serviceCategoryOid != 11) - { - report = new InputFamilienhilfe.Stundennachweis(); - } - else - { - if (ro.Services != null) - { - foreach (ServicesOverviewRO.ServiceDetail s in ro.Services) - { - if (s.ServiceCategory.ToLower().Contains("betreuter umgang")) - { - report = new InputFamilienhilfe.StundennachweisBetrUmgang(); - break; - } - else - { - report = new InputFamilienhilfe.Stundennachweis(); - break; - } - } - } - } + //} + //else if (serviceCategoryOid != null && serviceCategoryOid != 11) + //{ + // report = new InputFamilienhilfe.Stundennachweis(); + //} + //else + //{ + // if (ro.Services != null) + // { + // foreach (ServicesOverviewRO.ServiceDetail s in ro.Services) + // { + // //if (s.ServiceCategory.ToLower().Contains("betreuter umgang")) // alter Beleg kann wohl weg + // //{ + // report = new InputFamilienhilfe.StundennachweisBetrUmgang(); + // break; + // //} + // //else + // //{ + // // report = new InputFamilienhilfe.Stundennachweis(); + // // break; + // //} + // } + // } + //} report.SetReportDataSource(ro); return report as XtraReport; }