From 12cc4966ec1befda6a1ae40818b29a26f7e11bf8 Mon Sep 17 00:00:00 2001
From: Christian <christian.baeurle@ownsoft.de>
Date: Fri, 24 Oct 2025 01:49:21 +0200
Subject: [PATCH] =?UTF-8?q?ownChat=20Teams=20zugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BeWo/ServiceProxy/GeneratedCustomerService.cs |   1 +
 BeWo/ServiceProxy/GeneratedEmployeeService.cs |  28 +-
 .../GeneratedGkvAccountingService.cs          | 389 +-----------------
 .../GeneratedOperationsEnhancedService.cs     |   9 -
 .../GeneratedOperationsService.cs             |   1 +
 BeWo/View/Detail/TeamView.xaml                | 298 +++++++-------
 BeWo/View/Detail/TeamView.xaml.cs             | 122 +++++-
 .../Navigation/TeamNavigationView.xaml.cs     |   2 +-
 BeWo/View/Search/CustomerSearchView.cs        |  11 +-
 BeWo/View/Search/EmployeeSearchView.cs        |   8 +-
 BeWo/ViewModel/TeamVM.cs                      |   7 +-
 ...ges_2025-10-23 Team Change EmployeeOid.txt |   9 +
 Service/DCEntityMapper/CompactTeamDC_Team.cs  |   6 +-
 Service/DCEntityMapper/TeamDC_Team.cs         |  12 +-
 .../CustomerServiceImp.cs                     |   5 +
 .../EmployeeServiceImp.cs                     |  21 +-
 .../Compact/ClientPartials/CompactTeamDC.cs   |   6 +-
 Shared/DataContracts/Compact/CompactTeamDC.cs |   3 +
 Shared/DataContracts/Person2TeamDC.cs         |  16 +
 19 files changed, 387 insertions(+), 567 deletions(-)
 create mode 100644 Model/Changes_2025-10-23 Team Change EmployeeOid.txt

diff --git a/BeWo/ServiceProxy/GeneratedCustomerService.cs b/BeWo/ServiceProxy/GeneratedCustomerService.cs
index b4c1f02fa..d70690468 100644
--- a/BeWo/ServiceProxy/GeneratedCustomerService.cs
+++ b/BeWo/ServiceProxy/GeneratedCustomerService.cs
@@ -264,6 +264,7 @@ namespace BeWo.ServiceProxy
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AppointmentDayOfWeek))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.Behinderungsart>))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Behinderungsart))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.VgaTypeEnum))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.Merkzeichen>))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Merkzeichen))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Pflegegrad))]
diff --git a/BeWo/ServiceProxy/GeneratedEmployeeService.cs b/BeWo/ServiceProxy/GeneratedEmployeeService.cs
index 71cbf0f5e..80cce9a3d 100644
--- a/BeWo/ServiceProxy/GeneratedEmployeeService.cs
+++ b/BeWo/ServiceProxy/GeneratedEmployeeService.cs
@@ -17,6 +17,10 @@ namespace BeWo.ServiceProxy
     public interface IEmployeeService
     {
         
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/LoadCompactTeam", ReplyAction="http://tempuri.org/IEmployeeService/LoadCompactTeamResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/IEmployeeService/LoadCompactTeamBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")]
+        BS.Shared.DataContracts.Compact.CompactTeamDC LoadCompactTeam(long pTeamOid);
+        
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/LoadCompactEmployee", ReplyAction="http://tempuri.org/IEmployeeService/LoadCompactEmployeeResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/IEmployeeService/LoadCompactEmployeeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")]
         BS.Shared.DataContracts.Compact.CompactEmployeeDC LoadCompactEmployee(long pEmployeeOid);
@@ -416,6 +420,11 @@ namespace BeWo.ServiceProxy
         [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetAllTeamsCompactBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")]
         System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactTeamDC> GetAllTeamsCompact();
         
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/GetAllTeamsIncludingOwnChatCompact", ReplyAction="http://tempuri.org/IEmployeeService/GetAllTeamsIncludingOwnChatCompactResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetAllTeamsIncludingOwnChatCompactBeWoFaultFa" +
+            "ult", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactTeamDC> GetAllTeamsIncludingOwnChatCompact();
+        
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/GetAssessmentSheetEntriesForCustomer", ReplyAction="http://tempuri.org/IEmployeeService/GetAssessmentSheetEntriesForCustomerResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetAssessmentSheetEntriesForCustomerBeWoFault" +
             "Fault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")]
@@ -560,10 +569,6 @@ namespace BeWo.ServiceProxy
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/GetAllGroups", ReplyAction="http://tempuri.org/IEmployeeService/GetAllGroupsResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetAllGroupsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")]
         System.Collections.Generic.List<BS.Shared.DataContracts.GroupOfPeopleDC> GetAllGroups(System.Nullable<long> employeeOid);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/LoadCompactTeam", ReplyAction="http://tempuri.org/IEmployeeService/LoadCompactTeamResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/IEmployeeService/LoadCompactTeamBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")]
-        BS.Shared.DataContracts.Compact.CompactTeamDC LoadCompactTeam(long pTeamOid);
     }
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
@@ -600,6 +605,11 @@ namespace BeWo.ServiceProxy
         {
         }
         
+        public BS.Shared.DataContracts.Compact.CompactTeamDC LoadCompactTeam(long pTeamOid)
+        {
+            return base.Channel.LoadCompactTeam(pTeamOid);
+        }
+        
         public BS.Shared.DataContracts.Compact.CompactEmployeeDC LoadCompactEmployee(long pEmployeeOid)
         {
             return base.Channel.LoadCompactEmployee(pEmployeeOid);
@@ -1055,6 +1065,11 @@ namespace BeWo.ServiceProxy
             return base.Channel.GetAllTeamsCompact();
         }
         
+        public System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactTeamDC> GetAllTeamsIncludingOwnChatCompact()
+        {
+            return base.Channel.GetAllTeamsIncludingOwnChatCompact();
+        }
+        
         public System.Collections.Generic.List<BS.Shared.DataContracts.AssessmentSheetEntryDC> GetAssessmentSheetEntriesForCustomer(long customerOid, System.DateTime startDt, System.DateTime endDt)
         {
             return base.Channel.GetAssessmentSheetEntriesForCustomer(customerOid, startDt, endDt);
@@ -1224,10 +1239,5 @@ namespace BeWo.ServiceProxy
         {
             return base.Channel.GetAllGroups(employeeOid);
         }
-        
-        public BS.Shared.DataContracts.Compact.CompactTeamDC LoadCompactTeam(long pTeamOid)
-        {
-            return base.Channel.LoadCompactTeam(pTeamOid);
-        }
     }
 }
