From ec7f717476ab4c9a06bcbdf9d321e046e640e2bf Mon Sep 17 00:00:00 2001
From: Waldi <waldemar.ruppel@beyondsoft.de>
Date: Thu, 30 Mar 2017 06:19:17 +0200
Subject: [PATCH] Vieles, SBD Update, MonthlyFLS und Speichern der Durationart
 in die Appsettings

---
 BeWo/BeWoApp.xaml.cs                          |   20 +
 BeWo/Core/Config/AppSettings.cs               |   16 +-
 .../NewSchulbegleitenderDienstView.xaml       |  155 +-
 .../NewSchulbegleitenderDienstView.xaml.cs    |  364 +++-
 BeWo/ServiceProxy/Generated.cs                | 1878 +++++++++--------
 BeWo/View/Detail/EmployeeView.xaml            |   29 +-
 BeWo/View/Detail/ServiceRecordView2.xaml.cs   |   17 +
 BeWo/ViewModel/ContractVM.cs                  |   21 +
 BeWo/ViewModel/ServiceRecordVM.cs             |    1 +
 Data/Entities/Contract.cs                     |   14 +
 Data/Mappings/Contract.hbm.xml                |    1 +
 Model/Changes_2017_03_29.txt                  |    3 +
 Service/DCEntityMapper/ContractDC_Contract.cs |    2 +
 .../ServiceContracts/IOperationsService.cs    |   12 +
 .../OperationsServiceImp.cs                   |   44 +
 Shared/DataContracts/ContractDC.cs            |    3 +
 16 files changed, 1504 insertions(+), 1076 deletions(-)
 create mode 100644 Model/Changes_2017_03_29.txt

diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs
index b6c054db0..31798b242 100644
--- a/BeWo/BeWoApp.xaml.cs
+++ b/BeWo/BeWoApp.xaml.cs
@@ -202,6 +202,7 @@ namespace BeWo
                 bool isZeiterfassungInStdMin                 = false;
 			    int lastSelectedStundenkontoIntervall = 3;
 			    bool showSignatures                          = false;
+                
 
                 AppSettings.ShowAdvisedAttendedFlag = false;
 				String timeRecordingMenuName = "Zeiterfassung";
@@ -365,6 +366,7 @@ namespace BeWo
                         showSignatures = true;
                     }
 
+
                     switch (_Mandator.BeWoClientType)
 					{
 						case 1:
@@ -439,6 +441,7 @@ namespace BeWo
 				AppSettings.PrinterSettingsUseLandscape              = printerSettingsUseLandscape;
 				AppSettings.PrinterSettingsUseMargins                = printerSettingsUseMargins;
 				AppSettings.PrinterSettingsUsePaperKind              = printerSettingsUsePaperKind;
+			    
 
                 BS.Shared.Settings.ApplicationSettings.SupportConceptExpirationLimitInMonths = AppSettings.HilfeplanAuslaufAuswahl;
 			}
@@ -664,6 +667,7 @@ namespace BeWo
 				SetSettingValue(SettingsType.ApplicationSettings, "DocumentationFontSize", _AppSettings.DocumentationFontSize.ToString());
                 SetSettingValue(SettingsType.ApplicationSettings, "ZeigeNurMeineTermine", _AppSettings.ZeigeNurMeineTermine ? "1" : "0");
                 SetSettingValue(SettingsType.ApplicationSettings, "LastSelectedServiceRecordTimeIntervalDays", ((int)_AppSettings.LastSelectedServiceRecordTimeIntervalDays).ToString());
+                SetSettingValue(SettingsType.ApplicationSettings, "LetzteZeiterfassungsDauer", ((int)_AppSettings.LetzteZeiterfassungsDauer).ToString());
 
                 string val = string.Empty;
 				if (_AppSettings.StartupPanelOrder != null)
@@ -809,6 +813,22 @@ namespace BeWo
 			                "LastSelectedServiceRecordTimeIntervalDays"));
 			    }
 
+
+                val = GetSettingValue(SettingsType.ApplicationSettings, "LetzteZeiterfassungsDauer");
+                if (val != null)
+                {
+                   var x = Convert.ToInt32(GetSettingValue(SettingsType.ApplicationSettings,
+                            "LetzteZeiterfassungsDauer"));
+                    if (x == 0)
+                    {
+                        _AppSettings.LetzteZeiterfassungsDauer = ZeiterfassungsDauer.Minuten;
+                    }
+                    else
+                    {
+                        _AppSettings.LetzteZeiterfassungsDauer = ZeiterfassungsDauer.Stunden;
+                    }
+                }
+
 			    val = GetSettingValue(SettingsType.ApplicationSettings, "StartupPanelOrder");
                 if (val != null)
 				{
diff --git a/BeWo/Core/Config/AppSettings.cs b/BeWo/Core/Config/AppSettings.cs
index bd56ad18b..e88499c6c 100644
--- a/BeWo/Core/Config/AppSettings.cs
+++ b/BeWo/Core/Config/AppSettings.cs
@@ -26,6 +26,8 @@ namespace BeWo.Core.Config
 
         private int mLastSelectedServiceRecordTimeIntervalDays = 7;
 
+        private ZeiterfassungsDauer mLetzteZeiterfassungsDauer = ZeiterfassungsDauer.Minuten;
+
         public enum WindowStateType
         {
             Default,
@@ -71,7 +73,19 @@ namespace BeWo.Core.Config
             get { return misZeiterfassungInStdMin; }
             set { misZeiterfassungInStdMin = value; }
         }
-        
+
+        public ZeiterfassungsDauer LetzteZeiterfassungsDauer
+        {
+            get { return mLetzteZeiterfassungsDauer; }
+            set
+            {
+                if (mLetzteZeiterfassungsDauer != value)
+                {
+                    mLetzteZeiterfassungsDauer = value;
+                    IsDirty = true;
+                }
+            }
+        }
 
         public int MaxDaysEditServiceRecordsAllowed { get; set; }
 
diff --git a/BeWo/SchulbegleitenderDienst/NewSchulbegleitenderDienstView.xaml b/BeWo/SchulbegleitenderDienst/NewSchulbegleitenderDienstView.xaml
index 41c2a24d3..3495dc8b8 100644
--- a/BeWo/SchulbegleitenderDienst/NewSchulbegleitenderDienstView.xaml
+++ b/BeWo/SchulbegleitenderDienst/NewSchulbegleitenderDienstView.xaml
@@ -16,6 +16,7 @@
                     xmlns:controls="clr-namespace:BeWo.View.Controls"
                     xmlns:controls1="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
                     xmlns:validation="clr-namespace:BeWo.Validation"
+                    xmlns:search="clr-namespace:BeWo.View.Search"
                     Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True">
 	<localView:BeWoView.Resources>
 		<ResourceDictionary>
@@ -63,9 +64,9 @@
                 <!-- ####################################### Bereich Mitarbeiter #####################################-->
                 <Button Content="Mitarbeiter Vertretung" Grid.Row="1" Grid.Column="0" Margin="3,3,3,3" Click="MitarbeiterVertretung_OnClick" x:Name="MitarbeiterVertretung_Button"/>
 
-                <controls:PopupNonTopmost Topmost="False" x:Name="popup_newEnvironmentPerson" Width="350" StaysOpen="True" Placement="Relative" Grid.Row="1" PlacementTarget="{Binding ElementName=MitarbeiterVertretung_Button}">
+                <controls:PopupNonTopmost Topmost="False" x:Name="popup_newMitarbeiterVertretung" Width="350" StaysOpen="True" Placement="Relative" Grid.Row="1" PlacementTarget="{Binding ElementName=MitarbeiterVertretung_Button}">
                     <Border Background="White" Padding="3" BorderThickness="1" BorderBrush="Gray">
-                        <GroupBox x:Name="groupbox_newEnvironmentPerson" Header="Neue Person hinzufügen" Style="{DynamicResource ObjectEditGroupBox}">
+                        <GroupBox x:Name="groupbox_newEnvironmentPerson" Header="Neuen Mitarbeiter hinzufügen" Style="{DynamicResource ObjectEditGroupBox}">
                             <Grid>
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="Auto" />
@@ -78,28 +79,36 @@
                                     <RowDefinition Height="Auto" />
                                     <RowDefinition Height="Auto" />
                                     <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
                                 </Grid.RowDefinitions>
 
-                                <Label Grid.Row="0" Grid.Column="0" Content="Person" />
-                                <Label Grid.Row="1" Grid.Column="0" Content="Organisation" />
-                                <Label Grid.Row="2" Grid.Column="0" Content="Rolle" />
-                                <Label Grid.Row="3" Grid.Column="0" Content="Notiz" />
+                                <Label Grid.Row="0" Grid.Column="0" Content="Mitarbeiter" />
+                                <Label Grid.Row="1" Grid.Column="0" Content="Vertretung" />
+                                <Label Grid.Row="2" Grid.Column="0" Content="Abwesenheits Kategorie" />
+                                <Label Grid.Row="3" Grid.Column="0" Content="Krankschreibung von" />
+                                <Label Grid.Row="4" Grid.Column="0" Content="Krankschreibung bis" />
+                                <Label Grid.Row="5" Grid.Column="0" Content="Notiz" />
 
                                 
                                 <!--  PreviewMouseDoubleClick="Popupedit_environmentPersonSearch_OnPreviewMouseDoubleClick" Text="{validation:ValidationBinding Path=EnvironmentPersons.NewVM.PersonString, UpdateSourceTrigger=PropertyChanged}"
-											              NewClick="popupedit_environmentPersonSearch_NewClick"  PopUpClick="popupedit_environmentPersonSearch_PopUpClick" -->
+											                PopUpClick="popupedit_environmentPersonSearch_PopUpClick" -->
                                 <controls1:PopUpEdit Cursor="Arrow" NewButtonVisibility="Visible"
-											              IsReadOnly="True"
-											              x:Name="popupedit_environmentPersonSearch" Grid.Column="1" Grid.ColumnSpan="2" Margin="3" Height="23"
-											              Grid.Row="0" DeleteButtonVisibility="Collapsed"	Text="Hi" />									             
+										          IsReadOnly="True"
+									              x:Name="popupedit_MitarbeiterVertretungSearch" Grid.Column="1" Grid.ColumnSpan="2" Margin="3" Height="23"
+									              Grid.Row="0" DeleteButtonVisibility="Collapsed"
+                                                  NewClick="Popupedit_MitarbeiterVertretungSearch_OnNewClickpopupedit_MitarbeiterVertretungSearch_NewClick"                     
+                                                  PopUpClick="Popupedit_MitarbeiterVertretungSearch_OnPopUpClick_popupedit_MitarbeiterVertretungSearch_PopUpClick"  
+                                                     
+                                                  />									             
 											               
 
                                 <!--  NewClick="popupedit_environmentOrganisationSearch_NewClick" PopUpClick="popupedit_environmentPersonOrganisationSearch_PopUpClick"
                                         PreviewMouseDoubleClick="Popupedit_environmentOrganisationSearch_OnPreviewMouseDoubleClick" Text="{Binding Path=EnvironmentPersons.NewVM.OrganisationString, UpdateSourceTrigger=PropertyChanged}"-->
-                                
+                               
                                 <controls1:PopUpEdit NewButtonVisibility="Visible"
                                         Cursor="Arrow"
-                                        Text="Hallo"
+                                        
                                         IsReadOnly="True"
                                         x:Name="popupedit_environmentPersonOrganisationSearch"
                                         Grid.Column="1" Margin="3" Height="23" Grid.Row="1" Grid.ColumnSpan="2"
@@ -109,21 +118,25 @@
 
                                 <!--popupedit_environmentOrganisationSearch  danach suchen für organisationsbereich -->
 
-                                <ComboBox Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="2" Margin="3" Height="23"
-											              ItemsSource="{Binding Path=EnvironmentPersons.PossibleRoles}"
-											              SelectedItem="{validation:ValidationBinding Path=EnvironmentPersons.NewVM.Role}" />
+                                <dxe:DateEdit x:Name="MVDatepickerVon" MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="2" Margin="3" Height="23" EditValueChanged="MVDatepickerVon_OnEditValueChanged"/>
 
-                                <TextBox Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="3" Margin="3" Height="50" AcceptsReturn="True"
+                                <dxe:DateEdit x:Name="MVDatepickerBis" MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="4" Grid.ColumnSpan="2" Margin="3" Height="23" EditValueChanged="MVDatepickerBis_OnEditValueChanged" />
+
+                                <!--<ComboBox Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="2" Margin="3" Height="23"
+											              ItemsSource="{Binding Path=EnvironmentPersons.PossibleRoles}"
+											              SelectedItem="{validation:ValidationBinding Path=EnvironmentPersons.NewVM.Role}" />-->
+
+                                <TextBox Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="5" Margin="3" Height="50" AcceptsReturn="True"
 										                VerticalScrollBarVisibility="Auto"
 										                Text="{Binding Path=EnvironmentPersons.NewVM.Notice, UpdateSourceTrigger=PropertyChanged}" />
 
 
                                 <!-- Click="button_addEnvironmentPerson_Click"   -->
-                                <Button Grid.Column="1" Grid.Row="4" x:Name="button_addEnvironmentPerson"	Content="Hinzufügen" Height="25" 								                
-										                FontWeight="Normal" Margin="3" VerticalAlignment="Bottom" HorizontalAlignment="Right" />
+                                <Button Grid.Column="1" Grid.Row="6" x:Name="button_addMitarbeiterVertretung"	Content="Hinzufügen" Height="25" 								                
+										                FontWeight="Normal" Margin="3" VerticalAlignment="Bottom" HorizontalAlignment="Right"  Click="Button_addMitarbeiterVertretung_OnClick"/>
 
                                 <!--Click="button_cancelAddEnvironmentPerson_Click" -->
-                                <Button Grid.Row="4" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="25"
+                                <Button Grid.Row="6" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="25"
 										                Margin="3" Content="Abbrechen" x:Name="button_cancelMitarbeiterVertretung" Click="Button_cancelMitarbeiterVertretung_OnClick"/>
 
                             </Grid>
@@ -140,7 +153,7 @@
                 
                 <controls:PopupNonTopmost Topmost="False" x:Name="popup_newKlientVertretung" Width="350" StaysOpen="True" Placement="Relative" Grid.Row="1" PlacementTarget="{Binding ElementName=KlientVertretung_Button}">
                     <Border Background="White" Padding="3" BorderThickness="1" BorderBrush="Gray">
-                        <GroupBox x:Name="groupbox_newKlientVertretung" Header="Neue Person hinzufügen" Style="{DynamicResource ObjectEditGroupBox}">
+                        <GroupBox x:Name="groupbox_newKlientVertretung" Header="Neue Klienten hinzufügen" Style="{DynamicResource ObjectEditGroupBox}">
                             <Grid>
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="Auto" />
@@ -153,53 +166,43 @@
                                     <RowDefinition Height="Auto" />
                                     <RowDefinition Height="Auto" />
                                     <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
                                 </Grid.RowDefinitions>
 
-                                <Label Grid.Row="0" Grid.Column="0" Content="Person" />
-                                <Label Grid.Row="1" Grid.Column="0" Content="Organisation" />
-                                <Label Grid.Row="2" Grid.Column="0" Content="Rolle" />
-                                <Label Grid.Row="3" Grid.Column="0" Content="Notiz" />
+                                <Label Grid.Row="0" Grid.Column="0" Content="Klient" />
+                                <Label Grid.Row="1" Grid.Column="0" Content="Abwesenheits Kategorie" />
+                                <Label Grid.Row="2" Grid.Column="0" Content="Krankschreibung von" />
+                                <Label Grid.Row="3" Grid.Column="0" Content="Krankschreibung bis" />
+                                <Label Grid.Row="4" Grid.Column="0" Content="Notiz" />
 
 
                                 <!--  PreviewMouseDoubleClick="Popupedit_environmentPersonSearch_OnPreviewMouseDoubleClick" Text="{validation:ValidationBinding Path=EnvironmentPersons.NewVM.PersonString, UpdateSourceTrigger=PropertyChanged}"
-											              NewClick="popupedit_environmentPersonSearch_NewClick"  PopUpClick="popupedit_environmentPersonSearch_PopUpClick" -->
+											              NewClick="popupedit_environmentPersonSearch_NewClick" PopUpClick="Popupedit_environmentPersonSearch2_OnPopUpClick_popupedit_environmentPersonSearch_PopUpClick"  -->
                                 <controls1:PopUpEdit Cursor="Arrow" NewButtonVisibility="Visible"
-											              IsReadOnly="True"
-											              x:Name="popupedit_environmentPersonSearch2" Grid.Column="1" Grid.ColumnSpan="2" Margin="3" Height="23"
-											              Grid.Row="0" DeleteButtonVisibility="Collapsed"	Text="Hi" />
+											        IsReadOnly="True"
+											        x:Name="popupedit_KlientVertretungSearch" Grid.Column="1" Grid.ColumnSpan="2" Margin="3" Height="23"
+											        Grid.Row="0" DeleteButtonVisibility="Collapsed" 
+                                                    PopUpClick="Popupedit_KlientVertretungSearch_OnPopUpClick_popupedit_KlientVertretungSearch_PopUpClick"/>
+                                
 
+                                <dxe:DateEdit x:Name="KVDatepickerVon" MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="2" Margin="3" Height="23" EditValueChanged="KVDatepickerVon_OnEditValueChanged"/>
 
-                                <!--  NewClick="popupedit_environmentOrganisationSearch_NewClick" PopUpClick="popupedit_environmentPersonOrganisationSearch_PopUpClick"
-                                        PreviewMouseDoubleClick="Popupedit_environmentOrganisationSearch_OnPreviewMouseDoubleClick" Text="{Binding Path=EnvironmentPersons.NewVM.OrganisationString, UpdateSourceTrigger=PropertyChanged}"-->
+                                <dxe:DateEdit x:Name="KVDatepickerBis" MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="2" Margin="3" Height="23"  EditValueChanged="KVDatepickerBis_OnEditValueChanged"/>
+                                                           
 
-                                <controls1:PopUpEdit NewButtonVisibility="Visible"
-                                        Cursor="Arrow"
-                                        Text="Hallo"
-                                        IsReadOnly="True"
-                                        x:Name="popupedit_environmentPersonOrganisationSearch2"
-                                        Grid.Column="1" Margin="3" Height="23" Grid.Row="1" Grid.ColumnSpan="2"
-                                        DeleteButtonVisibility="Collapsed"/>
-
-
-
-                                <!--popupedit_environmentOrganisationSearch  danach suchen für organisationsbereich -->
-
-                                <ComboBox Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="2" Margin="3" Height="23"
-											              ItemsSource="{Binding Path=EnvironmentPersons.PossibleRoles}"
-											              SelectedItem="{validation:ValidationBinding Path=EnvironmentPersons.NewVM.Role}" />
-
-                                <TextBox Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="3" Margin="3" Height="50" AcceptsReturn="True"
+                                <TextBox Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="4" Margin="3" Height="50" AcceptsReturn="True"
 										                VerticalScrollBarVisibility="Auto"
 										                Text="{Binding Path=EnvironmentPersons.NewVM.Notice, UpdateSourceTrigger=PropertyChanged}" />
 
 
                                 <!-- Click="button_addEnvironmentPerson_Click"    -->
-                                <Button Grid.Column="1" Grid.Row="4" x:Name="button_addEnvironmentPerson2"	Content="Hinzufügen" Height="25"								                
-										                FontWeight="Normal" Margin="3" VerticalAlignment="Bottom" HorizontalAlignment="Right" />
+                                <Button Grid.Column="1" Grid.Row="5" x:Name="button_addKlientVertretung"	Content="Hinzufügen" Height="25"								                
+										                FontWeight="Normal" Margin="3" VerticalAlignment="Bottom" HorizontalAlignment="Right" Click="Button_addKlientVertretung_OnClick" />
 
                                 <!--Click="button_cancelAddEnvironmentPerson_Click" -->
-                                <Button Grid.Row="4" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="25"
-										                Margin="3" Content="Abbrechen" x:Name="button_cancelAddEnvironmentPerson2" Click="Button_cancelKlientVertretung_OnClick" />
+                                <Button Grid.Row="5" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="25"
+										                Margin="3" Content="Abbrechen" x:Name="button_cancelKlientVertretung" Click="Button_cancelKlientVertretung_OnClick" />
 
                             </Grid>
                         </GroupBox>
@@ -215,41 +218,8 @@
             </Grid>
 
         <!-- ########################################################################################################## -->
-        
-                <!--<ListView Grid.Column="0" Grid.Row="1" x:Name="MitarbeiterList" Margin="3,3,3,3" AllowDrop="True" DragEnter="MitarbeiterList_OnDragEnter" DragLeave="MitarbeiterList_OnDragLeave">
-            <ListView.View>
-                <GridView>
-                    <GridViewColumn  Header="Mitarbeiter" Width="200" DisplayMemberBinding="{Binding Mitarbeiter}"/>
-                </GridView>
-            </ListView.View>
-        </ListView>-->
 
-            <!--<dxg:GridControl x:Name="MitarbeiterList"  Grid.Row="1" Grid.Column="0" AllowDrop="true" DragEnter="GridDataControl_OnDragEnter" DragLeave="GridDataControl_OnDragLeave" Margin="3,3,10,3" Width="250">
-                <dxg:GridControl.Columns>
-                    <dxg:GridColumn FieldName="Mitarbeiter" Width="250"/>
-                </dxg:GridControl.Columns>
-            </dxg:GridControl>-->
-
-
-            <!--<ListView Grid.Column="1" Grid.Row="1" x:Name="SchulbegleitenderDienstList" Margin="3,3,3,3" BorderBrush="Black" BorderThickness="1" HorizontalAlignment="Center">
-            <ListView.View>
-                <GridView>
-                    <GridViewColumn  Header="Vertretung" Width="200"  DisplayMemberBinding="{Binding Vertretung}" />
-                    <GridViewColumn  Header="Kunde" Width="385" DisplayMemberBinding="{Binding Kunde}"/>
-                    <GridViewColumn  Header="Mitarbeiter/Krank" Width="200" DisplayMemberBinding="{Binding KrankerMitarbeiter}"/>
-                    <GridViewColumn  Header="MA Fehlzeit" Width="200" DisplayMemberBinding="{Binding MaFehlzeit}"/>
-                    <GridViewColumn  Header="Kind Fehlzeit" Width="200" DisplayMemberBinding="{Binding KindFehlzeit}"/>
-                </GridView>
-            </ListView.View>
-            <ListView.Resources>
-                <Style x:Key="itemstyle" TargetType="{x:Type ListViewItem}">
-                    <Setter Property="BorderThickness" Value="1" />
-                    <Setter Property="BorderBrush" Value="Black" />
-                </Style>
-            </ListView.Resources> 
-        </ListView>-->
-
-        <dxg:GridControl AutoGenerateColumns="AddNew" x:Name="GridDataControl"  Grid.Row="1" Grid.ColumnSpan="3" AllowDrop="true" DragEnter="GridDataControl_OnDragEnter" DragLeave="GridDataControl_OnDragLeave" Margin="5,5,5,5">
+        <dxg:GridControl AutoGenerateColumns="AddNew" x:Name="GridDataControl"  Grid.Row="1" Grid.ColumnSpan="3" AllowDrop="true"  Margin="5,5,5,5">
             <dxg:GridControl.Columns>
                 
                 
@@ -261,6 +231,7 @@
                 <dxg:GridColumn FieldName="Kunde" Width="250"/>
                 <dxg:GridColumn FieldName="KrankerMitarbeiter" Width="250" />
                 <dxg:GridColumn FieldName="KrankheitsZeitraum" Width="250"/>
+                <dxg:GridColumn FieldName="AbwesenheitsKategorie" Width="250"/>
                 <dxg:GridColumn FieldName="MaFehlzeit"  Width="250"/>
                 <dxg:GridColumn FieldName="KindFehlzeit"  Width="250"/>
             </dxg:GridControl.Columns>
@@ -269,7 +240,17 @@
             </dxg:GridControl.View>
         </dxg:GridControl>
         <!-- End mal geschaut  -->
-        
-	</Grid>
+
+
+            <Popup Margin="10" x:Name="popup_MitarbeiterVertretung" StaysOpen="False" Placement="MousePoint" Width="370" Height="250"
+		       Closed="popup_Closed" Opened="popup_Opened">
+                <search:EmployeeSearchView x:Name="MitarbeiterVertretungsearchview" />
+            </Popup>
+            
+            <Popup Margin="10" x:Name="popup_KlientVertretung" StaysOpen="False" Placement="MousePoint" Width="370" Height="250"
+		       Closed="popup_Closed" Opened="popup_Opened">
+                <search:CustomerSearchView x:Name="KlientVertretungsearchview" />
+            </Popup>
+        </Grid>
     </ScrollViewer>
 </localView:BeWoView>
diff --git a/BeWo/SchulbegleitenderDienst/NewSchulbegleitenderDienstView.xaml.cs b/BeWo/SchulbegleitenderDienst/NewSchulbegleitenderDienstView.xaml.cs
index 702684f1e..a80482564 100644
--- a/BeWo/SchulbegleitenderDienst/NewSchulbegleitenderDienstView.xaml.cs
+++ b/BeWo/SchulbegleitenderDienst/NewSchulbegleitenderDienstView.xaml.cs
@@ -20,7 +20,8 @@ using BeWo.Core.Service;
 using BeWo.Scheduler.Converter;
 using BeWo.Scheduler.ViewModel;
 using BeWo.ServiceProxy;
-
+using BeWo.View.Detail;
+using BeWo.ViewModel;
 using BS.Shared;
 using BS.Shared.Core;
 using BS.Shared.DataContracts;
@@ -48,18 +49,26 @@ namespace BeWo.SchulbegleitenderDienst
 	{
         public List<string> Mitarbeiter { get; set; }
 
+        private List<SchulbegleitenderDienst> items = new List<SchulbegleitenderDienst>();
+
         public NewSchulbegleitenderDienstView()
 	    {
             InitializeComponent();
 
+            GridDataControl.ItemsSource = items;
+
+	        getAllVertretungenOnLoad(null,DateTime.Now,null);
             
-	        TestMitarbeiter();
-
-	        TestSchulBegleitenderDienst();
-
-
             setAktDate();
 
+
+	        //TestMitarbeiter();
+
+	        //TestSchulBegleitenderDienst();
+
+
+          
+
             //SchulbegleitenderDienstList.ItemContainerStyle = (Style)SchulbegleitenderDienstList.Resources["itemstyle"];
         }
 
@@ -91,14 +100,14 @@ namespace BeWo.SchulbegleitenderDienst
             //Hier muss nacher die Funktion hin die Alle Daten Rauspickt
             List<SchulbegleitenderDienst> items = new List<SchulbegleitenderDienst>();
 
-            items.Add(new SchulbegleitenderDienst() { Vertretung = "John Doe" , Kunde = "Schlumpfine", KrankerMitarbeiter = "Hanz", KrankheitsZeitraum = "10.03.2017 - 13.03.2017", MaFehlzeit = "KEine",KindFehlzeit = "Keine"});
-            items.Add(new SchulbegleitenderDienst() { Vertretung = "Miss Piggi" , Kunde = "Schlumpfine", KrankerMitarbeiter = "Hanz", KrankheitsZeitraum = "10.05.2017 - 13.06.2017", MaFehlzeit = "KEine", KindFehlzeit = "Keine" });
-            items.Add(new SchulbegleitenderDienst() { Vertretung = "Lynchknoten" , Kunde = "Schlumpfine", KrankerMitarbeiter = "Hanz", KrankheitsZeitraum = "10.06.2017 - 13.07.2017", MaFehlzeit = "KEine", KindFehlzeit = "Keine" });
-            items.Add(new SchulbegleitenderDienst() { Vertretung = "Franz Dita von HodenKnecht" , Kunde = "Schlumpfine", KrankerMitarbeiter = "Hanz", KrankheitsZeitraum = "02.03.2017 - 13.03.2017", MaFehlzeit = "KEine", KindFehlzeit = "Keine" });
-            items.Add(new SchulbegleitenderDienst() { Vertretung = "Miss Piggi", Kunde = "Schlumpfine", KrankerMitarbeiter = "Hanz", KrankheitsZeitraum = "10.05.2017 - 13.06.2017", MaFehlzeit = "KEine", KindFehlzeit = "Keine" });
-            items.Add(new SchulbegleitenderDienst() { Vertretung = "Miss Piggi", Kunde = "Schlumpfine", KrankerMitarbeiter = "Hanz", KrankheitsZeitraum = "10.05.2017 - 13.06.2017", MaFehlzeit = "KEine", KindFehlzeit = "Keine" });
-            items.Add(new SchulbegleitenderDienst() {  Kunde = "Schlumpfine", KrankerMitarbeiter = "Hanz", KrankheitsZeitraum = "10.05.2017 - 13.06.2017", MaFehlzeit = "KEine", KindFehlzeit = "Keine" });
-            items.Add(new SchulbegleitenderDienst() { Vertretung = "Miss Piggi", Kunde = "Schlumpfine", KrankerMitarbeiter = "Hanz", KrankheitsZeitraum = "10.05.2017 - 13.06.2017", MaFehlzeit = "KEine", KindFehlzeit = "Keine" });
+            items.Add(new SchulbegleitenderDienst() { Vertretung = "John Doe" , Kunde = "Schlumpfine", AbwesenheitsKategorie = "Husten",KrankerMitarbeiter = "Hanz", KrankheitsZeitraum = "10.03.2017 - 13.03.2017", MaFehlzeit = "KEine",KindFehlzeit = "Keine"});
+            items.Add(new SchulbegleitenderDienst() { Vertretung = "Miss Piggi" , Kunde = "Schlumpfine", AbwesenheitsKategorie = "Husten", KrankerMitarbeiter = "Hanz", KrankheitsZeitraum = "10.05.2017 - 13.06.2017", MaFehlzeit = "KEine", KindFehlzeit = "Keine" });
+            items.Add(new SchulbegleitenderDienst() { Vertretung = "Lynchknoten" , Kunde = "Schlumpfine", AbwesenheitsKategorie = "Husten", KrankerMitarbeiter = "Hanz", KrankheitsZeitraum = "10.06.2017 - 13.07.2017", MaFehlzeit = "KEine", KindFehlzeit = "Keine" });
+            items.Add(new SchulbegleitenderDienst() { Vertretung = "Franz Dita von HodenKnecht" , Kunde = "Schlumpfine", AbwesenheitsKategorie = "Husten", KrankerMitarbeiter = "Hanz", KrankheitsZeitraum = "02.03.2017 - 13.03.2017", MaFehlzeit = "KEine", KindFehlzeit = "Keine" });
+            items.Add(new SchulbegleitenderDienst() { Vertretung = "Miss Piggi", Kunde = "Schlumpfine", AbwesenheitsKategorie = "Husten", KrankerMitarbeiter = "Hanz", KrankheitsZeitraum = "10.05.2017 - 13.06.2017", MaFehlzeit = "KEine", KindFehlzeit = "Keine" });
+            items.Add(new SchulbegleitenderDienst() { Vertretung = "Miss Piggi", Kunde = "Schlumpfine", AbwesenheitsKategorie = "Husten", KrankerMitarbeiter = "Hanz", KrankheitsZeitraum = "10.05.2017 - 13.06.2017", MaFehlzeit = "KEine", KindFehlzeit = "Keine" });
+            items.Add(new SchulbegleitenderDienst() {  Kunde = "Schlumpfine", KrankerMitarbeiter = "Hanz", AbwesenheitsKategorie = "Husten", KrankheitsZeitraum = "10.05.2017 - 13.06.2017", MaFehlzeit = "KEine", KindFehlzeit = "Keine" });
+            items.Add(new SchulbegleitenderDienst() { Vertretung = "Miss Piggi", Kunde = "Schlumpfine", AbwesenheitsKategorie = "Husten", KrankerMitarbeiter = "Hanz", KrankheitsZeitraum = "10.05.2017 - 13.06.2017", MaFehlzeit = "KEine", KindFehlzeit = "Keine" });
             
             //SchulbegleitenderDienstList.ItemsSource = items;
             GridDataControl.ItemsSource = items;
@@ -113,7 +122,16 @@ namespace BeWo.SchulbegleitenderDienst
             //hole zuerst alle Daten 
 	        Datepicker.DateTime = dt;
 
-	    }
+            //MitarbeiterVertretung
+	        MVDatepickerVon.DateTime = dt;
+	        MVDatepickerBis.DateTime = dt;
+
+            //KlientenVertretung
+            KVDatepickerVon.DateTime = dt;
+            KVDatepickerBis.DateTime = dt;
+
+
+        }
 
 	    public void ColorDataGrid()
 	    {
@@ -146,69 +164,314 @@ namespace BeWo.SchulbegleitenderDienst
                 }
         }
 
