diff --git a/BeWo/ViewModel/ListViewModel/ServiceRecordListVM.cs b/BeWo/ViewModel/ListViewModel/ServiceRecordListVM.cs index fa8c9a23d..1ad9f8f1e 100644 --- a/BeWo/ViewModel/ListViewModel/ServiceRecordListVM.cs +++ b/BeWo/ViewModel/ListViewModel/ServiceRecordListVM.cs @@ -1808,7 +1808,7 @@ namespace BeWo.ViewModel.ListViewModel { foreach (var cat in _Category2Services.Keys) { - if (cat.OhneHilfeplan.HasValue && cat.OhneHilfeplan.Value != AccountingvisibilityType.NichtKlientenbezogen) + if (cat.OhneHilfeplan.HasValue && cat.OhneHilfeplan.Value != AccountingvisibilityType.NichtKlientenbezogen && cat.OhneHilfeplan.Value != AccountingvisibilityType.Never) { var descList = _Category2Services[cat]; foreach (var desc in descList) diff --git a/BeWo/ViewModel/ServiceRecordVM.cs b/BeWo/ViewModel/ServiceRecordVM.cs index 09b59deb7..4627e00a3 100644 --- a/BeWo/ViewModel/ServiceRecordVM.cs +++ b/BeWo/ViewModel/ServiceRecordVM.cs @@ -2248,6 +2248,10 @@ namespace BeWo.ViewModel { add = false; } + else if (cat.OhneHilfeplan.HasValue && cat.OhneHilfeplan.Value == AccountingvisibilityType.Never) + { + add = false; + } if (add) { newCategoryDict.Add(cat, allDict[cat]); diff --git a/Service/ServiceImplementations/OperationsServiceImp.cs b/Service/ServiceImplementations/OperationsServiceImp.cs index ab2962cdc..a060f8f3c 100644 --- a/Service/ServiceImplementations/OperationsServiceImp.cs +++ b/Service/ServiceImplementations/OperationsServiceImp.cs @@ -519,7 +519,7 @@ namespace BeWo.Service.ServiceImplementations { try { - IList list = DAOFactory.GenericDAO.GetAllActive(); + IList list = DAOFactory.GenericDAO.GetAllActive()/*.Where(sc => !sc.OhneHilfeplan.HasValue || sc.OhneHilfeplan.HasValue && sc.OhneHilfeplan.Value != AccountingvisibilityType.Never).ToList()*/; var dcList = MapperFactory.ServiceCategoryDC_ServiceCategory.MapToNewDCs(list); //AppSettings settings = AppSettings.CreateSettings();