diff --git a/BeWo/ServiceProxy/GeneratedGkvAccountingService.cs b/BeWo/ServiceProxy/GeneratedGkvAccountingService.cs
index 8fa8c6d4e..57971c3b6 100644
--- a/BeWo/ServiceProxy/GeneratedGkvAccountingService.cs
+++ b/BeWo/ServiceProxy/GeneratedGkvAccountingService.cs
@@ -19,111 +19,15 @@ namespace BeWo.ServiceProxy
         
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IGkvAccountingService/GetGkvAbrechnung", ReplyAction="http://tempuri.org/IGkvAccountingService/GetGkvAbrechnungResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/IGkvAccountingService/GetGkvAbrechnungBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Core.BeWoFault))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Core.BeWoFaultType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<object>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<long, string>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<long>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<long, BS.Shared.ValueListEntryType>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<long, long>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<string>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungViewFilterDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungCreateRequestDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.GkvAbrechnung.GkvTransferProtokollDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvTransferProtokollDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungCreateResponseDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvResponseDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungSendRequestDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungSendResponseDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungGetIKRequestDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungGetIKResponseDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactOrganisationDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactCustomerDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactEmployeeDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactSupportConceptDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactCostBearerDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactCostBearerDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactPersonDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.InvoiceBaseDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.InvoiceBaseDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.InvoiceItemDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.InvoiceItemDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ServiceRecordDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.CostRatePeriodDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.CostRatePeriodDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ValueListEntryDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.AbsenceTimeDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AbsenceTimeDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AbsenceReasonDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.ValueListEntryDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ServiceDescriptionDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ServiceCategoryDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.ContactDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ContactDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.SupportConceptCostBearerRelDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.SupportConceptApprovalPeriodDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.SupportConceptApprovalPeriodDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.BudgetDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.SupportConceptApprovalPeriodEmployeeRelDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.SupportConceptApprovalPeriodEmployeeRelDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Organisation2PersonDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Organisation2PersonDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.OrganisationDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.ArbeitszeitDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ArbeitszeitDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.ArbeitszeitEintragDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ArbeitszeitEintragDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.FeiertagDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.FeiertagDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AddressDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.BeWoDataContract))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.OrganisationPersonRelationDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.OrganisationPersonRelationDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.VarFieldDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.VarFieldDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AppResponseDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Light.InvoiceBaseLightDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Light.InvoiceBaseLightDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Light.GkvTransferProtokollLightDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Light.GkvTransferProtokollLightDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Light.GkvAbrechnungLightDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.InvoiceType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.GkvTransferResultType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.GkvVerfahrensstufe))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.GkvRawDataType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AccountingIntervalType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ActivationTypeId))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.CostRatePeriodType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ValueListEntryType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AbsenceReasonVisibilityType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Sex))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SubstitutionNeed))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ZeiterfassungsDauer))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AccountingvisibilityType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ScopeTypeId))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceUnit))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceRecordFormate))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceRecordTypeId))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.CostBearer2SupportConceptStatus))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ContactType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SupportConceptApprovalInterval))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Bewilligungsart))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SystemEntryID))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.FamilyStatus))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.PersonType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AppointmentDayOfWeek))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ControlType))]
         BS.Shared.DataContracts.Light.GkvAbrechnungLightDC GetGkvAbrechnung(long oid);
         
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IGkvAccountingService/GetAllGkvAbrechnungen", ReplyAction="http://tempuri.org/IGkvAccountingService/GetAllGkvAbrechnungenResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/IGkvAccountingService/GetAllGkvAbrechnungenBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")]
         System.Collections.Generic.List<BS.Shared.DataContracts.Light.GkvAbrechnungLightDC> GetAllGkvAbrechnungen();
         
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IGkvAccountingService/GetFilteredGkvAbrechnungen", ReplyAction="http://tempuri.org/IGkvAccountingService/GetFilteredGkvAbrechnungenResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/IGkvAccountingService/GetFilteredGkvAbrechnungenBeWoFaultFault" +
-            "", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")]
-        System.Collections.Generic.List<BS.Shared.DataContracts.Light.GkvAbrechnungLightDC> GetFilteredGkvAbrechnungen(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungViewFilterDC gkvAbrechnungViewFilter);
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IGkvAccountingService/GetAllGkvAbrechnungenBy", ReplyAction="http://tempuri.org/IGkvAccountingService/GetAllGkvAbrechnungenByResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/IGkvAccountingService/GetAllGkvAbrechnungenByBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.Light.GkvAbrechnungLightDC> GetAllGkvAbrechnungenBy(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungViewFilterDC gkvAbrechnungViewFilter);
         
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IGkvAccountingService/GetProtokollRawDataString", ReplyAction="http://tempuri.org/IGkvAccountingService/GetProtokollRawDataStringResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/IGkvAccountingService/GetProtokollRawDataStringBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")]
@@ -131,199 +35,10 @@ namespace BeWo.ServiceProxy
         
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IGkvAccountingService/CreateNewGkvAbrechnung", ReplyAction="http://tempuri.org/IGkvAccountingService/CreateNewGkvAbrechnungResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/IGkvAccountingService/CreateNewGkvAbrechnungBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Core.BeWoFault))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Core.BeWoFaultType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<object>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<long, string>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<long>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<long, BS.Shared.ValueListEntryType>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<long, long>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<string>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungViewFilterDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungCreateRequestDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.GkvAbrechnung.GkvTransferProtokollDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvTransferProtokollDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvResponseDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungSendRequestDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungSendResponseDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungGetIKRequestDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungGetIKResponseDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactOrganisationDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactCustomerDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactEmployeeDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactSupportConceptDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactCostBearerDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactCostBearerDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactPersonDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.InvoiceBaseDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.InvoiceBaseDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.InvoiceItemDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.InvoiceItemDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ServiceRecordDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.CostRatePeriodDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.CostRatePeriodDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ValueListEntryDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.AbsenceTimeDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AbsenceTimeDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AbsenceReasonDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.ValueListEntryDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ServiceDescriptionDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ServiceCategoryDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.ContactDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ContactDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.SupportConceptCostBearerRelDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.SupportConceptApprovalPeriodDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.SupportConceptApprovalPeriodDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.BudgetDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.SupportConceptApprovalPeriodEmployeeRelDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.SupportConceptApprovalPeriodEmployeeRelDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Organisation2PersonDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Organisation2PersonDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.OrganisationDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.ArbeitszeitDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ArbeitszeitDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.ArbeitszeitEintragDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ArbeitszeitEintragDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.FeiertagDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.FeiertagDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AddressDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.BeWoDataContract))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.OrganisationPersonRelationDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.OrganisationPersonRelationDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.VarFieldDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.VarFieldDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AppResponseDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Light.InvoiceBaseLightDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Light.InvoiceBaseLightDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Light.GkvTransferProtokollLightDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Light.GkvTransferProtokollLightDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Light.GkvAbrechnungLightDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.InvoiceType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.GkvTransferResultType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.GkvVerfahrensstufe))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.GkvRawDataType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AccountingIntervalType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ActivationTypeId))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.CostRatePeriodType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ValueListEntryType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AbsenceReasonVisibilityType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Sex))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SubstitutionNeed))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ZeiterfassungsDauer))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AccountingvisibilityType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ScopeTypeId))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceUnit))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceRecordFormate))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceRecordTypeId))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.CostBearer2SupportConceptStatus))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ContactType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SupportConceptApprovalInterval))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Bewilligungsart))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SystemEntryID))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.FamilyStatus))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.PersonType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AppointmentDayOfWeek))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ControlType))]
         BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungCreateResponseDC CreateNewGkvAbrechnung(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungCreateRequestDC request);
         
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IGkvAccountingService/UpdateGkvAbrechnung", ReplyAction="http://tempuri.org/IGkvAccountingService/UpdateGkvAbrechnungResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/IGkvAccountingService/UpdateGkvAbrechnungBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Core.BeWoFault))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Core.BeWoFaultType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<object>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<long, string>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<long>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<long, BS.Shared.ValueListEntryType>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<long, long>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<string>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungViewFilterDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungCreateRequestDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.GkvAbrechnung.GkvTransferProtokollDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvTransferProtokollDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungCreateResponseDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvResponseDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungSendRequestDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungSendResponseDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungGetIKRequestDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungGetIKResponseDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactOrganisationDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactCustomerDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactEmployeeDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactSupportConceptDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactCostBearerDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactCostBearerDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactPersonDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.InvoiceBaseDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.InvoiceBaseDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.InvoiceItemDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.InvoiceItemDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ServiceRecordDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.CostRatePeriodDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.CostRatePeriodDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ValueListEntryDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.AbsenceTimeDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AbsenceTimeDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AbsenceReasonDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.ValueListEntryDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ServiceDescriptionDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ServiceCategoryDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.ContactDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ContactDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.SupportConceptCostBearerRelDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.SupportConceptApprovalPeriodDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.SupportConceptApprovalPeriodDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.BudgetDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.SupportConceptApprovalPeriodEmployeeRelDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.SupportConceptApprovalPeriodEmployeeRelDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Organisation2PersonDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Organisation2PersonDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.OrganisationDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.ArbeitszeitDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ArbeitszeitDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.ArbeitszeitEintragDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ArbeitszeitEintragDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.FeiertagDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.FeiertagDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AddressDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.BeWoDataContract))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.OrganisationPersonRelationDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.OrganisationPersonRelationDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.VarFieldDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.VarFieldDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AppResponseDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Light.InvoiceBaseLightDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Light.InvoiceBaseLightDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Light.GkvTransferProtokollLightDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Light.GkvTransferProtokollLightDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Light.GkvAbrechnungLightDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.InvoiceType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.GkvTransferResultType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.GkvVerfahrensstufe))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.GkvRawDataType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AccountingIntervalType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ActivationTypeId))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.CostRatePeriodType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ValueListEntryType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AbsenceReasonVisibilityType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Sex))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SubstitutionNeed))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ZeiterfassungsDauer))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AccountingvisibilityType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ScopeTypeId))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceUnit))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceRecordFormate))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceRecordTypeId))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.CostBearer2SupportConceptStatus))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ContactType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SupportConceptApprovalInterval))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Bewilligungsart))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SystemEntryID))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.FamilyStatus))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.PersonType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AppointmentDayOfWeek))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ControlType))]
         BS.Shared.DataContracts.Light.GkvAbrechnungLightDC UpdateGkvAbrechnung(BS.Shared.DataContracts.Light.GkvAbrechnungLightDC abrechnung);
         
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IGkvAccountingService/DeleteGkvAbrechnung", ReplyAction="http://tempuri.org/IGkvAccountingService/DeleteGkvAbrechnungResponse")]
@@ -332,100 +47,6 @@ namespace BeWo.ServiceProxy
         
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IGkvAccountingService/SendNewGkvAbrechnung", ReplyAction="http://tempuri.org/IGkvAccountingService/SendNewGkvAbrechnungResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/IGkvAccountingService/SendNewGkvAbrechnungBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Core.BeWoFault))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Core.BeWoFaultType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<object>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<long, string>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<long>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<long, BS.Shared.ValueListEntryType>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<long, long>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<string>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungViewFilterDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungCreateRequestDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.GkvAbrechnung.GkvTransferProtokollDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvTransferProtokollDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungCreateResponseDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvResponseDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungSendRequestDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungGetIKRequestDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungGetIKResponseDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactOrganisationDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactCustomerDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactEmployeeDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactSupportConceptDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactCostBearerDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactCostBearerDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactPersonDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.InvoiceBaseDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.InvoiceBaseDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.InvoiceItemDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.InvoiceItemDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ServiceRecordDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.CostRatePeriodDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.CostRatePeriodDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ValueListEntryDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.AbsenceTimeDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AbsenceTimeDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AbsenceReasonDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.ValueListEntryDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ServiceDescriptionDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ServiceCategoryDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.ContactDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ContactDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.SupportConceptCostBearerRelDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.SupportConceptApprovalPeriodDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.SupportConceptApprovalPeriodDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.BudgetDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.SupportConceptApprovalPeriodEmployeeRelDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.SupportConceptApprovalPeriodEmployeeRelDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Organisation2PersonDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Organisation2PersonDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.OrganisationDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.ArbeitszeitDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ArbeitszeitDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.ArbeitszeitEintragDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ArbeitszeitEintragDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.FeiertagDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.FeiertagDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AddressDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.BeWoDataContract))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.OrganisationPersonRelationDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.OrganisationPersonRelationDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.VarFieldDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.VarFieldDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AppResponseDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Light.InvoiceBaseLightDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Light.InvoiceBaseLightDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Light.GkvTransferProtokollLightDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Light.GkvTransferProtokollLightDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Light.GkvAbrechnungLightDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.InvoiceType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.GkvTransferResultType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.GkvVerfahrensstufe))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.GkvRawDataType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AccountingIntervalType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ActivationTypeId))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.CostRatePeriodType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ValueListEntryType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AbsenceReasonVisibilityType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Sex))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SubstitutionNeed))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ZeiterfassungsDauer))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AccountingvisibilityType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ScopeTypeId))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceUnit))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceRecordFormate))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceRecordTypeId))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.CostBearer2SupportConceptStatus))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ContactType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SupportConceptApprovalInterval))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Bewilligungsart))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SystemEntryID))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.FamilyStatus))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.PersonType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AppointmentDayOfWeek))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ControlType))]
         BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungSendResponseDC SendNewGkvAbrechnung(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungSendRequestDC req);
         
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IGkvAccountingService/SendGetIKRequest", ReplyAction="http://tempuri.org/IGkvAccountingService/SendGetIKRequestResponse")]
@@ -477,9 +98,9 @@ namespace BeWo.ServiceProxy
             return base.Channel.GetAllGkvAbrechnungen();
         }
         