-	    public object getAllVertretungen(string MitarbeiterAbsenstime, DateTime AusgewähltesDatum, string KlientenAbsenstime)
+	    public void getAllVertretungenOnLoad(string MitarbeiterAbsenstime, DateTime AusgewähltesDatum, string KlientenAbsenstime)
 	    {
-	        //Hole hier alle Vertretungs Objekte raus || für die Liste
-	        return null;
+	        //Erstmal hole alle vertretungen aus der Datenbank und zeige diese an.
+	        var vertretungen = ServiceFacade.DoOperationsServiceSync(s => s.GetAllVertretungen());
+
+            items.Clear();
+            //Muss noch vollendet werden
+	        foreach (var vertritt in vertretungen)
+	        {
+	            AddItemsToGrid(vertritt);
+	        }
+  
+            GridDataControl.RefreshData();
+            
+            //------------------------------------------------------------------------------------------------------
+
+	        //Dann suche mit mit hilfe aller Absense Times und dem gewählten datum alle passenden Daten
+
+            
+            
+
 	    }
 
-	
-        
+	    public void AddItemsToGrid(VertretungDC vertritt)
+	    {
+            //diese added diese dann falls nicht vorhanden den items hinzu also mit (Vertrtung oid oder so ) vergleichen  
+            items.Add(new SchulbegleitenderDienst()
+            {
+                KrankheitsZeitraum = vertritt.VertretungsZeitraumVon + " - " + vertritt.VertretungsZeitraumBis,
+                KrankerMitarbeiter = vertritt.EmployeeOid.ToString(),
+                Vertretung = "",
+                Kunde = vertritt.CustomerOid.ToString(),
+                KindFehlzeit = "",
+                MaFehlzeit = "",
+                AbwesenheitsKategorie = " "
+            });
+	    }
+
+
+	    public void UpdateGridControl()
+	    {
+	        //erstelle ein GetallNewVertretung 
+
+            //itemlist mit allen Schulbegleitenden diensten übergeben
+
+            // liste der der items hinzufügen
+
+	    }
+
+
         //######################### Action Event Listener ###########################
-	    private void MitarbeiterList_OnDragEnter(object sender, DragEventArgs e)
-	    {
-	        e.Effects = DragDropEffects.Copy; 
-	    }
-
-	    private void GridDataControl_OnDragEnter(object sender, DragEventArgs e)
-	    {
-            //items.Add(new SchulbegleitenderDienst() { Vertretung = e.Data.ToString()});
-	    }
-
-	    private void GridDataControl_OnDragLeave(object sender, DragEventArgs e)
-	    {
-            MessageBox.Show("Hallo");
-        }
-
-	    private void MitarbeiterList_OnDragLeave(object sender, DragEventArgs e)
-	    {
-            MessageBox.Show("tschüss");
-        }
-
-          
+              
 	    private void Datepicker_OnEditValueChanged(object sender, EditValueChangedEventArgs e)
 	    {
 	        var dt = (DateTime) e.NewValue;
     
             Datelbl.Content = dt.ToString("dddd dd.MM.yyyy");
 
-        } 
+        }
+
+
+        //------------------------------------------------------------------------------------------------------------------------------------
+        //################################ Mitarbeiter DatePicker Von - Bis ################################
+        private void MVDatepickerVon_OnEditValueChanged(object sender, EditValueChangedEventArgs e)
+        {
+            var dt = (DateTime)e.NewValue;
+
+            if (dt > MVDatepickerBis.DateTime)
+            {
+                MVDatepickerBis.DateTime = dt;
+            }
+        }
+
+
+        private void MVDatepickerBis_OnEditValueChanged(object sender, EditValueChangedEventArgs e)
+        {
+            var dt = (DateTime)e.NewValue;
+
+            if(dt < MVDatepickerVon.DateTime) { 
+                MVDatepickerVon.DateTime = dt;
+            }
+        }
+
+
+        //##################################################################################################
+        //-------------------------------------------------------------------------------------------------------------------------------------
+
+
+
+        //-------------------------------------------------------------------------------------------------------------------------------------
+        //################################ Klienten Vertrtung Von - Bis ####################################
+        private void KVDatepickerVon_OnEditValueChanged(object sender, EditValueChangedEventArgs e)
+        {
+            var dt = (DateTime)e.NewValue;
+       
+            if(dt > KVDatepickerBis.DateTime) { 
+                KVDatepickerBis.DateTime = dt;
+            }
+        }
+
+        private void KVDatepickerBis_OnEditValueChanged(object sender, EditValueChangedEventArgs e)
+        {
+            var dt = (DateTime)e.NewValue;
+
+            if(dt < MVDatepickerVon.DateTime) { 
+                KVDatepickerVon.DateTime = dt;
+            }
+        }
+        //###################################################################################################
+        //-------------------------------------------------------------------------------------------------------------------------------------
+
+
+        public void GetAllEmployees()
+	    {
+            
+	      //  popupedit_KlientVertretungSearch.Text = "";
+            
+            //hole alle mit Service Raus
+	        //var a = ServiceFacade.DoEmployeeServiceSync(s => s.GetAllEmployees());
+
+
+
+            //Dieser Schitt wird wahrscheinlich nicht gebraucht
+         //   List<string> EmployeeString = new List<string>();
+
+	        //foreach (var employee in a)
+	        //{
+	        //    EmployeeString.Add(employee.FirstName+" "+employee.LastName);
+	        //}
+
+            //popupedit_environmentPersonSearch2.
+
+        }
+
+        //-----------------------------------------------------------------------------------------------------------------------------------------------
+
         //####################  Popup GEdöns  ##########################################################	
 	    private void MitarbeiterVertretung_OnClick(object sender, RoutedEventArgs e)
 	    {
-            popup_newEnvironmentPerson.IsOpen = true;
+            popup_newMitarbeiterVertretung.IsOpen = true;
         }
 
         private void Button_cancelMitarbeiterVertretung_OnClick(object sender, RoutedEventArgs e)
 	    {
-            popup_newEnvironmentPerson.IsOpen = false;
+            popup_newMitarbeiterVertretung.IsOpen = false;
+        }       
+
+	    private void Popupedit_MitarbeiterVertretungSearch_OnPopUpClick_popupedit_MitarbeiterVertretungSearch_PopUpClick(object sender, RoutedEventArgs e)
+	    {
+	        MitarbeiterVertretungsearchview.ItemSelected +=  MitarbeiterVertretungsearchview_MitarbeiterVertretungSelected;
+            popup_MitarbeiterVertretung.IsOpen = true;
         }
 
 
-	    private void KlientVertretung_Button_OnClick(object sender, RoutedEventArgs e)
-	    {
-	        popup_newKlientVertretung.IsOpen = true;
+        private void MitarbeiterVertretungsearchview_MitarbeiterVertretungSelected(object sender, EventArgs<CompactEmployeeDC> e)
+        {
+            popup_MitarbeiterVertretung.IsOpen = false;
+            MitarbeiterVertretungsearchview.ItemSelected -= MitarbeiterVertretungsearchview_MitarbeiterVertretungSelected;
 
-	    }
+            //hole alle mit Service Raus
+            var employeeList = ServiceFacade.DoEmployeeServiceSync(s => s.GetAllActiveEmployeesCompact());
 
-	    private void Button_cancelKlientVertretung_OnClick(object sender, RoutedEventArgs e)
+            MitarbeiterVertretungsearchview.ObjectList = employeeList;
+
+            popupedit_MitarbeiterVertretungSearch.Focus();
+
+           
+        }
+
+
+        private void Popupedit_MitarbeiterVertretungSearch_OnNewClickpopupedit_MitarbeiterVertretungSearch_NewClick(object sender, RoutedEventArgs e)
 	    {
+            //popup_newMitarbeiterVertretung.IsOpen = false;
+            //VMFactory.CreateEmployeeVMAsync(
+            //    cb => this.Dispatch(() => BeWoUtils.OpenModalViewWindow<EmployeeVM, EmployeeDC, NewSchulbegleitenderDienstView>(cb, this,
+            //        () => this.Dispatch(delegate { }), _EmployeeModalPopUp_EmployeeSavedOrUpdated, allowSaveIfParentDirty: true)));
+        }
+
+        private void _EmployeeModalPopUp_EmployeeSavedOrUpdated(object sender, EventArgs<EmployeeVM> e)
+        {
+            ServiceFacade.DoEmployeeServiceAsync(
+                s => s.LoadCompactEmployee(e.Data.DataContract.EmployeeOid.Value),
+                p => this.Dispatch(
+                    delegate
+                    {
+                        MainControl.CloseCurrentPopUp();
+                        BeWoUtils.UpdateAllViews(p);
+                        //ViewModel.EnvironmentOrganisations.NewVM.Organisation = p;
+                        //popup_newEnvironmentOrganisation.IsOpen = true;
+                        //popupedit_environmentOrganisationSearch.Focus();
+
+
+                    }));
+        }
+
+        private void Button_addMitarbeiterVertretung_OnClick(object sender, RoutedEventArgs e)
+        {
+            popup_newMitarbeiterVertretung.IsOpen = false;
+
+
+            //Speichere alle daten in die Vertretungs Daten tabelle
+            VertretungDC vertretung = new VertretungDC();
+
+            //initialisiere die vertretung
+            vertretung.VertretungsZeitraumVon = MVDatepickerVon.DateTime;
+            vertretung.VertretungsZeitraumBis = MVDatepickerBis.DateTime;
+            vertretung.CustomerOid = 3;
+            vertretung.EmployeeOid = 1;
+            
+            //Notice muss noch in die Vertretung eingefügt werden
+            //vertretung.Notice = "";
+
+            ServiceFacade.DoOperationsServiceSync(s => s.InsertNewMitarbeiterVertretung(vertretung));
+
+            getAllVertretungenOnLoad(null, DateTime.Now, null);
+        }
+
+
+        //-------------------------------------------------------------------------------------------------------------------------------------------------------
+
+        // ############################  Klienten Vertretungs Popup gedönse ####################################################
+
+        private void KlientVertretung_Button_OnClick(object sender, RoutedEventArgs e)
+        {
+            popup_newKlientVertretung.IsOpen = true;
+
+        }
+
+        private void Button_cancelKlientVertretung_OnClick(object sender, RoutedEventArgs e)
+        {
             popup_newKlientVertretung.IsOpen = false;
         }
 
-	   
+        //Ab hier muss noch am Inhalt bearbeitet werden 
+        private void Popupedit_KlientVertretungSearch_OnPopUpClick_popupedit_KlientVertretungSearch_PopUpClick(object sender, RoutedEventArgs e)
+        {
+            KlientVertretungsearchview.ItemSelected +=KlientVertretungsearchview_KlientVertretungSelected;
+            popup_KlientVertretung.IsOpen = true;
+        }
 
 
+        private void KlientVertretungsearchview_KlientVertretungSelected(object sender, EventArgs<CompactCustomerDC> e)
+        {
+            popup_KlientVertretung.IsOpen = false;
+            KlientVertretungsearchview.ItemSelected -= KlientVertretungsearchview_KlientVertretungSelected;
+
+            //hole alle mit Service Raus
+            var customerList = ServiceFacade.DoCustomerServiceSync(s => s.GetAllActiveCompactCustomers());
+
+            KlientVertretungsearchview.ObjectList = customerList;
+
+            popupedit_MitarbeiterVertretungSearch.Focus();
+
+
+        }
+
+        private void Popupedit_KlientSearch_OnNewClickpopupedit_KlientSearch_NewClick(object sender, RoutedEventArgs e)
+        {
+            //popup_newMitarbeiterVertretung.IsOpen = false;
+            //VMFactory.CreateEmployeeVMAsync(
+            //    cb => this.Dispatch(() => BeWoUtils.OpenModalViewWindow<CustomerVM, CustomerDC, NewSchulbegleitenderDienstView>(cb, this,
+            //        () => this.Dispatch(delegate { }), _KlientModalPopUp_KlientSavedOrUpdated, allowSaveIfParentDirty: true)));
+        }
+
+        private void _KlientModalPopUp_KlientSavedOrUpdated(object sender, EventArgs<EmployeeVM> e)
+        {
+            ServiceFacade.DoCustomerServiceAsync(
+                s => s.LoadPersonCompact(e.Data.DataContract.PersonOid.Value),
+                p => this.Dispatch(
+                    delegate
+                    {
+                        MainControl.CloseCurrentPopUp();
+                        BeWoUtils.UpdateAllViews(p);
+                        //ViewModel.EnvironmentOrganisations.NewVM.Organisation = p;
+                        //popup_newEnvironmentOrganisation.IsOpen = true;
+                        //popupedit_environmentOrganisationSearch.Focus();
+
+
+                    }));
+        }
+
+
+        private void Button_addKlientVertretung_OnClick(object sender, RoutedEventArgs e)
+        {
+            popup_newKlientVertretung.IsOpen = false;
+
+
+            VertretungDC vertretung = new VertretungDC();
+
+            vertretung.VertretungsZeitraumVon = KVDatepickerVon.DateTime;
+            vertretung.VertretungsZeitraumBis = KVDatepickerBis.DateTime;
+            vertretung.CustomerOid = 5;
+            vertretung.EmployeeOid = 2;
+            
+            //Die Notice muss noch in die Vertretung eingefügt werden.
+            //vertretung.Notice = "";
+
+
+            //initialisiere object
+
+            ServiceFacade.DoOperationsServiceSync(s => s.InsertNewKlientenVertretung(vertretung));
+
+            getAllVertretungenOnLoad(null, DateTime.Now, null);
+        }
+        
+        //#######################################################################################################################
+        //----------------------------------------------------------------------------------------------------------------------------------------------------------------
+
 
 	}
 