-        public System.Collections.Generic.List<BS.Shared.DataContracts.Light.GkvAbrechnungLightDC> GetFilteredGkvAbrechnungen(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungViewFilterDC gkvAbrechnungViewFilter)
+        public System.Collections.Generic.List<BS.Shared.DataContracts.Light.GkvAbrechnungLightDC> GetAllGkvAbrechnungenBy(BS.Shared.DataContracts.GkvAbrechnung.GkvAbrechnungViewFilterDC gkvAbrechnungViewFilter)
         {
-            return base.Channel.GetFilteredGkvAbrechnungen(gkvAbrechnungViewFilter);
+            return base.Channel.GetAllGkvAbrechnungenBy(gkvAbrechnungViewFilter);
         }
         
         public string GetProtokollRawDataString(long oid, BS.Shared.GkvRawDataType gkvRawData)
diff --git a/BeWo/ServiceProxy/GeneratedOperationsEnhancedService.cs b/BeWo/ServiceProxy/GeneratedOperationsEnhancedService.cs
index c7499dc80..21a6123cf 100644
--- a/BeWo/ServiceProxy/GeneratedOperationsEnhancedService.cs
+++ b/BeWo/ServiceProxy/GeneratedOperationsEnhancedService.cs
@@ -20,10 +20,6 @@ namespace BeWo.ServiceProxy
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsEnhancedService/HelloWorld", ReplyAction="http://tempuri.org/IOperationsEnhancedService/HelloWorldResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/IOperationsEnhancedService/HelloWorldBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")]
         string HelloWorld();
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsEnhancedService/GetPdf", ReplyAction="http://tempuri.org/IOperationsEnhancedService/GetPdfResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/IOperationsEnhancedService/GetPdfBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")]
-        byte[] GetPdf();
     }
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
@@ -64,10 +60,5 @@ namespace BeWo.ServiceProxy
         {
             return base.Channel.HelloWorld();
         }
-        
-        public byte[] GetPdf()
-        {
-            return base.Channel.GetPdf();
-        }
     }
 }
diff --git a/BeWo/ServiceProxy/GeneratedOperationsService.cs b/BeWo/ServiceProxy/GeneratedOperationsService.cs
index efcf5d175..01a747a1a 100644
--- a/BeWo/ServiceProxy/GeneratedOperationsService.cs
+++ b/BeWo/ServiceProxy/GeneratedOperationsService.cs
@@ -70,6 +70,7 @@ namespace BeWo.ServiceProxy
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.TokenTyp))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.Behinderungsart>))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Behinderungsart))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.VgaTypeEnum))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.Merkzeichen>))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Merkzeichen))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Pflegegrad))]
diff --git a/BeWo/View/Detail/TeamView.xaml b/BeWo/View/Detail/TeamView.xaml
index 3eb781a83..486954df2 100644
--- a/BeWo/View/Detail/TeamView.xaml
+++ b/BeWo/View/Detail/TeamView.xaml
@@ -1,8 +1,15 @@
-<localView:BeWoView x:Class="BeWo.View.Detail.TeamView" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:localView="clr-namespace:BeWo.View" xmlns:localSearchView="clr-namespace:BeWo.View.Search" xmlns:val="clr-namespace:BeWo.Validation" xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
+<localView:BeWoView x:Class="BeWo.View.Detail.TeamView"
+                    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+                    xmlns:localView="clr-namespace:BeWo.View" 
+                    xmlns:localSearchView="clr-namespace:BeWo.View.Search" 
+                    xmlns:val="clr-namespace:BeWo.Validation" 
+                    xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
                     xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
                     xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
+                    xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
                     Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True">
-	<Grid x:Name="teamViewMainGrid">
+    <Grid x:Name="teamViewMainGrid">
         <Grid.Resources>
             <Style x:Key="myNavigationListItemStyle" TargetType="{x:Type ListBoxItem}">
                 <Setter Property="HorizontalContentAlignment" Value="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorLevel=1, AncestorType={x:Type ItemsControl}, Mode=FindAncestor}}" />
@@ -13,7 +20,7 @@
                     <Setter.Value>
                         <ControlTemplate>
                             <Grid>
-                                <Border x:Name="ItemBorder" CornerRadius="5" MinHeight="30" Background="#FF000000">
+                                <Border x:Name="ItemBorder" CornerRadius="5" MinHeight="20" Background="#FF000000">
                                     <Border.OpacityMask>
                                         <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
                                             <GradientStop Color="#19000000" Offset="0" />
@@ -22,7 +29,7 @@
                                     </Border.OpacityMask>
 
                                 </Border>
-                                <Border x:Name="ItemContent" CornerRadius="5" MinHeight="30">
+                                <Border x:Name="ItemContent" CornerRadius="5" MinHeight="20">
                                     <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="5,3,5,3" OpacityMask="{x:Null}" SnapsToDevicePixels="True">
                                         <Grid.ColumnDefinitions>
                                             <ColumnDefinition Width="Auto" />
@@ -31,20 +38,10 @@
                                         </Grid.ColumnDefinitions>
                                         <Grid.RowDefinitions>
                                             <RowDefinition Height="Auto" />
-                                            <RowDefinition Height="*" />
                                         </Grid.RowDefinitions>
-                                        <Image Grid.RowSpan="2" Source="..\..\Ressources\Icons\UserHomeMaleDisabled.png" Margin="0,0,5,0" Height="30" VerticalAlignment="Center" HorizontalAlignment="Stretch" Width="Auto" RenderTransformOrigin="0.5,0.5" Grid.Row="0" />
-                                        <StackPanel Grid.Column="1" Orientation="Horizontal">
-                                            <TextBlock Text="{Binding Path=FirstName}" FontSize="14" Foreground="#FFD2D2D2" FontFamily="Microsoft Sans Serif" />
-                                            <TextBlock Text="{Binding Path=LastName}" Margin="3,0,0,0" FontSize="14" Foreground="#FFD2D2D2" FontFamily="Microsoft Sans Serif" />
-                                            <TextBlock Text="{Binding Path=DateOfBirth}" Margin="3,0,0,0" FontSize="14" Foreground="#FFD2D2D2" FontFamily="Microsoft Sans Serif" />
-                                        </StackPanel>
-                                        <StackPanel Grid.Column="1" Grid.Row="1" Orientation="Horizontal">
-                                            <TextBlock Text="{Binding Path=Street}" FontSize="14" Foreground="#FFA0A0A0" FontFamily="Microsoft Sans Serif" />
-                                            <TextBlock Text="{Binding Path=PostalCode}" Margin="10,0,0,0" FontSize="14" Foreground="#FFA0A0A0" FontFamily="Microsoft Sans Serif" />
-                                            <TextBlock Text="{Binding Path=Town}" Margin="3,0,0,0" FontSize="14" Foreground="#FFA0A0A0" FontFamily="Microsoft Sans Serif" />
+                                        <Image Source="..\..\Ressources\Icons\UserHomeMaleDisabled.png" Margin="0,0,5,0" Height="20" VerticalAlignment="Center" HorizontalAlignment="Stretch" Width="Auto" RenderTransformOrigin="0.5,0.5" Grid.Row="0" />
+                                        <TextBlock Grid.Column="2" Text="{Binding Path=SimpleDescription}" FontSize="14" Foreground="#FFD2D2D2" FontFamily="Microsoft Sans Serif" />
 
-                                        </StackPanel>
                                     </Grid>
 
                                 </Border>
@@ -96,8 +93,7 @@
             <ContextMenu
             x:Key="OwnChatTreeListContextMenu"
             x:Name="OwnChatTreeListContextMenu"
-            MenuItem.Click="OwnChatTreeListContextMenu_Click"
-            Opened="OwnChatTreeListContextMenu_Opened">
+            MenuItem.Click="OwnChatTreeListContextMenu_Click">
                 <MenuItem Header="Ausgewählte Personen entfernen">
                     <MenuItem.Icon>
                         <Image Source="..\Ressources\Icons\Delete24.png" />
@@ -105,59 +101,62 @@
                 </MenuItem>
             </ContextMenu>
         </Grid.Resources>
-		<uc:ShadowChrome>
-			<GroupBox Style="{StaticResource MainContentGroupBoxStyle}">
-				<GroupBox.Header>
-					<StackPanel Orientation="Horizontal" VerticalAlignment="Bottom">
-						<Image Source="..\..\Ressources\Icons\UserGroupBusinessDisabled.png" RenderTransformOrigin="0.5,0.5" Stretch="Uniform" Width="32">
-							<Image.RenderTransform>
-								<TransformGroup>
-									<ScaleTransform ScaleX="1" ScaleY="1" />
-									<SkewTransform AngleX="0" AngleY="0" />
-									<RotateTransform Angle="0" />
-									<TranslateTransform X="0" Y="5" />
-								</TransformGroup>
-							</Image.RenderTransform>
-						</Image>
-						<TextBox Text="{Binding Path=Name, Mode=OneWay}" Margin="10,0,0,0" Background="{x:Null}" Foreground="#FFFFFFFF" FontSize="22" BorderBrush="{x:Null}" VerticalAlignment="Bottom" Padding="0,0,0,0" />
-					</StackPanel>
-				</GroupBox.Header>
-				<Grid Margin="0,3,0,0" Background="{DynamicResource ObjectEditBackgroundBrush}">
-					<Grid.RowDefinitions>
-						<RowDefinition Height="Auto" />
-						<RowDefinition Height="*" />
-						<RowDefinition Height="Auto" />
-					</Grid.RowDefinitions>
-					<Rectangle Fill="{DynamicResource TeamContentBrush}" Height="6" />
-					<TabControl x:Name="root" Grid.Row="1" Style="{StaticResource ObjectEditTabControl}" BorderThickness="0,0,0,0" Padding="4,4,4,4">
-						<TabItem Header="Details" IsSelected="True">
-							<Grid Name="grid_root">
-								<Grid.ColumnDefinitions>
-									<ColumnDefinition Width="Auto" />
-									<ColumnDefinition Width="250" />
-									<ColumnDefinition Width="Auto" />
-									<ColumnDefinition Width="*" />
-								</Grid.ColumnDefinitions>
-								<Grid.RowDefinitions>
-									<RowDefinition Height="Auto" />
+        <uc:ShadowChrome>
+            <GroupBox Style="{StaticResource MainContentGroupBoxStyle}">
+                <GroupBox.Header>
+                    <StackPanel Orientation="Horizontal" VerticalAlignment="Bottom">
+                        <Image Source="..\..\Ressources\Icons\UserGroupBusinessDisabled.png" RenderTransformOrigin="0.5,0.5" Stretch="Uniform" Width="32">
+                            <Image.RenderTransform>
+                                <TransformGroup>
+                                    <ScaleTransform ScaleX="1" ScaleY="1" />
+                                    <SkewTransform AngleX="0" AngleY="0" />
+                                    <RotateTransform Angle="0" />
+                                    <TranslateTransform X="0" Y="5" />
+                                </TransformGroup>
+                            </Image.RenderTransform>
+                        </Image>
+                        <TextBox Text="{Binding Path=Name, Mode=OneWay}" Margin="10,0,0,0" Background="{x:Null}" Foreground="#FFFFFFFF" FontSize="22" BorderBrush="{x:Null}" VerticalAlignment="Bottom" Padding="0,0,0,0" />
+                    </StackPanel>
+                </GroupBox.Header>
+                <Grid Margin="0,3,0,0" Background="{DynamicResource ObjectEditBackgroundBrush}">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <Rectangle Fill="{DynamicResource TeamContentBrush}" Height="6" />
+                    <TabControl x:Name="root" Grid.Row="1" Style="{StaticResource ObjectEditTabControl}" BorderThickness="0,0,0,0" Padding="4,4,4,4">
+                        <TabItem Header="Details" IsSelected="True">
+                            <Grid Name="grid_root">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="250" />
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+                                <Grid.RowDefinitions>
                                     <RowDefinition Height="Auto" />
-									<RowDefinition Height="Auto" />
-									<RowDefinition Height="Auto" />
-									<RowDefinition Height="*" />
-									<RowDefinition Height="0" />
-								</Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="*" />
+                                    <RowDefinition Height="0" />
+                                </Grid.RowDefinitions>
 
-								<Label>Teamname</Label>
-								<Label Grid.Row="1">Leitung</Label>
-                                <Label Grid.Column="2">Notiz</Label>
-                                <CheckBox x:Name="CheckBoxIstOwnChatGruppe" Grid.Row="2" Margin="3" Grid.ColumnSpan="2"  Content="{markup:Translate ownChat Gruppe}" IsChecked="{Binding Path=IsOwnChatTeam, UpdateSourceTrigger=PropertyChanged}" />
-                                <TextBox Grid.Column="1" Height="23" Margin="3" Text="{val:ValidationBinding Path=Name, UpdateSourceTrigger=PropertyChanged}" />
-								<uc:PopUpEdit IsReadOnly="True" Name="popupedit_leader" 
-                                              Grid.Row="1" Grid.Column="1" Height="23" 
+                                <CheckBox x:Name="CheckBoxIstOwnChatGruppe" Grid.Row="0" Margin="3" Grid.ColumnSpan="2"  Content="{markup:Translate Nur ownChat}" IsChecked="{Binding Path=IsOwnChatTeam, UpdateSourceTrigger=PropertyChanged}" Checked="CheckBoxIstOwnChatGruppe_CheckedChanged" Unchecked="CheckBoxIstOwnChatGruppe_CheckedChanged"/>
+
+                                <Label Grid.Row="1">Teamname</Label>
+                                <Label Grid.Row="2" x:Name="lblLeitung">Leitung</Label>
+                                <Label Grid.Row="0" Grid.Column="2" x:Name="lblNotiz">Notiz</Label>
+
+
+                                <TextBox Grid.Column="1" Grid.Row="1" Height="23" Margin="3" Text="{val:ValidationBinding Path=Name, UpdateSourceTrigger=PropertyChanged}" />
+                                <uc:PopUpEdit IsReadOnly="True" Name="popupedit_leader" 
+                                              Grid.Row="2" Grid.Column="1" Height="23" 
                                               DeleteButtonVisibility="Visible" Margin="3" 
                                               PopUpClick="PopUpEdit_PopUpClick" Text="{val:ValidationBinding Path=LeaderString}"
                                               Cursor="Arrow" PreviewMouseDoubleClick="Popupedit_leader_OnPreviewMouseDoubleClick"/>
-								<TextBox Grid.Column="3" Grid.RowSpan="4" MaxHeight="78" AcceptsReturn="True" Margin="3" Text="{Binding Path=Notice,UpdateSourceTrigger=PropertyChanged}" VerticalScrollBarVisibility="Auto" MinWidth="100" />
+                                <TextBox Grid.Column="3" Grid.RowSpan="4" MaxHeight="78" AcceptsReturn="True" Margin="3" Text="{Binding Path=Notice,UpdateSourceTrigger=PropertyChanged}" VerticalScrollBarVisibility="Auto" MinWidth="100" />
 
                                 <GroupBox x:Name="GroupBoxOwnChat" Grid.Row="4" Grid.ColumnSpan="4" Header="Personen hinzufügen" Margin="3,15,3,3" Style="{DynamicResource ObjectEditGroupBox}" Visibility="{Binding Path=IsOwnChatTeam, Converter={StaticResource BoolVisibilityConverter}}">
                                     <Grid>
@@ -169,6 +168,7 @@
                                         <Grid.RowDefinitions>
                                             <RowDefinition Height="Auto" />
                                             <RowDefinition Height="*" />
+                                            <RowDefinition Height="Auto" />
                                         </Grid.RowDefinitions>
 
                                         <Label VerticalAlignment="Bottom" Content="{markup:Translate zugeordnete Personen}">