@@ -223,6 +486,7 @@ namespace BeWo.SchulbegleitenderDienst
         public string Vertretung { get; set; }
         public string Kunde { get; set; }
         public string KrankerMitarbeiter { get; set; }
+        public string AbwesenheitsKategorie { get; set; }
         public string MaFehlzeit { get; set; }
         public string KindFehlzeit { get; set; }
         public string KrankheitsZeitraum { get; set; }
diff --git a/BeWo/ServiceProxy/Generated.cs b/BeWo/ServiceProxy/Generated.cs
index 4ea1326cf..cd1591efd 100644
--- a/BeWo/ServiceProxy/Generated.cs
+++ b/BeWo/ServiceProxy/Generated.cs
@@ -166,69 +166,6 @@ namespace BeWo.ServiceProxy
     public interface IEmployeeService
     {
         
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/GetAllOvertimes", ReplyAction="http://tempuri.org/IEmployeeService/GetAllOvertimesResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetAllOvertimesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<BS.Shared.DataContracts.OvertimeDC> GetAllOvertimes();
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/DeleteOvertimes", ReplyAction="http://tempuri.org/IEmployeeService/DeleteOvertimesResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/DeleteOvertimesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        void DeleteOvertimes(System.Collections.Generic.Dictionary<long, long> pOid2Version);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/InsertOvertimes", ReplyAction="http://tempuri.org/IEmployeeService/InsertOvertimesResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/InsertOvertimesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<long> InsertOvertimes(System.Collections.Generic.List<BS.Shared.DataContracts.OvertimeDC> pOvertimes);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/UpdateOvertimes", ReplyAction="http://tempuri.org/IEmployeeService/UpdateOvertimesResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/UpdateOvertimesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<long> UpdateOvertimes(System.Collections.Generic.List<BS.Shared.DataContracts.OvertimeDC> pOvertimes);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/GetAllAuszahlungsarten", ReplyAction="http://tempuri.org/IEmployeeService/GetAllAuszahlungsartenResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetAllAuszahlungsartenBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<BS.Shared.DataContracts.AuszahlungsartDC> GetAllAuszahlungsarten();
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/InsertAuszahlungsarten", ReplyAction="http://tempuri.org/IEmployeeService/InsertAuszahlungsartenResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/InsertAuszahlungsartenBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<long> InsertAuszahlungsarten(System.Collections.Generic.List<BS.Shared.DataContracts.AuszahlungsartDC> pAuszahlungsarten);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/UpdateAuszahlungsarten", ReplyAction="http://tempuri.org/IEmployeeService/UpdateAuszahlungsartenResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/UpdateAuszahlungsartenBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<long> UpdateAuszahlungsarten(System.Collections.Generic.List<BS.Shared.DataContracts.AuszahlungsartDC> pAuszahlungsarten);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/DeleteAuszahlungsarten", ReplyAction="http://tempuri.org/IEmployeeService/DeleteAuszahlungsartenResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/DeleteAuszahlungsartenBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        void DeleteAuszahlungsarten(System.Collections.Generic.Dictionary<long, long> pOid2Version);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/GetTeamOidsByEmployee", ReplyAction="http://tempuri.org/IEmployeeService/GetTeamOidsByEmployeeResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetTeamOidsByEmployeeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactTeamDC> GetTeamOidsByEmployee(long pEmployeeOid);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/LoadLoggedOnEmployee", ReplyAction="http://tempuri.org/IEmployeeService/LoadLoggedOnEmployeeResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/LoadLoggedOnEmployeeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        BS.Shared.DataContracts.EmployeeDC LoadLoggedOnEmployee(long pEmployeeOid);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/GetAllChatActiveEmployeesCompact", ReplyAction="http://tempuri.org/IEmployeeService/GetAllChatActiveEmployeesCompactResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetAllChatActiveEmployeesCompactBeWoFaultFaul" +
-            "t", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactEmployeeDC> GetAllChatActiveEmployeesCompact();
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/GetAllEmployeeAppCodes", ReplyAction="http://tempuri.org/IEmployeeService/GetAllEmployeeAppCodesResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetAllEmployeeAppCodesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<BS.Shared.DataContracts.EmployeeAPPCodeDC> GetAllEmployeeAppCodes(long pEmployeeOid);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/GetEmployeeImage", ReplyAction="http://tempuri.org/IEmployeeService/GetEmployeeImageResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetEmployeeImageBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        byte[] GetEmployeeImage(long employeeOid);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/GetEmployeeThumbnail", ReplyAction="http://tempuri.org/IEmployeeService/GetEmployeeThumbnailResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetEmployeeThumbnailBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        byte[] GetEmployeeThumbnail(long employeeOid);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/DeleteEmployeeCustomerRelationForEmployee", ReplyAction="http://tempuri.org/IEmployeeService/DeleteEmployeeCustomerRelationForEmployeeResp" +
-            "onse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/DeleteEmployeeCustomerRelationForEmployeeBeWo" +
-            "FaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        void DeleteEmployeeCustomerRelationForEmployee(long employeeOid);
-        
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/ArchiveEmployee", ReplyAction="http://tempuri.org/IEmployeeService/ArchiveEmployeeResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/ArchiveEmployeeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         void ArchiveEmployee(long pOid, long pVersion);
@@ -499,6 +436,69 @@ namespace BeWo.ServiceProxy
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/GetAllOvertimesFromEmployee", ReplyAction="http://tempuri.org/IEmployeeService/GetAllOvertimesFromEmployeeResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetAllOvertimesFromEmployeeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         System.Collections.Generic.List<BS.Shared.DataContracts.OvertimeDC> GetAllOvertimesFromEmployee(long employeeOid);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/GetAllOvertimes", ReplyAction="http://tempuri.org/IEmployeeService/GetAllOvertimesResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetAllOvertimesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.OvertimeDC> GetAllOvertimes();
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/DeleteOvertimes", ReplyAction="http://tempuri.org/IEmployeeService/DeleteOvertimesResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/DeleteOvertimesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        void DeleteOvertimes(System.Collections.Generic.Dictionary<long, long> pOid2Version);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/InsertOvertimes", ReplyAction="http://tempuri.org/IEmployeeService/InsertOvertimesResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/InsertOvertimesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<long> InsertOvertimes(System.Collections.Generic.List<BS.Shared.DataContracts.OvertimeDC> pOvertimes);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/UpdateOvertimes", ReplyAction="http://tempuri.org/IEmployeeService/UpdateOvertimesResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/UpdateOvertimesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<long> UpdateOvertimes(System.Collections.Generic.List<BS.Shared.DataContracts.OvertimeDC> pOvertimes);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/GetAllAuszahlungsarten", ReplyAction="http://tempuri.org/IEmployeeService/GetAllAuszahlungsartenResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetAllAuszahlungsartenBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.AuszahlungsartDC> GetAllAuszahlungsarten();
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/InsertAuszahlungsarten", ReplyAction="http://tempuri.org/IEmployeeService/InsertAuszahlungsartenResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/InsertAuszahlungsartenBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<long> InsertAuszahlungsarten(System.Collections.Generic.List<BS.Shared.DataContracts.AuszahlungsartDC> pAuszahlungsarten);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/UpdateAuszahlungsarten", ReplyAction="http://tempuri.org/IEmployeeService/UpdateAuszahlungsartenResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/UpdateAuszahlungsartenBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<long> UpdateAuszahlungsarten(System.Collections.Generic.List<BS.Shared.DataContracts.AuszahlungsartDC> pAuszahlungsarten);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/DeleteAuszahlungsarten", ReplyAction="http://tempuri.org/IEmployeeService/DeleteAuszahlungsartenResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/DeleteAuszahlungsartenBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        void DeleteAuszahlungsarten(System.Collections.Generic.Dictionary<long, long> pOid2Version);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/GetTeamOidsByEmployee", ReplyAction="http://tempuri.org/IEmployeeService/GetTeamOidsByEmployeeResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetTeamOidsByEmployeeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactTeamDC> GetTeamOidsByEmployee(long pEmployeeOid);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/LoadLoggedOnEmployee", ReplyAction="http://tempuri.org/IEmployeeService/LoadLoggedOnEmployeeResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/LoadLoggedOnEmployeeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        BS.Shared.DataContracts.EmployeeDC LoadLoggedOnEmployee(long pEmployeeOid);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/GetAllChatActiveEmployeesCompact", ReplyAction="http://tempuri.org/IEmployeeService/GetAllChatActiveEmployeesCompactResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetAllChatActiveEmployeesCompactBeWoFaultFaul" +
+            "t", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactEmployeeDC> GetAllChatActiveEmployeesCompact();
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/GetAllEmployeeAppCodes", ReplyAction="http://tempuri.org/IEmployeeService/GetAllEmployeeAppCodesResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetAllEmployeeAppCodesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.EmployeeAPPCodeDC> GetAllEmployeeAppCodes(long pEmployeeOid);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/GetEmployeeImage", ReplyAction="http://tempuri.org/IEmployeeService/GetEmployeeImageResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetEmployeeImageBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        byte[] GetEmployeeImage(long employeeOid);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/GetEmployeeThumbnail", ReplyAction="http://tempuri.org/IEmployeeService/GetEmployeeThumbnailResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetEmployeeThumbnailBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        byte[] GetEmployeeThumbnail(long employeeOid);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/DeleteEmployeeCustomerRelationForEmployee", ReplyAction="http://tempuri.org/IEmployeeService/DeleteEmployeeCustomerRelationForEmployeeResp" +
+            "onse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/DeleteEmployeeCustomerRelationForEmployeeBeWo" +
+            "FaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        void DeleteEmployeeCustomerRelationForEmployee(long employeeOid);
     }
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
@@ -535,81 +535,6 @@ namespace BeWo.ServiceProxy
         {
         }
         