@@ -177,115 +177,135 @@
 
                                         <dxg:TreeListControl x:Name="treelistcontrol_ownChatMember" Grid.Row="1" DefaultSorting="Name" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" SelectionMode="Row">
                                             <dxg:TreeListControl.Columns>
-                                                <dxg:TreeListColumn FieldName="Person.DetailDescription" AllowSorting="True"/>
+                                                <dxg:TreeListColumn Header="Name" FieldName="Person.DetailDescription" AllowSorting="False"/>
+                                                <dxg:TreeListColumn Header="Name" FieldName="Person.FirstName" AllowSorting="False"/>
+                                                <dxg:TreeListColumn Header="Moderation" FieldName="IstModerator" AllowSorting="False" HorizontalHeaderContentAlignment="Center">
+                                                    <dxg:TreeListColumn.CellTemplate>
+                                                        <DataTemplate>
+                                                            <dxe:CheckEdit Name="PART_Editor" />
+                                                        </DataTemplate>
+                                                    </dxg:TreeListColumn.CellTemplate>
+                                                </dxg:TreeListColumn>
                                             </dxg:TreeListControl.Columns>
                                             <dxg:TreeListControl.View>
-                                                <dxg:TreeListView x:Name="TreeView_template" ShowColumnHeaders="False" ShowIndicator="False" ShowHorizontalLines="False" ShowVerticalLines="False"  AutoWidth="True"
-                                            AllowEditing="False" ShowNodeImages="False" PrintNodeImages="True"
+                                                <dxg:TreeListView x:Name="TreeView_template" ShowColumnHeaders="True" ShowIndicator="False" ShowHorizontalLines="False" ShowVerticalLines="False"  AutoWidth="True"
+                                            ShowNodeImages="False" PrintNodeImages="True" CellValueChanging="TreeView_template_CellValueChanging" ExpandCollapseNodesOnNavigation="True"
+                                            RowDoubleClick="TreeView_template_RowDoubleClick"
                                             ContextMenu="{StaticResource OwnChatTreeListContextMenu}">
+                                                    <dxg:TreeListView.FormatConditions>
+                                                        <dxg:FormatCondition PredefinedFormatName="BoldText" Expression="[Person.FirstName] is null" ApplyToRow="True" />
+                                                    </dxg:TreeListView.FormatConditions>
                                                 </dxg:TreeListView>
                                             </dxg:TreeListControl.View>
                                         </dxg:TreeListControl>
 
-                                        <Button Name="button_add_ownChatPerson" Content="&lt;" FontWeight="Bold" Width="25" Grid.Row="2" Grid.Column="1" VerticalAlignment="Center" Height="25" MinWidth="30" Margin="3" ToolTip="{markup:Translate Ausgewählte Personen dem Team hinzufügen}" Click="button_addOwnChatMember_Click" />
+                                        <Button Grid.Column="0" Grid.Row="2" Margin="3" Height="23"
+					                        Name="button_aufklappenAllLeistungen" Click="button_selectAll_Click"
+					                        HorizontalAlignment="Left" VerticalAlignment="Bottom">Alle auswählen</Button>
+                                        <Button Grid.Column="0" Grid.Row="2" Margin="100,3,3,3" Height="23"
+					                        Name="button_zuklappenAllLeistungen" Click="button_deselectAll_Click"
+					                        HorizontalAlignment="Left" VerticalAlignment="Bottom">Alle abwählen</Button>
+
+                                        <Button Name="button_add_ownChatPerson" Content="&lt;" FontWeight="Bold" Width="25" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" Height="25" MinWidth="30" Margin="3" ToolTip="{markup:Translate Ausgewählte Personen dem Team hinzufügen}" Click="button_addOwnChatMember_Click" />
 
                                         <Label VerticalAlignment="Bottom" Grid.Column="2" Content="{markup:Translate verfügbare Personen}">
 
                                         </Label>
 
-                                        <TabControl x:Name="TabControlOwnChatPersonen" Grid.Column="2" Grid.Row="1" BorderThickness="0,0,0,0" FontSize="14">
+
+                                        <TabControl x:Name="TabControlOwnChatPersonen" Grid.Column="1" Grid.RowSpan="3" BorderThickness="0,0,0,0" FontSize="14" Grid.ColumnSpan="2" Margin="32.333,19,3.667,-0.333">
                                             <TabItem Header="{markup:Translate Mitarbeiter}" IsSelected="True">
-                                                <localSearchView:EmployeeSearchView x:Name="ownChatemployeesearchview" IsMultiSelect="True" />
+                                                <localSearchView:EmployeeSearchView x:Name="ownChatemployeesearchview" IsMultiSelect="True" OnlyOwnChat="True" />
                                             </TabItem>
-                                            <TabItem Header="{markup:Translate Klienten}">
-                                                <localSearchView:CustomerSearchView x:Name="ownChatcustomersearchview" IsMultiSelect="True" />
+                                            <TabItem Header="{markup:Translate Klienten}" Margin="-4.333,0,4.333,-0.333">
+                                                <localSearchView:CustomerSearchView x:Name="ownChatcustomersearchview" IsMultiSelect="True" OnlyOwnChat="True" />
                                             </TabItem>
-                                            <TabItem Header="{markup:Translate Personen}">
+                                            <!--<TabItem Header="{markup:Translate Personen}">
                                                 <localSearchView:PersonSearchView x:Name="ownChatpersonsearchview" IsMultiSelect="True" />
-                                            </TabItem>
+                                            </TabItem>-->
                                         </TabControl>
-                                        
+
                                     </Grid>
                                 </GroupBox>
 
                                 <GroupBox x:Name="GroupBoxTeam" Grid.Row="4" Grid.ColumnSpan="4" Header="Mitglieder hinzufügen" Margin="3,15,3,3" Style="{DynamicResource ObjectEditGroupBox}" Visibility="{Binding Path=IsOwnChatTeam, Converter={StaticResource BoolVisibilityConverter}, ConverterParameter=Reverse}">
-									<Grid>
-										<Grid.ColumnDefinitions>
-											<ColumnDefinition Width="*" />
-											<ColumnDefinition Width="Auto" />
-											<ColumnDefinition Width="*" />
-										</Grid.ColumnDefinitions>
-										<Grid.RowDefinitions>
-											<RowDefinition Height="Auto" />
-											<RowDefinition Height="*" />
-										</Grid.RowDefinitions>
+                                    <Grid>
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="*" />
+                                            <ColumnDefinition Width="Auto" />
+                                            <ColumnDefinition Width="*" />
+                                        </Grid.ColumnDefinitions>
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="*" />
+                                        </Grid.RowDefinitions>
 
                                         <Label VerticalAlignment="Bottom" Content="{markup:Translate zugeordnete Mitarbeiter}">
-											
-										</Label>
 
-										<ListBox Name="listbox_teamMember" Grid.Row="1" ItemsSource="{Binding Path=Member}">
+                                        </Label>
+
+                                        <ListBox Name="listbox_teamMember" Grid.Row="1" ItemsSource="{Binding Path=Member}">
                                             <ListBox.ItemContainerStyle>
                                                 <Style TargetType="{x:Type ListBoxItem}">
                                                     <EventSetter Event="MouseDoubleClick" Handler="DoubleClickHandler" />
                                                 </Style>
                                             </ListBox.ItemContainerStyle>
-											<ListBox.ItemTemplate>
-												<DataTemplate>
-													<StackPanel Orientation="Horizontal">
-														<Button Style="{StaticResource {x:Type Button}}" HorizontalAlignment="Center" VerticalAlignment="Center" Height="18" Padding="0" Width="{Binding RelativeSource={RelativeSource Self}, Path=ActualHeight}" Margin="3 0 0 0" Click="button_remove_Click" Tag="{Binding}" ToolTip="Entfernen">
-															<Canvas HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-																<Path Stroke="White" StrokeThickness="1.5" Data="M -3,-3 L 3, 3" StrokeStartLineCap="Round" StrokeEndLineCap="Round" />
-																<Path Stroke="White" StrokeThickness="1.5" Data="M 3,-3 L -3, 3" StrokeStartLineCap="Round" StrokeEndLineCap="Round" />
-															</Canvas>
-														</Button>
-														<Label Margin="3 0 0 3" Padding="0" Content="{Binding Path=LastName}" />
-														<Label Margin="0" Padding="0" Content=", " />
-														<Label Margin="0" Padding="0" Content="{Binding Path=FirstName}" />
-													</StackPanel>
-												</DataTemplate>
-											</ListBox.ItemTemplate>
-										</ListBox>
+                                            <ListBox.ItemTemplate>
+                                                <DataTemplate>
+                                                    <StackPanel Orientation="Horizontal">
+                                                        <Button Style="{StaticResource {x:Type Button}}" HorizontalAlignment="Center" VerticalAlignment="Center" Height="18" Padding="0" Width="{Binding RelativeSource={RelativeSource Self}, Path=ActualHeight}" Margin="3 0 0 0" Click="button_remove_Click" Tag="{Binding}" ToolTip="Entfernen">
+                                                            <Canvas HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                                                                <Path Stroke="White" StrokeThickness="1.5" Data="M -3,-3 L 3, 3" StrokeStartLineCap="Round" StrokeEndLineCap="Round" />
+                                                                <Path Stroke="White" StrokeThickness="1.5" Data="M 3,-3 L -3, 3" StrokeStartLineCap="Round" StrokeEndLineCap="Round" />
+                                                            </Canvas>
+                                                        </Button>
+                                                        <Label Margin="3 0 0 3" Padding="0" Content="{Binding Path=LastName}" />
+                                                        <Label Margin="0" Padding="0" Content=", " />
+                                                        <Label Margin="0" Padding="0" Content="{Binding Path=FirstName}" />
+                                                    </StackPanel>
+                                                </DataTemplate>
+                                            </ListBox.ItemTemplate>
+                                        </ListBox>
 
                                         <Button Name="button_add" Content="&lt;" FontWeight="Bold" Width="25" Grid.Row="2" Grid.Column="1" VerticalAlignment="Center" Height="25" MinWidth="30" Margin="3" ToolTip="{markup:Translate Mitarbeiter dem Team hinzufügen}" Click="button_add_Click" />
 
                                         <Label VerticalAlignment="Bottom" Grid.Column="2" Content="{markup:Translate verfügbare Mitarbeiter}">
-											
-										</Label>
-										<localSearchView:EmployeeSearchView x:Name="employeesearchview" IsMultiSelect="True" Grid.Column="2" Grid.Row="1" />
-									</Grid>
-								</GroupBox>
+
+                                        </Label>
+                                        <localSearchView:EmployeeSearchView x:Name="employeesearchview" IsMultiSelect="True" Grid.Column="2" Grid.Row="1" />
+                                    </Grid>
+                                </GroupBox>
 
 
-								<Popup Grid.Row="5" Grid.ColumnSpan="4" Margin="10" Name="popup_employee" StaysOpen="False" Placement="MousePoint" Width="370" Height="250" Opened="popup_Opened" Closed="popup_Closed">
-									<localSearchView:EmployeeSearchView ItemSelected="EmployeeSearchView_EmployeeSelected" x:Name="leaderSearchView" />
-								</Popup>
+                                <Popup Grid.Row="5" Grid.ColumnSpan="4" Margin="10" Name="popup_employee" StaysOpen="False" Placement="MousePoint" Width="370" Height="250" Opened="popup_Opened" Closed="popup_Closed">
+                                    <localSearchView:EmployeeSearchView ItemSelected="EmployeeSearchView_EmployeeSelected" x:Name="leaderSearchView" />
+                                </Popup>
 
-							</Grid>
-						</TabItem>
-					    <TabItem Header="{markup:Translate TeamVarFieldsTitle}" Name="tabitem_varFields">
-					        <ScrollViewer VerticalScrollBarVisibility="Auto">
-					            <localView:VarFieldView VarFieldList="{Binding VarFields}" />
-					        </ScrollViewer>
-					    </TabItem>
-						<TabItem Header="Dokumente" Name="tabitem_documents" Selector.Selected="tabitem_documents_Selected" />
+                            </Grid>
+                        </TabItem>
+                        <TabItem Header="{markup:Translate TeamVarFieldsTitle}" Name="tabitem_varFields">
+                            <ScrollViewer VerticalScrollBarVisibility="Auto">
+                                <localView:VarFieldView VarFieldList="{Binding VarFields}" />
+                            </ScrollViewer>
+                        </TabItem>
+                        <TabItem Header="Dokumente" Name="tabitem_documents" Selector.Selected="tabitem_documents_Selected" />
 
-					</TabControl>
-					<Border Grid.Row="2" Grid.ColumnSpan="3" Height="40" Margin="0,10,0,0" VerticalAlignment="Stretch" Background="#FF000000">
-						<Border.OpacityMask>
-							<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-								<GradientStop Color="#19000000" Offset="0" />
-								<GradientStop Color="#33FFFFFF" Offset="1" />
-							</LinearGradientBrush>
-						</Border.OpacityMask>
+                    </TabControl>
+                    <Border Grid.Row="2" Grid.ColumnSpan="3" Height="40" Margin="0,10,0,0" VerticalAlignment="Stretch" Background="#FF000000">
+                        <Border.OpacityMask>
+                            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                                <GradientStop Color="#19000000" Offset="0" />
+                                <GradientStop Color="#33FFFFFF" Offset="1" />
+                            </LinearGradientBrush>
+                        </Border.OpacityMask>
 
-					</Border>
-					<StackPanel Grid.ColumnSpan="3" Grid.Row="2" Orientation="Horizontal" VerticalAlignment="Center" Height="Auto" Margin="5,10,0,0" HorizontalAlignment="Right">
-						<Button x:Name="btnSave" Content="Speichern" Margin="0,0,2,0" Command="ApplicationCommands.Save" Height="25" />
-						<Button x:Name="btnClose" Content="Schließen" Margin="0,0,3,0" Command="ApplicationCommands.Close" Height="25" />
-					</StackPanel>
-				</Grid>
-			</GroupBox>
-		</uc:ShadowChrome>
-	</Grid>
+                    </Border>
+                    <StackPanel Grid.ColumnSpan="3" Grid.Row="2" Orientation="Horizontal" VerticalAlignment="Center" Height="Auto" Margin="5,10,0,0" HorizontalAlignment="Right">
+                        <Button x:Name="btnSave" Content="Speichern" Margin="0,0,2,0" Command="ApplicationCommands.Save" Height="25" />
+                        <Button x:Name="btnClose" Content="Schließen" Margin="0,0,3,0" Command="ApplicationCommands.Close" Height="25" />
+                    </StackPanel>
+                </Grid>
+            </GroupBox>
+        </uc:ShadowChrome>
+    </Grid>
 </localView:BeWoView>
\ No newline at end of file
diff --git a/BeWo/View/Detail/TeamView.xaml.cs b/BeWo/View/Detail/TeamView.xaml.cs
index 5ebc7b565..facf1b364 100644
--- a/BeWo/View/Detail/TeamView.xaml.cs
+++ b/BeWo/View/Detail/TeamView.xaml.cs
@@ -52,6 +52,8 @@ namespace BeWo.View.Detail
             if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ChatSettings) || !BeWoApp.AppSettings.ShowOwnChat)
             {
                 CheckBoxIstOwnChatGruppe.Visibility = Visibility.Collapsed;
+
+                Grid.SetRow(lblNotiz, 1);
                 //GroupBoxOwnChat.Visibility = Visibility.Collapsed;
             }
             //else
@@ -85,6 +87,13 @@ namespace BeWo.View.Detail
 
         protected override void Save()
         {
+            if (!this.ViewModel.IsOwnChatTeam && this.ViewModel.Leader == null)
+            {
+                MessageBox.Show("Bitte wählen Sie ein Teamleitung aus", "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Warning);
+                return;
+            }
+
+
             var lDC = ViewModel.CommitToDataContract();
 
             try
@@ -147,7 +156,7 @@ namespace BeWo.View.Detail
 
             ViewModel.OwnChatMember.AddRange(ConvertToPerson2TeamList(ConvertToPersonDC(ownChatemployeesearchview.SelectedItems).Where(p => !ViewModel.OwnChatMember.Select(p2c => p2c.Person).Contains(p)).ToList()));
             ViewModel.OwnChatMember.AddRange(ConvertToPerson2TeamList(ConvertToPersonDC(ownChatcustomersearchview.SelectedItems).Where(p => !ViewModel.OwnChatMember.Select(p2c => p2c.Person).Contains(p)).ToList()));
-            ViewModel.OwnChatMember.AddRange(ConvertToPerson2TeamList(ownChatpersonsearchview.SelectedItems.Where(p => !ViewModel.OwnChatMember.Select(p2c => p2c.Person).Contains(p)).ToList()));
+            //ViewModel.OwnChatMember.AddRange(ConvertToPerson2TeamList(ownChatpersonsearchview.SelectedItems.Where(p => !ViewModel.OwnChatMember.Select(p2c => p2c.Person).Contains(p)).ToList()));
 
             RebuildOwnChatMemberTree();
         }
@@ -158,7 +167,7 @@ namespace BeWo.View.Detail
 
             TreeListNode mRootNode = null;
             TreeListNode cRootNode = null;
-            TreeListNode pRootNode = null;
+            //TreeListNode pRootNode = null;
 
             if (treelistcontrol_ownChatMember.View.Nodes.Count == 0)
             {
@@ -174,21 +183,21 @@ namespace BeWo.View.Detail
                 cRootNode.IsExpanded = true;
                 treelistcontrol_ownChatMember.View.Nodes.Add(cRootNode);
 
-                pRootNode = new TreeListNode();
-                pRootNode.Content = new Person2TeamDC() { Person = new CompactPersonDC { LastName = Translator.Translate("Personen") } };
-                pRootNode.IsExpandButtonVisible = DevExpress.Utils.DefaultBoolean.True;
-                pRootNode.IsExpanded = true;
-                treelistcontrol_ownChatMember.View.Nodes.Add(pRootNode);
+                //pRootNode = new TreeListNode();
+                //pRootNode.Content = new Person2TeamDC() { Person = new CompactPersonDC { LastName = Translator.Translate("Personen") } };
+                //pRootNode.IsExpandButtonVisible = DevExpress.Utils.DefaultBoolean.True;
+                //pRootNode.IsExpanded = true;
+                //treelistcontrol_ownChatMember.View.Nodes.Add(pRootNode);
             }
             else
             {
                 mRootNode = treelistcontrol_ownChatMember.View.Nodes[0];
                 cRootNode = treelistcontrol_ownChatMember.View.Nodes[1];
-                pRootNode = treelistcontrol_ownChatMember.View.Nodes[2];
+                //pRootNode = treelistcontrol_ownChatMember.View.Nodes[2];
 
                 mRootNode.Nodes.Clear();
                 cRootNode.Nodes.Clear();
-                pRootNode.Nodes.Clear();
+                //pRootNode.Nodes.Clear();
             }
 
             foreach (var p in ViewModel.OwnChatMember)
@@ -205,7 +214,7 @@ namespace BeWo.View.Detail
                 }
                 else
                 {
-                    pRootNode.Nodes.Add(node);
+                    //pRootNode.Nodes.Add(node);
                 }
                 
             }