-        public System.Collections.Generic.List<BS.Shared.DataContracts.OvertimeDC> GetAllOvertimes()
-        {
-            return base.Channel.GetAllOvertimes();
-        }
-        
-        public void DeleteOvertimes(System.Collections.Generic.Dictionary<long, long> pOid2Version)
-        {
-            base.Channel.DeleteOvertimes(pOid2Version);
-        }
-        
-        public System.Collections.Generic.List<long> InsertOvertimes(System.Collections.Generic.List<BS.Shared.DataContracts.OvertimeDC> pOvertimes)
-        {
-            return base.Channel.InsertOvertimes(pOvertimes);
-        }
-        
-        public System.Collections.Generic.List<long> UpdateOvertimes(System.Collections.Generic.List<BS.Shared.DataContracts.OvertimeDC> pOvertimes)
-        {
-            return base.Channel.UpdateOvertimes(pOvertimes);
-        }
-        
-        public System.Collections.Generic.List<BS.Shared.DataContracts.AuszahlungsartDC> GetAllAuszahlungsarten()
-        {
-            return base.Channel.GetAllAuszahlungsarten();
-        }
-        
-        public System.Collections.Generic.List<long> InsertAuszahlungsarten(System.Collections.Generic.List<BS.Shared.DataContracts.AuszahlungsartDC> pAuszahlungsarten)
-        {
-            return base.Channel.InsertAuszahlungsarten(pAuszahlungsarten);
-        }
-        
-        public System.Collections.Generic.List<long> UpdateAuszahlungsarten(System.Collections.Generic.List<BS.Shared.DataContracts.AuszahlungsartDC> pAuszahlungsarten)
-        {
-            return base.Channel.UpdateAuszahlungsarten(pAuszahlungsarten);
-        }
-        
-        public void DeleteAuszahlungsarten(System.Collections.Generic.Dictionary<long, long> pOid2Version)
-        {
-            base.Channel.DeleteAuszahlungsarten(pOid2Version);
-        }
-        
-        public System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactTeamDC> GetTeamOidsByEmployee(long pEmployeeOid)
-        {
-            return base.Channel.GetTeamOidsByEmployee(pEmployeeOid);
-        }
-        
-        public BS.Shared.DataContracts.EmployeeDC LoadLoggedOnEmployee(long pEmployeeOid)
-        {
-            return base.Channel.LoadLoggedOnEmployee(pEmployeeOid);
-        }
-        
-        public System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactEmployeeDC> GetAllChatActiveEmployeesCompact()
-        {
-            return base.Channel.GetAllChatActiveEmployeesCompact();
-        }
-        
-        public System.Collections.Generic.List<BS.Shared.DataContracts.EmployeeAPPCodeDC> GetAllEmployeeAppCodes(long pEmployeeOid)
-        {
-            return base.Channel.GetAllEmployeeAppCodes(pEmployeeOid);
-        }
-        
-        public byte[] GetEmployeeImage(long employeeOid)
-        {
-            return base.Channel.GetEmployeeImage(employeeOid);
-        }
-        
-        public byte[] GetEmployeeThumbnail(long employeeOid)
-        {
-            return base.Channel.GetEmployeeThumbnail(employeeOid);
-        }
-        
-        public void DeleteEmployeeCustomerRelationForEmployee(long employeeOid)
-        {
-            base.Channel.DeleteEmployeeCustomerRelationForEmployee(employeeOid);
-        }
-        
         public void ArchiveEmployee(long pOid, long pVersion)
         {
             base.Channel.ArchiveEmployee(pOid, pVersion);
@@ -929,6 +854,81 @@ namespace BeWo.ServiceProxy
         {
             return base.Channel.GetAllOvertimesFromEmployee(employeeOid);
         }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.OvertimeDC> GetAllOvertimes()
+        {
+            return base.Channel.GetAllOvertimes();
+        }
+        
+        public void DeleteOvertimes(System.Collections.Generic.Dictionary<long, long> pOid2Version)
+        {
+            base.Channel.DeleteOvertimes(pOid2Version);
+        }
+        
+        public System.Collections.Generic.List<long> InsertOvertimes(System.Collections.Generic.List<BS.Shared.DataContracts.OvertimeDC> pOvertimes)
+        {
+            return base.Channel.InsertOvertimes(pOvertimes);
+        }
+        
+        public System.Collections.Generic.List<long> UpdateOvertimes(System.Collections.Generic.List<BS.Shared.DataContracts.OvertimeDC> pOvertimes)
+        {
+            return base.Channel.UpdateOvertimes(pOvertimes);
+        }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.AuszahlungsartDC> GetAllAuszahlungsarten()
+        {
+            return base.Channel.GetAllAuszahlungsarten();
+        }
+        
+        public System.Collections.Generic.List<long> InsertAuszahlungsarten(System.Collections.Generic.List<BS.Shared.DataContracts.AuszahlungsartDC> pAuszahlungsarten)
+        {
+            return base.Channel.InsertAuszahlungsarten(pAuszahlungsarten);
+        }
+        
+        public System.Collections.Generic.List<long> UpdateAuszahlungsarten(System.Collections.Generic.List<BS.Shared.DataContracts.AuszahlungsartDC> pAuszahlungsarten)
+        {
+            return base.Channel.UpdateAuszahlungsarten(pAuszahlungsarten);
+        }
+        
+        public void DeleteAuszahlungsarten(System.Collections.Generic.Dictionary<long, long> pOid2Version)
+        {
+            base.Channel.DeleteAuszahlungsarten(pOid2Version);
+        }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactTeamDC> GetTeamOidsByEmployee(long pEmployeeOid)
+        {
+            return base.Channel.GetTeamOidsByEmployee(pEmployeeOid);
+        }
+        
+        public BS.Shared.DataContracts.EmployeeDC LoadLoggedOnEmployee(long pEmployeeOid)
+        {
+            return base.Channel.LoadLoggedOnEmployee(pEmployeeOid);
+        }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactEmployeeDC> GetAllChatActiveEmployeesCompact()
+        {
+            return base.Channel.GetAllChatActiveEmployeesCompact();
+        }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.EmployeeAPPCodeDC> GetAllEmployeeAppCodes(long pEmployeeOid)
+        {
+            return base.Channel.GetAllEmployeeAppCodes(pEmployeeOid);
+        }
+        
+        public byte[] GetEmployeeImage(long employeeOid)
+        {
+            return base.Channel.GetEmployeeImage(employeeOid);
+        }
+        
+        public byte[] GetEmployeeThumbnail(long employeeOid)
+        {
+            return base.Channel.GetEmployeeThumbnail(employeeOid);
+        }
+        
+        public void DeleteEmployeeCustomerRelationForEmployee(long employeeOid)
+        {
+            base.Channel.DeleteEmployeeCustomerRelationForEmployee(employeeOid);
+        }
     }
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
@@ -936,221 +936,6 @@ namespace BeWo.ServiceProxy
     public interface ICustomerService
     {
         
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/InsertWohnheimbuchung", ReplyAction="http://tempuri.org/ICustomerService/InsertWohnheimbuchungResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/InsertWohnheimbuchungBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        long InsertWohnheimbuchung(BS.Shared.DataContracts.WohnheimbuchungDC buchung);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetWohnheimbuchungByWohnheimAndBuchungsdatum", ReplyAction="http://tempuri.org/ICustomerService/GetWohnheimbuchungByWohnheimAndBuchungsdatumR" +
-            "esponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetWohnheimbuchungByWohnheimAndBuchungsdatumB" +
-            "eWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        BS.Shared.DataContracts.WohnheimbuchungDC GetWohnheimbuchungByWohnheimAndBuchungsdatum(long pWohnheimOid, System.DateTime pBuchungsdatum);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/FindWohnheimbuchungsServiceRecords", ReplyAction="http://tempuri.org/ICustomerService/FindWohnheimbuchungsServiceRecordsResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/FindWohnheimbuchungsServiceRecordsBeWoFaultFa" +
-            "ult", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<BS.Shared.DataContracts.ServiceRecordDC> FindWohnheimbuchungsServiceRecords(long pWohnheimbuchungsOid);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/DeleteWohnheimbuchung", ReplyAction="http://tempuri.org/ICustomerService/DeleteWohnheimbuchungResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/DeleteWohnheimbuchungBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        void DeleteWohnheimbuchung(long pWohnheimbuchungsOid, long pWohnheimbuchungsVersion);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetAllActiveSupportConcepts", ReplyAction="http://tempuri.org/ICustomerService/GetAllActiveSupportConceptsResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetAllActiveSupportConceptsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<BS.Shared.DataContracts.SupportConceptDC> GetAllActiveSupportConcepts();
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/CreateServiceRecordsFromWohnheimbuchung", ReplyAction="http://tempuri.org/ICustomerService/CreateServiceRecordsFromWohnheimbuchungRespon" +
-            "se")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/CreateServiceRecordsFromWohnheimbuchungBeWoFa" +
-            "ultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<long> CreateServiceRecordsFromWohnheimbuchung(long pWohnheimbuchungsOid, long pServiceDescriptionOid);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/FindServiceDescriptionForWohnheimbuchungsServ" +
-            "iceRecord", ReplyAction="http://tempuri.org/ICustomerService/FindServiceDescriptionForWohnheimbuchungsServ" +
-            "iceRecordResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/FindServiceDescriptionForWohnheimbuchungsServ" +
-            "iceRecordBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        BS.Shared.DataContracts.ServiceDescriptionDC FindServiceDescriptionForWohnheimbuchungsServiceRecord(long pWohnheimbuchungsOid);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/LoadCustomerPersonRelationsByOid", ReplyAction="http://tempuri.org/ICustomerService/LoadCustomerPersonRelationsByOidResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/LoadCustomerPersonRelationsByOidBeWoFaultFaul" +
-            "t", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<BS.Shared.DataContracts.CustomerPersonRelationDC> LoadCustomerPersonRelationsByOid(System.Collections.Generic.List<long> pOids);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/LoadCustomerOrganisationRelationsByOid", ReplyAction="http://tempuri.org/ICustomerService/LoadCustomerOrganisationRelationsByOidRespons" +
-            "e")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/LoadCustomerOrganisationRelationsByOidBeWoFau" +
-            "ltFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<BS.Shared.DataContracts.CustomerOrganisationRelationDC> LoadCustomerOrganisationRelationsByOid(System.Collections.Generic.List<long> pOids);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/InsertMedRecords", ReplyAction="http://tempuri.org/ICustomerService/InsertMedRecordsResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/InsertMedRecordsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<long> InsertMedRecords(System.Collections.Generic.List<BS.Shared.DataContracts.MedRecordDC> pDCList);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetMedRecordsForCustomer", ReplyAction="http://tempuri.org/ICustomerService/GetMedRecordsForCustomerResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetMedRecordsForCustomerBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<BS.Shared.DataContracts.MedRecordDC> GetMedRecordsForCustomer(long pCustomerOid);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/UpdateMedRecords", ReplyAction="http://tempuri.org/ICustomerService/UpdateMedRecordsResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/UpdateMedRecordsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<BS.Shared.DataContracts.MedRecordDC> UpdateMedRecords(System.Collections.Generic.List<BS.Shared.DataContracts.MedRecordDC> pDCList);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/DeactivateMedRecords", ReplyAction="http://tempuri.org/ICustomerService/DeactivateMedRecordsResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/DeactivateMedRecordsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        void DeactivateMedRecords(System.Collections.Generic.Dictionary<long, long> pOid2Version);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/DeleteMedRecord", ReplyAction="http://tempuri.org/ICustomerService/DeleteMedRecordResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/DeleteMedRecordBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        void DeleteMedRecord(long pOid, long pVersion);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/AndroidGetCustomerCompact", ReplyAction="http://tempuri.org/ICustomerService/AndroidGetCustomerCompactResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/AndroidGetCustomerCompactBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        string AndroidGetCustomerCompact(long pCustomerOid);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetAllChatActiveCustomersCompact", ReplyAction="http://tempuri.org/ICustomerService/GetAllChatActiveCustomersCompactResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetAllChatActiveCustomersCompactBeWoFaultFaul" +
-            "t", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactCustomerDC> GetAllChatActiveCustomersCompact(long personOid);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/FindAllChatMessages", ReplyAction="http://tempuri.org/ICustomerService/FindAllChatMessagesResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/FindAllChatMessagesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<BS.Shared.DataContracts.ChatMessageDC> FindAllChatMessages(long senderOid, long empfaengerOid, int maxNachricht);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/FindAllChatMessagesFromTeam", ReplyAction="http://tempuri.org/ICustomerService/FindAllChatMessagesFromTeamResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/FindAllChatMessagesFromTeamBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<BS.Shared.DataContracts.ChatMessageDC> FindAllChatMessagesFromTeam(long senderOid, long teamEmpfangOid, int maxNachrichten);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/CountChatMessages", ReplyAction="http://tempuri.org/ICustomerService/CountChatMessagesResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/CountChatMessagesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        int CountChatMessages(int aktuelleAnzahl, long senderoid, long empfangoid, bool isTeam);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetNextChatMessages", ReplyAction="http://tempuri.org/ICustomerService/GetNextChatMessagesResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetNextChatMessagesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<BS.Shared.DataContracts.ChatMessageDC> GetNextChatMessages(long senderOid, long EmpfangOid, bool isteam, System.Collections.Generic.List<string> messageIds, int maxMessage);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/UpdateIstGelesen", ReplyAction="http://tempuri.org/ICustomerService/UpdateIstGelesenResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/UpdateIstGelesenBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        void UpdateIstGelesen(long senderOid, long empfaengerOid, bool istGelesen);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/UpdateIstGelesenForOne", ReplyAction="http://tempuri.org/ICustomerService/UpdateIstGelesenForOneResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/UpdateIstGelesenForOneBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        void UpdateIstGelesenForOne(long senderOid, long empfaengerOid, bool istGelesen, string messageId);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetCustomerImage", ReplyAction="http://tempuri.org/ICustomerService/GetCustomerImageResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetCustomerImageBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        byte[] GetCustomerImage(long customerOid);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetCustomerThumbnail", ReplyAction="http://tempuri.org/ICustomerService/GetCustomerThumbnailResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetCustomerThumbnailBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        byte[] GetCustomerThumbnail(long customerOid);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetAllCustomerAppCodes", ReplyAction="http://tempuri.org/ICustomerService/GetAllCustomerAppCodesResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetAllCustomerAppCodesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<BS.Shared.DataContracts.CustomerAPPCodeDC> GetAllCustomerAppCodes(long pCustomerOid);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetChatMedia", ReplyAction="http://tempuri.org/ICustomerService/GetChatMediaResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetChatMediaBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        byte[] GetChatMedia(long chatMediaMessageOid);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetOrganisationsForPerson", ReplyAction="http://tempuri.org/ICustomerService/GetOrganisationsForPersonResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetOrganisationsForPersonBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactOrganisationDC> GetOrganisationsForPerson(long personoid);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetPersonForOrganisations", ReplyAction="http://tempuri.org/ICustomerService/GetPersonForOrganisationsResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetPersonForOrganisationsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactPersonDC> GetPersonForOrganisations(long organisationoid);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/UpdateOrganisation", ReplyAction="http://tempuri.org/ICustomerService/UpdateOrganisationResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/UpdateOrganisationBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        long UpdateOrganisation(BS.Shared.DataContracts.OrganisationDC pOrganisationDC);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/UpdatePerson", ReplyAction="http://tempuri.org/ICustomerService/UpdatePersonResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/UpdatePersonBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.CustomerDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.WohnheimDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.EmployeeDC))]
-        long UpdatePerson(BS.Shared.DataContracts.PersonDC pPersonDC);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/UpdateSupportConcept", ReplyAction="http://tempuri.org/ICustomerService/UpdateSupportConceptResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/UpdateSupportConceptBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        long UpdateSupportConcept(BS.Shared.DataContracts.SupportConceptDC pSupportConcept);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/LoadCustomerAssessmentSheetCategoryList", ReplyAction="http://tempuri.org/ICustomerService/LoadCustomerAssessmentSheetCategoryListRespon" +
-            "se")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/LoadCustomerAssessmentSheetCategoryListBeWoFa" +
-            "ultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<BS.Shared.DataContracts.AssessmentSheetCategoryDC> LoadCustomerAssessmentSheetCategoryList(long pCustomerOid);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/LoadAppointments", ReplyAction="http://tempuri.org/ICustomerService/LoadAppointmentsResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/LoadAppointmentsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<BS.Shared.DataContracts.AppointmentDC> LoadAppointments(System.Nullable<long> customerOid, System.Nullable<long> employeeOid);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetAllAppointmentCategories", ReplyAction="http://tempuri.org/ICustomerService/GetAllAppointmentCategoriesResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetAllAppointmentCategoriesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<BS.Shared.DataContracts.AppointmentCategoryDC> GetAllAppointmentCategories();
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/InsertNewAppointmentCategories", ReplyAction="http://tempuri.org/ICustomerService/InsertNewAppointmentCategoriesResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/InsertNewAppointmentCategoriesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<long> InsertNewAppointmentCategories(System.Collections.Generic.List<BS.Shared.DataContracts.AppointmentCategoryDC> pAppointmentCategories);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/UpdateAppointmentCategories", ReplyAction="http://tempuri.org/ICustomerService/UpdateAppointmentCategoriesResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/UpdateAppointmentCategoriesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<long> UpdateAppointmentCategories(System.Collections.Generic.List<BS.Shared.DataContracts.AppointmentCategoryDC> pAppointmentCategories);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/DeactivateAppointmentCategories", ReplyAction="http://tempuri.org/ICustomerService/DeactivateAppointmentCategoriesResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/DeactivateAppointmentCategoriesBeWoFaultFault" +
-            "", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        void DeactivateAppointmentCategories(System.Collections.Generic.Dictionary<long, long> pOid2Version);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/InsertNewAppointments", ReplyAction="http://tempuri.org/ICustomerService/InsertNewAppointmentsResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/InsertNewAppointmentsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<BS.Shared.DataContracts.AppointmentDC> InsertNewAppointments(System.Collections.Generic.List<BS.Shared.DataContracts.AppointmentDC> pAppointments);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/UpdateAppointments", ReplyAction="http://tempuri.org/ICustomerService/UpdateAppointmentsResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/UpdateAppointmentsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<BS.Shared.DataContracts.AppointmentDC> UpdateAppointments(System.Collections.Generic.List<BS.Shared.DataContracts.AppointmentDC> pAppointments);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/DeactivateAppointments", ReplyAction="http://tempuri.org/ICustomerService/DeactivateAppointmentsResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/DeactivateAppointmentsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        void DeactivateAppointments(System.Collections.Generic.Dictionary<long, long> pOid2Version);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/InsertAbsenceTimes", ReplyAction="http://tempuri.org/ICustomerService/InsertAbsenceTimesResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/InsertAbsenceTimesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<BS.Shared.DataContracts.AbsenceTimeDC> InsertAbsenceTimes(System.Collections.Generic.List<BS.Shared.DataContracts.AbsenceTimeDC> pDCList);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/UpdateAbsenceTimes", ReplyAction="http://tempuri.org/ICustomerService/UpdateAbsenceTimesResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/UpdateAbsenceTimesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<BS.Shared.DataContracts.AbsenceTimeDC> UpdateAbsenceTimes(System.Collections.Generic.List<BS.Shared.DataContracts.AbsenceTimeDC> pDCList);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/DeactivateAbsenceTimes", ReplyAction="http://tempuri.org/ICustomerService/DeactivateAbsenceTimesResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/DeactivateAbsenceTimesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        void DeactivateAbsenceTimes(System.Collections.Generic.Dictionary<long, long> pOid2Version);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetAllCustomerGoals", ReplyAction="http://tempuri.org/ICustomerService/GetAllCustomerGoalsResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetAllCustomerGoalsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<BS.Shared.DataContracts.ValueListEntryDC> GetAllCustomerGoals(long pCustomerOid);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/LoadCompactSupportConceptDC", ReplyAction="http://tempuri.org/ICustomerService/LoadCompactSupportConceptDCResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/LoadCompactSupportConceptDCBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        BS.Shared.DataContracts.Compact.CompactSupportConceptDC LoadCompactSupportConceptDC(long pOid, System.Nullable<long> currentEmployeeOid);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetCompactCustomerDC", ReplyAction="http://tempuri.org/ICustomerService/GetCompactCustomerDCResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetCompactCustomerDCBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        BS.Shared.DataContracts.Compact.CompactCustomerDC GetCompactCustomerDC(long pOid);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetAllActiveCompactCustomers", ReplyAction="http://tempuri.org/ICustomerService/GetAllActiveCompactCustomersResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetAllActiveCompactCustomersBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactCustomerDC> GetAllActiveCompactCustomers();
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/ServiceRecordOutOfSupportConcept", ReplyAction="http://tempuri.org/ICustomerService/ServiceRecordOutOfSupportConceptResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/ServiceRecordOutOfSupportConceptBeWoFaultFaul" +
-            "t", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        bool ServiceRecordOutOfSupportConcept(BS.Shared.DataContracts.SupportConceptDC pSupportConcept);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetAllActiveCustomers", ReplyAction="http://tempuri.org/ICustomerService/GetAllActiveCustomersResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetAllActiveCustomersBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<BS.Shared.DataContracts.CustomerDC> GetAllActiveCustomers();
-        
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetCustomersById", ReplyAction="http://tempuri.org/ICustomerService/GetCustomersByIdResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetCustomersByIdBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         System.Collections.Generic.List<BS.Shared.DataContracts.CustomerDC> GetCustomersById(System.Collections.Generic.List<long> idList);
@@ -1332,6 +1117,130 @@ namespace BeWo.ServiceProxy
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/UpdateWohnheimbuchungBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         long UpdateWohnheimbuchung(BS.Shared.DataContracts.WohnheimbuchungDC buchung);
         
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/InsertWohnheimbuchung", ReplyAction="http://tempuri.org/ICustomerService/InsertWohnheimbuchungResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/InsertWohnheimbuchungBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        long InsertWohnheimbuchung(BS.Shared.DataContracts.WohnheimbuchungDC buchung);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetWohnheimbuchungByWohnheimAndBuchungsdatum", ReplyAction="http://tempuri.org/ICustomerService/GetWohnheimbuchungByWohnheimAndBuchungsdatumR" +
+            "esponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetWohnheimbuchungByWohnheimAndBuchungsdatumB" +
+            "eWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        BS.Shared.DataContracts.WohnheimbuchungDC GetWohnheimbuchungByWohnheimAndBuchungsdatum(long pWohnheimOid, System.DateTime pBuchungsdatum);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/FindWohnheimbuchungsServiceRecords", ReplyAction="http://tempuri.org/ICustomerService/FindWohnheimbuchungsServiceRecordsResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/FindWohnheimbuchungsServiceRecordsBeWoFaultFa" +
+            "ult", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.ServiceRecordDC> FindWohnheimbuchungsServiceRecords(long pWohnheimbuchungsOid);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/DeleteWohnheimbuchung", ReplyAction="http://tempuri.org/ICustomerService/DeleteWohnheimbuchungResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/DeleteWohnheimbuchungBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        void DeleteWohnheimbuchung(long pWohnheimbuchungsOid, long pWohnheimbuchungsVersion);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetAllActiveSupportConcepts", ReplyAction="http://tempuri.org/ICustomerService/GetAllActiveSupportConceptsResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetAllActiveSupportConceptsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.SupportConceptDC> GetAllActiveSupportConcepts();
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/CreateServiceRecordsFromWohnheimbuchung", ReplyAction="http://tempuri.org/ICustomerService/CreateServiceRecordsFromWohnheimbuchungRespon" +
+            "se")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/CreateServiceRecordsFromWohnheimbuchungBeWoFa" +
+            "ultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<long> CreateServiceRecordsFromWohnheimbuchung(long pWohnheimbuchungsOid, long pServiceDescriptionOid);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/FindServiceDescriptionForWohnheimbuchungsServ" +
+            "iceRecord", ReplyAction="http://tempuri.org/ICustomerService/FindServiceDescriptionForWohnheimbuchungsServ" +
+            "iceRecordResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/FindServiceDescriptionForWohnheimbuchungsServ" +
+            "iceRecordBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        BS.Shared.DataContracts.ServiceDescriptionDC FindServiceDescriptionForWohnheimbuchungsServiceRecord(long pWohnheimbuchungsOid);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/LoadCustomerPersonRelationsByOid", ReplyAction="http://tempuri.org/ICustomerService/LoadCustomerPersonRelationsByOidResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/LoadCustomerPersonRelationsByOidBeWoFaultFaul" +
+            "t", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.CustomerPersonRelationDC> LoadCustomerPersonRelationsByOid(System.Collections.Generic.List<long> pOids);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/LoadCustomerOrganisationRelationsByOid", ReplyAction="http://tempuri.org/ICustomerService/LoadCustomerOrganisationRelationsByOidRespons" +
+            "e")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/LoadCustomerOrganisationRelationsByOidBeWoFau" +
+            "ltFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.CustomerOrganisationRelationDC> LoadCustomerOrganisationRelationsByOid(System.Collections.Generic.List<long> pOids);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/InsertMedRecords", ReplyAction="http://tempuri.org/ICustomerService/InsertMedRecordsResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/InsertMedRecordsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<long> InsertMedRecords(System.Collections.Generic.List<BS.Shared.DataContracts.MedRecordDC> pDCList);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetMedRecordsForCustomer", ReplyAction="http://tempuri.org/ICustomerService/GetMedRecordsForCustomerResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetMedRecordsForCustomerBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.MedRecordDC> GetMedRecordsForCustomer(long pCustomerOid);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/UpdateMedRecords", ReplyAction="http://tempuri.org/ICustomerService/UpdateMedRecordsResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/UpdateMedRecordsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.MedRecordDC> UpdateMedRecords(System.Collections.Generic.List<BS.Shared.DataContracts.MedRecordDC> pDCList);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/DeactivateMedRecords", ReplyAction="http://tempuri.org/ICustomerService/DeactivateMedRecordsResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/DeactivateMedRecordsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        void DeactivateMedRecords(System.Collections.Generic.Dictionary<long, long> pOid2Version);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/DeleteMedRecord", ReplyAction="http://tempuri.org/ICustomerService/DeleteMedRecordResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/DeleteMedRecordBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        void DeleteMedRecord(long pOid, long pVersion);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/AndroidGetCustomerCompact", ReplyAction="http://tempuri.org/ICustomerService/AndroidGetCustomerCompactResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/AndroidGetCustomerCompactBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        string AndroidGetCustomerCompact(long pCustomerOid);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetAllChatActiveCustomersCompact", ReplyAction="http://tempuri.org/ICustomerService/GetAllChatActiveCustomersCompactResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetAllChatActiveCustomersCompactBeWoFaultFaul" +
+            "t", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactCustomerDC> GetAllChatActiveCustomersCompact(long personOid);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/FindAllChatMessages", ReplyAction="http://tempuri.org/ICustomerService/FindAllChatMessagesResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/FindAllChatMessagesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.ChatMessageDC> FindAllChatMessages(long senderOid, long empfaengerOid, int maxNachricht);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/FindAllChatMessagesFromTeam", ReplyAction="http://tempuri.org/ICustomerService/FindAllChatMessagesFromTeamResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/FindAllChatMessagesFromTeamBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.ChatMessageDC> FindAllChatMessagesFromTeam(long senderOid, long teamEmpfangOid, int maxNachrichten);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/CountChatMessages", ReplyAction="http://tempuri.org/ICustomerService/CountChatMessagesResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/CountChatMessagesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        int CountChatMessages(int aktuelleAnzahl, long senderoid, long empfangoid, bool isTeam);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetNextChatMessages", ReplyAction="http://tempuri.org/ICustomerService/GetNextChatMessagesResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetNextChatMessagesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.ChatMessageDC> GetNextChatMessages(long senderOid, long EmpfangOid, bool isteam, System.Collections.Generic.List<string> messageIds, int maxMessage);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/UpdateIstGelesen", ReplyAction="http://tempuri.org/ICustomerService/UpdateIstGelesenResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/UpdateIstGelesenBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        void UpdateIstGelesen(long senderOid, long empfaengerOid, bool istGelesen);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/UpdateIstGelesenForOne", ReplyAction="http://tempuri.org/ICustomerService/UpdateIstGelesenForOneResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/UpdateIstGelesenForOneBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        void UpdateIstGelesenForOne(long senderOid, long empfaengerOid, bool istGelesen, string messageId);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetCustomerImage", ReplyAction="http://tempuri.org/ICustomerService/GetCustomerImageResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetCustomerImageBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        byte[] GetCustomerImage(long customerOid);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetCustomerThumbnail", ReplyAction="http://tempuri.org/ICustomerService/GetCustomerThumbnailResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetCustomerThumbnailBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        byte[] GetCustomerThumbnail(long customerOid);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetAllCustomerAppCodes", ReplyAction="http://tempuri.org/ICustomerService/GetAllCustomerAppCodesResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetAllCustomerAppCodesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.CustomerAPPCodeDC> GetAllCustomerAppCodes(long pCustomerOid);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetChatMedia", ReplyAction="http://tempuri.org/ICustomerService/GetChatMediaResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetChatMediaBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        byte[] GetChatMedia(long chatMediaMessageOid);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetOrganisationsForPerson", ReplyAction="http://tempuri.org/ICustomerService/GetOrganisationsForPersonResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetOrganisationsForPersonBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactOrganisationDC> GetOrganisationsForPerson(long personoid);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetPersonForOrganisations", ReplyAction="http://tempuri.org/ICustomerService/GetPersonForOrganisationsResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetPersonForOrganisationsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactPersonDC> GetPersonForOrganisations(long organisationoid);
+        
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/ArchiveCustomer", ReplyAction="http://tempuri.org/ICustomerService/ArchiveCustomerResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/ArchiveCustomerBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         void ArchiveCustomer(long pOid, long pVersion);
@@ -1609,6 +1518,97 @@ namespace BeWo.ServiceProxy
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/UpdateCustomersAbsenceTimes", ReplyAction="http://tempuri.org/ICustomerService/UpdateCustomersAbsenceTimesResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/UpdateCustomersAbsenceTimesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         void UpdateCustomersAbsenceTimes(long pCustomerOid, System.Collections.Generic.List<BS.Shared.DataContracts.AbsenceTimeDC> pAbsenceTimes);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/UpdateOrganisation", ReplyAction="http://tempuri.org/ICustomerService/UpdateOrganisationResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/UpdateOrganisationBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        long UpdateOrganisation(BS.Shared.DataContracts.OrganisationDC pOrganisationDC);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/UpdatePerson", ReplyAction="http://tempuri.org/ICustomerService/UpdatePersonResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/UpdatePersonBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.CustomerDC))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.WohnheimDC))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.EmployeeDC))]
+        long UpdatePerson(BS.Shared.DataContracts.PersonDC pPersonDC);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/UpdateSupportConcept", ReplyAction="http://tempuri.org/ICustomerService/UpdateSupportConceptResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/UpdateSupportConceptBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        long UpdateSupportConcept(BS.Shared.DataContracts.SupportConceptDC pSupportConcept);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/LoadCustomerAssessmentSheetCategoryList", ReplyAction="http://tempuri.org/ICustomerService/LoadCustomerAssessmentSheetCategoryListRespon" +
+            "se")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/LoadCustomerAssessmentSheetCategoryListBeWoFa" +
+            "ultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.AssessmentSheetCategoryDC> LoadCustomerAssessmentSheetCategoryList(long pCustomerOid);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/LoadAppointments", ReplyAction="http://tempuri.org/ICustomerService/LoadAppointmentsResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/LoadAppointmentsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.AppointmentDC> LoadAppointments(System.Nullable<long> customerOid, System.Nullable<long> employeeOid);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetAllAppointmentCategories", ReplyAction="http://tempuri.org/ICustomerService/GetAllAppointmentCategoriesResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetAllAppointmentCategoriesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.AppointmentCategoryDC> GetAllAppointmentCategories();
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/InsertNewAppointmentCategories", ReplyAction="http://tempuri.org/ICustomerService/InsertNewAppointmentCategoriesResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/InsertNewAppointmentCategoriesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<long> InsertNewAppointmentCategories(System.Collections.Generic.List<BS.Shared.DataContracts.AppointmentCategoryDC> pAppointmentCategories);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/UpdateAppointmentCategories", ReplyAction="http://tempuri.org/ICustomerService/UpdateAppointmentCategoriesResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/UpdateAppointmentCategoriesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<long> UpdateAppointmentCategories(System.Collections.Generic.List<BS.Shared.DataContracts.AppointmentCategoryDC> pAppointmentCategories);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/DeactivateAppointmentCategories", ReplyAction="http://tempuri.org/ICustomerService/DeactivateAppointmentCategoriesResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/DeactivateAppointmentCategoriesBeWoFaultFault" +
+            "", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        void DeactivateAppointmentCategories(System.Collections.Generic.Dictionary<long, long> pOid2Version);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/InsertNewAppointments", ReplyAction="http://tempuri.org/ICustomerService/InsertNewAppointmentsResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/InsertNewAppointmentsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.AppointmentDC> InsertNewAppointments(System.Collections.Generic.List<BS.Shared.DataContracts.AppointmentDC> pAppointments);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/UpdateAppointments", ReplyAction="http://tempuri.org/ICustomerService/UpdateAppointmentsResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/UpdateAppointmentsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.AppointmentDC> UpdateAppointments(System.Collections.Generic.List<BS.Shared.DataContracts.AppointmentDC> pAppointments);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/DeactivateAppointments", ReplyAction="http://tempuri.org/ICustomerService/DeactivateAppointmentsResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/DeactivateAppointmentsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        void DeactivateAppointments(System.Collections.Generic.Dictionary<long, long> pOid2Version);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/InsertAbsenceTimes", ReplyAction="http://tempuri.org/ICustomerService/InsertAbsenceTimesResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/InsertAbsenceTimesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.AbsenceTimeDC> InsertAbsenceTimes(System.Collections.Generic.List<BS.Shared.DataContracts.AbsenceTimeDC> pDCList);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/UpdateAbsenceTimes", ReplyAction="http://tempuri.org/ICustomerService/UpdateAbsenceTimesResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/UpdateAbsenceTimesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.AbsenceTimeDC> UpdateAbsenceTimes(System.Collections.Generic.List<BS.Shared.DataContracts.AbsenceTimeDC> pDCList);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/DeactivateAbsenceTimes", ReplyAction="http://tempuri.org/ICustomerService/DeactivateAbsenceTimesResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/DeactivateAbsenceTimesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        void DeactivateAbsenceTimes(System.Collections.Generic.Dictionary<long, long> pOid2Version);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetAllCustomerGoals", ReplyAction="http://tempuri.org/ICustomerService/GetAllCustomerGoalsResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetAllCustomerGoalsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.ValueListEntryDC> GetAllCustomerGoals(long pCustomerOid);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/LoadCompactSupportConceptDC", ReplyAction="http://tempuri.org/ICustomerService/LoadCompactSupportConceptDCResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/LoadCompactSupportConceptDCBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        BS.Shared.DataContracts.Compact.CompactSupportConceptDC LoadCompactSupportConceptDC(long pOid, System.Nullable<long> currentEmployeeOid);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetCompactCustomerDC", ReplyAction="http://tempuri.org/ICustomerService/GetCompactCustomerDCResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetCompactCustomerDCBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        BS.Shared.DataContracts.Compact.CompactCustomerDC GetCompactCustomerDC(long pOid);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetAllActiveCompactCustomers", ReplyAction="http://tempuri.org/ICustomerService/GetAllActiveCompactCustomersResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetAllActiveCompactCustomersBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactCustomerDC> GetAllActiveCompactCustomers();
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/ServiceRecordOutOfSupportConcept", ReplyAction="http://tempuri.org/ICustomerService/ServiceRecordOutOfSupportConceptResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/ServiceRecordOutOfSupportConceptBeWoFaultFaul" +
+            "t", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        bool ServiceRecordOutOfSupportConcept(BS.Shared.DataContracts.SupportConceptDC pSupportConcept);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetAllActiveCustomers", ReplyAction="http://tempuri.org/ICustomerService/GetAllActiveCustomersResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetAllActiveCustomersBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.CustomerDC> GetAllActiveCustomers();
     }
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
@@ -1645,251 +1645,6 @@ namespace BeWo.ServiceProxy
         {
         }
         
-        public long InsertWohnheimbuchung(BS.Shared.DataContracts.WohnheimbuchungDC buchung)
-        {
-            return base.Channel.InsertWohnheimbuchung(buchung);
-        }
-        
-        public BS.Shared.DataContracts.WohnheimbuchungDC GetWohnheimbuchungByWohnheimAndBuchungsdatum(long pWohnheimOid, System.DateTime pBuchungsdatum)
-        {
-            return base.Channel.GetWohnheimbuchungByWohnheimAndBuchungsdatum(pWohnheimOid, pBuchungsdatum);
-        }
-        
-        public System.Collections.Generic.List<BS.Shared.DataContracts.ServiceRecordDC> FindWohnheimbuchungsServiceRecords(long pWohnheimbuchungsOid)
-        {
-            return base.Channel.FindWohnheimbuchungsServiceRecords(pWohnheimbuchungsOid);
-        }
-        
-        public void DeleteWohnheimbuchung(long pWohnheimbuchungsOid, long pWohnheimbuchungsVersion)
-        {
-            base.Channel.DeleteWohnheimbuchung(pWohnheimbuchungsOid, pWohnheimbuchungsVersion);
-        }
-        
-        public System.Collections.Generic.List<BS.Shared.DataContracts.SupportConceptDC> GetAllActiveSupportConcepts()
-        {
-            return base.Channel.GetAllActiveSupportConcepts();
-        }
-        
-        public System.Collections.Generic.List<long> CreateServiceRecordsFromWohnheimbuchung(long pWohnheimbuchungsOid, long pServiceDescriptionOid)
-        {
-            return base.Channel.CreateServiceRecordsFromWohnheimbuchung(pWohnheimbuchungsOid, pServiceDescriptionOid);
-        }
-        
-        public BS.Shared.DataContracts.ServiceDescriptionDC FindServiceDescriptionForWohnheimbuchungsServiceRecord(long pWohnheimbuchungsOid)
-        {
-            return base.Channel.FindServiceDescriptionForWohnheimbuchungsServiceRecord(pWohnheimbuchungsOid);
-        }
-        
-        public System.Collections.Generic.List<BS.Shared.DataContracts.CustomerPersonRelationDC> LoadCustomerPersonRelationsByOid(System.Collections.Generic.List<long> pOids)
-        {
-            return base.Channel.LoadCustomerPersonRelationsByOid(pOids);
-        }
-        
-        public System.Collections.Generic.List<BS.Shared.DataContracts.CustomerOrganisationRelationDC> LoadCustomerOrganisationRelationsByOid(System.Collections.Generic.List<long> pOids)
-        {
-            return base.Channel.LoadCustomerOrganisationRelationsByOid(pOids);
-        }
-        
-        public System.Collections.Generic.List<long> InsertMedRecords(System.Collections.Generic.List<BS.Shared.DataContracts.MedRecordDC> pDCList)
-        {
-            return base.Channel.InsertMedRecords(pDCList);
-        }
-        
-        public System.Collections.Generic.List<BS.Shared.DataContracts.MedRecordDC> GetMedRecordsForCustomer(long pCustomerOid)
-        {
-            return base.Channel.GetMedRecordsForCustomer(pCustomerOid);
-        }
-        
-        public System.Collections.Generic.List<BS.Shared.DataContracts.MedRecordDC> UpdateMedRecords(System.Collections.Generic.List<BS.Shared.DataContracts.MedRecordDC> pDCList)
-        {
-            return base.Channel.UpdateMedRecords(pDCList);
-        }
-        
-        public void DeactivateMedRecords(System.Collections.Generic.Dictionary<long, long> pOid2Version)
-        {
-            base.Channel.DeactivateMedRecords(pOid2Version);
-        }
-        
-        public void DeleteMedRecord(long pOid, long pVersion)
-        {
-            base.Channel.DeleteMedRecord(pOid, pVersion);
-        }
-        
-        public string AndroidGetCustomerCompact(long pCustomerOid)
-        {
-            return base.Channel.AndroidGetCustomerCompact(pCustomerOid);
-        }
-        
-        public System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactCustomerDC> GetAllChatActiveCustomersCompact(long personOid)
-        {
-            return base.Channel.GetAllChatActiveCustomersCompact(personOid);
-        }
-        
-        public System.Collections.Generic.List<BS.Shared.DataContracts.ChatMessageDC> FindAllChatMessages(long senderOid, long empfaengerOid, int maxNachricht)
-        {
-            return base.Channel.FindAllChatMessages(senderOid, empfaengerOid, maxNachricht);
-        }
-        
-        public System.Collections.Generic.List<BS.Shared.DataContracts.ChatMessageDC> FindAllChatMessagesFromTeam(long senderOid, long teamEmpfangOid, int maxNachrichten)
-        {
-            return base.Channel.FindAllChatMessagesFromTeam(senderOid, teamEmpfangOid, maxNachrichten);
-        }
-        
-        public int CountChatMessages(int aktuelleAnzahl, long senderoid, long empfangoid, bool isTeam)
-        {
-            return base.Channel.CountChatMessages(aktuelleAnzahl, senderoid, empfangoid, isTeam);
-        }
-        
-        public System.Collections.Generic.List<BS.Shared.DataContracts.ChatMessageDC> GetNextChatMessages(long senderOid, long EmpfangOid, bool isteam, System.Collections.Generic.List<string> messageIds, int maxMessage)
-        {
-            return base.Channel.GetNextChatMessages(senderOid, EmpfangOid, isteam, messageIds, maxMessage);
-        }
-        
-        public void UpdateIstGelesen(long senderOid, long empfaengerOid, bool istGelesen)
-        {
-            base.Channel.UpdateIstGelesen(senderOid, empfaengerOid, istGelesen);
-        }
-        
-        public void UpdateIstGelesenForOne(long senderOid, long empfaengerOid, bool istGelesen, string messageId)
-        {
-            base.Channel.UpdateIstGelesenForOne(senderOid, empfaengerOid, istGelesen, messageId);
-        }
-        
-        public byte[] GetCustomerImage(long customerOid)
-        {
-            return base.Channel.GetCustomerImage(customerOid);
-        }
-        
-        public byte[] GetCustomerThumbnail(long customerOid)
-        {
-            return base.Channel.GetCustomerThumbnail(customerOid);
-        }
-        
-        public System.Collections.Generic.List<BS.Shared.DataContracts.CustomerAPPCodeDC> GetAllCustomerAppCodes(long pCustomerOid)
-        {
-            return base.Channel.GetAllCustomerAppCodes(pCustomerOid);
-        }
-        
-        public byte[] GetChatMedia(long chatMediaMessageOid)
-        {
-            return base.Channel.GetChatMedia(chatMediaMessageOid);
-        }
-        
-        public System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactOrganisationDC> GetOrganisationsForPerson(long personoid)
-        {
-            return base.Channel.GetOrganisationsForPerson(personoid);
-        }
-        
-        public System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactPersonDC> GetPersonForOrganisations(long organisationoid)
-        {
-            return base.Channel.GetPersonForOrganisations(organisationoid);
-        }
-        
-        public long UpdateOrganisation(BS.Shared.DataContracts.OrganisationDC pOrganisationDC)
-        {
-            return base.Channel.UpdateOrganisation(pOrganisationDC);
-        }
-        
-        public long UpdatePerson(BS.Shared.DataContracts.PersonDC pPersonDC)
-        {
-            return base.Channel.UpdatePerson(pPersonDC);
-        }
-        
-        public long UpdateSupportConcept(BS.Shared.DataContracts.SupportConceptDC pSupportConcept)
-        {
-            return base.Channel.UpdateSupportConcept(pSupportConcept);
-        }
-        
-        public System.Collections.Generic.List<BS.Shared.DataContracts.AssessmentSheetCategoryDC> LoadCustomerAssessmentSheetCategoryList(long pCustomerOid)
-        {
-            return base.Channel.LoadCustomerAssessmentSheetCategoryList(pCustomerOid);
-        }
-        
-        public System.Collections.Generic.List<BS.Shared.DataContracts.AppointmentDC> LoadAppointments(System.Nullable<long> customerOid, System.Nullable<long> employeeOid)
-        {
-            return base.Channel.LoadAppointments(customerOid, employeeOid);
-        }
-        
-        public System.Collections.Generic.List<BS.Shared.DataContracts.AppointmentCategoryDC> GetAllAppointmentCategories()
-        {
-            return base.Channel.GetAllAppointmentCategories();
-        }
-        
-        public System.Collections.Generic.List<long> InsertNewAppointmentCategories(System.Collections.Generic.List<BS.Shared.DataContracts.AppointmentCategoryDC> pAppointmentCategories)
-        {
-            return base.Channel.InsertNewAppointmentCategories(pAppointmentCategories);
-        }
-        
-        public System.Collections.Generic.List<long> UpdateAppointmentCategories(System.Collections.Generic.List<BS.Shared.DataContracts.AppointmentCategoryDC> pAppointmentCategories)
-        {
-            return base.Channel.UpdateAppointmentCategories(pAppointmentCategories);
-        }
-        
-        public void DeactivateAppointmentCategories(System.Collections.Generic.Dictionary<long, long> pOid2Version)
-        {
-            base.Channel.DeactivateAppointmentCategories(pOid2Version);
-        }
-        
-        public System.Collections.Generic.List<BS.Shared.DataContracts.AppointmentDC> InsertNewAppointments(System.Collections.Generic.List<BS.Shared.DataContracts.AppointmentDC> pAppointments)
-        {
-            return base.Channel.InsertNewAppointments(pAppointments);
-        }
-        
-        public System.Collections.Generic.List<BS.Shared.DataContracts.AppointmentDC> UpdateAppointments(System.Collections.Generic.List<BS.Shared.DataContracts.AppointmentDC> pAppointments)
-        {
-            return base.Channel.UpdateAppointments(pAppointments);
-        }
-        
-        public void DeactivateAppointments(System.Collections.Generic.Dictionary<long, long> pOid2Version)
-        {
-            base.Channel.DeactivateAppointments(pOid2Version);
-        }
-        
-        public System.Collections.Generic.List<BS.Shared.DataContracts.AbsenceTimeDC> InsertAbsenceTimes(System.Collections.Generic.List<BS.Shared.DataContracts.AbsenceTimeDC> pDCList)
-        {
-            return base.Channel.InsertAbsenceTimes(pDCList);
-        }
-        
-        public System.Collections.Generic.List<BS.Shared.DataContracts.AbsenceTimeDC> UpdateAbsenceTimes(System.Collections.Generic.List<BS.Shared.DataContracts.AbsenceTimeDC> pDCList)
-        {
-            return base.Channel.UpdateAbsenceTimes(pDCList);
-        }
-        
-        public void DeactivateAbsenceTimes(System.Collections.Generic.Dictionary<long, long> pOid2Version)
-        {
-            base.Channel.DeactivateAbsenceTimes(pOid2Version);
-        }
-        
-        public System.Collections.Generic.List<BS.Shared.DataContracts.ValueListEntryDC> GetAllCustomerGoals(long pCustomerOid)
-        {
-            return base.Channel.GetAllCustomerGoals(pCustomerOid);
-        }
-        
-        public BS.Shared.DataContracts.Compact.CompactSupportConceptDC LoadCompactSupportConceptDC(long pOid, System.Nullable<long> currentEmployeeOid)
-        {
-            return base.Channel.LoadCompactSupportConceptDC(pOid, currentEmployeeOid);
-        }
-        
-        public BS.Shared.DataContracts.Compact.CompactCustomerDC GetCompactCustomerDC(long pOid)
-        {
-            return base.Channel.GetCompactCustomerDC(pOid);
-        }
-        
-        public System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactCustomerDC> GetAllActiveCompactCustomers()
-        {
-            return base.Channel.GetAllActiveCompactCustomers();
-        }
-        
-        public bool ServiceRecordOutOfSupportConcept(BS.Shared.DataContracts.SupportConceptDC pSupportConcept)
-        {
-            return base.Channel.ServiceRecordOutOfSupportConcept(pSupportConcept);
-        }
-        
-        public System.Collections.Generic.List<BS.Shared.DataContracts.CustomerDC> GetAllActiveCustomers()
-        {
-            return base.Channel.GetAllActiveCustomers();
-        }
-        
         public System.Collections.Generic.List<BS.Shared.DataContracts.CustomerDC> GetCustomersById(System.Collections.Generic.List<long> idList)
         {
             return base.Channel.GetCustomersById(idList);
@@ -2105,6 +1860,146 @@ namespace BeWo.ServiceProxy
             return base.Channel.UpdateWohnheimbuchung(buchung);
         }
         