@@ -300,11 +309,6 @@ namespace BeWo.View.Detail
                         () => BeWoUtils.OpenModalViewWindow<EmployeeVM, EmployeeDC, TeamView>(cb, this, () => this.Dispatch(
                             () => BeWoUtils.UpdateAllViews(employee)))));
         }
-
-        private void OwnChatTreeListContextMenu_Opened(object sender, RoutedEventArgs e)
-        {
-            
-        }
         private void OwnChatTreeListContextMenu_Click(object sender, RoutedEventArgs e)
         {
             if (e.OriginalSource is MenuItem)
@@ -322,6 +326,94 @@ namespace BeWo.View.Detail
                 }
             }
         }
+        private void TreeView_template_CellValueChanging(object sender, DevExpress.Xpf.Grid.TreeList.TreeListCellValueChangedEventArgs e)
+        {
+            var dc = e.Node.Content as Person2TeamDC;
+            if (!dc.Oid.HasValue && e.Node.HasChildren)
+            {
+                treelistcontrol_ownChatMember.BeginDataUpdate();
+                //Checkbox des Gruppen Node geändert->Setze den Checked Status der Kinder
+                foreach (var item in e.Node.Nodes)
+                {
+                    var childDc = item.Content as Person2TeamDC;
+                    childDc.IstModerator = (bool)e.Value;
+                }
+
+                treelistcontrol_ownChatMember.EndDataUpdate();
+            }
+            ViewModel.OwnChatMemberRoleChanged(true);
+        }
+
+        private void CheckBoxIstOwnChatGruppe_CheckedChanged(object sender, RoutedEventArgs e)
+        {
+            if (CheckBoxIstOwnChatGruppe.IsChecked is true)
+            {
+                popupedit_leader.Visibility = Visibility.Collapsed;
+                lblLeitung.Visibility = Visibility.Collapsed;
+            }
+            else
+            {
+                popupedit_leader.Visibility = Visibility.Visible;
+                lblLeitung.Visibility = Visibility.Visible;
+            }
+        }
+
+        private void button_selectAll_Click(object sender, RoutedEventArgs e)
+        {
+            SetzeAlleModeratoren(true);
+        }
+
+        private void button_deselectAll_Click(object sender, RoutedEventArgs e)
+        {
+            SetzeAlleModeratoren(false);
+        }
+        
+        private void SetzeAlleModeratoren(bool moderator)
+        {
+            
+            treelistcontrol_ownChatMember.BeginDataUpdate();
+            //Checkbox des Gruppen Node geändert->Setze den Checked Status der Kinder
+            foreach (var p2c in ViewModel.OwnChatMember)
+            {
+                p2c.IstModerator = moderator;
+            }
+
+            foreach (var item in treelistcontrol_ownChatMember.View.Nodes)
+            {
+                var p2c = item.Content as Person2TeamDC;
+
+                if (p2c !=null)
+                {
+                    p2c.IstModerator = moderator;
+                }
+            }
+
+            treelistcontrol_ownChatMember.EndDataUpdate();
+            
+            ViewModel.OwnChatMemberRoleChanged(true);
+        }
+
+        private void TreeView_template_RowDoubleClick(object sender, RowDoubleClickEventArgs e)
+        {
+            var tlv = sender as TreeListView;
+
+            var hi = (DevExpress.Xpf.Grid.TreeList.TreeListViewHitInfo)e.HitInfo;
+            var col = hi.Column;
+            if (col != null && "IstModerator".Equals(col.FieldName))
+            {
+                e.Handled = true;
+                return;
+            }
+            var node = tlv.GetNodeByRowHandle(e.HitInfo.RowHandle);
+            if (node.IsExpanded)
+            {
+                tlv.CollapseNode(e.HitInfo.RowHandle);
+            }
+            else
+            {
+                tlv.ExpandNode(e.HitInfo.RowHandle);
+            }
+        }
 
         //private void ToggleOwnChatGroupBox_Checked_Unchecked(object sender, RoutedEventArgs e)
         //{