+        public long InsertWohnheimbuchung(BS.Shared.DataContracts.WohnheimbuchungDC buchung)
+        {
+            return base.Channel.InsertWohnheimbuchung(buchung);
+        }
+        
+        public BS.Shared.DataContracts.WohnheimbuchungDC GetWohnheimbuchungByWohnheimAndBuchungsdatum(long pWohnheimOid, System.DateTime pBuchungsdatum)
+        {
+            return base.Channel.GetWohnheimbuchungByWohnheimAndBuchungsdatum(pWohnheimOid, pBuchungsdatum);
+        }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.ServiceRecordDC> FindWohnheimbuchungsServiceRecords(long pWohnheimbuchungsOid)
+        {
+            return base.Channel.FindWohnheimbuchungsServiceRecords(pWohnheimbuchungsOid);
+        }
+        
+        public void DeleteWohnheimbuchung(long pWohnheimbuchungsOid, long pWohnheimbuchungsVersion)
+        {
+            base.Channel.DeleteWohnheimbuchung(pWohnheimbuchungsOid, pWohnheimbuchungsVersion);
+        }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.SupportConceptDC> GetAllActiveSupportConcepts()
+        {
+            return base.Channel.GetAllActiveSupportConcepts();
+        }
+        
+        public System.Collections.Generic.List<long> CreateServiceRecordsFromWohnheimbuchung(long pWohnheimbuchungsOid, long pServiceDescriptionOid)
+        {
+            return base.Channel.CreateServiceRecordsFromWohnheimbuchung(pWohnheimbuchungsOid, pServiceDescriptionOid);
+        }
+        
+        public BS.Shared.DataContracts.ServiceDescriptionDC FindServiceDescriptionForWohnheimbuchungsServiceRecord(long pWohnheimbuchungsOid)
+        {
+            return base.Channel.FindServiceDescriptionForWohnheimbuchungsServiceRecord(pWohnheimbuchungsOid);
+        }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.CustomerPersonRelationDC> LoadCustomerPersonRelationsByOid(System.Collections.Generic.List<long> pOids)
+        {
+            return base.Channel.LoadCustomerPersonRelationsByOid(pOids);
+        }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.CustomerOrganisationRelationDC> LoadCustomerOrganisationRelationsByOid(System.Collections.Generic.List<long> pOids)
+        {
+            return base.Channel.LoadCustomerOrganisationRelationsByOid(pOids);
+        }
+        
+        public System.Collections.Generic.List<long> InsertMedRecords(System.Collections.Generic.List<BS.Shared.DataContracts.MedRecordDC> pDCList)
+        {
+            return base.Channel.InsertMedRecords(pDCList);
+        }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.MedRecordDC> GetMedRecordsForCustomer(long pCustomerOid)
+        {
+            return base.Channel.GetMedRecordsForCustomer(pCustomerOid);
+        }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.MedRecordDC> UpdateMedRecords(System.Collections.Generic.List<BS.Shared.DataContracts.MedRecordDC> pDCList)
+        {
+            return base.Channel.UpdateMedRecords(pDCList);
+        }
+        
+        public void DeactivateMedRecords(System.Collections.Generic.Dictionary<long, long> pOid2Version)
+        {
+            base.Channel.DeactivateMedRecords(pOid2Version);
+        }
+        
+        public void DeleteMedRecord(long pOid, long pVersion)
+        {
+            base.Channel.DeleteMedRecord(pOid, pVersion);
+        }
+        
+        public string AndroidGetCustomerCompact(long pCustomerOid)
+        {
+            return base.Channel.AndroidGetCustomerCompact(pCustomerOid);
+        }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactCustomerDC> GetAllChatActiveCustomersCompact(long personOid)
+        {
+            return base.Channel.GetAllChatActiveCustomersCompact(personOid);
+        }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.ChatMessageDC> FindAllChatMessages(long senderOid, long empfaengerOid, int maxNachricht)
+        {
+            return base.Channel.FindAllChatMessages(senderOid, empfaengerOid, maxNachricht);
+        }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.ChatMessageDC> FindAllChatMessagesFromTeam(long senderOid, long teamEmpfangOid, int maxNachrichten)
+        {
+            return base.Channel.FindAllChatMessagesFromTeam(senderOid, teamEmpfangOid, maxNachrichten);
+        }
+        
+        public int CountChatMessages(int aktuelleAnzahl, long senderoid, long empfangoid, bool isTeam)
+        {
+            return base.Channel.CountChatMessages(aktuelleAnzahl, senderoid, empfangoid, isTeam);
+        }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.ChatMessageDC> GetNextChatMessages(long senderOid, long EmpfangOid, bool isteam, System.Collections.Generic.List<string> messageIds, int maxMessage)
+        {
+            return base.Channel.GetNextChatMessages(senderOid, EmpfangOid, isteam, messageIds, maxMessage);
+        }
+        
+        public void UpdateIstGelesen(long senderOid, long empfaengerOid, bool istGelesen)
+        {
+            base.Channel.UpdateIstGelesen(senderOid, empfaengerOid, istGelesen);
+        }
+        
+        public void UpdateIstGelesenForOne(long senderOid, long empfaengerOid, bool istGelesen, string messageId)
+        {
+            base.Channel.UpdateIstGelesenForOne(senderOid, empfaengerOid, istGelesen, messageId);
+        }
+        
+        public byte[] GetCustomerImage(long customerOid)
+        {
+            return base.Channel.GetCustomerImage(customerOid);
+        }
+        
+        public byte[] GetCustomerThumbnail(long customerOid)
+        {
+            return base.Channel.GetCustomerThumbnail(customerOid);
+        }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.CustomerAPPCodeDC> GetAllCustomerAppCodes(long pCustomerOid)
+        {
+            return base.Channel.GetAllCustomerAppCodes(pCustomerOid);
+        }
+        
+        public byte[] GetChatMedia(long chatMediaMessageOid)
+        {
+            return base.Channel.GetChatMedia(chatMediaMessageOid);
+        }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactOrganisationDC> GetOrganisationsForPerson(long personoid)
+        {
+            return base.Channel.GetOrganisationsForPerson(personoid);
+        }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactPersonDC> GetPersonForOrganisations(long organisationoid)
+        {
+            return base.Channel.GetPersonForOrganisations(organisationoid);
+        }
+        
         public void ArchiveCustomer(long pOid, long pVersion)
         {
             base.Channel.ArchiveCustomer(pOid, pVersion);
@@ -2424,6 +2319,111 @@ namespace BeWo.ServiceProxy
         {
             base.Channel.UpdateCustomersAbsenceTimes(pCustomerOid, pAbsenceTimes);
         }
+        
+        public long UpdateOrganisation(BS.Shared.DataContracts.OrganisationDC pOrganisationDC)
+        {
+            return base.Channel.UpdateOrganisation(pOrganisationDC);
+        }
+        
+        public long UpdatePerson(BS.Shared.DataContracts.PersonDC pPersonDC)
+        {
+            return base.Channel.UpdatePerson(pPersonDC);
+        }
+        
+        public long UpdateSupportConcept(BS.Shared.DataContracts.SupportConceptDC pSupportConcept)
+        {
+            return base.Channel.UpdateSupportConcept(pSupportConcept);
+        }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.AssessmentSheetCategoryDC> LoadCustomerAssessmentSheetCategoryList(long pCustomerOid)
+        {
+            return base.Channel.LoadCustomerAssessmentSheetCategoryList(pCustomerOid);
+        }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.AppointmentDC> LoadAppointments(System.Nullable<long> customerOid, System.Nullable<long> employeeOid)
+        {
+            return base.Channel.LoadAppointments(customerOid, employeeOid);
+        }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.AppointmentCategoryDC> GetAllAppointmentCategories()
+        {
+            return base.Channel.GetAllAppointmentCategories();
+        }
+        
+        public System.Collections.Generic.List<long> InsertNewAppointmentCategories(System.Collections.Generic.List<BS.Shared.DataContracts.AppointmentCategoryDC> pAppointmentCategories)
+        {
+            return base.Channel.InsertNewAppointmentCategories(pAppointmentCategories);
+        }
+        
+        public System.Collections.Generic.List<long> UpdateAppointmentCategories(System.Collections.Generic.List<BS.Shared.DataContracts.AppointmentCategoryDC> pAppointmentCategories)
+        {
+            return base.Channel.UpdateAppointmentCategories(pAppointmentCategories);
+        }
+        
+        public void DeactivateAppointmentCategories(System.Collections.Generic.Dictionary<long, long> pOid2Version)
+        {
+            base.Channel.DeactivateAppointmentCategories(pOid2Version);
+        }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.AppointmentDC> InsertNewAppointments(System.Collections.Generic.List<BS.Shared.DataContracts.AppointmentDC> pAppointments)
+        {
+            return base.Channel.InsertNewAppointments(pAppointments);
+        }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.AppointmentDC> UpdateAppointments(System.Collections.Generic.List<BS.Shared.DataContracts.AppointmentDC> pAppointments)
+        {
+            return base.Channel.UpdateAppointments(pAppointments);
+        }
+        
+        public void DeactivateAppointments(System.Collections.Generic.Dictionary<long, long> pOid2Version)
+        {
+            base.Channel.DeactivateAppointments(pOid2Version);
+        }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.AbsenceTimeDC> InsertAbsenceTimes(System.Collections.Generic.List<BS.Shared.DataContracts.AbsenceTimeDC> pDCList)
+        {
+            return base.Channel.InsertAbsenceTimes(pDCList);
+        }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.AbsenceTimeDC> UpdateAbsenceTimes(System.Collections.Generic.List<BS.Shared.DataContracts.AbsenceTimeDC> pDCList)
+        {
+            return base.Channel.UpdateAbsenceTimes(pDCList);
+        }
+        
+        public void DeactivateAbsenceTimes(System.Collections.Generic.Dictionary<long, long> pOid2Version)
+        {
+            base.Channel.DeactivateAbsenceTimes(pOid2Version);
+        }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.ValueListEntryDC> GetAllCustomerGoals(long pCustomerOid)
+        {
+            return base.Channel.GetAllCustomerGoals(pCustomerOid);
+        }
+        
+        public BS.Shared.DataContracts.Compact.CompactSupportConceptDC LoadCompactSupportConceptDC(long pOid, System.Nullable<long> currentEmployeeOid)
+        {
+            return base.Channel.LoadCompactSupportConceptDC(pOid, currentEmployeeOid);
+        }
+        
+        public BS.Shared.DataContracts.Compact.CompactCustomerDC GetCompactCustomerDC(long pOid)
+        {
+            return base.Channel.GetCompactCustomerDC(pOid);
+        }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactCustomerDC> GetAllActiveCompactCustomers()
+        {
+            return base.Channel.GetAllActiveCompactCustomers();
+        }
+        
+        public bool ServiceRecordOutOfSupportConcept(BS.Shared.DataContracts.SupportConceptDC pSupportConcept)
+        {
+            return base.Channel.ServiceRecordOutOfSupportConcept(pSupportConcept);
+        }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.CustomerDC> GetAllActiveCustomers()
+        {
+            return base.Channel.GetAllActiveCustomers();
+        }
     }
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
@@ -3862,173 +3862,6 @@ namespace BeWo.ServiceProxy
     public interface IOperationsService
     {
         
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/CreateNewEmployeeAPPCodeDC", ReplyAction="http://tempuri.org/IOperationsService/CreateNewEmployeeAPPCodeDCResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/CreateNewEmployeeAPPCodeDCBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        BS.Shared.DataContracts.EmployeeAPPCodeDC CreateNewEmployeeAPPCodeDC(long employeeOid);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateIsChatActiveEmployeeAPPCodeDC", ReplyAction="http://tempuri.org/IOperationsService/UpdateIsChatActiveEmployeeAPPCodeDCResponse" +
-            "")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateIsChatActiveEmployeeAPPCodeDCBeWoFaul" +
-            "tFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        void UpdateIsChatActiveEmployeeAPPCodeDC(long employeeOid, int activeType);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateNotfallNacrichtEmployeeAPPCodeDC", ReplyAction="http://tempuri.org/IOperationsService/UpdateNotfallNacrichtEmployeeAPPCodeDCRespo" +
-            "nse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateNotfallNacrichtEmployeeAPPCodeDCBeWoF" +
-            "aultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        void UpdateNotfallNacrichtEmployeeAPPCodeDC(long employeeOid, string notfallstate);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/LoadOrganisationPersonRelationsByOid", ReplyAction="http://tempuri.org/IOperationsService/LoadOrganisationPersonRelationsByOidRespons" +
-            "e")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/LoadOrganisationPersonRelationsByOidBeWoFau" +
-            "ltFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<BS.Shared.DataContracts.OrganisationPersonRelationDC> LoadOrganisationPersonRelationsByOid(System.Collections.Generic.List<long> pOids);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/LoadBargeldkassenForObject", ReplyAction="http://tempuri.org/IOperationsService/LoadBargeldkassenForObjectResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/LoadBargeldkassenForObjectBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<BS.Shared.DataContracts.BargeldkassenDC> LoadBargeldkassenForObject(BS.Shared.TableID objectTid, long objectOid);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/InsertNewBargeldkasse", ReplyAction="http://tempuri.org/IOperationsService/InsertNewBargeldkasseResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertNewBargeldkasseBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        long InsertNewBargeldkasse(BS.Shared.DataContracts.BargeldkassenDC pBargeldkasse);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateBargeldkasse", ReplyAction="http://tempuri.org/IOperationsService/UpdateBargeldkasseResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateBargeldkasseBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        BS.Shared.DataContracts.BargeldkassenDC UpdateBargeldkasse(BS.Shared.DataContracts.BargeldkassenDC pBargeldkasse);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DeactivateBargeldkasse", ReplyAction="http://tempuri.org/IOperationsService/DeactivateBargeldkasseResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DeactivateBargeldkasseBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        void DeactivateBargeldkasse(long pOid, long pVersion);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/CreateNewPerson2OrganisationRelation", ReplyAction="http://tempuri.org/IOperationsService/CreateNewPerson2OrganisationRelationRespons" +
-            "e")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/CreateNewPerson2OrganisationRelationBeWoFau" +
-            "ltFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        void CreateNewPerson2OrganisationRelation(long organi, BS.Shared.DataContracts.ValueListEntryDC value, long personOid, string mail, string fax, string tele, string notice);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetEmployeesServiceRecordsWithStartEndDate", ReplyAction="http://tempuri.org/IOperationsService/GetEmployeesServiceRecordsWithStartEndDateR" +
-            "esponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetEmployeesServiceRecordsWithStartEndDateB" +
-            "eWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<BS.Shared.DataContracts.ServiceRecordDC> GetEmployeesServiceRecordsWithStartEndDate(long pEmployeeOid, System.DateTime start, System.DateTime ende);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetCustomerServiceRecordsCompactWithStartEn" +
-            "dDate", ReplyAction="http://tempuri.org/IOperationsService/GetCustomerServiceRecordsCompactWithStartEn" +
-            "dDateResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetCustomerServiceRecordsCompactWithStartEn" +
-            "dDateBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<BS.Shared.DataContracts.ServiceRecordDC> GetCustomerServiceRecordsCompactWithStartEndDate(long pCustomerOid, long costbearer2SupportConceptOid, System.DateTime start, System.DateTime ende);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateServiceDescriptions", ReplyAction="http://tempuri.org/IOperationsService/UpdateServiceDescriptionsResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateServiceDescriptionsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        void UpdateServiceDescriptions(System.Collections.Generic.List<BS.Shared.DataContracts.ServiceDescriptionDC> pServiceDescriptions);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateServiceRecordGroup", ReplyAction="http://tempuri.org/IOperationsService/UpdateServiceRecordGroupResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateServiceRecordGroupBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        BS.Shared.DataContracts.ServiceRecordGroupDC UpdateServiceRecordGroup(BS.Shared.DataContracts.ServiceRecordGroupDC pServiceRecordGroup);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateServiceRecords", ReplyAction="http://tempuri.org/IOperationsService/UpdateServiceRecordsResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateServiceRecordsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        void UpdateServiceRecords(System.Collections.Generic.List<BS.Shared.DataContracts.ServiceRecordDC> pServiceRecords);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetServiceRecordStatisticInfo", ReplyAction="http://tempuri.org/IOperationsService/GetServiceRecordStatisticInfoResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetServiceRecordStatisticInfoBeWoFaultFault" +
-            "", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        BS.Shared.DataContracts.ServiceRecordStatisticsInfoDC GetServiceRecordStatisticInfo(long costBearer2SupportConceptOid, System.DateTime statisticsDate);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/CreateSupportConceptStatistics", ReplyAction="http://tempuri.org/IOperationsService/CreateSupportConceptStatisticsResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/CreateSupportConceptStatisticsBeWoFaultFaul" +
-            "t", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        BS.Shared.DataContracts.SupportConceptStatisticsDC CreateSupportConceptStatistics(long costBearer2SupportConceptOid, System.DateTime statisticsDate);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetServiceRecordHistory", ReplyAction="http://tempuri.org/IOperationsService/GetServiceRecordHistoryResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetServiceRecordHistoryBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<BS.Shared.DataContracts.ServiceRecordHistoryDC> GetServiceRecordHistory(long serviceRecordOid);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/ResetTenant", ReplyAction="http://tempuri.org/IOperationsService/ResetTenantResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/ResetTenantBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        void ResetTenant(string tenant);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/ResetAllTenants", ReplyAction="http://tempuri.org/IOperationsService/ResetAllTenantsResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/ResetAllTenantsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        void ResetAllTenants();
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DoesNotOverlapWithOtherServiceRecord", ReplyAction="http://tempuri.org/IOperationsService/DoesNotOverlapWithOtherServiceRecordRespons" +
-            "e")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DoesNotOverlapWithOtherServiceRecordBeWoFau" +
-            "ltFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        bool DoesNotOverlapWithOtherServiceRecord(BS.Shared.DataContracts.ServiceRecordDC pServiceRecord, long customerOid, System.Nullable<long> employeeOid);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetAllAdditionalService", ReplyAction="http://tempuri.org/IOperationsService/GetAllAdditionalServiceResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetAllAdditionalServiceBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceDC> GetAllAdditionalService();
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetAllAdditionalServiceRegion", ReplyAction="http://tempuri.org/IOperationsService/GetAllAdditionalServiceRegionResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetAllAdditionalServiceRegionBeWoFaultFault" +
-            "", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceRegionDC> GetAllAdditionalServiceRegion();
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetAllAdditionalServiceGroupOfPeopleRelatio" +
-            "n", ReplyAction="http://tempuri.org/IOperationsService/GetAllAdditionalServiceGroupOfPeopleRelatio" +
-            "nResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetAllAdditionalServiceGroupOfPeopleRelatio" +
-            "nBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleRelationDC> GetAllAdditionalServiceGroupOfPeopleRelation();
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetAllAdditionalServiceGroupOfPeople", ReplyAction="http://tempuri.org/IOperationsService/GetAllAdditionalServiceGroupOfPeopleRespons" +
-            "e")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetAllAdditionalServiceGroupOfPeopleBeWoFau" +
-            "ltFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleDC> GetAllAdditionalServiceGroupOfPeople();
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceGroupOfPeopleRela" +
-            "tions", ReplyAction="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceGroupOfPeopleRela" +
-            "tionsResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceGroupOfPeopleRela" +
-            "tionsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<long> InsertNewAdditionalServiceGroupOfPeopleRelations(System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleRelationDC> pAdditionalServiceGroupOfPeopleRelations);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateAdditionalServiceGroupOfPeopleRelatio" +
-            "ns", ReplyAction="http://tempuri.org/IOperationsService/UpdateAdditionalServiceGroupOfPeopleRelatio" +
-            "nsResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateAdditionalServiceGroupOfPeopleRelatio" +
-            "nsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        void UpdateAdditionalServiceGroupOfPeopleRelations(System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleRelationDC> pAdditionalServiceGroupOfPeopleRelations);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DeleteAdditionalServiceGroupOfPeopleRelatio" +
-            "n", ReplyAction="http://tempuri.org/IOperationsService/DeleteAdditionalServiceGroupOfPeopleRelatio" +
-            "nResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DeleteAdditionalServiceGroupOfPeopleRelatio" +
-            "nBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        void DeleteAdditionalServiceGroupOfPeopleRelation(long pDeleteAdditionalServiceGroupOfPeopleRelationOid, long pVersion);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateAdditionalServiceGroupOfPeople", ReplyAction="http://tempuri.org/IOperationsService/UpdateAdditionalServiceGroupOfPeopleRespons" +
-            "e")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateAdditionalServiceGroupOfPeopleBeWoFau" +
-            "ltFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleDC UpdateAdditionalServiceGroupOfPeople(BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleDC pAdditionalServiceGroupOfPeople);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceGroupsOfPeople", ReplyAction="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceGroupsOfPeopleRes" +
-            "ponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceGroupsOfPeopleBeW" +
-            "oFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<long> InsertNewAdditionalServiceGroupsOfPeople(System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleDC> pGroups);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetAllAdditionalServiceBookings", ReplyAction="http://tempuri.org/IOperationsService/GetAllAdditionalServiceBookingsResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetAllAdditionalServiceBookingsBeWoFaultFau" +
-            "lt", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceBookingDC> GetAllAdditionalServiceBookings(System.Nullable<long> regionOid, System.DateTime start, System.DateTime end);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceBookings", ReplyAction="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceBookingsResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceBookingsBeWoFault" +
-            "Fault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<long> InsertNewAdditionalServiceBookings(System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceBookingDC> pAdditionalServiceBookings);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateAdditionalServiceBookings", ReplyAction="http://tempuri.org/IOperationsService/UpdateAdditionalServiceBookingsResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateAdditionalServiceBookingsBeWoFaultFau" +
-            "lt", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        void UpdateAdditionalServiceBookings(System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceBookingDC> pAdditionalServiceBookings);
-        
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DeleteAdditionalServiceBookings", ReplyAction="http://tempuri.org/IOperationsService/DeleteAdditionalServiceBookingsResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DeleteAdditionalServiceBookingsBeWoFaultFau" +
             "lt", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
@@ -4226,6 +4059,76 @@ namespace BeWo.ServiceProxy
             "Fault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         System.Collections.Generic.List<BS.Shared.DataContracts.ChatMessageDC> FindUnreadChatMessagesForRecipient(long personOid);
         
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/CreateNewEmployeeAPPCodeDC", ReplyAction="http://tempuri.org/IOperationsService/CreateNewEmployeeAPPCodeDCResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/CreateNewEmployeeAPPCodeDCBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        BS.Shared.DataContracts.EmployeeAPPCodeDC CreateNewEmployeeAPPCodeDC(long employeeOid);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateIsChatActiveEmployeeAPPCodeDC", ReplyAction="http://tempuri.org/IOperationsService/UpdateIsChatActiveEmployeeAPPCodeDCResponse" +
+            "")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateIsChatActiveEmployeeAPPCodeDCBeWoFaul" +
+            "tFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        void UpdateIsChatActiveEmployeeAPPCodeDC(long employeeOid, int activeType);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateNotfallNacrichtEmployeeAPPCodeDC", ReplyAction="http://tempuri.org/IOperationsService/UpdateNotfallNacrichtEmployeeAPPCodeDCRespo" +
+            "nse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateNotfallNacrichtEmployeeAPPCodeDCBeWoF" +
+            "aultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        void UpdateNotfallNacrichtEmployeeAPPCodeDC(long employeeOid, string notfallstate);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/LoadOrganisationPersonRelationsByOid", ReplyAction="http://tempuri.org/IOperationsService/LoadOrganisationPersonRelationsByOidRespons" +
+            "e")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/LoadOrganisationPersonRelationsByOidBeWoFau" +
+            "ltFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.OrganisationPersonRelationDC> LoadOrganisationPersonRelationsByOid(System.Collections.Generic.List<long> pOids);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/LoadBargeldkassenForObject", ReplyAction="http://tempuri.org/IOperationsService/LoadBargeldkassenForObjectResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/LoadBargeldkassenForObjectBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.BargeldkassenDC> LoadBargeldkassenForObject(BS.Shared.TableID objectTid, long objectOid);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/InsertNewBargeldkasse", ReplyAction="http://tempuri.org/IOperationsService/InsertNewBargeldkasseResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertNewBargeldkasseBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        long InsertNewBargeldkasse(BS.Shared.DataContracts.BargeldkassenDC pBargeldkasse);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateBargeldkasse", ReplyAction="http://tempuri.org/IOperationsService/UpdateBargeldkasseResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateBargeldkasseBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        BS.Shared.DataContracts.BargeldkassenDC UpdateBargeldkasse(BS.Shared.DataContracts.BargeldkassenDC pBargeldkasse);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DeactivateBargeldkasse", ReplyAction="http://tempuri.org/IOperationsService/DeactivateBargeldkasseResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DeactivateBargeldkasseBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        void DeactivateBargeldkasse(long pOid, long pVersion);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/CreateNewPerson2OrganisationRelation", ReplyAction="http://tempuri.org/IOperationsService/CreateNewPerson2OrganisationRelationRespons" +
+            "e")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/CreateNewPerson2OrganisationRelationBeWoFau" +
+            "ltFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        void CreateNewPerson2OrganisationRelation(long organi, BS.Shared.DataContracts.ValueListEntryDC value, long personOid, string mail, string fax, string tele, string notice);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetEmployeesServiceRecordsWithStartEndDate", ReplyAction="http://tempuri.org/IOperationsService/GetEmployeesServiceRecordsWithStartEndDateR" +
+            "esponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetEmployeesServiceRecordsWithStartEndDateB" +
+            "eWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.ServiceRecordDC> GetEmployeesServiceRecordsWithStartEndDate(long pEmployeeOid, System.DateTime start, System.DateTime ende);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetCustomerServiceRecordsCompactWithStartEn" +
+            "dDate", ReplyAction="http://tempuri.org/IOperationsService/GetCustomerServiceRecordsCompactWithStartEn" +
+            "dDateResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetCustomerServiceRecordsCompactWithStartEn" +
+            "dDateBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.ServiceRecordDC> GetCustomerServiceRecordsCompactWithStartEndDate(long pCustomerOid, long costbearer2SupportConceptOid, System.DateTime start, System.DateTime ende);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetAllVertretungen", ReplyAction="http://tempuri.org/IOperationsService/GetAllVertretungenResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetAllVertretungenBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.VertretungDC> GetAllVertretungen();
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/InsertNewMitarbeiterVertretung", ReplyAction="http://tempuri.org/IOperationsService/InsertNewMitarbeiterVertretungResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertNewMitarbeiterVertretungBeWoFaultFaul" +
+            "t", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        void InsertNewMitarbeiterVertretung(BS.Shared.DataContracts.VertretungDC vertretungM);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/InsertNewKlientenVertretung", ReplyAction="http://tempuri.org/IOperationsService/InsertNewKlientenVertretungResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertNewKlientenVertretungBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        void InsertNewKlientenVertretung(BS.Shared.DataContracts.VertretungDC vertretungK);
+        
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DeactivateInvoices", ReplyAction="http://tempuri.org/IOperationsService/DeactivateInvoicesResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DeactivateInvoicesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         void DeactivateInvoices(System.Collections.Generic.List<BS.Shared.DataContracts.InvoiceDC> invoices);
@@ -4505,6 +4408,116 @@ namespace BeWo.ServiceProxy
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateServiceCategories", ReplyAction="http://tempuri.org/IOperationsService/UpdateServiceCategoriesResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateServiceCategoriesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         void UpdateServiceCategories(System.Collections.Generic.List<BS.Shared.DataContracts.ServiceCategoryDC> pServiceCategories);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateServiceDescriptions", ReplyAction="http://tempuri.org/IOperationsService/UpdateServiceDescriptionsResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateServiceDescriptionsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        void UpdateServiceDescriptions(System.Collections.Generic.List<BS.Shared.DataContracts.ServiceDescriptionDC> pServiceDescriptions);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateServiceRecordGroup", ReplyAction="http://tempuri.org/IOperationsService/UpdateServiceRecordGroupResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateServiceRecordGroupBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        BS.Shared.DataContracts.ServiceRecordGroupDC UpdateServiceRecordGroup(BS.Shared.DataContracts.ServiceRecordGroupDC pServiceRecordGroup);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateServiceRecords", ReplyAction="http://tempuri.org/IOperationsService/UpdateServiceRecordsResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateServiceRecordsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        void UpdateServiceRecords(System.Collections.Generic.List<BS.Shared.DataContracts.ServiceRecordDC> pServiceRecords);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetServiceRecordStatisticInfo", ReplyAction="http://tempuri.org/IOperationsService/GetServiceRecordStatisticInfoResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetServiceRecordStatisticInfoBeWoFaultFault" +
+            "", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        BS.Shared.DataContracts.ServiceRecordStatisticsInfoDC GetServiceRecordStatisticInfo(long costBearer2SupportConceptOid, System.DateTime statisticsDate);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/CreateSupportConceptStatistics", ReplyAction="http://tempuri.org/IOperationsService/CreateSupportConceptStatisticsResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/CreateSupportConceptStatisticsBeWoFaultFaul" +
+            "t", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        BS.Shared.DataContracts.SupportConceptStatisticsDC CreateSupportConceptStatistics(long costBearer2SupportConceptOid, System.DateTime statisticsDate);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetServiceRecordHistory", ReplyAction="http://tempuri.org/IOperationsService/GetServiceRecordHistoryResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetServiceRecordHistoryBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.ServiceRecordHistoryDC> GetServiceRecordHistory(long serviceRecordOid);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/ResetTenant", ReplyAction="http://tempuri.org/IOperationsService/ResetTenantResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/ResetTenantBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        void ResetTenant(string tenant);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/ResetAllTenants", ReplyAction="http://tempuri.org/IOperationsService/ResetAllTenantsResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/ResetAllTenantsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        void ResetAllTenants();
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DoesNotOverlapWithOtherServiceRecord", ReplyAction="http://tempuri.org/IOperationsService/DoesNotOverlapWithOtherServiceRecordRespons" +
+            "e")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DoesNotOverlapWithOtherServiceRecordBeWoFau" +
+            "ltFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        bool DoesNotOverlapWithOtherServiceRecord(BS.Shared.DataContracts.ServiceRecordDC pServiceRecord, long customerOid, System.Nullable<long> employeeOid);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetAllAdditionalService", ReplyAction="http://tempuri.org/IOperationsService/GetAllAdditionalServiceResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetAllAdditionalServiceBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceDC> GetAllAdditionalService();
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetAllAdditionalServiceRegion", ReplyAction="http://tempuri.org/IOperationsService/GetAllAdditionalServiceRegionResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetAllAdditionalServiceRegionBeWoFaultFault" +
+            "", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceRegionDC> GetAllAdditionalServiceRegion();
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetAllAdditionalServiceGroupOfPeopleRelatio" +
+            "n", ReplyAction="http://tempuri.org/IOperationsService/GetAllAdditionalServiceGroupOfPeopleRelatio" +
+            "nResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetAllAdditionalServiceGroupOfPeopleRelatio" +
+            "nBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleRelationDC> GetAllAdditionalServiceGroupOfPeopleRelation();
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetAllAdditionalServiceGroupOfPeople", ReplyAction="http://tempuri.org/IOperationsService/GetAllAdditionalServiceGroupOfPeopleRespons" +
+            "e")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetAllAdditionalServiceGroupOfPeopleBeWoFau" +
+            "ltFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleDC> GetAllAdditionalServiceGroupOfPeople();
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceGroupOfPeopleRela" +
+            "tions", ReplyAction="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceGroupOfPeopleRela" +
+            "tionsResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceGroupOfPeopleRela" +
+            "tionsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<long> InsertNewAdditionalServiceGroupOfPeopleRelations(System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleRelationDC> pAdditionalServiceGroupOfPeopleRelations);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateAdditionalServiceGroupOfPeopleRelatio" +
+            "ns", ReplyAction="http://tempuri.org/IOperationsService/UpdateAdditionalServiceGroupOfPeopleRelatio" +
+            "nsResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateAdditionalServiceGroupOfPeopleRelatio" +
+            "nsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        void UpdateAdditionalServiceGroupOfPeopleRelations(System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleRelationDC> pAdditionalServiceGroupOfPeopleRelations);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DeleteAdditionalServiceGroupOfPeopleRelatio" +
+            "n", ReplyAction="http://tempuri.org/IOperationsService/DeleteAdditionalServiceGroupOfPeopleRelatio" +
+            "nResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DeleteAdditionalServiceGroupOfPeopleRelatio" +
+            "nBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        void DeleteAdditionalServiceGroupOfPeopleRelation(long pDeleteAdditionalServiceGroupOfPeopleRelationOid, long pVersion);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateAdditionalServiceGroupOfPeople", ReplyAction="http://tempuri.org/IOperationsService/UpdateAdditionalServiceGroupOfPeopleRespons" +
+            "e")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateAdditionalServiceGroupOfPeopleBeWoFau" +
+            "ltFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleDC UpdateAdditionalServiceGroupOfPeople(BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleDC pAdditionalServiceGroupOfPeople);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceGroupsOfPeople", ReplyAction="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceGroupsOfPeopleRes" +
+            "ponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceGroupsOfPeopleBeW" +
+            "oFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<long> InsertNewAdditionalServiceGroupsOfPeople(System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleDC> pGroups);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetAllAdditionalServiceBookings", ReplyAction="http://tempuri.org/IOperationsService/GetAllAdditionalServiceBookingsResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetAllAdditionalServiceBookingsBeWoFaultFau" +
+            "lt", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceBookingDC> GetAllAdditionalServiceBookings(System.Nullable<long> regionOid, System.DateTime start, System.DateTime end);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceBookings", ReplyAction="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceBookingsResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceBookingsBeWoFault" +
+            "Fault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<long> InsertNewAdditionalServiceBookings(System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceBookingDC> pAdditionalServiceBookings);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateAdditionalServiceBookings", ReplyAction="http://tempuri.org/IOperationsService/UpdateAdditionalServiceBookingsResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateAdditionalServiceBookingsBeWoFaultFau" +
+            "lt", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        void UpdateAdditionalServiceBookings(System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceBookingDC> pAdditionalServiceBookings);
     }
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
@@ -4541,166 +4554,6 @@ namespace BeWo.ServiceProxy
         {
         }
         