diff --git a/BeWo/View/Navigation/TeamNavigationView.xaml.cs b/BeWo/View/Navigation/TeamNavigationView.xaml.cs
index 4227cd717..866b1dd43 100644
--- a/BeWo/View/Navigation/TeamNavigationView.xaml.cs
+++ b/BeWo/View/Navigation/TeamNavigationView.xaml.cs
@@ -108,7 +108,7 @@ namespace BeWo.View.Navigation
         {
             if (refresh || recentList == null)
             {
-                ServiceFacade.DoEmployeeServiceAsync(s => s.GetAllTeamsCompact(), r => 
+                ServiceFacade.DoEmployeeServiceAsync(s => s.GetAllTeamsIncludingOwnChatCompact(), r => 
                     this.Dispatch(delegate
                     {
                         objectList = r;
diff --git a/BeWo/View/Search/CustomerSearchView.cs b/BeWo/View/Search/CustomerSearchView.cs
index 9bd9de76f..a1f8a035f 100644
--- a/BeWo/View/Search/CustomerSearchView.cs
+++ b/BeWo/View/Search/CustomerSearchView.cs
@@ -26,9 +26,18 @@ namespace BeWo.View.Search
 
         public bool FetchReferenceNumbers { get; set; }
 
+        public bool OnlyOwnChat { get; set; }
         protected override void GetAll(Action<List<CompactCustomerDC>> pCallBack)
         {
-            ServiceFacade.DoCustomerServiceAsync(s => s.GetAllActiveCustomersForEmployee(FetchReferenceNumbers), pCallBack);
+            if (OnlyOwnChat)
+            {
+                ServiceFacade.DoCustomerServiceAsync(s => s.GetAllChatActiveCustomersCompact(0), pCallBack);
+            }
+            else
+            {
+                ServiceFacade.DoCustomerServiceAsync(s => s.GetAllActiveCustomersForEmployee(FetchReferenceNumbers), pCallBack);
+            }
+            
         }
     }
 }
diff --git a/BeWo/View/Search/EmployeeSearchView.cs b/BeWo/View/Search/EmployeeSearchView.cs
index 871340fdf..57f31a2b9 100644
--- a/BeWo/View/Search/EmployeeSearchView.cs
+++ b/BeWo/View/Search/EmployeeSearchView.cs
@@ -53,6 +53,8 @@ namespace BeWo.View.Search
             }
         }
 
+        public bool OnlyOwnChat { get; set; }
+        
         protected override bool ShowDCInList(object dc)
         {
             var emp = dc as CompactEmployeeDC;
@@ -83,7 +85,11 @@ namespace BeWo.View.Search
             }
             else
             {
-                if (SearchMode == SearchMode.OnlyTeamMember)
+                if (OnlyOwnChat)
+                {
+                    ServiceFacade.DoEmployeeServiceAsync(s => s.GetAllChatActiveEmployeesCompact(), pCallBack);
+                }
+                else if (SearchMode == SearchMode.OnlyTeamMember)
                 {
                     Cache.GetInstance().GetAllTeamMemberForEmployee(BeWoApp.LoggedOnUser.Employee, pCallBack);
                 }
diff --git a/BeWo/ViewModel/TeamVM.cs b/BeWo/ViewModel/TeamVM.cs
index 5a9379478..41f777970 100644
--- a/BeWo/ViewModel/TeamVM.cs
+++ b/BeWo/ViewModel/TeamVM.cs
@@ -82,7 +82,7 @@ namespace BeWo.ViewModel
             }
         }
 
-        [Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
+        
         public string LeaderString
         {
             get { return this._Leader.ToStringNullCheck(); } // Validation Workaround
@@ -117,6 +117,11 @@ namespace BeWo.ViewModel
             }
         }
 
+        public void OwnChatMemberRoleChanged(bool changed)
+        {
+            this.StoreDirtyInformation(changed, "OwnChatMemberRole");
+        }
+
         [ValidationAttribute(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
         public string Name
         {
diff --git a/Model/Changes_2025-10-23 Team Change EmployeeOid.txt b/Model/Changes_2025-10-23 Team Change EmployeeOid.txt
new file mode 100644
index 000000000..9364bb8e9
--- /dev/null
+++ b/Model/Changes_2025-10-23 Team Change EmployeeOid.txt	
@@ -0,0 +1,9 @@
+
+ALTER TABLE `team` 
+DROP FOREIGN KEY `FK_TEAM_LEADER_EMPLOYEE`;
+ALTER TABLE `team` 
+CHANGE COLUMN `EmployeeOid` `EmployeeOid` BIGINT NULL ;
+ALTER TABLE `team` 
+ADD CONSTRAINT `FK_TEAM_LEADER_EMPLOYEE`
+  FOREIGN KEY (`EmployeeOid`)
+  REFERENCES `employee` (`Oid`);
diff --git a/Service/DCEntityMapper/CompactTeamDC_Team.cs b/Service/DCEntityMapper/CompactTeamDC_Team.cs
index a55f1857f..fcb4b7a9c 100644
--- a/Service/DCEntityMapper/CompactTeamDC_Team.cs
+++ b/Service/DCEntityMapper/CompactTeamDC_Team.cs
@@ -11,9 +11,13 @@ namespace BeWo.Service.DCEntityMapper
         public override CompactTeamDC MergeWithDC(Team pEntity, CompactTeamDC pDataContract)
         {
             pDataContract.Name = pEntity.Name;
-            pDataContract.LeaderString = pEntity.Leader.Person.LastName + ", " + pEntity.Leader.Person.FirstName;
+            if (pEntity.Leader != null)
+            {
+                pDataContract.LeaderString = pEntity.Leader.Person.LastName + ", " + pEntity.Leader.Person.FirstName;
+            }
             pDataContract.TeamOid = pEntity.Oid.Value;
             pDataContract.TeamVersion = pEntity.Version.Value;
+            pDataContract.IsOwnChatTeam = pEntity.IsOwnChatTeam;
 
             return pDataContract;
         }
diff --git a/Service/DCEntityMapper/TeamDC_Team.cs b/Service/DCEntityMapper/TeamDC_Team.cs
index 220c1c0f2..4ce4b508a 100644
--- a/Service/DCEntityMapper/TeamDC_Team.cs
+++ b/Service/DCEntityMapper/TeamDC_Team.cs
@@ -15,7 +15,11 @@ namespace BeWo.Service.DCEntityMapper
             pDataContract.TeamOid = pEntity.Oid;
             pDataContract.TeamVersion = pEntity.Version;
             pDataContract.Notice = pEntity.Notice;
-            pDataContract.Leader = MapperFactory.CompactEmployeeDC_Employee.MapToNewDC(pEntity.Leader);
+            if (pEntity.Leader != null)
+            {
+                pDataContract.Leader = MapperFactory.CompactEmployeeDC_Employee.MapToNewDC(pEntity.Leader);
+            }
+            
             pDataContract.Member = MapperFactory.CompactEmployeeDC_Employee.MapToNewDCs(pEntity.MemberList);
             pDataContract.OwnChatMember = MapperFactory.Person2TeamDC_Person2Team.MapToNewDCs(pEntity.OwnChatMember);
 
@@ -34,10 +38,14 @@ namespace BeWo.Service.DCEntityMapper
             pEntity.Notice = pDataContract.Notice;
             pEntity.Name = pDataContract.Name;
 
-            if (pEntity.Leader == null || pEntity.Leader.Oid != pDataContract.Leader.EmployeeOid)
+            if ((pEntity.Leader == null && pDataContract.Leader != null) || (pEntity.Leader?.Oid != pDataContract.Leader?.EmployeeOid))
             {
                 pEntity.Leader = DAOFactory.GenericDAO.LoadByID<Employee>(pDataContract.Leader.EmployeeOid);
             }
+            else if (pDataContract.Leader == null)
+            {
+                pEntity.Leader = null;
+            }
 
             MapperFactory.CompactEmployeeDC_Employee.MergeWithEntitys(pDataContract.Member, pEntity.MemberList);
             MapperFactory.Person2TeamDC_Person2Team.MergeWithEntitys(pDataContract.OwnChatMember, pEntity.OwnChatMember);
diff --git a/Service/ServiceImplementations/CustomerServiceImp.cs b/Service/ServiceImplementations/CustomerServiceImp.cs
index eb1a4a677..44e2e6bff 100644
--- a/Service/ServiceImplementations/CustomerServiceImp.cs
+++ b/Service/ServiceImplementations/CustomerServiceImp.cs
@@ -3098,6 +3098,11 @@ namespace BeWo.Service.ServiceImplementations
 			{
 				var customers = DAOFactory.SearchDAO.FindAllChatActiveCustomers();
 
+				if (personOid == 0)
+				{
+					return MapperFactory.CompactCustomerDC_Customer.MapToNewDCs(customers).OrderBy(c => c.LastNameFirstName).ToList();
+				}
+
 				var chatpartner = DAOFactory.SearchDAO.FindAllChatpartnerEmployee2Customer(personOid);
 
 				List<Customer> customerpartner = new List<Customer>();
diff --git a/Service/ServiceImplementations/EmployeeServiceImp.cs b/Service/ServiceImplementations/EmployeeServiceImp.cs
index 677c4b24c..cb60c0789 100644
--- a/Service/ServiceImplementations/EmployeeServiceImp.cs
+++ b/Service/ServiceImplementations/EmployeeServiceImp.cs
@@ -477,7 +477,7 @@ namespace BeWo.Service.ServiceImplementations
             {
                 var s = PluginLoader.FindClass<EmployeeService>();
 
-                return s.GetAllTeamsCompact();
+                return s.GetAllTeamsCompact(false);
 
             }
             catch (Exception e)
@@ -485,7 +485,22 @@ namespace BeWo.Service.ServiceImplementations
                 throw Utils.CreateBeWoFaultException(e);
             }
         }
-        
+
+        public List<CompactTeamDC> GetAllTeamsIncludingOwnChatCompact()
+        {
+            try
+            {
+                var s = PluginLoader.FindClass<EmployeeService>();
+
+                return s.GetAllTeamsCompact(true);
+
+            }
+            catch (Exception e)
+            {
+                throw Utils.CreateBeWoFaultException(e);
+            }
+        }
+
         public List<AssessmentSheetEntryDC> GetAssessmentSheetEntriesForCustomer(long customerOid, DateTime startDt, DateTime endDt)
         {
             
@@ -1347,7 +1362,7 @@ namespace BeWo.Service.ServiceImplementations
             {
                 var employees = DAOFactory.SearchDAO.FindAllChatActiveEmployees();
 
-                return MapperFactory.CompactEmployeeDC_Employee.MapToNewDCs(employees);
+                return MapperFactory.CompactEmployeeDC_Employee.MapToNewDCs(employees).OrderBy(e => e.ToString()).ToList();
             }
             catch (Exception e)
             {
diff --git a/Shared/DataContracts/Compact/ClientPartials/CompactTeamDC.cs b/Shared/DataContracts/Compact/ClientPartials/CompactTeamDC.cs
index ce8fb8d05..1913495cc 100644
--- a/Shared/DataContracts/Compact/ClientPartials/CompactTeamDC.cs
+++ b/Shared/DataContracts/Compact/ClientPartials/CompactTeamDC.cs
@@ -46,7 +46,11 @@ namespace BS.Shared.DataContracts.Compact
 
         public override string ToString()
         {
-            return this.Name + ", Leitung: " + this.LeaderString;
+            if (!string.IsNullOrEmpty(this.LeaderString))
+            {
+                return this.Name + ", Leitung: " + this.LeaderString;
+            }
+            return this.Name;
         }
 
         public SolidColorBrush FilterableBrush => new SolidColorBrush(Colors.Transparent);
diff --git a/Shared/DataContracts/Compact/CompactTeamDC.cs b/Shared/DataContracts/Compact/CompactTeamDC.cs
index e2ab15ea3..1359c9029 100644
--- a/Shared/DataContracts/Compact/CompactTeamDC.cs
+++ b/Shared/DataContracts/Compact/CompactTeamDC.cs
@@ -11,6 +11,9 @@ namespace BS.Shared.DataContracts.Compact
         [DataMember]
         public string Name { get; set; }
 
+        [DataMember]
+        public bool IsOwnChatTeam { get; set; }
+
         [DataMember]
         public long TeamOid { get; set; }
 
diff --git a/Shared/DataContracts/Person2TeamDC.cs b/Shared/DataContracts/Person2TeamDC.cs
index 14546b60d..641849e31 100644
--- a/Shared/DataContracts/Person2TeamDC.cs
+++ b/Shared/DataContracts/Person2TeamDC.cs
@@ -21,6 +21,22 @@ namespace BS.Shared.DataContracts
         [DataMember]
         public int? OwnChatRole { get; set; }
 
+        public bool IstModerator
+        {
+            get
+            {
+                if (!OwnChatRole.HasValue || OwnChatRole.Value == 0)
+                {
+                    return true;
+                }
+                return false;
+            }
+            set
+            {
+                OwnChatRole = value ? 0 : 1;
+            }
+        }
+
         public override bool Equals(object obj)
         {
             if (obj is Person2TeamDC)