-        public BS.Shared.DataContracts.EmployeeAPPCodeDC CreateNewEmployeeAPPCodeDC(long employeeOid)
-        {
-            return base.Channel.CreateNewEmployeeAPPCodeDC(employeeOid);
-        }
-        
-        public void UpdateIsChatActiveEmployeeAPPCodeDC(long employeeOid, int activeType)
-        {
-            base.Channel.UpdateIsChatActiveEmployeeAPPCodeDC(employeeOid, activeType);
-        }
-        
-        public void UpdateNotfallNacrichtEmployeeAPPCodeDC(long employeeOid, string notfallstate)
-        {
-            base.Channel.UpdateNotfallNacrichtEmployeeAPPCodeDC(employeeOid, notfallstate);
-        }
-        
-        public System.Collections.Generic.List<BS.Shared.DataContracts.OrganisationPersonRelationDC> LoadOrganisationPersonRelationsByOid(System.Collections.Generic.List<long> pOids)
-        {
-            return base.Channel.LoadOrganisationPersonRelationsByOid(pOids);
-        }
-        
-        public System.Collections.Generic.List<BS.Shared.DataContracts.BargeldkassenDC> LoadBargeldkassenForObject(BS.Shared.TableID objectTid, long objectOid)
-        {
-            return base.Channel.LoadBargeldkassenForObject(objectTid, objectOid);
-        }
-        
-        public long InsertNewBargeldkasse(BS.Shared.DataContracts.BargeldkassenDC pBargeldkasse)
-        {
-            return base.Channel.InsertNewBargeldkasse(pBargeldkasse);
-        }
-        
-        public BS.Shared.DataContracts.BargeldkassenDC UpdateBargeldkasse(BS.Shared.DataContracts.BargeldkassenDC pBargeldkasse)
-        {
-            return base.Channel.UpdateBargeldkasse(pBargeldkasse);
-        }
-        
-        public void DeactivateBargeldkasse(long pOid, long pVersion)
-        {
-            base.Channel.DeactivateBargeldkasse(pOid, pVersion);
-        }
-        
-        public void CreateNewPerson2OrganisationRelation(long organi, BS.Shared.DataContracts.ValueListEntryDC value, long personOid, string mail, string fax, string tele, string notice)
-        {
-            base.Channel.CreateNewPerson2OrganisationRelation(organi, value, personOid, mail, fax, tele, notice);
-        }
-        
-        public System.Collections.Generic.List<BS.Shared.DataContracts.ServiceRecordDC> GetEmployeesServiceRecordsWithStartEndDate(long pEmployeeOid, System.DateTime start, System.DateTime ende)
-        {
-            return base.Channel.GetEmployeesServiceRecordsWithStartEndDate(pEmployeeOid, start, ende);
-        }
-        
-        public System.Collections.Generic.List<BS.Shared.DataContracts.ServiceRecordDC> GetCustomerServiceRecordsCompactWithStartEndDate(long pCustomerOid, long costbearer2SupportConceptOid, System.DateTime start, System.DateTime ende)
-        {
-            return base.Channel.GetCustomerServiceRecordsCompactWithStartEndDate(pCustomerOid, costbearer2SupportConceptOid, start, ende);
-        }
-        
-        public void UpdateServiceDescriptions(System.Collections.Generic.List<BS.Shared.DataContracts.ServiceDescriptionDC> pServiceDescriptions)
-        {
-            base.Channel.UpdateServiceDescriptions(pServiceDescriptions);
-        }
-        
-        public BS.Shared.DataContracts.ServiceRecordGroupDC UpdateServiceRecordGroup(BS.Shared.DataContracts.ServiceRecordGroupDC pServiceRecordGroup)
-        {
-            return base.Channel.UpdateServiceRecordGroup(pServiceRecordGroup);
-        }
-        
-        public void UpdateServiceRecords(System.Collections.Generic.List<BS.Shared.DataContracts.ServiceRecordDC> pServiceRecords)
-        {
-            base.Channel.UpdateServiceRecords(pServiceRecords);
-        }
-        
-        public BS.Shared.DataContracts.ServiceRecordStatisticsInfoDC GetServiceRecordStatisticInfo(long costBearer2SupportConceptOid, System.DateTime statisticsDate)
-        {
-            return base.Channel.GetServiceRecordStatisticInfo(costBearer2SupportConceptOid, statisticsDate);
-        }
-        
-        public BS.Shared.DataContracts.SupportConceptStatisticsDC CreateSupportConceptStatistics(long costBearer2SupportConceptOid, System.DateTime statisticsDate)
-        {
-            return base.Channel.CreateSupportConceptStatistics(costBearer2SupportConceptOid, statisticsDate);
-        }
-        
-        public System.Collections.Generic.List<BS.Shared.DataContracts.ServiceRecordHistoryDC> GetServiceRecordHistory(long serviceRecordOid)
-        {
-            return base.Channel.GetServiceRecordHistory(serviceRecordOid);
-        }
-        
-        public void ResetTenant(string tenant)
-        {
-            base.Channel.ResetTenant(tenant);
-        }
-        
-        public void ResetAllTenants()
-        {
-            base.Channel.ResetAllTenants();
-        }
-        
-        public bool DoesNotOverlapWithOtherServiceRecord(BS.Shared.DataContracts.ServiceRecordDC pServiceRecord, long customerOid, System.Nullable<long> employeeOid)
-        {
-            return base.Channel.DoesNotOverlapWithOtherServiceRecord(pServiceRecord, customerOid, employeeOid);
-        }
-        
-        public System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceDC> GetAllAdditionalService()
-        {
-            return base.Channel.GetAllAdditionalService();
-        }
-        
-        public System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceRegionDC> GetAllAdditionalServiceRegion()
-        {
-            return base.Channel.GetAllAdditionalServiceRegion();
-        }
-        
-        public System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleRelationDC> GetAllAdditionalServiceGroupOfPeopleRelation()
-        {
-            return base.Channel.GetAllAdditionalServiceGroupOfPeopleRelation();
-        }
-        
-        public System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleDC> GetAllAdditionalServiceGroupOfPeople()
-        {
-            return base.Channel.GetAllAdditionalServiceGroupOfPeople();
-        }
-        
-        public System.Collections.Generic.List<long> InsertNewAdditionalServiceGroupOfPeopleRelations(System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleRelationDC> pAdditionalServiceGroupOfPeopleRelations)
-        {
-            return base.Channel.InsertNewAdditionalServiceGroupOfPeopleRelations(pAdditionalServiceGroupOfPeopleRelations);
-        }
-        
-        public void UpdateAdditionalServiceGroupOfPeopleRelations(System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleRelationDC> pAdditionalServiceGroupOfPeopleRelations)
-        {
-            base.Channel.UpdateAdditionalServiceGroupOfPeopleRelations(pAdditionalServiceGroupOfPeopleRelations);
-        }
-        
-        public void DeleteAdditionalServiceGroupOfPeopleRelation(long pDeleteAdditionalServiceGroupOfPeopleRelationOid, long pVersion)
-        {
-            base.Channel.DeleteAdditionalServiceGroupOfPeopleRelation(pDeleteAdditionalServiceGroupOfPeopleRelationOid, pVersion);
-        }
-        
-        public BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleDC UpdateAdditionalServiceGroupOfPeople(BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleDC pAdditionalServiceGroupOfPeople)
-        {
-            return base.Channel.UpdateAdditionalServiceGroupOfPeople(pAdditionalServiceGroupOfPeople);
-        }
-        
-        public System.Collections.Generic.List<long> InsertNewAdditionalServiceGroupsOfPeople(System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleDC> pGroups)
-        {
-            return base.Channel.InsertNewAdditionalServiceGroupsOfPeople(pGroups);
-        }
-        
-        public System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceBookingDC> GetAllAdditionalServiceBookings(System.Nullable<long> regionOid, System.DateTime start, System.DateTime end)
-        {
-            return base.Channel.GetAllAdditionalServiceBookings(regionOid, start, end);
-        }
-        
-        public System.Collections.Generic.List<long> InsertNewAdditionalServiceBookings(System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceBookingDC> pAdditionalServiceBookings)
-        {
-            return base.Channel.InsertNewAdditionalServiceBookings(pAdditionalServiceBookings);
-        }
-        
-        public void UpdateAdditionalServiceBookings(System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceBookingDC> pAdditionalServiceBookings)
-        {
-            base.Channel.UpdateAdditionalServiceBookings(pAdditionalServiceBookings);
-        }
-        
         public void DeleteAdditionalServiceBookings(System.Collections.Generic.Dictionary<long, long> pOid2Version)
         {
             base.Channel.DeleteAdditionalServiceBookings(pOid2Version);
@@ -4916,6 +4769,76 @@ namespace BeWo.ServiceProxy
             return base.Channel.FindUnreadChatMessagesForRecipient(personOid);
         }
         
+        public BS.Shared.DataContracts.EmployeeAPPCodeDC CreateNewEmployeeAPPCodeDC(long employeeOid)
+        {
+            return base.Channel.CreateNewEmployeeAPPCodeDC(employeeOid);
+        }
+        
+        public void UpdateIsChatActiveEmployeeAPPCodeDC(long employeeOid, int activeType)
+        {
+            base.Channel.UpdateIsChatActiveEmployeeAPPCodeDC(employeeOid, activeType);
+        }
+        
+        public void UpdateNotfallNacrichtEmployeeAPPCodeDC(long employeeOid, string notfallstate)
+        {
+            base.Channel.UpdateNotfallNacrichtEmployeeAPPCodeDC(employeeOid, notfallstate);
+        }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.OrganisationPersonRelationDC> LoadOrganisationPersonRelationsByOid(System.Collections.Generic.List<long> pOids)
+        {
+            return base.Channel.LoadOrganisationPersonRelationsByOid(pOids);
+        }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.BargeldkassenDC> LoadBargeldkassenForObject(BS.Shared.TableID objectTid, long objectOid)
+        {
+            return base.Channel.LoadBargeldkassenForObject(objectTid, objectOid);
+        }
+        
+        public long InsertNewBargeldkasse(BS.Shared.DataContracts.BargeldkassenDC pBargeldkasse)
+        {
+            return base.Channel.InsertNewBargeldkasse(pBargeldkasse);
+        }
+        
+        public BS.Shared.DataContracts.BargeldkassenDC UpdateBargeldkasse(BS.Shared.DataContracts.BargeldkassenDC pBargeldkasse)
+        {
+            return base.Channel.UpdateBargeldkasse(pBargeldkasse);
+        }
+        
+        public void DeactivateBargeldkasse(long pOid, long pVersion)
+        {
+            base.Channel.DeactivateBargeldkasse(pOid, pVersion);
+        }
+        
+        public void CreateNewPerson2OrganisationRelation(long organi, BS.Shared.DataContracts.ValueListEntryDC value, long personOid, string mail, string fax, string tele, string notice)
+        {
+            base.Channel.CreateNewPerson2OrganisationRelation(organi, value, personOid, mail, fax, tele, notice);
+        }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.ServiceRecordDC> GetEmployeesServiceRecordsWithStartEndDate(long pEmployeeOid, System.DateTime start, System.DateTime ende)
+        {
+            return base.Channel.GetEmployeesServiceRecordsWithStartEndDate(pEmployeeOid, start, ende);
+        }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.ServiceRecordDC> GetCustomerServiceRecordsCompactWithStartEndDate(long pCustomerOid, long costbearer2SupportConceptOid, System.DateTime start, System.DateTime ende)
+        {
+            return base.Channel.GetCustomerServiceRecordsCompactWithStartEndDate(pCustomerOid, costbearer2SupportConceptOid, start, ende);
+        }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.VertretungDC> GetAllVertretungen()
+        {
+            return base.Channel.GetAllVertretungen();
+        }
+        
+        public void InsertNewMitarbeiterVertretung(BS.Shared.DataContracts.VertretungDC vertretungM)
+        {
+            base.Channel.InsertNewMitarbeiterVertretung(vertretungM);
+        }
+        
+        public void InsertNewKlientenVertretung(BS.Shared.DataContracts.VertretungDC vertretungK)
+        {
+            base.Channel.InsertNewKlientenVertretung(vertretungK);
+        }
+        
         public void DeactivateInvoices(System.Collections.Generic.List<BS.Shared.DataContracts.InvoiceDC> invoices)
         {
             base.Channel.DeactivateInvoices(invoices);
@@ -5235,6 +5158,111 @@ namespace BeWo.ServiceProxy
         {
             base.Channel.UpdateServiceCategories(pServiceCategories);
         }
+        
+        public void UpdateServiceDescriptions(System.Collections.Generic.List<BS.Shared.DataContracts.ServiceDescriptionDC> pServiceDescriptions)
+        {
+            base.Channel.UpdateServiceDescriptions(pServiceDescriptions);
+        }
+        
+        public BS.Shared.DataContracts.ServiceRecordGroupDC UpdateServiceRecordGroup(BS.Shared.DataContracts.ServiceRecordGroupDC pServiceRecordGroup)
+        {
+            return base.Channel.UpdateServiceRecordGroup(pServiceRecordGroup);
+        }
+        
+        public void UpdateServiceRecords(System.Collections.Generic.List<BS.Shared.DataContracts.ServiceRecordDC> pServiceRecords)
+        {
+            base.Channel.UpdateServiceRecords(pServiceRecords);
+        }
+        
+        public BS.Shared.DataContracts.ServiceRecordStatisticsInfoDC GetServiceRecordStatisticInfo(long costBearer2SupportConceptOid, System.DateTime statisticsDate)
+        {
+            return base.Channel.GetServiceRecordStatisticInfo(costBearer2SupportConceptOid, statisticsDate);
+        }
+        
+        public BS.Shared.DataContracts.SupportConceptStatisticsDC CreateSupportConceptStatistics(long costBearer2SupportConceptOid, System.DateTime statisticsDate)
+        {
+            return base.Channel.CreateSupportConceptStatistics(costBearer2SupportConceptOid, statisticsDate);
+        }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.ServiceRecordHistoryDC> GetServiceRecordHistory(long serviceRecordOid)
+        {
+            return base.Channel.GetServiceRecordHistory(serviceRecordOid);
+        }
+        
+        public void ResetTenant(string tenant)
+        {
+            base.Channel.ResetTenant(tenant);
+        }
+        
+        public void ResetAllTenants()
+        {
+            base.Channel.ResetAllTenants();
+        }
+        
+        public bool DoesNotOverlapWithOtherServiceRecord(BS.Shared.DataContracts.ServiceRecordDC pServiceRecord, long customerOid, System.Nullable<long> employeeOid)
+        {
+            return base.Channel.DoesNotOverlapWithOtherServiceRecord(pServiceRecord, customerOid, employeeOid);
+        }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceDC> GetAllAdditionalService()
+        {
+            return base.Channel.GetAllAdditionalService();
+        }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceRegionDC> GetAllAdditionalServiceRegion()
+        {
+            return base.Channel.GetAllAdditionalServiceRegion();
+        }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleRelationDC> GetAllAdditionalServiceGroupOfPeopleRelation()
+        {
+            return base.Channel.GetAllAdditionalServiceGroupOfPeopleRelation();
+        }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleDC> GetAllAdditionalServiceGroupOfPeople()
+        {
+            return base.Channel.GetAllAdditionalServiceGroupOfPeople();
+        }
+        
+        public System.Collections.Generic.List<long> InsertNewAdditionalServiceGroupOfPeopleRelations(System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleRelationDC> pAdditionalServiceGroupOfPeopleRelations)
+        {
+            return base.Channel.InsertNewAdditionalServiceGroupOfPeopleRelations(pAdditionalServiceGroupOfPeopleRelations);
+        }
+        
+        public void UpdateAdditionalServiceGroupOfPeopleRelations(System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleRelationDC> pAdditionalServiceGroupOfPeopleRelations)
+        {
+            base.Channel.UpdateAdditionalServiceGroupOfPeopleRelations(pAdditionalServiceGroupOfPeopleRelations);
+        }
+        
+        public void DeleteAdditionalServiceGroupOfPeopleRelation(long pDeleteAdditionalServiceGroupOfPeopleRelationOid, long pVersion)
+        {
+            base.Channel.DeleteAdditionalServiceGroupOfPeopleRelation(pDeleteAdditionalServiceGroupOfPeopleRelationOid, pVersion);
+        }
+        
+        public BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleDC UpdateAdditionalServiceGroupOfPeople(BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleDC pAdditionalServiceGroupOfPeople)
+        {
+            return base.Channel.UpdateAdditionalServiceGroupOfPeople(pAdditionalServiceGroupOfPeople);
+        }
+        
+        public System.Collections.Generic.List<long> InsertNewAdditionalServiceGroupsOfPeople(System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleDC> pGroups)
+        {
+            return base.Channel.InsertNewAdditionalServiceGroupsOfPeople(pGroups);
+        }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceBookingDC> GetAllAdditionalServiceBookings(System.Nullable<long> regionOid, System.DateTime start, System.DateTime end)
+        {
+            return base.Channel.GetAllAdditionalServiceBookings(regionOid, start, end);
+        }
+        
+        public System.Collections.Generic.List<long> InsertNewAdditionalServiceBookings(System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceBookingDC> pAdditionalServiceBookings)
+        {
+            return base.Channel.InsertNewAdditionalServiceBookings(pAdditionalServiceBookings);
+        }
+        
+        public void UpdateAdditionalServiceBookings(System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceBookingDC> pAdditionalServiceBookings)
+        {
+            base.Channel.UpdateAdditionalServiceBookings(pAdditionalServiceBookings);
+        }
     }
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
diff --git a/BeWo/View/Detail/EmployeeView.xaml b/BeWo/View/Detail/EmployeeView.xaml
index 855cc022c..6efa18f89 100644
--- a/BeWo/View/Detail/EmployeeView.xaml
+++ b/BeWo/View/Detail/EmployeeView.xaml
@@ -396,18 +396,20 @@
                                                                     <RowDefinition Height="Auto" />
                                                                     <RowDefinition Height="Auto" />
                                                                     <RowDefinition Height="Auto" />
+                                                                    <RowDefinition Height="Auto" />
                                                                 </Grid.RowDefinitions>
                                                                 <Label Grid.Column="0" Grid.Row="0" Margin="3" VerticalAlignment="Center">Vertragsbeginn</Label>
                                                                 <Label Grid.Column="0" Grid.Row="1" Margin="3" VerticalAlignment="Center">Befristet bis</Label>
                                                                 <Label Grid.Column="0" Grid.Row="2" Margin="3" VerticalAlignment="Center">beschäftigt als</Label>
                                                                 <Label Grid.Column="0" Grid.Row="3" Margin="3" VerticalAlignment="Center">Stundensatz</Label>
                                                                 <Label Grid.Column="0" Grid.Row="4" Margin="3" VerticalAlignment="Center">FLS/Woche</Label>
-                                                                <Label Grid.Column="0" Grid.Row="5" Margin="3" VerticalAlignment="Center">Gesamtstunden/Woche</Label>
-                                                                <Label Grid.Column="0" Grid.Row="6" Margin="3" VerticalAlignment="Center">Gesamtstunden/Monat</Label>
-                                                                <Label Grid.Column="0" Grid.Row="7" Margin="3" VerticalAlignment="Center">Arbeitstage pro Woche</Label>
-                                                                <Label Grid.Column="0" Grid.Row="8" Margin="3" VerticalAlignment="Center">Urlaubstage</Label>
-                                                                <Label Grid.Column="0" Grid.Row="9" Margin="3" VerticalAlignment="Center">Probezeit (Tage)</Label>
-                                                                <Label Grid.Column="0" Grid.Row="10" Margin="3" VerticalAlignment="Center">Künd.-frist (Tage)</Label>
+                                                                <Label Grid.Column="0" Grid.Row="5" Margin="3" VerticalAlignment="Center">FLS/Monat</Label>
+                                                                <Label Grid.Column="0" Grid.Row="6" Margin="3" VerticalAlignment="Center">Gesamtstunden/Woche</Label>
+                                                                <Label Grid.Column="0" Grid.Row="7" Margin="3" VerticalAlignment="Center">Gesamtstunden/Monat</Label>
+                                                                <Label Grid.Column="0" Grid.Row="8" Margin="3" VerticalAlignment="Center">Arbeitstage pro Woche</Label>
+                                                                <Label Grid.Column="0" Grid.Row="9" Margin="3" VerticalAlignment="Center">Urlaubstage</Label>
+                                                                <Label Grid.Column="0" Grid.Row="10" Margin="3" VerticalAlignment="Center">Probezeit (Tage)</Label>
+                                                                <Label Grid.Column="0" Grid.Row="11" Margin="3" VerticalAlignment="Center">Künd.-frist (Tage)</Label>
 
                                                                 <Label Grid.Column="3" Grid.Row="0" Margin="3" VerticalAlignment="Center">Bemerkungen</Label>
 
@@ -415,13 +417,14 @@
                                                                 <dxe:DateEdit MaskType="DateTimeAdvancingCaret" AllowNullInput="True" Grid.Column="1" Grid.Row="1" Margin="3" Height="23" EditValue="{Binding Path=ContractEndDate, UpdateSourceTrigger=PropertyChanged}" />
                                                                 <dxe:ComboBoxEdit Grid.Column="1" Grid.Row="2" Margin="3" Height="23" Name="combobox_employmenttype" ItemsSource="{Binding Path=PossibleEmploymentTypes, UpdateSourceTrigger=PropertyChanged}" SelectedItem="{Binding Path=EmploymentType}" AutoComplete="True" />
                                                                 <dxe:TextEdit MaskType="Numeric" Mask="c" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="3" Height="23" Margin="3" EditValue="{Binding Path=HourlyRate, UpdateSourceTrigger=PropertyChanged}"/>
-                                                                <dxe:TextEdit MaskType="Numeric" Mask="########0.000" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="4" Margin="3" Height="23" EditValue="{Binding Path=WeeklyFLS, UpdateSourceTrigger=PropertyChanged}" />
-                                                                <dxe:TextEdit MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="5" Margin="3" Height="23" EditValue="{Binding Path=WeeklyTotalHours, UpdateSourceTrigger=PropertyChanged}" />
-                                                                <dxe:TextEdit MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="6" Margin="3" Height="23" EditValue="{Binding Path=MonthlyTotalHours, UpdateSourceTrigger=PropertyChanged}" />
-                                                                <dxe:SpinEdit MinValue="0" MaxValue="7" IsFloatValue="False" Grid.Column="1" Grid.Row="7" Margin="3" Height="23" EditValue="{Binding Path=WeeklyDays, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}" />
-                                                                <dxe:TextEdit MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="8" Margin="3" Height="23" EditValue="{Binding Path=LeaveDays, UpdateSourceTrigger=PropertyChanged}" />
-                                                                <dxe:SpinEdit MinValue="0" IsFloatValue="False" Grid.Column="1" Grid.Row="9" Margin="3" Height="23" EditValue="{Binding Path=ProbationPeriod, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}" />
-                                                                <dxe:SpinEdit MinValue="0" IsFloatValue="False" Grid.Column="1" Grid.Row="10" Margin="3" Height="23" EditValue="{Binding Path=CancellationPeriod, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}" />
+                                                                <dxe:TextEdit MaskType="Numeric" Mask="########0.000" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="4" Margin="3" Height="23" EditValue="{Binding Path=WeeklyFLS, UpdateSourceTrigger=PropertyChanged}" />                                                            
+                                                                <dxe:TextEdit MaskType="Numeric" Mask="########0.000" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="5" Margin="3" Height="23" EditValue="{Binding Path=MonthlyFLS, UpdateSourceTrigger=PropertyChanged}" />                                                                                                                    
+                                                                <dxe:TextEdit MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="6" Margin="3" Height="23" EditValue="{Binding Path=WeeklyTotalHours, UpdateSourceTrigger=PropertyChanged}" />
+                                                                <dxe:TextEdit MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="7" Margin="3" Height="23" EditValue="{Binding Path=MonthlyTotalHours, UpdateSourceTrigger=PropertyChanged}" />
+                                                                <dxe:SpinEdit MinValue="0" MaxValue="7" IsFloatValue="False" Grid.Column="1" Grid.Row="8" Margin="3" Height="23" EditValue="{Binding Path=WeeklyDays, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}" />
+                                                                <dxe:TextEdit MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="9" Margin="3" Height="23" EditValue="{Binding Path=LeaveDays, UpdateSourceTrigger=PropertyChanged}" />
+                                                                <dxe:SpinEdit MinValue="0" IsFloatValue="False" Grid.Column="1" Grid.Row="10" Margin="3" Height="23" EditValue="{Binding Path=ProbationPeriod, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}" />
+                                                                <dxe:SpinEdit MinValue="0" IsFloatValue="False" Grid.Column="1" Grid.Row="11" Margin="3" Height="23" EditValue="{Binding Path=CancellationPeriod, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}" />
                                                                 
                                                                 <TextBox  Grid.Column="3" Grid.Row="1" Grid.RowSpan="8"  Margin="3" Text="{Binding Path=Notice, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" VerticalContentAlignment="Stretch" 
                                                                     HorizontalContentAlignment="Left" ScrollViewer.CanContentScroll="False" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Hidden" TextWrapping="Wrap" AcceptsReturn="True" AutoWordSelection="True"  />
diff --git a/BeWo/View/Detail/ServiceRecordView2.xaml.cs b/BeWo/View/Detail/ServiceRecordView2.xaml.cs
index 39e6dc239..702389d28 100644
--- a/BeWo/View/Detail/ServiceRecordView2.xaml.cs
+++ b/BeWo/View/Detail/ServiceRecordView2.xaml.cs
@@ -88,6 +88,8 @@ namespace BeWo.View.Detail
 
         public ServiceRecordView2(ServiceRecordListVM pViewModel, long? startSupportConceptOid)
         {
+            
+            
             InitializeComponent();
 
             multiSupportConceptControl.AutoGetAllAfterLoaded = false;
@@ -96,11 +98,13 @@ namespace BeWo.View.Detail
 
             InsertedByColumn.Visible = !BeWoApp.AppSettings.HideServiceRecordInsertedByAndInsertedOn;
             InsertedOnColumn.Visible = !BeWoApp.AppSettings.HideServiceRecordInsertedByAndInsertedOn;
+            
 
             _StartSupportConceptOid = startSupportConceptOid;
 
             ViewModel = pViewModel;
 
+         
             //serviceRecordListContent.
             // CheckMinStdSwitch.SelectedIndex = 0;
 
@@ -262,6 +266,7 @@ namespace BeWo.View.Detail
             ConfigureEndDate();
 
             UnterschriftenHeader.Visible = BeWoApp.AppSettings.ShowSignatures;
+
         }
 
         private void ConfigureEndDate() {
@@ -4032,10 +4037,16 @@ namespace BeWo.View.Detail
             if(MinSTDOhneEnd.Text == ZeiterfassungsDauer.Minuten.ToString()) { 
                 numerictb_duration.IsFloatValue = false;
                 numerictb_duration.Mask = "########";
+
+                BeWoApp.AppSettings.LetzteZeiterfassungsDauer = ZeiterfassungsDauer.Minuten;
+                BeWoApp.SaveAppSettings();
             }
             else { 
                 numerictb_duration.IsFloatValue = true;
                 numerictb_duration.Mask = "########0.00";
+
+                BeWoApp.AppSettings.LetzteZeiterfassungsDauer = ZeiterfassungsDauer.Stunden;
+                BeWoApp.SaveAppSettings();
             }
         }
 
@@ -4044,10 +4055,16 @@ namespace BeWo.View.Detail
             if (MinSTDMitEnd.Text == ZeiterfassungsDauer.Minuten.ToString()) { 
                 numeric_duration.IsFloatValue = false;
                 numeric_duration.Mask = "########";
+
+                BeWoApp.AppSettings.LetzteZeiterfassungsDauer = ZeiterfassungsDauer.Minuten;
+                BeWoApp.SaveAppSettings();
             }
             else { 
                 numeric_duration.IsFloatValue = true;
                 numeric_duration.Mask = "########0.00";
+
+                BeWoApp.AppSettings.LetzteZeiterfassungsDauer = ZeiterfassungsDauer.Stunden;
+                BeWoApp.SaveAppSettings();
             }
         }
     }
diff --git a/BeWo/ViewModel/ContractVM.cs b/BeWo/ViewModel/ContractVM.cs
index 6110357e5..023a7f3d2 100644
--- a/BeWo/ViewModel/ContractVM.cs
+++ b/BeWo/ViewModel/ContractVM.cs
@@ -19,6 +19,7 @@ namespace BeWo.ViewModel
         public static string PropertyName_ContractEndDate = "ContractEndDate";
         public static string PropertyName_HourlyRate = "HourlyRate";
         public static string PropertyName_WeeklyFLS = "WeeklyFLS";
+        public static string PropertyName_MonthlyFLS = "MonthlyFLS";
         public static string PropertyName_WeeklyTotalHours = "WeeklyTotalHours";
         public static string PropertyName_MonthlyTotalHours = "MonthlyTotalHours";
         public static string PropertyName_LeaveDays = "LeaveDays";
@@ -31,6 +32,7 @@ namespace BeWo.ViewModel
         private decimal? _WeeklyTotalHours;
         private decimal? _MonthlyTotalHours;
         private decimal? _WeeklyFLS;
+        private decimal? _MonthlyFLS;
         private decimal? _HourlyRate;
         private DateTime? _EntryDate;
         private DateTime? _ContractEndDate;
@@ -170,6 +172,23 @@ namespace BeWo.ViewModel
             }
         }
 
+        public decimal? MonthlyFLS
+        {
+            get { return this._MonthlyFLS; }
+
+            set
+            {
+                if (this.AreDifferent(this._MonthlyFLS, value))
+                {
+                    this._MonthlyFLS = value;
+                    this.StoreDirtyInformation(this.AreDifferent(this.DataContract.MonthlyFLS, value), PropertyName_MonthlyFLS);
+                    this.FirePropertyChanged(PropertyName_MonthlyFLS);
+                }
+            }
+        }
+
+        
+
         public decimal? HourlyRate
         {
             get { return this._HourlyRate; }
@@ -291,6 +310,7 @@ namespace BeWo.ViewModel
                 this._ProbationPeriod = pDataContract.ProbationPeriod;
                 this._WeeklyDays = pDataContract.WeeklyDays;
                 this._WeeklyFLS = pDataContract.WeeklyFLS;
+                this._MonthlyFLS = pDataContract.MonthlyFLS;
                 this._WeeklyTotalHours = pDataContract.WeeklyTotalHours;
                 _MonthlyTotalHours = pDataContract.MonthlyTotalHours;
                 this._Notice = pDataContract.Notice;
@@ -308,6 +328,7 @@ namespace BeWo.ViewModel
             pDataContract.ProbationPeriod = this._ProbationPeriod;
             pDataContract.WeeklyDays = this._WeeklyDays;
             pDataContract.WeeklyFLS = this._WeeklyFLS;
+            pDataContract.MonthlyFLS = this._MonthlyFLS;
             pDataContract.WeeklyTotalHours = this._WeeklyTotalHours;
             pDataContract.MonthlyTotalHours = _MonthlyTotalHours;
             pDataContract.Notice = this._Notice;
diff --git a/BeWo/ViewModel/ServiceRecordVM.cs b/BeWo/ViewModel/ServiceRecordVM.cs
index c26f8a2b0..b2a63ea95 100644
--- a/BeWo/ViewModel/ServiceRecordVM.cs
+++ b/BeWo/ViewModel/ServiceRecordVM.cs
@@ -218,6 +218,7 @@ namespace BeWo.ViewModel
             List<ValueListEntryDC> pAllGoals)
             : base(pDC, pDC.ServiceRecordOid == null)
         {
+            _DurationInStunden = BeWoApp.AppSettings.LetzteZeiterfassungsDauer;
             _Category2Services = pCategory2Services;
 
             ChangeGoalTree(pAllGoalCategories, pAllGoals);
diff --git a/Data/Entities/Contract.cs b/Data/Entities/Contract.cs
index fc140b24f..13191540e 100644
--- a/Data/Entities/Contract.cs
+++ b/Data/Entities/Contract.cs
@@ -16,6 +16,7 @@ namespace BeWo.Data.Entities
         public static string PropertyName_ContractEndDate = "ContractEndDate";
         public static string PropertyName_HourlyRate = "HourlyRate";
         public static string PropertyName_WeeklyFLS = "WeeklyFLS";
+        public static string PropertyName_MonthlyFLS = "MonthlyFLS";
         public static string PropertyName_WeeklyTotalHours = "WeeklyTotalHours";
         public static string PropertyName_MonthlyTotalHours = "MonthlyTotalHours";
         public static string PropertyName_LeaveDays = "LeaveDays";
@@ -26,6 +27,7 @@ namespace BeWo.Data.Entities
         private decimal? _WeeklyTotalHours;
         private decimal? _MonthlyTotalHours;
         private decimal? _WeeklyFLS;
+        private decimal? _MonthlyFLS;
         private decimal? _HourlyRate;
         private DateTime? _EntryDate;
         private DateTime? _ContractEndDate;
@@ -94,6 +96,18 @@ namespace BeWo.Data.Entities
             }
         }
 
+        public virtual decimal? MonthlyFLS
+        {
+            get { return _MonthlyFLS; }
+            set
+            {
+                if (base.AreDifferent(_MonthlyFLS, value))
+                    _MonthlyFLS = value;
+            }
+        }
+
+        
+
         public virtual int ProbationPeriod
         {
             get { return _ProbationPeriod; }
diff --git a/Data/Mappings/Contract.hbm.xml b/Data/Mappings/Contract.hbm.xml
index fdf6d31ad..ed54a0226 100644
--- a/Data/Mappings/Contract.hbm.xml
+++ b/Data/Mappings/Contract.hbm.xml
@@ -15,6 +15,7 @@
     <property column="EmployeeOid" type="Int64" name="EmployeeOid" update="false" insert="false"/>
     <property column="HourlyRate" type="Decimal" name="HourlyRate" />
     <property column="WeeklyFLS" type="Decimal" name="WeeklyFLS" />
+    <property column="MonthlyFLS" type="Decimal" name="MonthlyFLS" />
     <property column="WeeklyTotalHours" type="Decimal" name="WeeklyTotalHours" />
     <property column="MonthlyTotalHours" type="Decimal" name="MonthlyTotalHours" />
     <property column="LeaveDays" type="Decimal" name="LeaveDays" />
diff --git a/Model/Changes_2017_03_29.txt b/Model/Changes_2017_03_29.txt
new file mode 100644
index 000000000..f9ba51434
--- /dev/null
+++ b/Model/Changes_2017_03_29.txt
@@ -0,0 +1,3 @@
+ALTER TABLE `1234567890`.`contract` 
+ADD COLUMN 
+`MonthlyFLS` DECIMAL(18,10) NULL DEFAULT NULL COMMENT '' AFTER `MonthlyTotalHours`;
diff --git a/Service/DCEntityMapper/ContractDC_Contract.cs b/Service/DCEntityMapper/ContractDC_Contract.cs
index 44dc68c35..075745e67 100644
--- a/Service/DCEntityMapper/ContractDC_Contract.cs
+++ b/Service/DCEntityMapper/ContractDC_Contract.cs
@@ -21,6 +21,7 @@ namespace BeWo.Service.DCEntityMapper
 	        if (pDataContract.WeeklyDays == 0)
 		        pDataContract.WeeklyDays = 5;
             pDataContract.WeeklyFLS = pEntity.WeeklyFLS;
+            pDataContract.MonthlyFLS = pEntity.MonthlyFLS;
             pDataContract.WeeklyTotalHours = pEntity.WeeklyTotalHours;
             pDataContract.MonthlyTotalHours = pEntity.MonthlyTotalHours;
             pDataContract.Notice = pEntity.Notice;
@@ -45,6 +46,7 @@ namespace BeWo.Service.DCEntityMapper
             pEntity.ProbationPeriod = pDataContract.ProbationPeriod;
             pEntity.WeeklyDays = pDataContract.WeeklyDays;
             pEntity.WeeklyFLS = pDataContract.WeeklyFLS;
+            pEntity.MonthlyFLS = pDataContract.MonthlyFLS;
             pEntity.WeeklyTotalHours = pDataContract.WeeklyTotalHours;
             pEntity.MonthlyTotalHours = pDataContract.MonthlyTotalHours;
             pEntity.Notice = pDataContract.Notice;
diff --git a/Service/ServiceContracts/IOperationsService.cs b/Service/ServiceContracts/IOperationsService.cs
index 4ae20e515..9709dc70a 100644
--- a/Service/ServiceContracts/IOperationsService.cs
+++ b/Service/ServiceContracts/IOperationsService.cs
@@ -581,5 +581,17 @@ namespace BeWo.Service.ServiceContracts
         [FaultContract(typeof(BeWoFault))]
         [OperationContract]
         List<ServiceRecordDC> GetCustomerServiceRecordsCompactWithStartEndDate(long pCustomerOid, long costbearer2SupportConceptOid, DateTime start, DateTime ende);
+
+        [FaultContract(typeof(BeWoFault))]
+        [OperationContract]
+        List<VertretungDC> GetAllVertretungen();
+
+        [FaultContract(typeof(BeWoFault))]
+        [OperationContract]
+        void InsertNewMitarbeiterVertretung(VertretungDC vertretungM);
+
+        [FaultContract(typeof(BeWoFault))]
+        [OperationContract]
+        void InsertNewKlientenVertretung(VertretungDC vertretungK);
     }
 }
\ No newline at end of file
diff --git a/Service/ServiceImplementations/OperationsServiceImp.cs b/Service/ServiceImplementations/OperationsServiceImp.cs
index d93a905b7..9c0b1ee27 100644
--- a/Service/ServiceImplementations/OperationsServiceImp.cs
+++ b/Service/ServiceImplementations/OperationsServiceImp.cs
@@ -3467,6 +3467,50 @@ namespace BeWo.Service.ServiceImplementations
             }
         }
 
+        //all new Audi ##############################################
+        public List<VertretungDC>GetAllVertretungen()
+        {
+            try
+            {               
+                return MapperFactory.VertretungDC_Vertretung.MapToNewDCs(DAOFactory.GenericDAO.GetAllActive<Vertretung>());
+            }
+            catch (Exception e)
+            {
+                throw Utils.CreateBeWoFaultException(e);
+            }
+        }
+
+        public void InsertNewMitarbeiterVertretung(VertretungDC vertretungM)
+        {
+            try
+            {
+                var lVertretung = MapperFactory.VertretungDC_Vertretung.MapToNewEntity(vertretungM);
+
+                DAOFactory.GenericDAO.Insert(lVertretung);  
+
+            }
+            catch (Exception e)
+            {
+                throw Utils.CreateBeWoFaultException(e);
+            }
+        }
+
+        public void InsertNewKlientenVertretung(VertretungDC vertretungK)
+        {
+            try
+            {             
+                var lVertretung = MapperFactory.VertretungDC_Vertretung.MapToNewEntity(vertretungK);
+
+                DAOFactory.GenericDAO.Insert(lVertretung);          
+            }
+            catch (Exception e)
+            {
+                throw Utils.CreateBeWoFaultException(e);
+            }
+        }
+
+        //#################################################################
+
         #endregion
 
         #endregion
diff --git a/Shared/DataContracts/ContractDC.cs b/Shared/DataContracts/ContractDC.cs
index 5b792f0b7..e1e5c0e06 100644
--- a/Shared/DataContracts/ContractDC.cs
+++ b/Shared/DataContracts/ContractDC.cs
@@ -24,6 +24,9 @@ namespace BS.Shared.DataContracts
         [DataMember]
         public decimal? WeeklyFLS { get; set; }
 
+        [DataMember]
+        public decimal? MonthlyFLS { get; set; }
+
         [DataMember]
         public decimal? HourlyRate { get; set; }