From 7fbcc7c2a30ce092a2dbcf313b64ec9074ee4f59 Mon Sep 17 00:00:00 2001
From: Christian <christian.baeurle@beyondsoft.de>
Date: Tue, 14 Mar 2023 18:12:07 +0100
Subject: [PATCH] =?UTF-8?q?cb,=20alle=20todos=20f=C3=BCr=20die=20Version?=
 =?UTF-8?q?=203.13=20und=20diverse=20Reports?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BeWo/BeWo.csproj                              |    6 +-
 BeWo/BeWoApp.xaml.cs                          |    4 +-
 .../Zeiterfassung/ServiceRecordEditView.xaml  |   40 +-
 .../ServiceRecordGroupEditView.xaml           | 1582 +++++++++--------
 .../ServiceRecordGroupEditView.xaml.cs        |  233 ++-
 .../Zeiterfassung/ServiceRecordView2.xaml     |   80 +-
 .../Navigation/Sorter/SupportConceptSorter.cs |    2 +
 .../SupportConceptNavigationView.xaml.cs      |   35 +-
 .../Finance/FinanceOverviewView.xaml.cs       |   10 +-
 .../KilometerauslastungsView.xaml             |   26 +-
 .../KilometerauslastungsView.xaml.cs          |  188 +-
 ...pportConceptApprovalPeriodEmployeeRelVM.cs |    6 +-
 Data/Access/SearchDAO.cs                      |   18 +-
 Host/ReportView.aspx.cs                       |   71 +
 Host/Web.config                               |    7 +-
 Report/AbstractReportCreator.cs               |    8 +-
 Report/DefaultReportCreator.cs                |   16 +-
 .../EmployeeKilometerauswertungsListRO.cs     |   20 +-
 .../EmployeeKilometerauswertungsRO.cs         |   43 +-
 .../KilometerauswertungsListRO.cs             |   20 +-
 .../ReportObjects/KilometerauswertungsRO.cs   |   45 +-
 .../Import/AbschlagszahlungImport.cs          |   41 +-
 .../Invoicing/SettlementInvoiceCreation.cs    |    2 +-
 ...CustomMitarbeiterstundenkontoBerechnung.cs |   11 +
 ReportImp/AkggMid/CustomReportCreator.cs      |    4 +
 ReportImp/AkggMid/LeistungsnachweisHelper.cs  |  126 +-
 .../AkggMid/LeistungsnachweisJugendamt.cs     |  143 +-
 .../LeistungsnachweisJugendamt.designer.cs    |  123 +-
 .../AkggMid/LeistungsnachweisJugendamt.resx   |    4 +-
 .../AkggMid/LeistungsnachweisSozialamt.cs     |    2 +-
 .../LeistungsnachweisSozialamt.designer.cs    |   66 +-
 ...nachweisSozialamtMitBlutzucker.designer.cs |   76 +-
 ...ungsnachweisSozialamtMitBlutzuckerPumpe.cs |    1 -
 ...eisSozialamtMitBlutzuckerPumpe.designer.cs |   72 +-
 .../AkggMid/Mitarbeiterarbeitszeitkonto.cs    |   29 +-
 .../Mitarbeiterarbeitszeitkonto.designer.cs   |   14 +-
 ...CustomMitarbeiterstundenkontoBerechnung.cs |   19 +-
 .../ServicesOverviewReport.Designer.cs        |   71 +-
 .../ServicesOverviewReport.cs                 |   28 +-
 .../Abrechnung/CustomInvoiceCreation.cs       |    4 +-
 .../RechnungNeu.Designer.cs                   |   43 +-
 ReportImp/InputFamilienhilfe/RechnungNeu.resx |    4 +-
 .../ReportServiceImp.cs                       |   14 +-
 Service/Dokumentverwaltung/DokumentManager.cs |    6 +-
 .../EmployeeServiceImp.cs                     |    2 +-
 .../ClientPartials/CompactSupportConceptDC.cs |   22 +
 Shared/DataContracts/ReportTypes.cs           |    3 +-
 47 files changed, 2184 insertions(+), 1206 deletions(-)

diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index daab167c0..0fb39222f 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -16,7 +16,7 @@
     <EnableSecurityDebugging>true</EnableSecurityDebugging>
     <TargetZone>Internet</TargetZone>
     <GenerateManifests>true</GenerateManifests>
-    <SignManifests>false</SignManifests>
+    <SignManifests>true</SignManifests>
     <ManifestKeyFile>
     </ManifestKeyFile>
     <ManifestCertificateThumbprint>8CA4066C36C87B745E4016FDA715A6DB16FCFFA9</ManifestCertificateThumbprint>
@@ -43,12 +43,12 @@
     <TargetCulture>de-DE</TargetCulture>
     <ProductName>BeWoPlaner</ProductName>
     <PublisherName>beyondSoft GmbH</PublisherName>
-    <MinimumRequiredVersion>2.0.1.219</MinimumRequiredVersion>
+    <MinimumRequiredVersion>2.0.1.220</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
     <TrustUrlParameters>true</TrustUrlParameters>
-    <ApplicationRevision>220</ApplicationRevision>
+    <ApplicationRevision>221</ApplicationRevision>
     <ApplicationVersion>2.0.1.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs
index 80bf44419..da9698cc5 100644
--- a/BeWo/BeWoApp.xaml.cs
+++ b/BeWo/BeWoApp.xaml.cs
@@ -49,8 +49,8 @@ namespace BeWo
 		public static LoginControl LoginControl;
 
 		public static MainControl MainControl;
-	    public static string ShortVersion = "3.12";
-        public static string Version = "Version 3.12";
+	    public static string ShortVersion = "3.13";
+        public static string Version = "Version 3.13";
 
 		public static int RenderTier = 0;
 
diff --git a/BeWo/View/Detail/Zeiterfassung/ServiceRecordEditView.xaml b/BeWo/View/Detail/Zeiterfassung/ServiceRecordEditView.xaml
index 960a7c26f..8fb7389b3 100644
--- a/BeWo/View/Detail/Zeiterfassung/ServiceRecordEditView.xaml
+++ b/BeWo/View/Detail/Zeiterfassung/ServiceRecordEditView.xaml
@@ -873,12 +873,12 @@
                         </Grid.RowDefinitions>
 
                         <DockPanel Grid.Column="0" Grid.Row="0" HorizontalAlignment="Left">
-                            <Button Margin="3" Content="1" FontFamily="Webdings" Click="FullscreenBtn_Click" />
-                            <Button Margin="3" Content="A+" HorizontalAlignment="Center" Click="IncreaseFontSizeBtn_Click" />
-                            <Button Margin="3" Content="A-" Click="DecreaseFontSizeBtn_Click" />
+                                                <Button Margin="3" Content="1" FontFamily="Webdings" Click="FullscreenBtn_Click" IsTabStop="False"/>
+                                                <Button Margin="3" Content="A+" HorizontalAlignment="Center" Click="IncreaseFontSizeBtn_Click" IsTabStop="False"/>
+                                                <Button Margin="3" Content="A-" Click="DecreaseFontSizeBtn_Click" IsTabStop="False"/>
                         </DockPanel>
 
-                        <Button Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TextbausteineButton1" Content="Textbausteine" Click="ButtonBase_OnClick" />
+                                            <Button Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TextbausteineButton1" Content="Textbausteine" Click="ButtonBase_OnClick" IsTabStop="False"/>
 
                                             <TextBox x:Name="TextboxNotice" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2"
                                  Text="{val:ValidationBinding Path=Notice, UpdateSourceTrigger=PropertyChanged}"
@@ -908,12 +908,12 @@
                         </Grid.RowDefinitions>
 
                         <DockPanel Grid.Column="0" Grid.Row="0" HorizontalAlignment="Left">
-                            <Button Margin="3" Content="1" FontFamily="Webdings" Click="FullscreenBtn_Click" />
-                            <Button Margin="3" Content="A+" HorizontalAlignment="Center" Click="IncreaseFontSizeBtn_Click" />
-                            <Button Margin="3" Content="A-" Click="DecreaseFontSizeBtn_Click" />
+                                                <Button Margin="3" Content="1" FontFamily="Webdings" Click="FullscreenBtn_Click" IsTabStop="False"/>
+                                                <Button Margin="3" Content="A+" HorizontalAlignment="Center" Click="IncreaseFontSizeBtn_Click" IsTabStop="False"/>
+                                                <Button Margin="3" Content="A-" Click="DecreaseFontSizeBtn_Click" IsTabStop="False"/>
                         </DockPanel>
 
-                        <Button Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TextbausteineButton2" Content="Textbausteine" Click="ButtonBase_OnClick" />
+                                            <Button Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TextbausteineButton2" Content="Textbausteine" Click="ButtonBase_OnClick" IsTabStop="False"/>
 
                                             <TextBox x:Name="TextboxNotice2" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2"
                                  Text="{val:ValidationBinding Path=Notice2, UpdateSourceTrigger=PropertyChanged}"
@@ -940,12 +940,12 @@
                                             </Grid.RowDefinitions>
 
                                             <DockPanel Grid.Column="0" Grid.Row="0" HorizontalAlignment="Left">
-                                                <Button Margin="3" Content="1" FontFamily="Webdings" Click="FullscreenBtn_Click" />
-                                                <Button Margin="3" Content="A+" HorizontalAlignment="Center" Click="IncreaseFontSizeBtn_Click" />
-                                                <Button Margin="3" Content="A-" Click="DecreaseFontSizeBtn_Click" />
+                                                <Button Margin="3" Content="1" FontFamily="Webdings" Click="FullscreenBtn_Click" IsTabStop="False"/>
+                                                <Button Margin="3" Content="A+" HorizontalAlignment="Center" Click="IncreaseFontSizeBtn_Click" IsTabStop="False"/>
+                                                <Button Margin="3" Content="A-" Click="DecreaseFontSizeBtn_Click" IsTabStop="False"/>
                                             </DockPanel>
 
-                                            <Button Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TextbausteineButton3" Content="Textbausteine" Click="ButtonBase_OnClick" />
+                                            <Button Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TextbausteineButton3" Content="Textbausteine" Click="ButtonBase_OnClick" IsTabStop="False"/>
 
                                             <TextBox x:Name="TextboxNotice3" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2"
                                                      Text="{val:ValidationBinding Path=Notice3, UpdateSourceTrigger=PropertyChanged}"
@@ -972,12 +972,12 @@
                         </Grid.RowDefinitions>
 
                         <DockPanel Grid.Column="0" Grid.Row="0" HorizontalAlignment="Left">
-                            <Button Margin="3" Content="1" FontFamily="Webdings" Click="FullscreenBtn_Click" />
-                            <Button Margin="3" Content="A+" HorizontalAlignment="Center" Click="IncreaseFontSizeBtn_Click" />
-                            <Button Margin="3" Content="A-" Click="DecreaseFontSizeBtn_Click" />
+                                                <Button Margin="3" Content="1" FontFamily="Webdings" Click="FullscreenBtn_Click" IsTabStop="False"/>
+                                                <Button Margin="3" Content="A+" HorizontalAlignment="Center" Click="IncreaseFontSizeBtn_Click" IsTabStop="False"/>
+                                                <Button Margin="3" Content="A-" Click="DecreaseFontSizeBtn_Click" IsTabStop="False"/>
                         </DockPanel>
 
-                        <Button Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TextbausteineButton4" Content="Textbausteine" Click="ButtonBase_OnClick" />
+                                            <Button Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TextbausteineButton4" Content="Textbausteine" Click="ButtonBase_OnClick" IsTabStop="False"/>
 
                         <TextBox x:Name="TextboxNotice4" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2"
                                  Text="{val:ValidationBinding Path=Notice4, UpdateSourceTrigger=PropertyChanged}"
@@ -1004,12 +1004,12 @@
                         </Grid.RowDefinitions>
 
                         <DockPanel Grid.Column="0" Grid.Row="0" HorizontalAlignment="Left">
-                            <Button Margin="3" Content="1" FontFamily="Webdings" Click="FullscreenBtn_Click" />
-                            <Button Margin="3" Content="A+" HorizontalAlignment="Center" Click="IncreaseFontSizeBtn_Click" />
-                            <Button Margin="3" Content="A-" Click="DecreaseFontSizeBtn_Click" />
+                                                <Button Margin="3" Content="1" FontFamily="Webdings" Click="FullscreenBtn_Click" IsTabStop="False"/>
+                                                <Button Margin="3" Content="A+" HorizontalAlignment="Center" Click="IncreaseFontSizeBtn_Click" IsTabStop="False"/>
+                                                <Button Margin="3" Content="A-" Click="DecreaseFontSizeBtn_Click" IsTabStop="False"/>
                         </DockPanel>
 
-                        <Button Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TextbausteineButton5" Content="Textbausteine" Click="ButtonBase_OnClick" />
+                                            <Button Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TextbausteineButton5" Content="Textbausteine" Click="ButtonBase_OnClick" IsTabStop="False"/>
 
                                             <TextBox x:Name="TextboxNotice5" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2"
                                  Text="{val:ValidationBinding Path=Notice5, UpdateSourceTrigger=PropertyChanged}"
diff --git a/BeWo/View/Detail/Zeiterfassung/ServiceRecordGroupEditView.xaml b/BeWo/View/Detail/Zeiterfassung/ServiceRecordGroupEditView.xaml
index 2c416a82d..2326b95a2 100644
--- a/BeWo/View/Detail/Zeiterfassung/ServiceRecordGroupEditView.xaml
+++ b/BeWo/View/Detail/Zeiterfassung/ServiceRecordGroupEditView.xaml
@@ -8,81 +8,83 @@
                     xmlns:core="clr-namespace:BS.Shared.Core;assembly=BS.Shared"
                     xmlns:dxb="http://schemas.devexpress.com/winfx/2008/xaml/bars"
                     xmlns:dxre="http://schemas.devexpress.com/winfx/2008/xaml/richedit"
+                    xmlns:zeit="clr-namespace:BeWo.View.Detail.Zeiterfassung"
+                    xmlns:localSearchView="clr-namespace:BeWo.View.Search"
                     Height="Auto" Width="Auto" 
                     HorizontalAlignment="Stretch" VerticalAlignment="Stretch" 
                     Focusable="True">
     <Grid Width="Auto" Height="Auto">
-		<!--uc:ShadowChrome-->
-		<GroupBox Style="{StaticResource PopUpWindowStyle}">
-			<GroupBox.Header>
-				<StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="0,0,0,0">
-					<Image Source="..\..\Ressources\Icons\HistoryDisabled.png" RenderTransformOrigin="0.5,0.5" Width="Auto" Height="28" Margin="0,0,0,0">
-						<Image.RenderTransform>
-							<TransformGroup>
-								<ScaleTransform ScaleX="1" ScaleY="1" />
-								<SkewTransform AngleX="0" AngleY="0" />
-								<RotateTransform Angle="0" />
-								<TranslateTransform X="0" Y="0" />
-							</TransformGroup>
-						</Image.RenderTransform>
-					</Image>
-					<TextBox Text="Gruppenbuchung bearbeiten" Margin="10,4,0,0" Background="{x:Null}" Foreground="{DynamicResource MainGroupBoxForegroundBrush}" FontSize="20" BorderBrush="{x:Null}" VerticalAlignment="Stretch" BorderThickness="0,0,0,0" Padding="0,0,0,0" />
-				</StackPanel>
-			</GroupBox.Header>
-			<Grid Margin="0,3,0,0" Background="{StaticResource ObjectEditBackgroundBrush}">
-                
-				<Grid.RowDefinitions>
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="*" />
-					<RowDefinition Height="Auto" />
-				</Grid.RowDefinitions>
+        <!--uc:ShadowChrome-->
+        <GroupBox Style="{StaticResource PopUpWindowStyle}">
+            <GroupBox.Header>
+                <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="0,0,0,0">
+                    <Image Source="..\..\Ressources\Icons\HistoryDisabled.png" RenderTransformOrigin="0.5,0.5" Width="Auto" Height="28" Margin="0,0,0,0">
+                        <Image.RenderTransform>
+                            <TransformGroup>
+                                <ScaleTransform ScaleX="1" ScaleY="1" />
+                                <SkewTransform AngleX="0" AngleY="0" />
+                                <RotateTransform Angle="0" />
+                                <TranslateTransform X="0" Y="0" />
+                            </TransformGroup>
+                        </Image.RenderTransform>
+                    </Image>
+                    <TextBox Text="Gruppenbuchung bearbeiten" Margin="10,4,0,0" Background="{x:Null}" Foreground="{DynamicResource MainGroupBoxForegroundBrush}" FontSize="20" BorderBrush="{x:Null}" VerticalAlignment="Stretch" BorderThickness="0,0,0,0" Padding="0,0,0,0" />
+                </StackPanel>
+            </GroupBox.Header>
+            <Grid Margin="0,3,0,0" Background="{StaticResource ObjectEditBackgroundBrush}">
+
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+
+                <Rectangle Fill="{DynamicResource ServiceRecordContentBrush}" Height="6" />
 
-				<Rectangle Fill="{DynamicResource ServiceRecordContentBrush}" Height="6" />
-                
                 <Grid x:Name="rootGrid" Grid.Row="1" Margin="10,10,10,0">
-                    
-					<Grid>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="*" />
-						</Grid.ColumnDefinitions>
-						<Grid.RowDefinitions>
-							<RowDefinition Height="Auto" />
-							<RowDefinition Height="*" />
-						</Grid.RowDefinitions>
 
-						<Grid x:Name="GridOben">
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition Width="250" />
-								<ColumnDefinition Width="250" />
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="*" />
+                        </Grid.RowDefinitions>
+
+                        <Grid x:Name="GridOben">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="250" />
+                                <ColumnDefinition Width="250" />
                                 <ColumnDefinition Width="Auto" />
-								<ColumnDefinition Width="*" />
-							</Grid.ColumnDefinitions>
-							<Grid.RowDefinitions>
-								<RowDefinition Height="Auto" />
-								<RowDefinition Height="*" />
-							</Grid.RowDefinitions>
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="*" />
+                            </Grid.RowDefinitions>
 
-							<localViewControls:MultiSupportConceptSelectionControl Margin="0,3,0,3" x:Name="multiSupportConceptControl" MinHeight="100" MaxHeight="200" />
-							<localViewControls:MultiEmployeeSelectionControl Grid.Column="1" Margin="5,3,0,3" x:Name="multiEmployeeControl" MinHeight="100" MaxHeight="200" />
+                            <localViewControls:MultiSupportConceptSelectionControl Margin="0,3,0,3" x:Name="multiSupportConceptControl" MinHeight="100" MaxHeight="200" />
+                            <localViewControls:MultiEmployeeSelectionControl Grid.Column="1" Margin="5,3,0,3" x:Name="multiEmployeeControl" MinHeight="100" MaxHeight="200" />
 
                             <Grid Grid.Column="2" Grid.RowSpan="2" VerticalAlignment="Top" Margin="5,0,0,0"  >
-								<Grid.ColumnDefinitions>
-									<ColumnDefinition Width="64" />
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="64" />
                                     <ColumnDefinition Width="201" />
                                 </Grid.ColumnDefinitions>
-								<Grid.RowDefinitions>
-									<RowDefinition Height="Auto" />
-									<RowDefinition Height="Auto" />
-									<RowDefinition Height="Auto" MinHeight="24" />
-									<RowDefinition Height="Auto" MinHeight="24" />
-									<RowDefinition Height="Auto" />
-									<RowDefinition Height="Auto" />
-									<RowDefinition Height="Auto" />
-								    <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-								</Grid.RowDefinitions>
-								<!--<Label Grid.Column="0" Grid.Row="1" Content="Ziele" Visibility="{Binding Path=IsGoalTreeVisible, Converter={StaticResource BoolVisibilityConverter}}" />
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" MinHeight="24" />
+                                    <RowDefinition Height="Auto" MinHeight="24" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                </Grid.RowDefinitions>
+                                <!--<Label Grid.Column="0" Grid.Row="1" Content="Ziele" Visibility="{Binding Path=IsGoalTreeVisible, Converter={StaticResource BoolVisibilityConverter}}" />
                                 <TreeView x:Name="treeview_Goals" Grid.Column="1"  Grid.Row="1" Margin="3,0,3,3" ItemsSource="{Binding Path=GoalTree}" Visibility="{Binding Path=IsGoalTreeVisible, Converter={StaticResource BoolVisibilityConverter}}" ItemContainerStyle="{DynamicResource goal_treeitemstyle}" ItemTemplate="{DynamicResource goal_treeitemtemplate}" Grid.RowSpan="1" MinHeight="24" MaxHeight="100"  >
                                     <TreeView.Resources>
                                         <Style x:Key="goal_treeitemstyle" TargetType="TreeViewItem">
@@ -100,113 +102,113 @@
                                         </HierarchicalDataTemplate>
                                     </TreeView.Resources>
                                 </TreeView>-->
-								<Label Grid.Column="0" Grid.Row="2" Content="Kategorie" />
-								<ComboBox Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="3" SelectedItem="{val:ValidationBinding Path=Category, Mode=TwoWay}" ItemsSource="{Binding Path=SortedCategories}" SelectedIndex="0" x:Name="combobox_category" Margin="3,0,3,3" Height="23" HorizontalAlignment="Stretch"/>
-								<Label Grid.Column="0" Grid.Row="3" Content="Leistung" />
-                <ComboBox Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="3" SelectedItem="{val:ValidationBinding Path=ServiceDescription, Mode=TwoWay}" ItemsSource="{Binding Path=PossibleServiceDescriptions}" SelectedIndex="0" x:Name="combobox_services" Margin="3,0,3,3" Height="23" HorizontalAlignment="Stretch"/>
+                                <Label Grid.Column="0" Grid.Row="2" Content="Kategorie" />
+                                <ComboBox Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="3" SelectedItem="{val:ValidationBinding Path=Category, Mode=TwoWay}" ItemsSource="{Binding Path=SortedCategories}" SelectedIndex="0" x:Name="combobox_category" Margin="3,0,3,3" Height="23" HorizontalAlignment="Stretch"/>
+                                <Label Grid.Column="0" Grid.Row="3" Content="Leistung" />
+                                <ComboBox Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="3" SelectedItem="{val:ValidationBinding Path=ServiceDescription, Mode=TwoWay}" ItemsSource="{Binding Path=PossibleServiceDescriptions}" SelectedIndex="0" x:Name="combobox_services" Margin="3,0,3,3" Height="23" HorizontalAlignment="Stretch"/>
 
-                <Grid Grid.Column="0" Grid.Row="4" ColumnSpan="2"  x:Name="GridOhneEnddatum" Visibility="Visible">
-                  <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="64" />
-                    <ColumnDefinition Width="62" />
-                    <ColumnDefinition Width="77" />
-                    <ColumnDefinition Width="62" />
-                  </Grid.ColumnDefinitions>
-                  <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                  </Grid.RowDefinitions>
-                  
-                  <Label Grid.Column="0" Grid.Row="0" Content="Datum" x:Name="startDatum1" />
-                  <dxe:DateEdit Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="3"
+                                <Grid Grid.Column="0" Grid.Row="4" ColumnSpan="2"  x:Name="GridOhneEnddatum" Visibility="Visible">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="64" />
+                                        <ColumnDefinition Width="62" />
+                                        <ColumnDefinition Width="77" />
+                                        <ColumnDefinition Width="62" />
+                                    </Grid.ColumnDefinitions>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+
+                                    <Label Grid.Column="0" Grid.Row="0" Content="Datum" x:Name="startDatum1" />
+                                    <dxe:DateEdit Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="3"
                                 x:Name="datepicker_newDate1"
                                 EditValue="{val:ValidationBinding Mode=TwoWay, Path=EditStartDate}"
                                 Height="23" Margin="3,0,3,3" MaskType="DateTimeAdvancingCaret" AllowNullInput="False"/>
 
-                  <Label Grid.Column="0" Grid.Row="1" Content="Startzeit" x:Name="StartzeitLabel1" HorizontalAlignment="Left"/>
-                  <dxe:TextEdit MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" ShowError="False" MaskShowPlaceHolders="True"
+                                    <Label Grid.Column="0" Grid.Row="1" Content="Startzeit" x:Name="StartzeitLabel1" HorizontalAlignment="Left"/>
+                                    <dxe:TextEdit MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" ShowError="False" MaskShowPlaceHolders="True"
                                 MaskUseAsDisplayFormat="True" InvalidValueBehavior="AllowLeaveEditor"
                                 EditValue="{Binding Mode=TwoWay, Path=StartTimeString, UpdateSourceTrigger=PropertyChanged}"
                                 x:Name="startTime1" Grid.Column="1" Grid.Row="1"
                                 Height="23"
                                 Margin="3,0,3,3" LostFocus="TimeTextBox_OnLostFocus"/>
 
-                  <Label Grid.Column="2" Content="Endzeit" Grid.Row="1" HorizontalAlignment="Right" Margin="0,0,3,0"/>
-                  <dxe:TextEdit MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" ShowError="False" MaskShowPlaceHolders="True"
+                                    <Label Grid.Column="2" Content="Endzeit" Grid.Row="1" HorizontalAlignment="Right" Margin="0,0,3,0"/>
+                                    <dxe:TextEdit MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" ShowError="False" MaskShowPlaceHolders="True"
                                 MaskUseAsDisplayFormat="True" InvalidValueBehavior="AllowLeaveEditor"
                                 EditValue="{Binding Mode=TwoWay, Path=EndTimeString, UpdateSourceTrigger=PropertyChanged}"
                                 Grid.Column="3" x:Name="endTime1" Grid.Row="1"
                                 Height="23"
                                 Margin="3,0,3,3" LostFocus="TimeTextBox_OnLostFocus"/>
 
-                  <Label Content="Dauer (min)" Grid.Column="2" x:Name="MinStdDauerLabel" Grid.Row="2" HorizontalAlignment="Right" Margin="0,0,3,0"/>
-                  <dxe:SpinEdit MinValue="0" Increment="5" IsFloatValue="False" AllowNullInput="False" x:Name="numerictb_duration" Mask="########0" MaskUseAsDisplayFormat="True"
+                                    <Label Content="Dauer (min)" Grid.Column="2" x:Name="MinStdDauerLabel" Grid.Row="2" HorizontalAlignment="Right" Margin="0,0,3,0"/>
+                                    <dxe:SpinEdit MinValue="0" Increment="5" IsFloatValue="False" AllowNullInput="False" x:Name="numerictb_duration" Mask="########0" MaskUseAsDisplayFormat="True"
                                 EditValue="{Binding Path=Duration, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                 Grid.Column="3" Grid.Row="2"
-                                Height="23" Margin="3,0,3,3"/> 
+                                Height="23" Margin="3,0,3,3"/>
 
-                  <dxe:ComboBoxEdit ItemsSource="{x:Static core:EnumTranslations.ZeiterfassungsDauerTranslations}" Grid.Column="2" Grid.ColumnSpan="2" Grid.Row="2" Margin="3,0,3,3"
+                                    <dxe:ComboBoxEdit ItemsSource="{x:Static core:EnumTranslations.ZeiterfassungsDauerTranslations}" Grid.Column="2" Grid.ColumnSpan="2" Grid.Row="2" Margin="3,0,3,3"
                                 EditValue="{Binding Path=DauerEinheit, UpdateSourceTrigger=PropertyChanged}" DisplayMember="Value" ValueMember="Key"
                                 IsTextEditable="False" x:Name="MinSTDOhneEnd" Visibility="Collapsed" SelectedIndexChanged="MinSTDOhneEnd_OnSelectedIndexChanged "/>
 
-                </Grid>
-                                                       
-                <Grid Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="2" x:Name="GridMitEnddatum" Visibility="Collapsed">
-                  <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" SharedSizeGroup="label1"/>
-                    <ColumnDefinition Width="88" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                  </Grid.ColumnDefinitions>
-                  <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                  </Grid.RowDefinitions>
+                                </Grid>
 
-                  <Label Grid.Column="0" Grid.Row="0" Content="Startdatum" />
-                  <dxe:DateEdit Grid.Column="1" Grid.Row="0"
+                                <Grid Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="2" x:Name="GridMitEnddatum" Visibility="Collapsed">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto" SharedSizeGroup="label1"/>
+                                        <ColumnDefinition Width="88" />
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="Auto" />
+                                    </Grid.ColumnDefinitions>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+
+                                    <Label Grid.Column="0" Grid.Row="0" Content="Startdatum" />
+                                    <dxe:DateEdit Grid.Column="1" Grid.Row="0"
                       x:Name="datepicker_newDate2"
                       EditValue="{val:ValidationBinding Mode=TwoWay, Path=EditStartDate}"
                       Height="23" Margin="3,0,3,3" MaskType="DateTimeAdvancingCaret" AllowNullInput="False"/>
 
-                  <Label Grid.Column="2" Grid.Row="0" Content="Uhrzeit" x:Name="StartzeitLabel2"/>
-                  <dxe:TextEdit Grid.Column="3" Grid.Row="0" MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" ShowError="False" MaskShowPlaceHolders="True"
+                                    <Label Grid.Column="2" Grid.Row="0" Content="Uhrzeit" x:Name="StartzeitLabel2"/>
+                                    <dxe:TextEdit Grid.Column="3" Grid.Row="0" MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" ShowError="False" MaskShowPlaceHolders="True"
                             MaskUseAsDisplayFormat="True" InvalidValueBehavior="AllowLeaveEditor"
                             EditValue="{Binding Mode=TwoWay, Path=StartTimeString, UpdateSourceTrigger=PropertyChanged}"
                             x:Name="startTime2" Width="62"
                             Height="23"
                             Margin="3,0,3,3" LostFocus="TimeTextBox_OnLostFocus"/>
 
-                  <Label Grid.Column="0" Grid.Row="1" Content="Enddatum" x:Name="EndDateLabel2"/>
-                  <dxe:DateEdit Grid.Column="1" Grid.Row="1"
+                                    <Label Grid.Column="0" Grid.Row="1" Content="Enddatum" x:Name="EndDateLabel2"/>
+                                    <dxe:DateEdit Grid.Column="1" Grid.Row="1"
                       x:Name="datepicker_newEndDate2"
                       EditValue="{val:ValidationBinding Mode=TwoWay, Path=EditEndDate}"
                       Height="23" Margin="3,0,3,3" MaskType="DateTimeAdvancingCaret" AllowNullInput="False"/>
 
-                  <Label Grid.Column="2" Grid.Row="1" Content="Uhrzeit"  />
-                  <dxe:TextEdit Grid.Column="3" Grid.Row="1" MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" ShowError="False" MaskShowPlaceHolders="True"
+                                    <Label Grid.Column="2" Grid.Row="1" Content="Uhrzeit"  />
+                                    <dxe:TextEdit Grid.Column="3" Grid.Row="1" MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" ShowError="False" MaskShowPlaceHolders="True"
                           MaskUseAsDisplayFormat="True" InvalidValueBehavior="AllowLeaveEditor"
                           EditValue="{Binding Mode=TwoWay, Path=EndTimeString, UpdateSourceTrigger=PropertyChanged}"
                           x:Name="endTime2" Width="62"
                           Height="23"
                           Margin="3,0,3,3" LostFocus="TimeTextBox_OnLostFocus"/>
 
-                  <Label Content="Dauer" Grid.Column="2" x:Name="MinStdDauerlbl" Grid.Row="2"/>
-                  <dxe:SpinEdit MinValue="0" Increment="5" IsFloatValue="False" AllowNullInput="False" x:Name="numeric_duration" Mask="########0" MaskUseAsDisplayFormat="True"
+                                    <Label Content="Dauer" Grid.Column="2" x:Name="MinStdDauerlbl" Grid.Row="2"/>
+                                    <dxe:SpinEdit MinValue="0" Increment="5" IsFloatValue="False" AllowNullInput="False" x:Name="numeric_duration" Mask="########0" MaskUseAsDisplayFormat="True"
                                 EditValue="{Binding Path=Duration, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                 Grid.Column="3" Grid.Row="2"
                                 Height="23" Margin="3,0,3,3"/>
 
-                  <dxe:ComboBoxEdit ItemsSource="{x:Static core:EnumTranslations.ZeiterfassungsDauerTranslations}" Grid.Column="2" Grid.ColumnSpan="2" Grid.Row="2" Margin="3,0,3,3"
+                                    <dxe:ComboBoxEdit ItemsSource="{x:Static core:EnumTranslations.ZeiterfassungsDauerTranslations}" Grid.Column="2" Grid.ColumnSpan="2" Grid.Row="2" Margin="3,0,3,3"
                                 EditValue="{Binding Path=DauerEinheit, UpdateSourceTrigger=PropertyChanged}" DisplayMember="Value" ValueMember="Key"
                                 IsTextEditable="False" x:Name="MinSTDMitEnd" Visibility="Collapsed" SelectedIndexChanged="MinSTDMitEnd_OnSelectedIndexChanged "/>
 
-                </Grid>               
-                              
-                <!--<Grid Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="2" x:Name="GridMitJahrMonat" Visibility="Collapsed">
+                                </Grid>
+
+                                <!--<Grid Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="2" x:Name="GridMitJahrMonat" Visibility="Collapsed">
                   <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto" SharedSizeGroup="Label1" />
                     <ColumnDefinition Width="88" />
@@ -243,23 +245,23 @@
 
                 </Grid>-->
 
-                <Grid Grid.Column="0" Grid.Row="6" ColumnSpan="2" x:Name="DauerGrid" Visibility="Visible">
-                  <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="70"/>
-                        <ColumnDefinition Width="62" />
-                        <ColumnDefinition Width="71" />
-                        <ColumnDefinition Width="62" />     
-                  </Grid.ColumnDefinitions>
-                  <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                  </Grid.RowDefinitions>
+                                <Grid Grid.Column="0" Grid.Row="6" ColumnSpan="2" x:Name="DauerGrid" Visibility="Visible">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="70"/>
+                                        <ColumnDefinition Width="62" />
+                                        <ColumnDefinition Width="71" />
+                                        <ColumnDefinition Width="62" />
+                                    </Grid.ColumnDefinitions>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
 
-                  <Label Grid.Row="1" Content="Gefahrene Kilometer" Grid.Column="1" Grid.ColumnSpan="2" x:Name="lblDistance" HorizontalAlignment="Right" Margin="0,0,3,0"/>
+                                    <Label Grid.Row="1" Content="Gefahrene Kilometer" Grid.Column="1" Grid.ColumnSpan="2" x:Name="lblDistance" HorizontalAlignment="Right" Margin="0,0,3,0"/>
                                     <dxe:SpinEdit Grid.Row="1" Increment="5" MinValue="0" IsFloatValue="True" Mask="########0.0#" MaskUseAsDisplayFormat="True"
                                 AllowNullInput="False" x:Name="numerictb_distance" EditValue="{Binding Mode=TwoWay, Path=DistanceInMeter, UpdateSourceTrigger=PropertyChanged}"
                                 Grid.Column="3" Height="23" Margin="3,0,3,3"  />
-                </Grid>
+                                </Grid>
                                 <Grid Grid.Column="0" Grid.Row="7" ColumnSpan="2" Visibility="Visible">
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="70" />
@@ -276,639 +278,737 @@
                                     <dxe:TextEdit x:Name="numerictb_betrag" Grid.Column="3" Grid.Row="1" Height="23" Margin="3,0,3,3" HorizontalAlignment="Stretch" MaskType="Numeric" MaskUseAsDisplayFormat="True" EditValue="{Binding Path=Betrag, UpdateSourceTrigger=PropertyChanged}" Mask="########0.00"/>
 
                                 </Grid>
-                              
-                <CheckBox x:Name="EditOnlyThisRecord" Grid.Row="8" Grid.Column="0" Visibility="Collapsed">Nur diesen Eintrag bearbeiten</CheckBox>
-							</Grid>
-						</Grid>
-						<Grid Grid.Row="1" Margin="0,0,0,0">
-							<Grid.RowDefinitions>
-								<RowDefinition Height="Auto" />
-								<RowDefinition Height="*" />
-							</Grid.RowDefinitions>
 
-              <dxb:BarManager ToolbarGlyphSize="Small" x:Name="barManager" AllowQuickCustomization="False" AllowHotCustomization="False" AllowCustomization="False">
-                <dxb:BarManager.Resources>
-                  <dxre:RichEditUICommand x:Key="commands"/>
-                  <dxre:RichEditStringIdConverter x:Key="stringIdConverter"/>
-                  <dxre:DefaultBarItemDataTemplates x:Key="defaultBarItemTemplates"/>
-                </dxb:BarManager.Resources>
-                <dxb:BarManager.Bars>
+                                <CheckBox x:Name="EditOnlyThisRecord" Grid.Row="8" Grid.Column="0" Visibility="Collapsed">Nur diesen Eintrag bearbeiten</CheckBox>
+                            </Grid>
+                        </Grid>
+                        <Grid Grid.Row="1" Margin="0,0,0,0">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="*" />
+                            </Grid.RowDefinitions>
 
-                  <dxb:Bar x:Name="barClipboard" Caption="{Binding ConverterParameter=Caption_GroupClipboard, Converter={StaticResource stringIdConverter}, Mode=OneTime, Source={StaticResource stringIdConverter}}">
-                    <dxb:Bar.DockInfo>
-                      <dxb:BarDockInfo ContainerType="Top"/>
-                    </dxb:Bar.DockInfo>
-                    <dxb:Bar.ItemLinks>
-                      <dxb:BarButtonItemLink BarItemName="biEditPaste"/>
-                      <dxb:BarButtonItemLink BarItemName="biEditCut"/>
-                      <dxb:BarButtonItemLink BarItemName="biEditCopy"/>
-                    </dxb:Bar.ItemLinks>
-                  </dxb:Bar>
-                  <dxb:Bar x:Name="barFont" Caption="{Binding ConverterParameter=Caption_GroupFont, Converter={StaticResource stringIdConverter}, Mode=OneTime, Source={StaticResource stringIdConverter}}">
-                    <dxb:Bar.DockInfo>
-                      <dxb:BarDockInfo ContainerType="Top"/>
-                    </dxb:Bar.DockInfo>
-                    <dxb:Bar.ItemLinks>
-                      <dxb:BarEditItemLink BarItemName="biFormatFontName"/>
-                      <dxb:BarEditItemLink BarItemName="biFormatFontSize"/>
-                      <dxb:BarButtonItemLink BarItemName="biFormatIncreaseFontSize"/>
-                      <dxb:BarButtonItemLink BarItemName="biFormatDecreaseFontSize"/>
-                      <dxb:BarButtonItemLink BarItemName="biFormatClearFormatting"/>
-                      <dxb:BarCheckItemLink BarItemName="biFormatFontBold"/>
-                      <dxb:BarCheckItemLink BarItemName="biFormatFontItalic"/>
-                      <dxb:BarCheckItemLink BarItemName="biFormatFontUnderline"/>
-                      <dxb:BarCheckItemLink BarItemName="biFormatFontStrikeout"/>
-                      <dxb:BarSubItemLink BarItemName="biEditChangeCase"/>
-                      <dxre:BarSplitButtonColorEditItemLink BarItemName="biFormatFontHighlightColor"/>
-                      <dxre:BarSplitButtonColorEditItemLink BarItemName="biFormatFontForeColor"/>
-                      <dxb:BarButtonItemLink BarItemName="biFormatFont"/>
-                    </dxb:Bar.ItemLinks>
-                  </dxb:Bar>
-                  <dxb:Bar x:Name="barParagraph" Caption="{Binding ConverterParameter=Caption_GroupParagraph, Converter={StaticResource stringIdConverter}, Mode=OneTime, Source={StaticResource stringIdConverter}}">
-                    <dxb:Bar.DockInfo>
-                      <dxb:BarDockInfo ContainerType="Top" Row="1"/>
-                    </dxb:Bar.DockInfo>
-                    <dxb:Bar.ItemLinks>
-                      <dxb:BarCheckItemLink BarItemName="biFormatBulletedList"/>
-                      <dxb:BarCheckItemLink BarItemName="biFormatNumberingList"/>
-                      <dxb:BarCheckItemLink BarItemName="biFormatMultilevelList"/>
-                      <dxb:BarButtonItemLink BarItemName="biFormatDecreaseIndent"/>
-                      <dxb:BarButtonItemLink BarItemName="biFormatIncreaseIndent"/>
-                      <dxb:BarCheckItemLink BarItemName="biViewShowWhitespace"/>
-                      <dxb:BarCheckItemLink BarItemName="biFormatParagraphAlignLeft"/>
-                      <dxb:BarCheckItemLink BarItemName="biFormatParagraphAlignCenter"/>
-                      <dxb:BarCheckItemLink BarItemName="biFormatParagraphAlignRight"/>
-                      <dxb:BarCheckItemLink BarItemName="biFormatParagraphAlignJustify"/>
-                      <dxb:BarSubItemLink BarItemName="biFormatParagraphLineSpacing"/>
-                      <dxre:BarSplitButtonColorEditItemLink BarItemName="biFormatParagraphBackColor"/>
-                      <dxb:BarButtonItemLink BarItemName="biFormatParagraph"/>
-                    </dxb:Bar.ItemLinks>
-                  </dxb:Bar>
+                            <dxb:BarManager ToolbarGlyphSize="Small" x:Name="barManager" AllowQuickCustomization="False" AllowHotCustomization="False" AllowCustomization="False">
+                                <dxb:BarManager.Resources>
+                                    <dxre:RichEditUICommand x:Key="commands"/>
+                                    <dxre:RichEditStringIdConverter x:Key="stringIdConverter"/>
+                                    <dxre:DefaultBarItemDataTemplates x:Key="defaultBarItemTemplates"/>
+                                </dxb:BarManager.Resources>
+                                <dxb:BarManager.Bars>
 
-                  <dxb:Bar x:Name="barEditing" Caption="{Binding ConverterParameter=Caption_GroupEditing, Converter={StaticResource stringIdConverter}, Mode=OneTime, Source={StaticResource stringIdConverter}}">
-                    <dxb:Bar.DockInfo>
-                      <dxb:BarDockInfo ContainerType="Top" Row="1"/>
-                    </dxb:Bar.DockInfo>
-                    <dxb:Bar.ItemLinks>
-                      <dxb:BarButtonItemLink BarItemName="biEditFind"/>
-                      <dxb:BarButtonItemLink BarItemName="biEditReplace"/>
-                      <dxb:BarButtonItemLink BarItemName="biInsertPageBreak"/>
-                      <dxb:BarButtonItemLink BarItemName="biInsertTable"/>
-                    </dxb:Bar.ItemLinks>
-                  </dxb:Bar>
+                                    <dxb:Bar x:Name="barClipboard" Caption="{Binding ConverterParameter=Caption_GroupClipboard, Converter={StaticResource stringIdConverter}, Mode=OneTime, Source={StaticResource stringIdConverter}}">
+                                        <dxb:Bar.DockInfo>
+                                            <dxb:BarDockInfo ContainerType="Top"/>
+                                        </dxb:Bar.DockInfo>
+                                        <dxb:Bar.ItemLinks>
+                                            <dxb:BarButtonItemLink BarItemName="biEditPaste"/>
+                                            <dxb:BarButtonItemLink BarItemName="biEditCut"/>
+                                            <dxb:BarButtonItemLink BarItemName="biEditCopy"/>
+                                        </dxb:Bar.ItemLinks>
+                                    </dxb:Bar>
+                                    <dxb:Bar x:Name="barFont" Caption="{Binding ConverterParameter=Caption_GroupFont, Converter={StaticResource stringIdConverter}, Mode=OneTime, Source={StaticResource stringIdConverter}}">
+                                        <dxb:Bar.DockInfo>
+                                            <dxb:BarDockInfo ContainerType="Top"/>
+                                        </dxb:Bar.DockInfo>
+                                        <dxb:Bar.ItemLinks>
+                                            <dxb:BarEditItemLink BarItemName="biFormatFontName"/>
+                                            <dxb:BarEditItemLink BarItemName="biFormatFontSize"/>
+                                            <dxb:BarButtonItemLink BarItemName="biFormatIncreaseFontSize"/>
+                                            <dxb:BarButtonItemLink BarItemName="biFormatDecreaseFontSize"/>
+                                            <dxb:BarButtonItemLink BarItemName="biFormatClearFormatting"/>
+                                            <dxb:BarCheckItemLink BarItemName="biFormatFontBold"/>
+                                            <dxb:BarCheckItemLink BarItemName="biFormatFontItalic"/>
+                                            <dxb:BarCheckItemLink BarItemName="biFormatFontUnderline"/>
+                                            <dxb:BarCheckItemLink BarItemName="biFormatFontStrikeout"/>
+                                            <dxb:BarSubItemLink BarItemName="biEditChangeCase"/>
+                                            <dxre:BarSplitButtonColorEditItemLink BarItemName="biFormatFontHighlightColor"/>
+                                            <dxre:BarSplitButtonColorEditItemLink BarItemName="biFormatFontForeColor"/>
+                                            <dxb:BarButtonItemLink BarItemName="biFormatFont"/>
+                                        </dxb:Bar.ItemLinks>
+                                    </dxb:Bar>
+                                    <dxb:Bar x:Name="barParagraph" Caption="{Binding ConverterParameter=Caption_GroupParagraph, Converter={StaticResource stringIdConverter}, Mode=OneTime, Source={StaticResource stringIdConverter}}">
+                                        <dxb:Bar.DockInfo>
+                                            <dxb:BarDockInfo ContainerType="Top" Row="1"/>
+                                        </dxb:Bar.DockInfo>
+                                        <dxb:Bar.ItemLinks>
+                                            <dxb:BarCheckItemLink BarItemName="biFormatBulletedList"/>
+                                            <dxb:BarCheckItemLink BarItemName="biFormatNumberingList"/>
+                                            <dxb:BarCheckItemLink BarItemName="biFormatMultilevelList"/>
+                                            <dxb:BarButtonItemLink BarItemName="biFormatDecreaseIndent"/>
+                                            <dxb:BarButtonItemLink BarItemName="biFormatIncreaseIndent"/>
+                                            <dxb:BarCheckItemLink BarItemName="biViewShowWhitespace"/>
+                                            <dxb:BarCheckItemLink BarItemName="biFormatParagraphAlignLeft"/>
+                                            <dxb:BarCheckItemLink BarItemName="biFormatParagraphAlignCenter"/>
+                                            <dxb:BarCheckItemLink BarItemName="biFormatParagraphAlignRight"/>
+                                            <dxb:BarCheckItemLink BarItemName="biFormatParagraphAlignJustify"/>
+                                            <dxb:BarSubItemLink BarItemName="biFormatParagraphLineSpacing"/>
+                                            <dxre:BarSplitButtonColorEditItemLink BarItemName="biFormatParagraphBackColor"/>
+                                            <dxb:BarButtonItemLink BarItemName="biFormatParagraph"/>
+                                        </dxb:Bar.ItemLinks>
+                                    </dxb:Bar>
 
-                  <dxb:Bar x:Name="barZoom" Caption="{Binding ConverterParameter=Caption_GroupZoom, Converter={StaticResource stringIdConverter}, Mode=OneTime, Source={StaticResource stringIdConverter}}">
-                    <dxb:Bar.DockInfo>
-                      <dxb:BarDockInfo ContainerType="Top" Row="1"/>
-                    </dxb:Bar.DockInfo>
-                    <dxb:Bar.ItemLinks>
-                      <dxb:BarButtonItemLink BarItemName="biViewZoomOut"/>
-                      <dxb:BarButtonItemLink BarItemName="biViewZoomIn"/>
-                    </dxb:Bar.ItemLinks>
-                  </dxb:Bar>
+                                    <dxb:Bar x:Name="barEditing" Caption="{Binding ConverterParameter=Caption_GroupEditing, Converter={StaticResource stringIdConverter}, Mode=OneTime, Source={StaticResource stringIdConverter}}">
+                                        <dxb:Bar.DockInfo>
+                                            <dxb:BarDockInfo ContainerType="Top" Row="1"/>
+                                        </dxb:Bar.DockInfo>
+                                        <dxb:Bar.ItemLinks>
+                                            <dxb:BarButtonItemLink BarItemName="biEditFind"/>
+                                            <dxb:BarButtonItemLink BarItemName="biEditReplace"/>
+                                            <dxb:BarButtonItemLink BarItemName="biInsertPageBreak"/>
+                                            <dxb:BarButtonItemLink BarItemName="biInsertTable"/>
+                                        </dxb:Bar.ItemLinks>
+                                    </dxb:Bar>
 
-                </dxb:BarManager.Bars>
-                <dxb:BarManager.Items>
-                  <dxb:BarButtonItem x:Name="biFileNew" Command="{Binding FileNew, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biFileOpen" Command="{Binding FileOpen, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biFileSave" Command="{Binding FileSave, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biFileSaveAs" Command="{Binding FileSaveAs, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biFileQuickPrint" Command="{Binding FileQuickPrint, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biFilePrint" Command="{Binding FilePrint, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biFilePrintPreview" Command="{Binding FilePrintPreview, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biEditUndo" Command="{Binding EditUndo, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biEditRedo" Command="{Binding EditRedo, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biFileDocumentProperties" Command="{Binding FileDocumentProperties, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biEditPaste" Command="{Binding EditPaste, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biEditCut" Command="{Binding EditCut, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biEditCopy" Command="{Binding EditCopy, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biEditPasteSpecial" Command="{Binding EditPasteSpecial, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarEditItem x:Name="biFormatFontName" Content="" Command="{Binding FormatFontName, Mode=OneTime, Source={StaticResource commands}}" EditWidth="150">
-                    <dxb:BarEditItem.EditSettings>
-                      <dxre:FontComboBoxEditSettings/>
-                    </dxb:BarEditItem.EditSettings>
-                  </dxb:BarEditItem>
-                  <dxb:BarEditItem x:Name="biFormatFontSize" Content="" Command="{Binding FormatFontSize, Mode=OneTime, Source={StaticResource commands}}" EditWidth="50">
-                    <dxb:BarEditItem.EditSettings>
-                      <dxre:FontSizeComboBoxEditSettings x:Name="FontSizeComboBox" />
-                    </dxb:BarEditItem.EditSettings>
-                  </dxb:BarEditItem>
-                  <dxb:BarButtonItem x:Name="biFormatIncreaseFontSize" Command="{Binding FormatIncreaseFontSize, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biFormatDecreaseFontSize" Command="{Binding FormatDecreaseFontSize, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biFormatClearFormatting" Command="{Binding FormatClearFormatting, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biFormatFontBold" Command="{Binding FormatFontBold, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biFormatFontItalic" Command="{Binding FormatFontItalic, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biFormatFontUnderline" Command="{Binding FormatFontUnderline, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biFormatFontDoubleUnderline" Command="{Binding FormatFontDoubleUnderline, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biFormatFontStrikeout" Command="{Binding FormatFontStrikeout, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biFormatFontDoubleStrikeout" Command="{Binding FormatFontDoubleStrikeout, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biFormatFontSuperscript" Command="{Binding FormatFontSuperscript, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biFormatFontSubscript" Command="{Binding FormatFontSubscript, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarSubItem x:Name="biEditChangeCase" Command="{Binding EditChangeCase, Mode=OneTime, Source={StaticResource commands}}">
-                    <dxb:BarSubItem.ItemLinks>
-                      <dxb:BarButtonItemLink BarItemName="biEditMakeUpperCase"/>
-                      <dxb:BarButtonItemLink BarItemName="biEditMakeLowerCase"/>
-                      <dxb:BarButtonItemLink BarItemName="biEditToggleCase"/>
-                    </dxb:BarSubItem.ItemLinks>
-                  </dxb:BarSubItem>
-                  <dxb:BarButtonItem x:Name="biEditMakeUpperCase" Command="{Binding EditMakeUpperCase, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biEditMakeLowerCase" Command="{Binding EditMakeLowerCase, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biEditToggleCase" Command="{Binding EditToggleCase, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxre:BarSplitButtonColorEditItem x:Name="biFormatFontHighlightColor" Command="{Binding FormatFontHighlightColor, Mode=OneTime, Source={StaticResource commands}}">
-                    <dxb:PopupControlContainerInfo>
-                      <dxe:ColorEdit ChipSize="Large" ChipMargin="5" ColumnCount="5" EditValue="{Binding EditValue, ElementName=biFormatFontHighlightColor, Mode=TwoWay}" ShowMoreColorsButton="False" ShowDefaultColorButton="False" ShowNoColorButton="True" ShowBorder="False">
-                        <dxe:ColorEdit.Palettes>
-                          <dxre:CharactersBackgroundColorPaletteCollection/>
-                        </dxe:ColorEdit.Palettes>
-                      </dxe:ColorEdit>
-                    </dxb:PopupControlContainerInfo>
-                  </dxre:BarSplitButtonColorEditItem>
-                  <dxre:BarSplitButtonColorEditItem x:Name="biFormatFontForeColor" Command="{Binding FormatFontForeColor, Mode=OneTime, Source={StaticResource commands}}">
-                    <dxb:PopupControlContainerInfo>
-                      <dxe:ColorEdit EditValue="{Binding EditValue, ElementName=biFormatFontForeColor, Mode=TwoWay}" ShowBorder="False"/>
-                    </dxb:PopupControlContainerInfo>
-                  </dxre:BarSplitButtonColorEditItem>
-                  <dxb:BarButtonItem x:Name="biFormatFont" Command="{Binding FormatFont, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biFormatBulletedList" Command="{Binding FormatBulletedList, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biFormatNumberingList" Command="{Binding FormatNumberingList, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biFormatMultilevelList" Command="{Binding FormatMultilevelList, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biFormatDecreaseIndent" Command="{Binding FormatDecreaseIndent, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biFormatIncreaseIndent" Command="{Binding FormatIncreaseIndent, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biViewShowWhitespace" Command="{Binding ViewShowWhitespace, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biFormatParagraphAlignLeft" Command="{Binding FormatParagraphAlignLeft, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biFormatParagraphAlignCenter" Command="{Binding FormatParagraphAlignCenter, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biFormatParagraphAlignRight" Command="{Binding FormatParagraphAlignRight, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biFormatParagraphAlignJustify" Command="{Binding FormatParagraphAlignJustify, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarSubItem x:Name="biFormatParagraphLineSpacing" Command="{Binding FormatParagraphLineSpacing, Mode=OneTime, Source={StaticResource commands}}">
-                    <dxb:BarSubItem.ItemLinks>
-                      <dxb:BarCheckItemLink BarItemName="biFormatParagraphLineSpacingSingle"/>
-                      <dxb:BarCheckItemLink BarItemName="biFormatParagraphLineSpacingSesquialteral"/>
-                      <dxb:BarCheckItemLink BarItemName="biFormatParagraphLineSpacingDouble"/>
-                      <dxb:BarButtonItemLink BarItemName="biFormatParagraphLineSpacingCustomize"/>
-                      <dxb:BarButtonItemLink BarItemName="biFormatParagraphAddSpacingBefore"/>
-                      <dxb:BarButtonItemLink BarItemName="biFormatParagraphRemoveSpacingBefore"/>
-                      <dxb:BarButtonItemLink BarItemName="biFormatParagraphAddSpacingAfter"/>
-                      <dxb:BarButtonItemLink BarItemName="biFormatParagraphRemoveSpacingAfter"/>
-                    </dxb:BarSubItem.ItemLinks>
-                  </dxb:BarSubItem>
-                  <dxb:BarCheckItem x:Name="biFormatParagraphLineSpacingSingle" Command="{Binding FormatParagraphLineSpacingSingle, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biFormatParagraphLineSpacingSesquialteral" Command="{Binding FormatParagraphLineSpacingSesquialteral, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biFormatParagraphLineSpacingDouble" Command="{Binding FormatParagraphLineSpacingDouble, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biFormatParagraphLineSpacingCustomize" Command="{Binding FormatParagraphLineSpacingCustomize, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biFormatParagraphAddSpacingBefore" Command="{Binding FormatParagraphAddSpacingBefore, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biFormatParagraphRemoveSpacingBefore" Command="{Binding FormatParagraphRemoveSpacingBefore, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biFormatParagraphAddSpacingAfter" Command="{Binding FormatParagraphAddSpacingAfter, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biFormatParagraphRemoveSpacingAfter" Command="{Binding FormatParagraphRemoveSpacingAfter, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxre:BarSplitButtonColorEditItem x:Name="biFormatParagraphBackColor" Command="{Binding FormatParagraphBackColor, Mode=OneTime, Source={StaticResource commands}}">
-                    <dxb:PopupControlContainerInfo>
-                      <dxe:ColorEdit EditValue="{Binding EditValue, ElementName=biFormatParagraphBackColor, Mode=TwoWay}" ShowDefaultColorButton="False" ShowNoColorButton="True" ShowBorder="False"/>
-                    </dxb:PopupControlContainerInfo>
-                  </dxre:BarSplitButtonColorEditItem>
-                  <dxb:BarButtonItem x:Name="biFormatParagraph" Command="{Binding FormatParagraph, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarEditItem x:Name="biFormatFontStyle" Content="" Command="{Binding FormatFontStyle, Mode=OneTime, Source={StaticResource commands}}" EditWidth="150">
-                    <dxb:BarEditItem.EditSettings>
-                      <dxre:RichEditStyleComboBoxEditSettings x:Name="RichEditStyleComboBox"/>
-                    </dxb:BarEditItem.EditSettings>
-                  </dxb:BarEditItem>
-                  <dxb:BarButtonItem x:Name="biFormatEditFontStyle" Command="{Binding FormatEditFontStyle, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biEditFind" Command="{Binding EditFind, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biEditReplace" Command="{Binding EditReplace, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biInsertPageBreak" Command="{Binding InsertPageBreak, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biInsertTable" Command="{Binding InsertTable, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biInsertPicture" Command="{Binding InsertPicture, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biInsertFloatingPicture" Command="{Binding InsertFloatingPicture, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biInsertBookmark" Command="{Binding InsertBookmark, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biInsertHyperlink" Command="{Binding InsertHyperlink, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biInsertHeader" Command="{Binding InsertHeader, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biInsertFooter" Command="{Binding InsertFooter, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biInsertPageNumber" Command="{Binding InsertPageNumber, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biInsertPageCount" Command="{Binding InsertPageCount, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biInsertTextBox" Command="{Binding InsertTextBox, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biInsertSymbol" Command="{Binding InsertSymbol, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarSubItem x:Name="biPageLayoutMargins" Command="{Binding PageLayoutMargins, Mode=OneTime, Source={StaticResource commands}}">
-                    <dxb:BarSubItem.ItemLinks>
-                      <dxb:BarCheckItemLink BarItemName="biPageLayoutNormalMargins"/>
-                      <dxb:BarCheckItemLink BarItemName="biPageLayoutNarrowMargins"/>
-                      <dxb:BarCheckItemLink BarItemName="biPageLayoutModerateMargins"/>
-                      <dxb:BarCheckItemLink BarItemName="biPageLayoutWideMargins"/>
-                      <dxb:BarButtonItemLink BarItemName="biPageLayoutPageMarginsOptions"/>
-                    </dxb:BarSubItem.ItemLinks>
-                  </dxb:BarSubItem>
-                  <dxb:BarCheckItem x:Name="biPageLayoutNormalMargins" ContentTemplate="{Binding SectionMarginBarItemContentTemplate, Mode=OneTime, Source={StaticResource defaultBarItemTemplates}}" Command="{Binding PageLayoutNormalMargins, Mode=OneTime, Source={StaticResource commands}}" GlyphSize="Large"/>
-                  <dxb:BarCheckItem x:Name="biPageLayoutNarrowMargins" ContentTemplate="{Binding SectionMarginBarItemContentTemplate, Mode=OneTime, Source={StaticResource defaultBarItemTemplates}}" Command="{Binding PageLayoutNarrowMargins, Mode=OneTime, Source={StaticResource commands}}" GlyphSize="Large"/>
-                  <dxb:BarCheckItem x:Name="biPageLayoutModerateMargins" ContentTemplate="{Binding SectionMarginBarItemContentTemplate, Mode=OneTime, Source={StaticResource defaultBarItemTemplates}}" Command="{Binding PageLayoutModerateMargins, Mode=OneTime, Source={StaticResource commands}}" GlyphSize="Large"/>
-                  <dxb:BarCheckItem x:Name="biPageLayoutWideMargins" ContentTemplate="{Binding SectionMarginBarItemContentTemplate, Mode=OneTime, Source={StaticResource defaultBarItemTemplates}}" Command="{Binding PageLayoutWideMargins, Mode=OneTime, Source={StaticResource commands}}" GlyphSize="Large"/>
-                  <dxb:BarButtonItem x:Name="biPageLayoutPageMarginsOptions" Command="{Binding PageLayoutPageMarginsOptions, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarSubItem x:Name="biPageLayoutOrientation" Command="{Binding PageLayoutOrientation, Mode=OneTime, Source={StaticResource commands}}">
-                    <dxb:BarSubItem.ItemLinks>
-                      <dxb:BarCheckItemLink BarItemName="biPageLayoutPortraitOrientation"/>
-                      <dxb:BarCheckItemLink BarItemName="biPageLayoutLandscapeOrientation"/>
-                    </dxb:BarSubItem.ItemLinks>
-                  </dxb:BarSubItem>
-                  <dxb:BarCheckItem x:Name="biPageLayoutPortraitOrientation" Command="{Binding PageLayoutPortraitOrientation, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biPageLayoutLandscapeOrientation" Command="{Binding PageLayoutLandscapeOrientation, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarSubItem x:Name="biPageLayoutSize" Command="{Binding PageLayoutSize, Mode=OneTime, Source={StaticResource commands}}">
-                    <dxb:BarSubItem.ItemLinks>
-                      <dxre:PaperKindBarListItemLink BarItemName="biPageLayoutSizeList"/>
-                      <dxb:BarButtonItemLink BarItemName="biPageLayoutPagePaperOptions"/>
-                    </dxb:BarSubItem.ItemLinks>
-                  </dxb:BarSubItem>
-                  <dxre:PaperKindBarListItem x:Name="biPageLayoutSizeList" />
-                  <dxb:BarButtonItem x:Name="biPageLayoutPagePaperOptions" Command="{Binding PageLayoutPagePaperOptions, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarSubItem x:Name="biPageLayoutColumns" Command="{Binding PageLayoutColumns, Mode=OneTime, Source={StaticResource commands}}">
-                    <dxb:BarSubItem.ItemLinks>
-                      <dxb:BarCheckItemLink BarItemName="biPageLayoutOneColumn"/>
-                      <dxb:BarCheckItemLink BarItemName="biPageLayoutTwoColumns"/>
-                      <dxb:BarCheckItemLink BarItemName="biPageLayoutThreeColumns"/>
-                      <dxb:BarButtonItemLink BarItemName="biPageLayoutColumnsOptions"/>
-                    </dxb:BarSubItem.ItemLinks>
-                  </dxb:BarSubItem>
-                  <dxb:BarCheckItem x:Name="biPageLayoutOneColumn" Command="{Binding PageLayoutOneColumn, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biPageLayoutTwoColumns" Command="{Binding PageLayoutTwoColumns, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biPageLayoutThreeColumns" Command="{Binding PageLayoutThreeColumns, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biPageLayoutColumnsOptions" Command="{Binding PageLayoutColumnsOptions, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarSubItem x:Name="biInsertBreak" Command="{Binding InsertBreak, Mode=OneTime, Source={StaticResource commands}}">
-                    <dxb:BarSubItem.ItemLinks>
-                      <dxb:BarButtonItemLink BarItemName="biInsertPageBreak"/>
-                      <dxb:BarButtonItemLink BarItemName="biInsertColumnBreak"/>
-                      <dxb:BarButtonItemLink BarItemName="biInsertSectionBreakNextPage"/>
-                      <dxb:BarButtonItemLink BarItemName="biInsertSectionBreakContinuous"/>
-                      <dxb:BarButtonItemLink BarItemName="biInsertSectionBreakEvenPage"/>
-                      <dxb:BarButtonItemLink BarItemName="biInsertSectionBreakOddPage"/>
-                    </dxb:BarSubItem.ItemLinks>
-                  </dxb:BarSubItem>
-                  <dxb:BarButtonItem x:Name="biInsertColumnBreak" Command="{Binding InsertColumnBreak, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biInsertSectionBreakNextPage" Command="{Binding InsertSectionBreakNextPage, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biInsertSectionBreakContinuous" Command="{Binding InsertSectionBreakContinuous, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biInsertSectionBreakEvenPage" Command="{Binding InsertSectionBreakEvenPage, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biInsertSectionBreakOddPage" Command="{Binding InsertSectionBreakOddPage, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarSubItem x:Name="biPageLayoutLineNumbering" Command="{Binding PageLayoutLineNumbering, Mode=OneTime, Source={StaticResource commands}}">
-                    <dxb:BarSubItem.ItemLinks>
-                      <dxb:BarCheckItemLink BarItemName="biPageLayoutLineNumberingNone"/>
-                      <dxb:BarCheckItemLink BarItemName="biPageLayoutLineNumberingContinuous"/>
-                      <dxb:BarCheckItemLink BarItemName="biPageLayoutLineNumberingRestartNewPage"/>
-                      <dxb:BarCheckItemLink BarItemName="biPageLayoutLineNumberingRestartNewSection"/>
-                      <dxb:BarCheckItemLink BarItemName="biFormatParagraphSuppressLineNumbers"/>
-                      <dxb:BarButtonItemLink BarItemName="biPageLayoutLineNumberingOptions"/>
-                    </dxb:BarSubItem.ItemLinks>
-                  </dxb:BarSubItem>
-                  <dxb:BarCheckItem x:Name="biPageLayoutLineNumberingNone" Command="{Binding PageLayoutLineNumberingNone, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biPageLayoutLineNumberingContinuous" Command="{Binding PageLayoutLineNumberingContinuous, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biPageLayoutLineNumberingRestartNewPage" Command="{Binding PageLayoutLineNumberingRestartNewPage, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biPageLayoutLineNumberingRestartNewSection" Command="{Binding PageLayoutLineNumberingRestartNewSection, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biFormatParagraphSuppressLineNumbers" Command="{Binding FormatParagraphSuppressLineNumbers, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biPageLayoutLineNumberingOptions" Command="{Binding PageLayoutLineNumberingOptions, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxre:BarButtonColorEditItem x:Name="biPageLayoutPageColor" Command="{Binding PageLayoutPageColor, Mode=OneTime, Source={StaticResource commands}}">
-                    <dxb:PopupControlContainerInfo>
-                      <dxe:ColorEdit EditValue="{Binding EditValue, ElementName=biPageLayoutPageColor, Mode=TwoWay}" ShowBorder="False"/>
-                    </dxb:PopupControlContainerInfo>
-                  </dxre:BarButtonColorEditItem>
-                  <dxb:BarButtonItem x:Name="biReferencesInsertTableOfContents" Command="{Binding ReferencesInsertTableOfContents, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarSubItem x:Name="biReferencesAddParagraphsToTableOfContents" Command="{Binding ReferencesAddParagraphsToTableOfContents, Mode=OneTime, Source={StaticResource commands}}">
-                    <dxb:BarSubItem.ItemLinks>
-                      <dxb:BarButtonItemLink BarItemName="biFormatParagraphSetBodyTextLevel"/>
-                      <dxb:BarButtonItemLink BarItemName="biFormatParagraphSetHeading1Level"/>
-                      <dxb:BarButtonItemLink BarItemName="biFormatParagraphSetHeading2Level"/>
-                      <dxb:BarButtonItemLink BarItemName="biFormatParagraphSetHeading3Level"/>
-                      <dxb:BarButtonItemLink BarItemName="biFormatParagraphSetHeading4Level"/>
-                      <dxb:BarButtonItemLink BarItemName="biFormatParagraphSetHeading5Level"/>
-                      <dxb:BarButtonItemLink BarItemName="biFormatParagraphSetHeading6Level"/>
-                      <dxb:BarButtonItemLink BarItemName="biFormatParagraphSetHeading7Level"/>
-                      <dxb:BarButtonItemLink BarItemName="biFormatParagraphSetHeading8Level"/>
-                      <dxb:BarButtonItemLink BarItemName="biFormatParagraphSetHeading9Level"/>
-                    </dxb:BarSubItem.ItemLinks>
-                  </dxb:BarSubItem>
-                  <dxb:BarButtonItem x:Name="biFormatParagraphSetBodyTextLevel" Command="{Binding FormatParagraphSetBodyTextLevel, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biFormatParagraphSetHeading1Level" Command="{Binding FormatParagraphSetHeading1Level, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biFormatParagraphSetHeading2Level" Command="{Binding FormatParagraphSetHeading2Level, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biFormatParagraphSetHeading3Level" Command="{Binding FormatParagraphSetHeading3Level, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biFormatParagraphSetHeading4Level" Command="{Binding FormatParagraphSetHeading4Level, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biFormatParagraphSetHeading5Level" Command="{Binding FormatParagraphSetHeading5Level, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biFormatParagraphSetHeading6Level" Command="{Binding FormatParagraphSetHeading6Level, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biFormatParagraphSetHeading7Level" Command="{Binding FormatParagraphSetHeading7Level, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biFormatParagraphSetHeading8Level" Command="{Binding FormatParagraphSetHeading8Level, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biFormatParagraphSetHeading9Level" Command="{Binding FormatParagraphSetHeading9Level, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biReferencesUpdateTableOfContents" Command="{Binding ReferencesUpdateTableOfContents, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarSubItem x:Name="biReferencesInsertCaptionPlaceholder" Command="{Binding ReferencesInsertCaptionPlaceholder, Mode=OneTime, Source={StaticResource commands}}">
-                    <dxb:BarSubItem.ItemLinks>
-                      <dxb:BarButtonItemLink BarItemName="biReferencesInsertFiguresCaption"/>
-                      <dxb:BarButtonItemLink BarItemName="biReferencesInsertTablesCaption"/>
-                      <dxb:BarButtonItemLink BarItemName="biReferencesInsertEquationsCaption"/>
-                    </dxb:BarSubItem.ItemLinks>
-                  </dxb:BarSubItem>
-                  <dxb:BarButtonItem x:Name="biReferencesInsertFiguresCaption" Command="{Binding ReferencesInsertFiguresCaption, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biReferencesInsertTablesCaption" Command="{Binding ReferencesInsertTablesCaption, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biReferencesInsertEquationsCaption" Command="{Binding ReferencesInsertEquationsCaption, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarSubItem x:Name="biReferencesInsertTableOfFiguresPlaceholder" Command="{Binding ReferencesInsertTableOfFiguresPlaceholder, Mode=OneTime, Source={StaticResource commands}}">
-                    <dxb:BarSubItem.ItemLinks>
-                      <dxb:BarButtonItemLink BarItemName="biReferencesInsertTableOfFigures"/>
-                      <dxb:BarButtonItemLink BarItemName="biReferencesInsertTableOfTables"/>
-                      <dxb:BarButtonItemLink BarItemName="biReferencesInsertTableOfEquations"/>
-                    </dxb:BarSubItem.ItemLinks>
-                  </dxb:BarSubItem>
-                  <dxb:BarButtonItem x:Name="biReferencesInsertTableOfFigures" Command="{Binding ReferencesInsertTableOfFigures, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biReferencesInsertTableOfTables" Command="{Binding ReferencesInsertTableOfTables, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biReferencesInsertTableOfEquations" Command="{Binding ReferencesInsertTableOfEquations, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biReferencesUpdateTableOfCaptions" Command="{Binding ReferencesUpdateTableOfCaptions, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxre:InsertMergeFieldsBarSubItem x:Name="biMailMergeInsertFieldPlaceholder" Command="{Binding MailMergeInsertFieldPlaceholder, Mode=OneTime, Source={StaticResource commands}}" />
-                  <dxb:BarCheckItem x:Name="biMailMergeViewMergedData" Command="{Binding MailMergeViewMergedData, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biMailMergeShowAllFieldCodes" Command="{Binding MailMergeShowAllFieldCodes, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biMailMergeShowAllFieldResults" Command="{Binding MailMergeShowAllFieldResults, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biMailMergeFirstDataRecord" Command="{Binding MailMergeFirstDataRecord, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biMailMergePreviousDataRecord" Command="{Binding MailMergePreviousDataRecord, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biMailMergeNextDataRecord" Command="{Binding MailMergeNextDataRecord, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biMailMergeLastDataRecord" Command="{Binding MailMergeLastDataRecord, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biMailMergeSaveDocumentAs" Command="{Binding MailMergeSaveDocumentAs, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biCheckSpelling" Command="{Binding CheckSpelling, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biReviewProtectDocument" Command="{Binding ReviewProtectDocument, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biReviewEditPermissionRange" Command="{Binding ReviewEditPermissionRange, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biReviewUnprotectDocument" Command="{Binding ReviewUnprotectDocument, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biReviewNewComment" Command="{Binding ReviewNewComment, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarSubItem x:Name="biReviewDeleteCommentsPlaceholder" Command="{Binding ReviewDeleteCommentsPlaceholder, Mode=OneTime, Source={StaticResource commands}}">
-                    <dxb:BarSubItem.ItemLinks>
-                      <dxb:BarButtonItemLink BarItemName="biReviewDeleteOneComment"/>
-                      <dxb:BarButtonItemLink BarItemName="biReviewDeleteAllCommentsShown"/>
-                      <dxb:BarButtonItemLink BarItemName="biReviewDeleteAllComments"/>
-                    </dxb:BarSubItem.ItemLinks>
-                  </dxb:BarSubItem>
-                  <dxb:BarButtonItem x:Name="biReviewDeleteOneComment" Command="{Binding ReviewDeleteOneComment, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biReviewDeleteAllCommentsShown" Command="{Binding ReviewDeleteAllCommentsShown, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biReviewDeleteAllComments" Command="{Binding ReviewDeleteAllComments, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biReviewPreviousComment" Command="{Binding ReviewPreviousComment, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biReviewNextComment" Command="{Binding ReviewNextComment, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biReviewViewComment" Command="{Binding ReviewViewComment, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxre:ReviewersBarSubItem x:Name="biReviewReviewers" Command="{Binding ReviewReviewers, Mode=OneTime, Source={StaticResource commands}}" />
-                  <dxb:BarCheckItem x:Name="biReviewReviewingPane" Command="{Binding ReviewReviewingPane, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biViewDraft" Command="{Binding ViewDraft, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biViewPrintLayout" Command="{Binding ViewPrintLayout, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biViewSimple" Command="{Binding ViewSimple, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biViewHorizontalRuler" Command="{Binding ViewHorizontalRuler, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biViewVerticalRuler" Command="{Binding ViewVerticalRuler, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biViewZoomOut" Command="{Binding ViewZoomOut, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biViewZoomIn" Command="{Binding ViewZoomIn, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biGoToHeader" Command="{Binding GoToHeader, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biGoToFooter" Command="{Binding GoToFooter, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biHeaderFooterGoToPrevious" Command="{Binding HeaderFooterGoToPrevious, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biHeaderFooterGoToNext" Command="{Binding HeaderFooterGoToNext, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biHeaderFooterLinkToPrevious" Command="{Binding HeaderFooterLinkToPrevious, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biHeaderFooterDifferentFirstPage" Command="{Binding HeaderFooterDifferentFirstPage, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biHeaderFooterDifferentOddEvenPages" Command="{Binding HeaderFooterDifferentOddEvenPages, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biHeaderFooterClose" Command="{Binding HeaderFooterClose, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxre:BarSplitButtonColorEditItem x:Name="biTableChangeCellsShading" Command="{Binding TableChangeCellsShading, Mode=OneTime, Source={StaticResource commands}}">
-                    <dxb:PopupControlContainerInfo>
-                      <dxe:ColorEdit EditValue="{Binding EditValue, ElementName=biTableChangeCellsShading, Mode=TwoWay}" ShowDefaultColorButton="False" ShowNoColorButton="True" ShowBorder="False"/>
-                    </dxb:PopupControlContainerInfo>
-                  </dxre:BarSplitButtonColorEditItem>
-                  <dxb:BarSubItem x:Name="biTableChangeBorders" Command="{Binding TableChangeBorders, Mode=OneTime, Source={StaticResource commands}}">
-                    <dxb:BarSubItem.ItemLinks>
-                      <dxb:BarCheckItemLink BarItemName="biTableToggleBottomBorder"/>
-                      <dxb:BarCheckItemLink BarItemName="biTableToggleTopBorder"/>
-                      <dxb:BarCheckItemLink BarItemName="biTableToggleLeftBorder"/>
-                      <dxb:BarCheckItemLink BarItemName="biTableToggleRightBorder"/>
-                      <dxb:BarButtonItemLink BarItemName="biTableResetAllBorders"/>
-                      <dxb:BarCheckItemLink BarItemName="biTableToggleAllBorders"/>
-                      <dxb:BarCheckItemLink BarItemName="biTableToggleOutsideBorder"/>
-                      <dxb:BarCheckItemLink BarItemName="biTableToggleInsideBorder"/>
-                      <dxb:BarCheckItemLink BarItemName="biTableToggleInsideHorizontalBorder"/>
-                      <dxb:BarCheckItemLink BarItemName="biTableToggleInsideVerticalBorder"/>
-                    </dxb:BarSubItem.ItemLinks>
-                  </dxb:BarSubItem>
-                  <dxb:BarCheckItem x:Name="biTableToggleBottomBorder" Command="{Binding TableToggleBottomBorder, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biTableToggleTopBorder" Command="{Binding TableToggleTopBorder, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biTableToggleLeftBorder" Command="{Binding TableToggleLeftBorder, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biTableToggleRightBorder" Command="{Binding TableToggleRightBorder, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biTableResetAllBorders" Command="{Binding TableResetAllBorders, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biTableToggleAllBorders" Command="{Binding TableToggleAllBorders, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biTableToggleOutsideBorder" Command="{Binding TableToggleOutsideBorder, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biTableToggleInsideBorder" Command="{Binding TableToggleInsideBorder, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biTableToggleInsideHorizontalBorder" Command="{Binding TableToggleInsideHorizontalBorder, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biTableToggleInsideVerticalBorder" Command="{Binding TableToggleInsideVerticalBorder, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxre:BarSplitButtonColorEditItem x:Name="biTableChangeCellsBorderColor" Command="{Binding TableChangeCellsBorderColor, Mode=OneTime, Source={StaticResource commands}}">
-                    <dxb:PopupControlContainerInfo>
-                      <dxe:ColorEdit EditValue="{Binding EditValue, ElementName=biTableChangeCellsBorderColor, Mode=TwoWay}" ShowBorder="False"/>
-                    </dxb:PopupControlContainerInfo>
-                  </dxre:BarSplitButtonColorEditItem>
-                  <dxb:BarSubItem x:Name="biTableSelectElement" Command="{Binding TableSelectElement, Mode=OneTime, Source={StaticResource commands}}">
-                    <dxb:BarSubItem.ItemLinks>
-                      <dxb:BarCheckItemLink BarItemName="biTableSelectCell"/>
-                      <dxb:BarCheckItemLink BarItemName="biTableSelectColumn"/>
-                      <dxb:BarCheckItemLink BarItemName="biTableSelectRow"/>
-                      <dxb:BarCheckItemLink BarItemName="biTableSelect"/>
-                    </dxb:BarSubItem.ItemLinks>
-                  </dxb:BarSubItem>
-                  <dxb:BarCheckItem x:Name="biTableSelectCell" Command="{Binding TableSelectCell, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biTableSelectColumn" Command="{Binding TableSelectColumn, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biTableSelectRow" Command="{Binding TableSelectRow, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biTableSelect" Command="{Binding TableSelect, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biTableToggleShowGridlines" Command="{Binding TableToggleShowGridlines, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biTableProperties" Command="{Binding TableProperties, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarSubItem x:Name="biTableDeleteElement" Command="{Binding TableDeleteElement, Mode=OneTime, Source={StaticResource commands}}">
-                    <dxb:BarSubItem.ItemLinks>
-                      <dxb:BarCheckItemLink BarItemName="biTableDeleteCell"/>
-                      <dxb:BarCheckItemLink BarItemName="biTableDeleteColumn"/>
-                      <dxb:BarCheckItemLink BarItemName="biTableDeleteRow"/>
-                      <dxb:BarCheckItemLink BarItemName="biTableDelete"/>
-                    </dxb:BarSubItem.ItemLinks>
-                  </dxb:BarSubItem>
-                  <dxb:BarCheckItem x:Name="biTableDeleteCell" Command="{Binding TableDeleteCell, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biTableDeleteColumn" Command="{Binding TableDeleteColumn, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biTableDeleteRow" Command="{Binding TableDeleteRow, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biTableDelete" Command="{Binding TableDelete, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biTableInsertRowAbove" Command="{Binding TableInsertRowAbove, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biTableInsertRowBelow" Command="{Binding TableInsertRowBelow, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biTableInsertColumnToLeft" Command="{Binding TableInsertColumnToLeft, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biTableInsertColumnToRight" Command="{Binding TableInsertColumnToRight, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biTableInsertCells" Command="{Binding TableInsertCells, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biTableMergeCells" Command="{Binding TableMergeCells, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biTableSplitCells" Command="{Binding TableSplitCells, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biTableSplit" Command="{Binding TableSplit, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarSubItem x:Name="biToggleTableAutoFit" Command="{Binding ToggleTableAutoFit, Mode=OneTime, Source={StaticResource commands}}">
-                    <dxb:BarSubItem.ItemLinks>
-                      <dxb:BarCheckItemLink BarItemName="biToggleTableAutoFitContents"/>
-                      <dxb:BarCheckItemLink BarItemName="biToggleTableAutoFitWindow"/>
-                      <dxb:BarCheckItemLink BarItemName="biToggleTableFixedColumnWidth"/>
-                    </dxb:BarSubItem.ItemLinks>
-                  </dxb:BarSubItem>
-                  <dxb:BarCheckItem x:Name="biToggleTableAutoFitContents" Command="{Binding ToggleTableAutoFitContents, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biToggleTableAutoFitWindow" Command="{Binding ToggleTableAutoFitWindow, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biToggleTableFixedColumnWidth" Command="{Binding ToggleTableFixedColumnWidth, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biTableToggleCellsTopLeftAlignment" Command="{Binding TableToggleCellsTopLeftAlignment, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biTableToggleCellsTopCenterAlignment" Command="{Binding TableToggleCellsTopCenterAlignment, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biTableToggleCellsTopRightAlignment" Command="{Binding TableToggleCellsTopRightAlignment, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biTableToggleCellsMiddleLeftAlignment" Command="{Binding TableToggleCellsMiddleLeftAlignment, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biTableToggleCellsMiddleCenterAlignment" Command="{Binding TableToggleCellsMiddleCenterAlignment, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biTableToggleCellsMiddleRightAlignment" Command="{Binding TableToggleCellsMiddleRightAlignment, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biTableToggleCellsBottomLeftAlignment" Command="{Binding TableToggleCellsBottomLeftAlignment, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biTableToggleCellsBottomCenterAlignment" Command="{Binding TableToggleCellsBottomCenterAlignment, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biTableToggleCellsBottomRightAlignment" Command="{Binding TableToggleCellsBottomRightAlignment, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biTableOptions" Command="{Binding TableOptions, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxre:BarSplitButtonColorEditItem x:Name="biPictureShapeFillColor" Command="{Binding PictureShapeFillColor, Mode=OneTime, Source={StaticResource commands}}">
-                    <dxb:PopupControlContainerInfo>
-                      <dxe:ColorEdit EditValue="{Binding EditValue, ElementName=biPictureShapeFillColor, Mode=TwoWay}" ShowDefaultColorButton="False" ShowNoColorButton="True" ShowBorder="False"/>
-                    </dxb:PopupControlContainerInfo>
-                  </dxre:BarSplitButtonColorEditItem>
-                  <dxre:BarSplitButtonColorEditItem x:Name="biPictureShapeOutlineColor" Command="{Binding PictureShapeOutlineColor, Mode=OneTime, Source={StaticResource commands}}">
-                    <dxb:PopupControlContainerInfo>
-                      <dxe:ColorEdit EditValue="{Binding EditValue, ElementName=biPictureShapeOutlineColor, Mode=TwoWay}" ShowDefaultColorButton="False" ShowNoColorButton="True" ShowBorder="False"/>
-                    </dxb:PopupControlContainerInfo>
-                  </dxre:BarSplitButtonColorEditItem>
-                  <dxb:BarSubItem x:Name="biPictureWrapText" Command="{Binding PictureWrapText, Mode=OneTime, Source={StaticResource commands}}">
-                    <dxb:BarSubItem.ItemLinks>
-                      <dxb:BarCheckItemLink BarItemName="biPictureWrapTextSquare"/>
-                      <dxb:BarCheckItemLink BarItemName="biPictureWrapTextTight"/>
-                      <dxb:BarCheckItemLink BarItemName="biPictureWrapTextThrough"/>
-                      <dxb:BarCheckItemLink BarItemName="biPictureWrapTextTopAndBottom"/>
-                      <dxb:BarCheckItemLink BarItemName="biPictureWrapTextBehind"/>
-                      <dxb:BarCheckItemLink BarItemName="biPictureWrapTextInFrontOf"/>
-                    </dxb:BarSubItem.ItemLinks>
-                  </dxb:BarSubItem>
-                  <dxb:BarCheckItem x:Name="biPictureWrapTextSquare" Command="{Binding PictureWrapTextSquare, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biPictureWrapTextTight" Command="{Binding PictureWrapTextTight, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biPictureWrapTextThrough" Command="{Binding PictureWrapTextThrough, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biPictureWrapTextTopAndBottom" Command="{Binding PictureWrapTextTopAndBottom, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biPictureWrapTextBehind" Command="{Binding PictureWrapTextBehind, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarCheckItem x:Name="biPictureWrapTextInFrontOf" Command="{Binding PictureWrapTextInFrontOf, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarSubItem x:Name="biPicturePosition" Command="{Binding PicturePosition, Mode=OneTime, Source={StaticResource commands}}">
-                    <dxb:BarSubItem.ItemLinks>
-                      <dxb:BarButtonItemLink BarItemName="biPictureTopLeftAlignment"/>
-                      <dxb:BarButtonItemLink BarItemName="biPictureTopCenterAlignment"/>
-                      <dxb:BarButtonItemLink BarItemName="biPictureTopRightAlignment"/>
-                      <dxb:BarButtonItemLink BarItemName="biPictureMiddleLeftAlignment"/>
-                      <dxb:BarButtonItemLink BarItemName="biPictureMiddleCenterAlignment"/>
-                      <dxb:BarButtonItemLink BarItemName="biPictureMiddleRightAlignment"/>
-                      <dxb:BarButtonItemLink BarItemName="biPictureBottomLeftAlignment"/>
-                      <dxb:BarButtonItemLink BarItemName="biPictureBottomCenterAlignment"/>
-                      <dxb:BarButtonItemLink BarItemName="biPictureBottomRightAlignment"/>
-                    </dxb:BarSubItem.ItemLinks>
-                  </dxb:BarSubItem>
-                  <dxb:BarButtonItem x:Name="biPictureTopLeftAlignment" Command="{Binding PictureTopLeftAlignment, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biPictureTopCenterAlignment" Command="{Binding PictureTopCenterAlignment, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biPictureTopRightAlignment" Command="{Binding PictureTopRightAlignment, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biPictureMiddleLeftAlignment" Command="{Binding PictureMiddleLeftAlignment, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biPictureMiddleCenterAlignment" Command="{Binding PictureMiddleCenterAlignment, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biPictureMiddleRightAlignment" Command="{Binding PictureMiddleRightAlignment, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biPictureBottomLeftAlignment" Command="{Binding PictureBottomLeftAlignment, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biPictureBottomCenterAlignment" Command="{Binding PictureBottomCenterAlignment, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biPictureBottomRightAlignment" Command="{Binding PictureBottomRightAlignment, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarSubItem x:Name="biPictureBringForwardPlaceholder" Command="{Binding PictureBringForwardPlaceholder, Mode=OneTime, Source={StaticResource commands}}">
-                    <dxb:BarSubItem.ItemLinks>
-                      <dxb:BarButtonItemLink BarItemName="biPictureBringForward"/>
-                      <dxb:BarButtonItemLink BarItemName="biPictureBringToFront"/>
-                      <dxb:BarButtonItemLink BarItemName="biPictureBringInFrontOfText"/>
-                    </dxb:BarSubItem.ItemLinks>
-                  </dxb:BarSubItem>
-                  <dxb:BarButtonItem x:Name="biPictureBringForward" Command="{Binding PictureBringForward, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biPictureBringToFront" Command="{Binding PictureBringToFront, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biPictureBringInFrontOfText" Command="{Binding PictureBringInFrontOfText, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarSubItem x:Name="biPictureSendBackwardPlaceholder" Command="{Binding PictureSendBackwardPlaceholder, Mode=OneTime, Source={StaticResource commands}}">
-                    <dxb:BarSubItem.ItemLinks>
-                      <dxb:BarButtonItemLink BarItemName="biPictureSendBackward"/>
-                      <dxb:BarButtonItemLink BarItemName="biPictureSendToBack"/>
-                      <dxb:BarButtonItemLink BarItemName="biPictureSendBehindText"/>
-                    </dxb:BarSubItem.ItemLinks>
-                  </dxb:BarSubItem>
-                  <dxb:BarButtonItem x:Name="biPictureSendBackward" Command="{Binding PictureSendBackward, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biPictureSendToBack" Command="{Binding PictureSendToBack, Mode=OneTime, Source={StaticResource commands}}"/>
-                  <dxb:BarButtonItem x:Name="biPictureSendBehindText" Command="{Binding PictureSendBehindText, Mode=OneTime, Source={StaticResource commands}}"/>
-                </dxb:BarManager.Items>
-                <!--<DockPanel>
+                                    <dxb:Bar x:Name="barZoom" Caption="{Binding ConverterParameter=Caption_GroupZoom, Converter={StaticResource stringIdConverter}, Mode=OneTime, Source={StaticResource stringIdConverter}}">
+                                        <dxb:Bar.DockInfo>
+                                            <dxb:BarDockInfo ContainerType="Top" Row="1"/>
+                                        </dxb:Bar.DockInfo>
+                                        <dxb:Bar.ItemLinks>
+                                            <dxb:BarButtonItemLink BarItemName="biViewZoomOut"/>
+                                            <dxb:BarButtonItemLink BarItemName="biViewZoomIn"/>
+                                        </dxb:Bar.ItemLinks>
+                                    </dxb:Bar>
+
+                                </dxb:BarManager.Bars>
+                                <dxb:BarManager.Items>
+                                    <dxb:BarButtonItem x:Name="biFileNew" Command="{Binding FileNew, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biFileOpen" Command="{Binding FileOpen, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biFileSave" Command="{Binding FileSave, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biFileSaveAs" Command="{Binding FileSaveAs, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biFileQuickPrint" Command="{Binding FileQuickPrint, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biFilePrint" Command="{Binding FilePrint, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biFilePrintPreview" Command="{Binding FilePrintPreview, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biEditUndo" Command="{Binding EditUndo, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biEditRedo" Command="{Binding EditRedo, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biFileDocumentProperties" Command="{Binding FileDocumentProperties, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biEditPaste" Command="{Binding EditPaste, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biEditCut" Command="{Binding EditCut, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biEditCopy" Command="{Binding EditCopy, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biEditPasteSpecial" Command="{Binding EditPasteSpecial, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarEditItem x:Name="biFormatFontName" Content="" Command="{Binding FormatFontName, Mode=OneTime, Source={StaticResource commands}}" EditWidth="150">
+                                        <dxb:BarEditItem.EditSettings>
+                                            <dxre:FontComboBoxEditSettings/>
+                                        </dxb:BarEditItem.EditSettings>
+                                    </dxb:BarEditItem>
+                                    <dxb:BarEditItem x:Name="biFormatFontSize" Content="" Command="{Binding FormatFontSize, Mode=OneTime, Source={StaticResource commands}}" EditWidth="50">
+                                        <dxb:BarEditItem.EditSettings>
+                                            <dxre:FontSizeComboBoxEditSettings x:Name="FontSizeComboBox" />
+                                        </dxb:BarEditItem.EditSettings>
+                                    </dxb:BarEditItem>
+                                    <dxb:BarButtonItem x:Name="biFormatIncreaseFontSize" Command="{Binding FormatIncreaseFontSize, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biFormatDecreaseFontSize" Command="{Binding FormatDecreaseFontSize, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biFormatClearFormatting" Command="{Binding FormatClearFormatting, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biFormatFontBold" Command="{Binding FormatFontBold, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biFormatFontItalic" Command="{Binding FormatFontItalic, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biFormatFontUnderline" Command="{Binding FormatFontUnderline, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biFormatFontDoubleUnderline" Command="{Binding FormatFontDoubleUnderline, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biFormatFontStrikeout" Command="{Binding FormatFontStrikeout, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biFormatFontDoubleStrikeout" Command="{Binding FormatFontDoubleStrikeout, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biFormatFontSuperscript" Command="{Binding FormatFontSuperscript, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biFormatFontSubscript" Command="{Binding FormatFontSubscript, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarSubItem x:Name="biEditChangeCase" Command="{Binding EditChangeCase, Mode=OneTime, Source={StaticResource commands}}">
+                                        <dxb:BarSubItem.ItemLinks>
+                                            <dxb:BarButtonItemLink BarItemName="biEditMakeUpperCase"/>
+                                            <dxb:BarButtonItemLink BarItemName="biEditMakeLowerCase"/>
+                                            <dxb:BarButtonItemLink BarItemName="biEditToggleCase"/>
+                                        </dxb:BarSubItem.ItemLinks>
+                                    </dxb:BarSubItem>
+                                    <dxb:BarButtonItem x:Name="biEditMakeUpperCase" Command="{Binding EditMakeUpperCase, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biEditMakeLowerCase" Command="{Binding EditMakeLowerCase, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biEditToggleCase" Command="{Binding EditToggleCase, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxre:BarSplitButtonColorEditItem x:Name="biFormatFontHighlightColor" Command="{Binding FormatFontHighlightColor, Mode=OneTime, Source={StaticResource commands}}">
+                                        <dxb:PopupControlContainerInfo>
+                                            <dxe:ColorEdit ChipSize="Large" ChipMargin="5" ColumnCount="5" EditValue="{Binding EditValue, ElementName=biFormatFontHighlightColor, Mode=TwoWay}" ShowMoreColorsButton="False" ShowDefaultColorButton="False" ShowNoColorButton="True" ShowBorder="False">
+                                                <dxe:ColorEdit.Palettes>
+                                                    <dxre:CharactersBackgroundColorPaletteCollection/>
+                                                </dxe:ColorEdit.Palettes>
+                                            </dxe:ColorEdit>
+                                        </dxb:PopupControlContainerInfo>
+                                    </dxre:BarSplitButtonColorEditItem>
+                                    <dxre:BarSplitButtonColorEditItem x:Name="biFormatFontForeColor" Command="{Binding FormatFontForeColor, Mode=OneTime, Source={StaticResource commands}}">
+                                        <dxb:PopupControlContainerInfo>
+                                            <dxe:ColorEdit EditValue="{Binding EditValue, ElementName=biFormatFontForeColor, Mode=TwoWay}" ShowBorder="False"/>
+                                        </dxb:PopupControlContainerInfo>
+                                    </dxre:BarSplitButtonColorEditItem>
+                                    <dxb:BarButtonItem x:Name="biFormatFont" Command="{Binding FormatFont, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biFormatBulletedList" Command="{Binding FormatBulletedList, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biFormatNumberingList" Command="{Binding FormatNumberingList, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biFormatMultilevelList" Command="{Binding FormatMultilevelList, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biFormatDecreaseIndent" Command="{Binding FormatDecreaseIndent, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biFormatIncreaseIndent" Command="{Binding FormatIncreaseIndent, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biViewShowWhitespace" Command="{Binding ViewShowWhitespace, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biFormatParagraphAlignLeft" Command="{Binding FormatParagraphAlignLeft, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biFormatParagraphAlignCenter" Command="{Binding FormatParagraphAlignCenter, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biFormatParagraphAlignRight" Command="{Binding FormatParagraphAlignRight, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biFormatParagraphAlignJustify" Command="{Binding FormatParagraphAlignJustify, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarSubItem x:Name="biFormatParagraphLineSpacing" Command="{Binding FormatParagraphLineSpacing, Mode=OneTime, Source={StaticResource commands}}">
+                                        <dxb:BarSubItem.ItemLinks>
+                                            <dxb:BarCheckItemLink BarItemName="biFormatParagraphLineSpacingSingle"/>
+                                            <dxb:BarCheckItemLink BarItemName="biFormatParagraphLineSpacingSesquialteral"/>
+                                            <dxb:BarCheckItemLink BarItemName="biFormatParagraphLineSpacingDouble"/>
+                                            <dxb:BarButtonItemLink BarItemName="biFormatParagraphLineSpacingCustomize"/>
+                                            <dxb:BarButtonItemLink BarItemName="biFormatParagraphAddSpacingBefore"/>
+                                            <dxb:BarButtonItemLink BarItemName="biFormatParagraphRemoveSpacingBefore"/>
+                                            <dxb:BarButtonItemLink BarItemName="biFormatParagraphAddSpacingAfter"/>
+                                            <dxb:BarButtonItemLink BarItemName="biFormatParagraphRemoveSpacingAfter"/>
+                                        </dxb:BarSubItem.ItemLinks>
+                                    </dxb:BarSubItem>
+                                    <dxb:BarCheckItem x:Name="biFormatParagraphLineSpacingSingle" Command="{Binding FormatParagraphLineSpacingSingle, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biFormatParagraphLineSpacingSesquialteral" Command="{Binding FormatParagraphLineSpacingSesquialteral, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biFormatParagraphLineSpacingDouble" Command="{Binding FormatParagraphLineSpacingDouble, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biFormatParagraphLineSpacingCustomize" Command="{Binding FormatParagraphLineSpacingCustomize, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biFormatParagraphAddSpacingBefore" Command="{Binding FormatParagraphAddSpacingBefore, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biFormatParagraphRemoveSpacingBefore" Command="{Binding FormatParagraphRemoveSpacingBefore, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biFormatParagraphAddSpacingAfter" Command="{Binding FormatParagraphAddSpacingAfter, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biFormatParagraphRemoveSpacingAfter" Command="{Binding FormatParagraphRemoveSpacingAfter, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxre:BarSplitButtonColorEditItem x:Name="biFormatParagraphBackColor" Command="{Binding FormatParagraphBackColor, Mode=OneTime, Source={StaticResource commands}}">
+                                        <dxb:PopupControlContainerInfo>
+                                            <dxe:ColorEdit EditValue="{Binding EditValue, ElementName=biFormatParagraphBackColor, Mode=TwoWay}" ShowDefaultColorButton="False" ShowNoColorButton="True" ShowBorder="False"/>
+                                        </dxb:PopupControlContainerInfo>
+                                    </dxre:BarSplitButtonColorEditItem>
+                                    <dxb:BarButtonItem x:Name="biFormatParagraph" Command="{Binding FormatParagraph, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarEditItem x:Name="biFormatFontStyle" Content="" Command="{Binding FormatFontStyle, Mode=OneTime, Source={StaticResource commands}}" EditWidth="150">
+                                        <dxb:BarEditItem.EditSettings>
+                                            <dxre:RichEditStyleComboBoxEditSettings x:Name="RichEditStyleComboBox"/>
+                                        </dxb:BarEditItem.EditSettings>
+                                    </dxb:BarEditItem>
+                                    <dxb:BarButtonItem x:Name="biFormatEditFontStyle" Command="{Binding FormatEditFontStyle, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biEditFind" Command="{Binding EditFind, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biEditReplace" Command="{Binding EditReplace, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biInsertPageBreak" Command="{Binding InsertPageBreak, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biInsertTable" Command="{Binding InsertTable, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biInsertPicture" Command="{Binding InsertPicture, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biInsertFloatingPicture" Command="{Binding InsertFloatingPicture, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biInsertBookmark" Command="{Binding InsertBookmark, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biInsertHyperlink" Command="{Binding InsertHyperlink, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biInsertHeader" Command="{Binding InsertHeader, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biInsertFooter" Command="{Binding InsertFooter, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biInsertPageNumber" Command="{Binding InsertPageNumber, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biInsertPageCount" Command="{Binding InsertPageCount, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biInsertTextBox" Command="{Binding InsertTextBox, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biInsertSymbol" Command="{Binding InsertSymbol, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarSubItem x:Name="biPageLayoutMargins" Command="{Binding PageLayoutMargins, Mode=OneTime, Source={StaticResource commands}}">
+                                        <dxb:BarSubItem.ItemLinks>
+                                            <dxb:BarCheckItemLink BarItemName="biPageLayoutNormalMargins"/>
+                                            <dxb:BarCheckItemLink BarItemName="biPageLayoutNarrowMargins"/>
+                                            <dxb:BarCheckItemLink BarItemName="biPageLayoutModerateMargins"/>
+                                            <dxb:BarCheckItemLink BarItemName="biPageLayoutWideMargins"/>
+                                            <dxb:BarButtonItemLink BarItemName="biPageLayoutPageMarginsOptions"/>
+                                        </dxb:BarSubItem.ItemLinks>
+                                    </dxb:BarSubItem>
+                                    <dxb:BarCheckItem x:Name="biPageLayoutNormalMargins" ContentTemplate="{Binding SectionMarginBarItemContentTemplate, Mode=OneTime, Source={StaticResource defaultBarItemTemplates}}" Command="{Binding PageLayoutNormalMargins, Mode=OneTime, Source={StaticResource commands}}" GlyphSize="Large"/>
+                                    <dxb:BarCheckItem x:Name="biPageLayoutNarrowMargins" ContentTemplate="{Binding SectionMarginBarItemContentTemplate, Mode=OneTime, Source={StaticResource defaultBarItemTemplates}}" Command="{Binding PageLayoutNarrowMargins, Mode=OneTime, Source={StaticResource commands}}" GlyphSize="Large"/>
+                                    <dxb:BarCheckItem x:Name="biPageLayoutModerateMargins" ContentTemplate="{Binding SectionMarginBarItemContentTemplate, Mode=OneTime, Source={StaticResource defaultBarItemTemplates}}" Command="{Binding PageLayoutModerateMargins, Mode=OneTime, Source={StaticResource commands}}" GlyphSize="Large"/>
+                                    <dxb:BarCheckItem x:Name="biPageLayoutWideMargins" ContentTemplate="{Binding SectionMarginBarItemContentTemplate, Mode=OneTime, Source={StaticResource defaultBarItemTemplates}}" Command="{Binding PageLayoutWideMargins, Mode=OneTime, Source={StaticResource commands}}" GlyphSize="Large"/>
+                                    <dxb:BarButtonItem x:Name="biPageLayoutPageMarginsOptions" Command="{Binding PageLayoutPageMarginsOptions, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarSubItem x:Name="biPageLayoutOrientation" Command="{Binding PageLayoutOrientation, Mode=OneTime, Source={StaticResource commands}}">
+                                        <dxb:BarSubItem.ItemLinks>
+                                            <dxb:BarCheckItemLink BarItemName="biPageLayoutPortraitOrientation"/>
+                                            <dxb:BarCheckItemLink BarItemName="biPageLayoutLandscapeOrientation"/>
+                                        </dxb:BarSubItem.ItemLinks>
+                                    </dxb:BarSubItem>
+                                    <dxb:BarCheckItem x:Name="biPageLayoutPortraitOrientation" Command="{Binding PageLayoutPortraitOrientation, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biPageLayoutLandscapeOrientation" Command="{Binding PageLayoutLandscapeOrientation, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarSubItem x:Name="biPageLayoutSize" Command="{Binding PageLayoutSize, Mode=OneTime, Source={StaticResource commands}}">
+                                        <dxb:BarSubItem.ItemLinks>
+                                            <dxre:PaperKindBarListItemLink BarItemName="biPageLayoutSizeList"/>
+                                            <dxb:BarButtonItemLink BarItemName="biPageLayoutPagePaperOptions"/>
+                                        </dxb:BarSubItem.ItemLinks>
+                                    </dxb:BarSubItem>
+                                    <dxre:PaperKindBarListItem x:Name="biPageLayoutSizeList" />
+                                    <dxb:BarButtonItem x:Name="biPageLayoutPagePaperOptions" Command="{Binding PageLayoutPagePaperOptions, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarSubItem x:Name="biPageLayoutColumns" Command="{Binding PageLayoutColumns, Mode=OneTime, Source={StaticResource commands}}">
+                                        <dxb:BarSubItem.ItemLinks>
+                                            <dxb:BarCheckItemLink BarItemName="biPageLayoutOneColumn"/>
+                                            <dxb:BarCheckItemLink BarItemName="biPageLayoutTwoColumns"/>
+                                            <dxb:BarCheckItemLink BarItemName="biPageLayoutThreeColumns"/>
+                                            <dxb:BarButtonItemLink BarItemName="biPageLayoutColumnsOptions"/>
+                                        </dxb:BarSubItem.ItemLinks>
+                                    </dxb:BarSubItem>
+                                    <dxb:BarCheckItem x:Name="biPageLayoutOneColumn" Command="{Binding PageLayoutOneColumn, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biPageLayoutTwoColumns" Command="{Binding PageLayoutTwoColumns, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biPageLayoutThreeColumns" Command="{Binding PageLayoutThreeColumns, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biPageLayoutColumnsOptions" Command="{Binding PageLayoutColumnsOptions, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarSubItem x:Name="biInsertBreak" Command="{Binding InsertBreak, Mode=OneTime, Source={StaticResource commands}}">
+                                        <dxb:BarSubItem.ItemLinks>
+                                            <dxb:BarButtonItemLink BarItemName="biInsertPageBreak"/>
+                                            <dxb:BarButtonItemLink BarItemName="biInsertColumnBreak"/>
+                                            <dxb:BarButtonItemLink BarItemName="biInsertSectionBreakNextPage"/>
+                                            <dxb:BarButtonItemLink BarItemName="biInsertSectionBreakContinuous"/>
+                                            <dxb:BarButtonItemLink BarItemName="biInsertSectionBreakEvenPage"/>
+                                            <dxb:BarButtonItemLink BarItemName="biInsertSectionBreakOddPage"/>
+                                        </dxb:BarSubItem.ItemLinks>
+                                    </dxb:BarSubItem>
+                                    <dxb:BarButtonItem x:Name="biInsertColumnBreak" Command="{Binding InsertColumnBreak, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biInsertSectionBreakNextPage" Command="{Binding InsertSectionBreakNextPage, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biInsertSectionBreakContinuous" Command="{Binding InsertSectionBreakContinuous, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biInsertSectionBreakEvenPage" Command="{Binding InsertSectionBreakEvenPage, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biInsertSectionBreakOddPage" Command="{Binding InsertSectionBreakOddPage, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarSubItem x:Name="biPageLayoutLineNumbering" Command="{Binding PageLayoutLineNumbering, Mode=OneTime, Source={StaticResource commands}}">
+                                        <dxb:BarSubItem.ItemLinks>
+                                            <dxb:BarCheckItemLink BarItemName="biPageLayoutLineNumberingNone"/>
+                                            <dxb:BarCheckItemLink BarItemName="biPageLayoutLineNumberingContinuous"/>
+                                            <dxb:BarCheckItemLink BarItemName="biPageLayoutLineNumberingRestartNewPage"/>
+                                            <dxb:BarCheckItemLink BarItemName="biPageLayoutLineNumberingRestartNewSection"/>
+                                            <dxb:BarCheckItemLink BarItemName="biFormatParagraphSuppressLineNumbers"/>
+                                            <dxb:BarButtonItemLink BarItemName="biPageLayoutLineNumberingOptions"/>
+                                        </dxb:BarSubItem.ItemLinks>
+                                    </dxb:BarSubItem>
+                                    <dxb:BarCheckItem x:Name="biPageLayoutLineNumberingNone" Command="{Binding PageLayoutLineNumberingNone, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biPageLayoutLineNumberingContinuous" Command="{Binding PageLayoutLineNumberingContinuous, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biPageLayoutLineNumberingRestartNewPage" Command="{Binding PageLayoutLineNumberingRestartNewPage, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biPageLayoutLineNumberingRestartNewSection" Command="{Binding PageLayoutLineNumberingRestartNewSection, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biFormatParagraphSuppressLineNumbers" Command="{Binding FormatParagraphSuppressLineNumbers, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biPageLayoutLineNumberingOptions" Command="{Binding PageLayoutLineNumberingOptions, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxre:BarButtonColorEditItem x:Name="biPageLayoutPageColor" Command="{Binding PageLayoutPageColor, Mode=OneTime, Source={StaticResource commands}}">
+                                        <dxb:PopupControlContainerInfo>
+                                            <dxe:ColorEdit EditValue="{Binding EditValue, ElementName=biPageLayoutPageColor, Mode=TwoWay}" ShowBorder="False"/>
+                                        </dxb:PopupControlContainerInfo>
+                                    </dxre:BarButtonColorEditItem>
+                                    <dxb:BarButtonItem x:Name="biReferencesInsertTableOfContents" Command="{Binding ReferencesInsertTableOfContents, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarSubItem x:Name="biReferencesAddParagraphsToTableOfContents" Command="{Binding ReferencesAddParagraphsToTableOfContents, Mode=OneTime, Source={StaticResource commands}}">
+                                        <dxb:BarSubItem.ItemLinks>
+                                            <dxb:BarButtonItemLink BarItemName="biFormatParagraphSetBodyTextLevel"/>
+                                            <dxb:BarButtonItemLink BarItemName="biFormatParagraphSetHeading1Level"/>
+                                            <dxb:BarButtonItemLink BarItemName="biFormatParagraphSetHeading2Level"/>
+                                            <dxb:BarButtonItemLink BarItemName="biFormatParagraphSetHeading3Level"/>
+                                            <dxb:BarButtonItemLink BarItemName="biFormatParagraphSetHeading4Level"/>
+                                            <dxb:BarButtonItemLink BarItemName="biFormatParagraphSetHeading5Level"/>
+                                            <dxb:BarButtonItemLink BarItemName="biFormatParagraphSetHeading6Level"/>
+                                            <dxb:BarButtonItemLink BarItemName="biFormatParagraphSetHeading7Level"/>
+                                            <dxb:BarButtonItemLink BarItemName="biFormatParagraphSetHeading8Level"/>
+                                            <dxb:BarButtonItemLink BarItemName="biFormatParagraphSetHeading9Level"/>
+                                        </dxb:BarSubItem.ItemLinks>
+                                    </dxb:BarSubItem>
+                                    <dxb:BarButtonItem x:Name="biFormatParagraphSetBodyTextLevel" Command="{Binding FormatParagraphSetBodyTextLevel, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biFormatParagraphSetHeading1Level" Command="{Binding FormatParagraphSetHeading1Level, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biFormatParagraphSetHeading2Level" Command="{Binding FormatParagraphSetHeading2Level, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biFormatParagraphSetHeading3Level" Command="{Binding FormatParagraphSetHeading3Level, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biFormatParagraphSetHeading4Level" Command="{Binding FormatParagraphSetHeading4Level, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biFormatParagraphSetHeading5Level" Command="{Binding FormatParagraphSetHeading5Level, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biFormatParagraphSetHeading6Level" Command="{Binding FormatParagraphSetHeading6Level, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biFormatParagraphSetHeading7Level" Command="{Binding FormatParagraphSetHeading7Level, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biFormatParagraphSetHeading8Level" Command="{Binding FormatParagraphSetHeading8Level, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biFormatParagraphSetHeading9Level" Command="{Binding FormatParagraphSetHeading9Level, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biReferencesUpdateTableOfContents" Command="{Binding ReferencesUpdateTableOfContents, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarSubItem x:Name="biReferencesInsertCaptionPlaceholder" Command="{Binding ReferencesInsertCaptionPlaceholder, Mode=OneTime, Source={StaticResource commands}}">
+                                        <dxb:BarSubItem.ItemLinks>
+                                            <dxb:BarButtonItemLink BarItemName="biReferencesInsertFiguresCaption"/>
+                                            <dxb:BarButtonItemLink BarItemName="biReferencesInsertTablesCaption"/>
+                                            <dxb:BarButtonItemLink BarItemName="biReferencesInsertEquationsCaption"/>
+                                        </dxb:BarSubItem.ItemLinks>
+                                    </dxb:BarSubItem>
+                                    <dxb:BarButtonItem x:Name="biReferencesInsertFiguresCaption" Command="{Binding ReferencesInsertFiguresCaption, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biReferencesInsertTablesCaption" Command="{Binding ReferencesInsertTablesCaption, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biReferencesInsertEquationsCaption" Command="{Binding ReferencesInsertEquationsCaption, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarSubItem x:Name="biReferencesInsertTableOfFiguresPlaceholder" Command="{Binding ReferencesInsertTableOfFiguresPlaceholder, Mode=OneTime, Source={StaticResource commands}}">
+                                        <dxb:BarSubItem.ItemLinks>
+                                            <dxb:BarButtonItemLink BarItemName="biReferencesInsertTableOfFigures"/>
+                                            <dxb:BarButtonItemLink BarItemName="biReferencesInsertTableOfTables"/>
+                                            <dxb:BarButtonItemLink BarItemName="biReferencesInsertTableOfEquations"/>
+                                        </dxb:BarSubItem.ItemLinks>
+                                    </dxb:BarSubItem>
+                                    <dxb:BarButtonItem x:Name="biReferencesInsertTableOfFigures" Command="{Binding ReferencesInsertTableOfFigures, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biReferencesInsertTableOfTables" Command="{Binding ReferencesInsertTableOfTables, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biReferencesInsertTableOfEquations" Command="{Binding ReferencesInsertTableOfEquations, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biReferencesUpdateTableOfCaptions" Command="{Binding ReferencesUpdateTableOfCaptions, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxre:InsertMergeFieldsBarSubItem x:Name="biMailMergeInsertFieldPlaceholder" Command="{Binding MailMergeInsertFieldPlaceholder, Mode=OneTime, Source={StaticResource commands}}" />
+                                    <dxb:BarCheckItem x:Name="biMailMergeViewMergedData" Command="{Binding MailMergeViewMergedData, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biMailMergeShowAllFieldCodes" Command="{Binding MailMergeShowAllFieldCodes, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biMailMergeShowAllFieldResults" Command="{Binding MailMergeShowAllFieldResults, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biMailMergeFirstDataRecord" Command="{Binding MailMergeFirstDataRecord, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biMailMergePreviousDataRecord" Command="{Binding MailMergePreviousDataRecord, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biMailMergeNextDataRecord" Command="{Binding MailMergeNextDataRecord, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biMailMergeLastDataRecord" Command="{Binding MailMergeLastDataRecord, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biMailMergeSaveDocumentAs" Command="{Binding MailMergeSaveDocumentAs, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biCheckSpelling" Command="{Binding CheckSpelling, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biReviewProtectDocument" Command="{Binding ReviewProtectDocument, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biReviewEditPermissionRange" Command="{Binding ReviewEditPermissionRange, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biReviewUnprotectDocument" Command="{Binding ReviewUnprotectDocument, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biReviewNewComment" Command="{Binding ReviewNewComment, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarSubItem x:Name="biReviewDeleteCommentsPlaceholder" Command="{Binding ReviewDeleteCommentsPlaceholder, Mode=OneTime, Source={StaticResource commands}}">
+                                        <dxb:BarSubItem.ItemLinks>
+                                            <dxb:BarButtonItemLink BarItemName="biReviewDeleteOneComment"/>
+                                            <dxb:BarButtonItemLink BarItemName="biReviewDeleteAllCommentsShown"/>
+                                            <dxb:BarButtonItemLink BarItemName="biReviewDeleteAllComments"/>
+                                        </dxb:BarSubItem.ItemLinks>
+                                    </dxb:BarSubItem>
+                                    <dxb:BarButtonItem x:Name="biReviewDeleteOneComment" Command="{Binding ReviewDeleteOneComment, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biReviewDeleteAllCommentsShown" Command="{Binding ReviewDeleteAllCommentsShown, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biReviewDeleteAllComments" Command="{Binding ReviewDeleteAllComments, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biReviewPreviousComment" Command="{Binding ReviewPreviousComment, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biReviewNextComment" Command="{Binding ReviewNextComment, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biReviewViewComment" Command="{Binding ReviewViewComment, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxre:ReviewersBarSubItem x:Name="biReviewReviewers" Command="{Binding ReviewReviewers, Mode=OneTime, Source={StaticResource commands}}" />
+                                    <dxb:BarCheckItem x:Name="biReviewReviewingPane" Command="{Binding ReviewReviewingPane, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biViewDraft" Command="{Binding ViewDraft, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biViewPrintLayout" Command="{Binding ViewPrintLayout, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biViewSimple" Command="{Binding ViewSimple, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biViewHorizontalRuler" Command="{Binding ViewHorizontalRuler, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biViewVerticalRuler" Command="{Binding ViewVerticalRuler, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biViewZoomOut" Command="{Binding ViewZoomOut, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biViewZoomIn" Command="{Binding ViewZoomIn, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biGoToHeader" Command="{Binding GoToHeader, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biGoToFooter" Command="{Binding GoToFooter, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biHeaderFooterGoToPrevious" Command="{Binding HeaderFooterGoToPrevious, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biHeaderFooterGoToNext" Command="{Binding HeaderFooterGoToNext, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biHeaderFooterLinkToPrevious" Command="{Binding HeaderFooterLinkToPrevious, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biHeaderFooterDifferentFirstPage" Command="{Binding HeaderFooterDifferentFirstPage, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biHeaderFooterDifferentOddEvenPages" Command="{Binding HeaderFooterDifferentOddEvenPages, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biHeaderFooterClose" Command="{Binding HeaderFooterClose, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxre:BarSplitButtonColorEditItem x:Name="biTableChangeCellsShading" Command="{Binding TableChangeCellsShading, Mode=OneTime, Source={StaticResource commands}}">
+                                        <dxb:PopupControlContainerInfo>
+                                            <dxe:ColorEdit EditValue="{Binding EditValue, ElementName=biTableChangeCellsShading, Mode=TwoWay}" ShowDefaultColorButton="False" ShowNoColorButton="True" ShowBorder="False"/>
+                                        </dxb:PopupControlContainerInfo>
+                                    </dxre:BarSplitButtonColorEditItem>
+                                    <dxb:BarSubItem x:Name="biTableChangeBorders" Command="{Binding TableChangeBorders, Mode=OneTime, Source={StaticResource commands}}">
+                                        <dxb:BarSubItem.ItemLinks>
+                                            <dxb:BarCheckItemLink BarItemName="biTableToggleBottomBorder"/>
+                                            <dxb:BarCheckItemLink BarItemName="biTableToggleTopBorder"/>
+                                            <dxb:BarCheckItemLink BarItemName="biTableToggleLeftBorder"/>
+                                            <dxb:BarCheckItemLink BarItemName="biTableToggleRightBorder"/>
+                                            <dxb:BarButtonItemLink BarItemName="biTableResetAllBorders"/>
+                                            <dxb:BarCheckItemLink BarItemName="biTableToggleAllBorders"/>
+                                            <dxb:BarCheckItemLink BarItemName="biTableToggleOutsideBorder"/>
+                                            <dxb:BarCheckItemLink BarItemName="biTableToggleInsideBorder"/>
+                                            <dxb:BarCheckItemLink BarItemName="biTableToggleInsideHorizontalBorder"/>
+                                            <dxb:BarCheckItemLink BarItemName="biTableToggleInsideVerticalBorder"/>
+                                        </dxb:BarSubItem.ItemLinks>
+                                    </dxb:BarSubItem>
+                                    <dxb:BarCheckItem x:Name="biTableToggleBottomBorder" Command="{Binding TableToggleBottomBorder, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biTableToggleTopBorder" Command="{Binding TableToggleTopBorder, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biTableToggleLeftBorder" Command="{Binding TableToggleLeftBorder, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biTableToggleRightBorder" Command="{Binding TableToggleRightBorder, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biTableResetAllBorders" Command="{Binding TableResetAllBorders, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biTableToggleAllBorders" Command="{Binding TableToggleAllBorders, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biTableToggleOutsideBorder" Command="{Binding TableToggleOutsideBorder, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biTableToggleInsideBorder" Command="{Binding TableToggleInsideBorder, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biTableToggleInsideHorizontalBorder" Command="{Binding TableToggleInsideHorizontalBorder, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biTableToggleInsideVerticalBorder" Command="{Binding TableToggleInsideVerticalBorder, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxre:BarSplitButtonColorEditItem x:Name="biTableChangeCellsBorderColor" Command="{Binding TableChangeCellsBorderColor, Mode=OneTime, Source={StaticResource commands}}">
+                                        <dxb:PopupControlContainerInfo>
+                                            <dxe:ColorEdit EditValue="{Binding EditValue, ElementName=biTableChangeCellsBorderColor, Mode=TwoWay}" ShowBorder="False"/>
+                                        </dxb:PopupControlContainerInfo>
+                                    </dxre:BarSplitButtonColorEditItem>
+                                    <dxb:BarSubItem x:Name="biTableSelectElement" Command="{Binding TableSelectElement, Mode=OneTime, Source={StaticResource commands}}">
+                                        <dxb:BarSubItem.ItemLinks>
+                                            <dxb:BarCheckItemLink BarItemName="biTableSelectCell"/>
+                                            <dxb:BarCheckItemLink BarItemName="biTableSelectColumn"/>
+                                            <dxb:BarCheckItemLink BarItemName="biTableSelectRow"/>
+                                            <dxb:BarCheckItemLink BarItemName="biTableSelect"/>
+                                        </dxb:BarSubItem.ItemLinks>
+                                    </dxb:BarSubItem>
+                                    <dxb:BarCheckItem x:Name="biTableSelectCell" Command="{Binding TableSelectCell, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biTableSelectColumn" Command="{Binding TableSelectColumn, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biTableSelectRow" Command="{Binding TableSelectRow, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biTableSelect" Command="{Binding TableSelect, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biTableToggleShowGridlines" Command="{Binding TableToggleShowGridlines, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biTableProperties" Command="{Binding TableProperties, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarSubItem x:Name="biTableDeleteElement" Command="{Binding TableDeleteElement, Mode=OneTime, Source={StaticResource commands}}">
+                                        <dxb:BarSubItem.ItemLinks>
+                                            <dxb:BarCheckItemLink BarItemName="biTableDeleteCell"/>
+                                            <dxb:BarCheckItemLink BarItemName="biTableDeleteColumn"/>
+                                            <dxb:BarCheckItemLink BarItemName="biTableDeleteRow"/>
+                                            <dxb:BarCheckItemLink BarItemName="biTableDelete"/>
+                                        </dxb:BarSubItem.ItemLinks>
+                                    </dxb:BarSubItem>
+                                    <dxb:BarCheckItem x:Name="biTableDeleteCell" Command="{Binding TableDeleteCell, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biTableDeleteColumn" Command="{Binding TableDeleteColumn, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biTableDeleteRow" Command="{Binding TableDeleteRow, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biTableDelete" Command="{Binding TableDelete, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biTableInsertRowAbove" Command="{Binding TableInsertRowAbove, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biTableInsertRowBelow" Command="{Binding TableInsertRowBelow, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biTableInsertColumnToLeft" Command="{Binding TableInsertColumnToLeft, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biTableInsertColumnToRight" Command="{Binding TableInsertColumnToRight, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biTableInsertCells" Command="{Binding TableInsertCells, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biTableMergeCells" Command="{Binding TableMergeCells, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biTableSplitCells" Command="{Binding TableSplitCells, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biTableSplit" Command="{Binding TableSplit, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarSubItem x:Name="biToggleTableAutoFit" Command="{Binding ToggleTableAutoFit, Mode=OneTime, Source={StaticResource commands}}">
+                                        <dxb:BarSubItem.ItemLinks>
+                                            <dxb:BarCheckItemLink BarItemName="biToggleTableAutoFitContents"/>
+                                            <dxb:BarCheckItemLink BarItemName="biToggleTableAutoFitWindow"/>
+                                            <dxb:BarCheckItemLink BarItemName="biToggleTableFixedColumnWidth"/>
+                                        </dxb:BarSubItem.ItemLinks>
+                                    </dxb:BarSubItem>
+                                    <dxb:BarCheckItem x:Name="biToggleTableAutoFitContents" Command="{Binding ToggleTableAutoFitContents, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biToggleTableAutoFitWindow" Command="{Binding ToggleTableAutoFitWindow, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biToggleTableFixedColumnWidth" Command="{Binding ToggleTableFixedColumnWidth, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biTableToggleCellsTopLeftAlignment" Command="{Binding TableToggleCellsTopLeftAlignment, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biTableToggleCellsTopCenterAlignment" Command="{Binding TableToggleCellsTopCenterAlignment, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biTableToggleCellsTopRightAlignment" Command="{Binding TableToggleCellsTopRightAlignment, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biTableToggleCellsMiddleLeftAlignment" Command="{Binding TableToggleCellsMiddleLeftAlignment, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biTableToggleCellsMiddleCenterAlignment" Command="{Binding TableToggleCellsMiddleCenterAlignment, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biTableToggleCellsMiddleRightAlignment" Command="{Binding TableToggleCellsMiddleRightAlignment, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biTableToggleCellsBottomLeftAlignment" Command="{Binding TableToggleCellsBottomLeftAlignment, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biTableToggleCellsBottomCenterAlignment" Command="{Binding TableToggleCellsBottomCenterAlignment, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biTableToggleCellsBottomRightAlignment" Command="{Binding TableToggleCellsBottomRightAlignment, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biTableOptions" Command="{Binding TableOptions, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxre:BarSplitButtonColorEditItem x:Name="biPictureShapeFillColor" Command="{Binding PictureShapeFillColor, Mode=OneTime, Source={StaticResource commands}}">
+                                        <dxb:PopupControlContainerInfo>
+                                            <dxe:ColorEdit EditValue="{Binding EditValue, ElementName=biPictureShapeFillColor, Mode=TwoWay}" ShowDefaultColorButton="False" ShowNoColorButton="True" ShowBorder="False"/>
+                                        </dxb:PopupControlContainerInfo>
+                                    </dxre:BarSplitButtonColorEditItem>
+                                    <dxre:BarSplitButtonColorEditItem x:Name="biPictureShapeOutlineColor" Command="{Binding PictureShapeOutlineColor, Mode=OneTime, Source={StaticResource commands}}">
+                                        <dxb:PopupControlContainerInfo>
+                                            <dxe:ColorEdit EditValue="{Binding EditValue, ElementName=biPictureShapeOutlineColor, Mode=TwoWay}" ShowDefaultColorButton="False" ShowNoColorButton="True" ShowBorder="False"/>
+                                        </dxb:PopupControlContainerInfo>
+                                    </dxre:BarSplitButtonColorEditItem>
+                                    <dxb:BarSubItem x:Name="biPictureWrapText" Command="{Binding PictureWrapText, Mode=OneTime, Source={StaticResource commands}}">
+                                        <dxb:BarSubItem.ItemLinks>
+                                            <dxb:BarCheckItemLink BarItemName="biPictureWrapTextSquare"/>
+                                            <dxb:BarCheckItemLink BarItemName="biPictureWrapTextTight"/>
+                                            <dxb:BarCheckItemLink BarItemName="biPictureWrapTextThrough"/>
+                                            <dxb:BarCheckItemLink BarItemName="biPictureWrapTextTopAndBottom"/>
+                                            <dxb:BarCheckItemLink BarItemName="biPictureWrapTextBehind"/>
+                                            <dxb:BarCheckItemLink BarItemName="biPictureWrapTextInFrontOf"/>
+                                        </dxb:BarSubItem.ItemLinks>
+                                    </dxb:BarSubItem>
+                                    <dxb:BarCheckItem x:Name="biPictureWrapTextSquare" Command="{Binding PictureWrapTextSquare, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biPictureWrapTextTight" Command="{Binding PictureWrapTextTight, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biPictureWrapTextThrough" Command="{Binding PictureWrapTextThrough, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biPictureWrapTextTopAndBottom" Command="{Binding PictureWrapTextTopAndBottom, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biPictureWrapTextBehind" Command="{Binding PictureWrapTextBehind, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarCheckItem x:Name="biPictureWrapTextInFrontOf" Command="{Binding PictureWrapTextInFrontOf, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarSubItem x:Name="biPicturePosition" Command="{Binding PicturePosition, Mode=OneTime, Source={StaticResource commands}}">
+                                        <dxb:BarSubItem.ItemLinks>
+                                            <dxb:BarButtonItemLink BarItemName="biPictureTopLeftAlignment"/>
+                                            <dxb:BarButtonItemLink BarItemName="biPictureTopCenterAlignment"/>
+                                            <dxb:BarButtonItemLink BarItemName="biPictureTopRightAlignment"/>
+                                            <dxb:BarButtonItemLink BarItemName="biPictureMiddleLeftAlignment"/>
+                                            <dxb:BarButtonItemLink BarItemName="biPictureMiddleCenterAlignment"/>
+                                            <dxb:BarButtonItemLink BarItemName="biPictureMiddleRightAlignment"/>
+                                            <dxb:BarButtonItemLink BarItemName="biPictureBottomLeftAlignment"/>
+                                            <dxb:BarButtonItemLink BarItemName="biPictureBottomCenterAlignment"/>
+                                            <dxb:BarButtonItemLink BarItemName="biPictureBottomRightAlignment"/>
+                                        </dxb:BarSubItem.ItemLinks>
+                                    </dxb:BarSubItem>
+                                    <dxb:BarButtonItem x:Name="biPictureTopLeftAlignment" Command="{Binding PictureTopLeftAlignment, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biPictureTopCenterAlignment" Command="{Binding PictureTopCenterAlignment, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biPictureTopRightAlignment" Command="{Binding PictureTopRightAlignment, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biPictureMiddleLeftAlignment" Command="{Binding PictureMiddleLeftAlignment, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biPictureMiddleCenterAlignment" Command="{Binding PictureMiddleCenterAlignment, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biPictureMiddleRightAlignment" Command="{Binding PictureMiddleRightAlignment, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biPictureBottomLeftAlignment" Command="{Binding PictureBottomLeftAlignment, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biPictureBottomCenterAlignment" Command="{Binding PictureBottomCenterAlignment, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biPictureBottomRightAlignment" Command="{Binding PictureBottomRightAlignment, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarSubItem x:Name="biPictureBringForwardPlaceholder" Command="{Binding PictureBringForwardPlaceholder, Mode=OneTime, Source={StaticResource commands}}">
+                                        <dxb:BarSubItem.ItemLinks>
+                                            <dxb:BarButtonItemLink BarItemName="biPictureBringForward"/>
+                                            <dxb:BarButtonItemLink BarItemName="biPictureBringToFront"/>
+                                            <dxb:BarButtonItemLink BarItemName="biPictureBringInFrontOfText"/>
+                                        </dxb:BarSubItem.ItemLinks>
+                                    </dxb:BarSubItem>
+                                    <dxb:BarButtonItem x:Name="biPictureBringForward" Command="{Binding PictureBringForward, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biPictureBringToFront" Command="{Binding PictureBringToFront, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biPictureBringInFrontOfText" Command="{Binding PictureBringInFrontOfText, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarSubItem x:Name="biPictureSendBackwardPlaceholder" Command="{Binding PictureSendBackwardPlaceholder, Mode=OneTime, Source={StaticResource commands}}">
+                                        <dxb:BarSubItem.ItemLinks>
+                                            <dxb:BarButtonItemLink BarItemName="biPictureSendBackward"/>
+                                            <dxb:BarButtonItemLink BarItemName="biPictureSendToBack"/>
+                                            <dxb:BarButtonItemLink BarItemName="biPictureSendBehindText"/>
+                                        </dxb:BarSubItem.ItemLinks>
+                                    </dxb:BarSubItem>
+                                    <dxb:BarButtonItem x:Name="biPictureSendBackward" Command="{Binding PictureSendBackward, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biPictureSendToBack" Command="{Binding PictureSendToBack, Mode=OneTime, Source={StaticResource commands}}"/>
+                                    <dxb:BarButtonItem x:Name="biPictureSendBehindText" Command="{Binding PictureSendBehindText, Mode=OneTime, Source={StaticResource commands}}"/>
+                                </dxb:BarManager.Items>
+                                <!--<DockPanel>
 
         <dxre:RichEditControl x:Name="richEditControl" BarManager="{Binding ElementName=barManager, Mode=OneTime}" CommandBarStyle="Empty" HorizontalAlignment="Stretch" Margin="0" VerticalAlignment="Stretch" />
       </DockPanel>-->
-              </dxb:BarManager>
+                            </dxb:BarManager>
 
-						    <Border Grid.Row="1" Background="White" x:Name="TabBorder">
-              <TabControl x:Name="TabControlNotice">
+                            <Border Grid.Row="1" Background="White" x:Name="TabBorder">
+                                <TabControl x:Name="TabControlNotice">
 
-                <TabItem Header="Notice1" IsSelected="True" x:Name="TabItem1_Notice">
-                  <TextBox x:Name="TextboxNotice"
-                              Text="{val:ValidationBinding Path=Notice, UpdateSourceTrigger=PropertyChanged}"
-                              VerticalAlignment="Stretch"
-                              AcceptsReturn="True" VerticalScrollBarVisibility="Auto"
-                              HorizontalScrollBarVisibility="Hidden" TextWrapping="Wrap"
-                              AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True"/>
-                </TabItem>
+                                    <TabItem Header="Notice1" IsSelected="True" x:Name="TabItem1_Notice">
+                                        <Grid>
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="*" />
+                                                <ColumnDefinition Width="Auto" />
+                                            </Grid.ColumnDefinitions>
+                                            <Grid.RowDefinitions>
+                                                <RowDefinition Height="Auto" />
+                                                <RowDefinition Height="*" />
+                                            </Grid.RowDefinitions>
 
-                <TabItem Header="RTF1"  x:Name="TabitemRtf1Note" Visibility="Collapsed" Selector.Selected="tabitem_RtfDokuSelected">
-                  
-                </TabItem>
+                                            <DockPanel Grid.Column="0" Grid.Row="0" HorizontalAlignment="Left">
+                                                <Button Margin="3" Content="1" FontFamily="Webdings" Click="FullscreenBtn_Click" IsTabStop="False"/>
+                                                <Button Margin="3" Content="A+" HorizontalAlignment="Center" Click="IncreaseFontSizeBtn_Click" IsTabStop="False"/>
+                                                <Button Margin="3" Content="A-" Click="DecreaseFontSizeBtn_Click" IsTabStop="False"/>
+                                            </DockPanel>
 
-                <TabItem Header="Notice2"  x:Name="TabItem2_Notice">
-                  <TextBox    x:Name="TextboxNotice2"
-                              VerticalAlignment="Stretch"
-                              Text="{val:ValidationBinding Path=Notice2, UpdateSourceTrigger=PropertyChanged}"
-                              AcceptsReturn="True" VerticalScrollBarVisibility="Auto"
-                              HorizontalScrollBarVisibility="Hidden" TextWrapping="Wrap"
-                              AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True" />
-                </TabItem>
+                                            <Button Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TextbausteineButton1" Content="Textbausteine" Click="ButtonBase_OnClick" IsTabStop="False"/>
 
-                <TabItem Header="RTF2"  x:Name="TabitemRtf2Note" Visibility="Collapsed" Selector.Selected="tabitem_RtfDokuSelected">
-                  
-                </TabItem>
+                                            <TextBox x:Name="TextboxNotice" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2"
+                                 Text="{val:ValidationBinding Path=Notice, UpdateSourceTrigger=PropertyChanged}"
+                                 VerticalAlignment="Stretch" FontSize="{Binding Path=DocumentationTextBoxFontSize, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type zeit:ServiceRecordEditView}}}"
+                                 AcceptsReturn="True" VerticalScrollBarVisibility="Auto"
+                                 HorizontalScrollBarVisibility="Hidden" TextWrapping="Wrap"
+                                 AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True"/>
+                                        </Grid>
+                                    </TabItem>
 
-                <TabItem Header="Notice3" x:Name="TabItem3_Notice">
-                  <TextBox    x:Name="TextboxNotice3"
-                              VerticalAlignment="Stretch"
-                              Text="{val:ValidationBinding Path=Notice3, UpdateSourceTrigger=PropertyChanged}"
-                              AcceptsReturn="True" VerticalScrollBarVisibility="Auto"
-                              HorizontalScrollBarVisibility="Hidden" TextWrapping="Wrap"
-                              AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True" />
-                </TabItem>
+                                    <TabItem Header="RTF1"  x:Name="TabitemRtf1Note" Visibility="Collapsed" Selector.Selected="tabitem_RtfDokuSelected">
 
-                <TabItem Header="RTF3"  x:Name="TabitemRtf3Note" Visibility="Collapsed" Selector.Selected="tabitem_RtfDokuSelected">
-                  
-                </TabItem>
+                                    </TabItem>
 
-                <TabItem Header="Notice4" x:Name="TabItem4_Notice">
-                  <TextBox    x:Name="TextboxNotice4"
-                              VerticalAlignment="Stretch"
-                              Text="{val:ValidationBinding Path=Notice4, UpdateSourceTrigger=PropertyChanged}"
-                              AcceptsReturn="True" VerticalScrollBarVisibility="Auto"
-                              HorizontalScrollBarVisibility="Hidden" TextWrapping="Wrap"
-                              AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True" />
-                </TabItem>
+                                    <TabItem Header="Notice2"  x:Name="TabItem2_Notice">
+                                        <Grid>
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="*" />
+                                                <ColumnDefinition Width="Auto" />
+                                            </Grid.ColumnDefinitions>
+                                            <Grid.RowDefinitions>
+                                                <RowDefinition Height="Auto" />
+                                                <RowDefinition Height="*" />
+                                            </Grid.RowDefinitions>
 
-                <TabItem Header="RTF4"  x:Name="TabitemRtf4Note" Visibility="Collapsed" Selector.Selected="tabitem_RtfDokuSelected">
-                  
-                </TabItem>
+                                            <DockPanel Grid.Column="0" Grid.Row="0" HorizontalAlignment="Left">
+                                                <Button Margin="3" Content="1" FontFamily="Webdings" Click="FullscreenBtn_Click" IsTabStop="False"/>
+                                                <Button Margin="3" Content="A+" HorizontalAlignment="Center" Click="IncreaseFontSizeBtn_Click" IsTabStop="False"/>
+                                                <Button Margin="3" Content="A-" Click="DecreaseFontSizeBtn_Click" IsTabStop="False"/>
+                                            </DockPanel>
 
-                <TabItem Header="Notice5" x:Name="TabItem5_Notice">
-                  <TextBox   x:Name="TextboxNotice5"
-                             VerticalAlignment="Stretch"
-                             Text="{val:ValidationBinding Path=Notice5, UpdateSourceTrigger=PropertyChanged}"
-                             AcceptsReturn="True" VerticalScrollBarVisibility="Auto"
-                             HorizontalScrollBarVisibility="Hidden" TextWrapping="Wrap"
-                             AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True" />
-                </TabItem>
+                                            <Button Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TextbausteineButton2" Content="Textbausteine" Click="ButtonBase_OnClick" IsTabStop="False"/>
 
-                <TabItem Header="RTF5"  x:Name="TabitemRtf5Note" Visibility="Collapsed" Selector.Selected="tabitem_RtfDokuSelected">
-                  
-                </TabItem>
-                
-              </TabControl>
+                                            <TextBox x:Name="TextboxNotice2" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2"
+                                 Text="{val:ValidationBinding Path=Notice2, UpdateSourceTrigger=PropertyChanged}"
+                                 VerticalAlignment="Stretch" FontSize="{Binding Path=DocumentationTextBoxFontSize, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type zeit:ServiceRecordEditView}}}"
+                                 AcceptsReturn="True" VerticalScrollBarVisibility="Auto"
+                                 HorizontalScrollBarVisibility="Hidden" TextWrapping="Wrap"
+                                 AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True"/>
+                                        </Grid>
+                                    </TabItem>
+
+                                    <TabItem Header="RTF2"  x:Name="TabitemRtf2Note" Visibility="Collapsed" Selector.Selected="tabitem_RtfDokuSelected">
+
+                                    </TabItem>
+
+                                    <TabItem Header="Notice3" x:Name="TabItem3_Notice">
+                                        <Grid>
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="*" />
+                                                <ColumnDefinition Width="Auto" />
+                                            </Grid.ColumnDefinitions>
+                                            <Grid.RowDefinitions>
+                                                <RowDefinition Height="Auto" />
+                                                <RowDefinition Height="*" />
+                                            </Grid.RowDefinitions>
+
+                                            <DockPanel Grid.Column="0" Grid.Row="0" HorizontalAlignment="Left">
+                                                <Button Margin="3" Content="1" FontFamily="Webdings" Click="FullscreenBtn_Click" IsTabStop="False"/>
+                                                <Button Margin="3" Content="A+" HorizontalAlignment="Center" Click="IncreaseFontSizeBtn_Click" IsTabStop="False"/>
+                                                <Button Margin="3" Content="A-" Click="DecreaseFontSizeBtn_Click" IsTabStop="False"/>
+                                            </DockPanel>
+
+                                            <Button Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TextbausteineButton3" Content="Textbausteine" Click="ButtonBase_OnClick" IsTabStop="False"/>
+
+                                            <TextBox x:Name="TextboxNotice3" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2"
+                                                     Text="{val:ValidationBinding Path=Notice3, UpdateSourceTrigger=PropertyChanged}"
+                                                     VerticalAlignment="Stretch" FontSize="{Binding Path=DocumentationTextBoxFontSize, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type zeit:ServiceRecordEditView}}}"
+                                                     AcceptsReturn="True" VerticalScrollBarVisibility="Auto"
+                                                     HorizontalScrollBarVisibility="Hidden" TextWrapping="Wrap"
+                                                     AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True"/>
+                                        </Grid>
+                                    </TabItem>
+
+                                    <TabItem Header="RTF3"  x:Name="TabitemRtf3Note" Visibility="Collapsed" Selector.Selected="tabitem_RtfDokuSelected">
+
+                                    </TabItem>
+
+                                    <TabItem Header="Notice4" x:Name="TabItem4_Notice">
+                                        <Grid>
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="*" />
+                                                <ColumnDefinition Width="Auto" />
+                                            </Grid.ColumnDefinitions>
+                                            <Grid.RowDefinitions>
+                                                <RowDefinition Height="Auto" />
+                                                <RowDefinition Height="*" />
+                                            </Grid.RowDefinitions>
+
+                                            <DockPanel Grid.Column="0" Grid.Row="0" HorizontalAlignment="Left">
+                                                <Button Margin="3" Content="1" FontFamily="Webdings" Click="FullscreenBtn_Click" IsTabStop="False"/>
+                                                <Button Margin="3" Content="A+" HorizontalAlignment="Center" Click="IncreaseFontSizeBtn_Click" IsTabStop="False"/>
+                                                <Button Margin="3" Content="A-" Click="DecreaseFontSizeBtn_Click" IsTabStop="False"/>
+                                            </DockPanel>
+
+                                            <Button Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TextbausteineButton4" Content="Textbausteine" Click="ButtonBase_OnClick" IsTabStop="False"/>
+
+                                            <TextBox x:Name="TextboxNotice4" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2"
+                                 Text="{val:ValidationBinding Path=Notice4, UpdateSourceTrigger=PropertyChanged}"
+                                 VerticalAlignment="Stretch" FontSize="{Binding Path=DocumentationTextBoxFontSize, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type zeit:ServiceRecordEditView}}}"
+                                 AcceptsReturn="True" VerticalScrollBarVisibility="Auto"
+                                 HorizontalScrollBarVisibility="Hidden" TextWrapping="Wrap"
+                                 AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True"/>
+                                        </Grid>
+                                    </TabItem>
+
+                                    <TabItem Header="RTF4"  x:Name="TabitemRtf4Note" Visibility="Collapsed" Selector.Selected="tabitem_RtfDokuSelected">
+
+                                    </TabItem>
+
+                                    <TabItem Header="Notice5" x:Name="TabItem5_Notice">
+                                        <Grid>
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="*" />
+                                                <ColumnDefinition Width="Auto" />
+                                            </Grid.ColumnDefinitions>
+                                            <Grid.RowDefinitions>
+                                                <RowDefinition Height="Auto" />
+                                                <RowDefinition Height="*" />
+                                            </Grid.RowDefinitions>
+
+                                            <DockPanel Grid.Column="0" Grid.Row="0" HorizontalAlignment="Left">
+                                                <Button Margin="3" Content="1" FontFamily="Webdings" Click="FullscreenBtn_Click" IsTabStop="False"/>
+                                                <Button Margin="3" Content="A+" HorizontalAlignment="Center" Click="IncreaseFontSizeBtn_Click" IsTabStop="False"/>
+                                                <Button Margin="3" Content="A-" Click="DecreaseFontSizeBtn_Click" IsTabStop="False"/>
+                                            </DockPanel>
+
+                                            <Button Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TextbausteineButton5" Content="Textbausteine" Click="ButtonBase_OnClick" IsTabStop="False"/>
+
+                                            <TextBox x:Name="TextboxNotice5" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2"
+                                 Text="{val:ValidationBinding Path=Notice5, UpdateSourceTrigger=PropertyChanged}"
+                                 VerticalAlignment="Stretch" FontSize="{Binding Path=DocumentationTextBoxFontSize, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type zeit:ServiceRecordEditView}}}"
+                                 AcceptsReturn="True" VerticalScrollBarVisibility="Auto"
+                                 HorizontalScrollBarVisibility="Hidden" TextWrapping="Wrap"
+                                 AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True"/>
+                                        </Grid>
+                                    </TabItem>
+
+                                    <TabItem Header="RTF5"  x:Name="TabitemRtf5Note" Visibility="Collapsed" Selector.Selected="tabitem_RtfDokuSelected">
+
+                                    </TabItem>
+
+                                </TabControl>
+
+                            </Border>
+                        </Grid>
+                    </Grid>
 
-                </Border>
-            </Grid>
-					</Grid>
-                        
                 </Grid>
-                
+
                 <Border Grid.Row="2" Grid.ColumnSpan="3" Height="40" Margin="0,10,0,0" VerticalAlignment="Stretch" Background="#FF000000">
-					<Border.OpacityMask>
-						<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-							<GradientStop Color="#19000000" Offset="0" />
-							<GradientStop Color="#33FFFFFF" Offset="1" />
-						</LinearGradientBrush>
-					</Border.OpacityMask>
-				</Border>
-				<StackPanel Grid.ColumnSpan="3" Grid.Row="2" Orientation="Horizontal" VerticalAlignment="Center" Height="Auto" Margin="5,10,0,0" HorizontalAlignment="Right">
-					<Button x:Name="btnSave" Content="Speichern und schließen" Margin="0,0,3,0" Command="ApplicationCommands.Save" Height="25" />
-					<Button x:Name="btnClose" Content="Abbrechen" Margin="0,0,3,0" Command="ApplicationCommands.Close" Height="25" />
-				</StackPanel>
-                
+                    <Border.OpacityMask>
+                        <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                            <GradientStop Color="#19000000" Offset="0" />
+                            <GradientStop Color="#33FFFFFF" Offset="1" />
+                        </LinearGradientBrush>
+                    </Border.OpacityMask>
+                </Border>
+                <StackPanel Grid.ColumnSpan="3" Grid.Row="2" Orientation="Horizontal" VerticalAlignment="Center" Height="Auto" Margin="5,10,0,0" HorizontalAlignment="Right">
+                    <Button x:Name="btnSave" Content="Speichern und schließen" Margin="0,0,3,0" Command="ApplicationCommands.Save" Height="25" />
+                    <Button x:Name="btnClose" Content="Abbrechen" Margin="0,0,3,0" Command="ApplicationCommands.Close" Height="25" />
+                </StackPanel>
+                <Popup Margin="10" x:Name="popup_textbausteine" StaysOpen="False" Placement="MousePoint" Width="400" Height="400">
+                    <!--<localSearchView:TextModuleSearchView x:Name="textbausteineSearchView" ItemSelected="TextbausteineSearchView_OnItemSelected" />-->
+                    <localSearchView:TextModuleTreeSearchView x:Name="textbausteineSearchView" ItemSelected="TextModulesSearchView_OnItemSelected" />
+                </Popup>
 
             </Grid>
         </GroupBox>
-		<!--/uc:ShadowChrome-->
-	</Grid>
+        <!--/uc:ShadowChrome-->
+    </Grid>
 </localView:BeWoView>
\ No newline at end of file
diff --git a/BeWo/View/Detail/Zeiterfassung/ServiceRecordGroupEditView.xaml.cs b/BeWo/View/Detail/Zeiterfassung/ServiceRecordGroupEditView.xaml.cs
index b84011ae5..998ce5fec 100644
--- a/BeWo/View/Detail/Zeiterfassung/ServiceRecordGroupEditView.xaml.cs
+++ b/BeWo/View/Detail/Zeiterfassung/ServiceRecordGroupEditView.xaml.cs
@@ -19,6 +19,8 @@ using BS.Shared.Translation;
 using DevExpress.Xpf.Editors;
 using DevExpress.Xpf.RichEdit;
 using SupportConceptService = BeWo.Core.Service.SupportConceptService;
+using BS.Shared.Extensions;
+using BS.Shared.Core;
 
 namespace BeWo.View.Detail.Zeiterfassung
 {
@@ -41,12 +43,57 @@ namespace BeWo.View.Detail.Zeiterfassung
 
         private ServiceRecordVM _ServiceRecordVM;
 
+        private readonly List<TabItem> _NoticeTabItemList;
+
+        private readonly List<TabItem> _RTFNoticeTabItemList;
+
+        private readonly List<Button> _TextModuleButtonList;
+
+        private readonly List<TextBox> _NoticeTextBoxList;
+
+        private TextBox _GrosseDokuTextBox;
 
         public ServiceRecordGroupEditView()
         {
             InitializeComponent();
 
             Loaded += loaded;
+
+            _NoticeTabItemList = new List<TabItem>
+            {
+                TabItem1_Notice,
+                TabItem2_Notice,
+                TabItem3_Notice,
+                TabItem4_Notice,
+                TabItem5_Notice
+            };
+
+            _RTFNoticeTabItemList = new List<TabItem>
+            {
+                TabitemRtf1Note,
+                TabitemRtf2Note,
+                TabitemRtf3Note,
+                TabitemRtf4Note,
+                TabitemRtf5Note
+            };
+
+            _TextModuleButtonList = new List<Button>
+            {
+                TextbausteineButton1,
+                TextbausteineButton2,
+                TextbausteineButton3,
+                TextbausteineButton4,
+                TextbausteineButton5
+            };
+
+            _NoticeTextBoxList = new List<TextBox>
+            {
+                TextboxNotice,
+                TextboxNotice2,
+                TextboxNotice3,
+                TextboxNotice4,
+                TextboxNotice5
+            };
         }
 
         private void loaded(object sender, RoutedEventArgs e)
@@ -163,10 +210,19 @@ namespace BeWo.View.Detail.Zeiterfassung
                 btnSave.Visibility = Visibility.Hidden;
                 
                 
-                TabControlNotice.IsEnabled = true;
+                TextboxNotice.IsEnabled  = false;
+                TextboxNotice2.IsEnabled = false;
+                TextboxNotice3.IsEnabled = false;
+                TextboxNotice4.IsEnabled = false;
+                TextboxNotice5.IsEnabled = false;
                
 
             }
+
+            if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineAlleAnsehen) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineNurEigeneAnsehen))
+            {
+                _TextModuleButtonList.DoForEach(button => button.Visibility = Visibility.Collapsed);
+            }
         }
         
 
@@ -1144,5 +1200,180 @@ namespace BeWo.View.Detail.Zeiterfassung
                 });
             }
         }
+
+        private void IncreaseFontSizeBtn_Click(object sender, RoutedEventArgs e)
+        {
+            if (!BeWoApp.AppSettings.ShowRtfTextfield)
+            {
+                _NoticeTextBoxList.DoForEach(textBox => textBox.FontSize++);
+
+                BeWoApp.AppSettings.DocumentationFontSize = TextboxNotice.FontSize;
+            }
+        }
+
+        private void DecreaseFontSizeBtn_Click(object sender, RoutedEventArgs e)
+        {
+            if (!BeWoApp.AppSettings.ShowRtfTextfield)
+            {
+                if (TextboxNotice.FontSize <= 1 || TextboxNotice2.FontSize <= 1 ||
+                   TextboxNotice3.FontSize <= 1 ||
+                   TextboxNotice4.FontSize <= 1 || TextboxNotice5.FontSize <= 1)
+                {
+                    return;
+                }
+
+                _NoticeTextBoxList.DoForEach(textBox => textBox.FontSize--);
+
+                BeWoApp.AppSettings.DocumentationFontSize = TextboxNotice.FontSize;
+            }
+        }
+
+        private void FullscreenBtn_Click(object sender, RoutedEventArgs e)
+        {
+            var stackPanel = new StackPanel
+            {
+                Orientation = Orientation.Horizontal,
+                HorizontalAlignment = HorizontalAlignment.Left
+            };
+
+            var schriftVergroessern = new Button
+            {
+                Margin = new Thickness(3),
+                HorizontalAlignment = HorizontalAlignment.Left,
+                Content = "A+"
+            };
+            var schriftVerkleinern = new Button
+            {
+                Margin = new Thickness(3),
+                HorizontalAlignment = HorizontalAlignment.Left,
+                Content = "A-"
+            };
+            var textbausteine = new Button { Margin = new Thickness(3), HorizontalAlignment = HorizontalAlignment.Left, Content = "Textbausteine" };
+
+            textbausteine.Click += ButtonBase_OnClick;
+
+            if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineAlleAnsehen) &&
+                !BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineNurEigeneAnsehen))
+            {
+                textbausteine.Visibility = Visibility.Collapsed;
+            }
+
+            stackPanel.Children.Add(schriftVergroessern);
+            stackPanel.Children.Add(schriftVerkleinern);
+            stackPanel.Children.Add(textbausteine);
+
+            var header = Translator.Translate("Dokumentation");
+
+            if (TabItem1_Notice.IsSelected)
+            {
+                _GrosseDokuTextBox = ServiceRecordView2.InitMaximizedDocumentationTextBox(TextboxNotice);
+                header = TabItem1_Notice.Header.ToString();
+            }
+            else if (TabItem2_Notice.IsSelected)
+            {
+                _GrosseDokuTextBox = ServiceRecordView2.InitMaximizedDocumentationTextBox(TextboxNotice2);
+                header = TabItem2_Notice.Header.ToString();
+            }
+            else if (TabItem3_Notice.IsSelected)
+            {
+                _GrosseDokuTextBox = ServiceRecordView2.InitMaximizedDocumentationTextBox(TextboxNotice3);
+                header = TabItem3_Notice.Header.ToString();
+            }
+            else if (TabItem4_Notice.IsSelected)
+            {
+                _GrosseDokuTextBox = ServiceRecordView2.InitMaximizedDocumentationTextBox(TextboxNotice4);
+                header = TabItem4_Notice.Header.ToString();
+            }
+            else if (TabItem5_Notice.IsSelected)
+            {
+                _GrosseDokuTextBox = ServiceRecordView2.InitMaximizedDocumentationTextBox(TextboxNotice5);
+                header = TabItem5_Notice.Header.ToString();
+            }
+
+            schriftVergroessern.Click += delegate (object o, RoutedEventArgs args)
+            {
+                IncreaseFontSizeBtn_Click(o, args);
+                _GrosseDokuTextBox.FontSize = TextboxNotice.FontSize;
+            };
+
+            schriftVerkleinern.Click += delegate (object o, RoutedEventArgs args)
+            {
+                DecreaseFontSizeBtn_Click(o, args);
+                _GrosseDokuTextBox.FontSize = TextboxNotice.FontSize;
+            };
+
+            Grid.SetRow(stackPanel, 0);
+            Grid.SetRow(_GrosseDokuTextBox, 1);
+
+            _GrosseDokuTextBox.SpellCheck.IsEnabled = true;
+
+            var rootGrid2 = new Grid();
+            rootGrid2.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
+            rootGrid2.RowDefinitions.Add(new RowDefinition { Height = new GridLength(1, GridUnitType.Star) });
+            rootGrid2.Children.Add(stackPanel);
+            rootGrid2.Children.Add(_GrosseDokuTextBox);
+
+            var neunzigProzentHoehe = MainControl.ActualHeight * .9;
+            var neunzigProzentBreite = MainControl.ActualWidth * .9;
+
+            var beWoWindow = new BeWoWindow(rootGrid2, "MainContentGroupBoxWithMinimizeBtnStyle")
+            {
+                Width = neunzigProzentBreite,
+                Height = neunzigProzentHoehe,
+                rootGroupBox = { Header = header },
+                WindowStartupLocation = WindowStartupLocation.CenterScreen
+            };
+
+            beWoWindow.Closed += delegate
+            {
+                _GrosseDokuTextBox = null;
+            };
+
+            beWoWindow.ShowDialog();
+        }
+
+        private void ButtonBase_OnClick(object sender, RoutedEventArgs e)
+        {
+            ServiceFacade.DoOperationsServiceAsync(s => s.GetTextModules(false, BeWoApp.LoggedOnEmployeeOid.Value, BeWoApp.HasLoggedOnUserRight(new[] { UserRightType.TextbausteineAlleAnsehen, UserRightType.ViewAll }), false), textModules => this.Dispatch(delegate
+            {
+                popup_textbausteine.IsOpen = true;
+
+                if (textbausteineSearchView.ServiceCategoryOid > 0)
+                {
+                    var selectedTextmodules = textModules.Where(w => w.ServiceCategory != null && w.ServiceCategory.ServiceCategoryOid == textbausteineSearchView.ServiceCategoryOid || w.ServiceCategory == null).ToList();
+
+                    textModules = Utils.GetParentTextModules(selectedTextmodules);
+                    textModules.AddRangeIfElementsNotIn(selectedTextmodules);
+                }
+
+                textbausteineSearchView.InitSearchView(textModules);
+            }));
+        }
+
+        private void TextModulesSearchView_OnItemSelected(object sender, EventArgs<TextModuleDC> e)
+        {
+            if (TabItem1_Notice.IsSelected)
+            {
+                ServiceRecordView2.AddTextModuleToTextBox(e.Data.Text, TextboxNotice, _GrosseDokuTextBox);
+            }
+            else if (TabItem2_Notice.IsSelected)
+            {
+                ServiceRecordView2.AddTextModuleToTextBox(e.Data.Text, TextboxNotice2, _GrosseDokuTextBox);
+            }
+            else if (TabItem3_Notice.IsSelected)
+            {
+                ServiceRecordView2.AddTextModuleToTextBox(e.Data.Text, TextboxNotice3, _GrosseDokuTextBox);
+            }
+            else if (TabItem4_Notice.IsSelected)
+            {
+                ServiceRecordView2.AddTextModuleToTextBox(e.Data.Text, TextboxNotice4, _GrosseDokuTextBox);
+            }
+            else if (TabItem5_Notice.IsSelected)
+            {
+                ServiceRecordView2.AddTextModuleToTextBox(e.Data.Text, TextboxNotice5, _GrosseDokuTextBox);
+            }
+
+            popup_textbausteine.IsOpen = false;
+        }
     }
 }
\ No newline at end of file
diff --git a/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml b/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml
index f1b55aecf..d256670f4 100644
--- a/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml
+++ b/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml
@@ -926,15 +926,15 @@
 															  </Grid.RowDefinitions>
 
 															  <DockPanel Grid.Column="0" Grid.Row="0" HorizontalAlignment="Left">
-																  <Button Margin="3" Content="1" FontFamily="Webdings" Click="VollbildDokuButton_OnClick" />
-																  <Button Margin="3" Content="A+" HorizontalAlignment="Center" Click="IncreaseFontSizeBtn_Click" />
-																  <Button Margin="3" Content="A-" Click="DecreaseFontSizeBtn_Click" />
+                                                                    <Button Margin="3" Content="1" FontFamily="Webdings" Click="VollbildDokuButton_OnClick" IsTabStop="False" />
+                                                                    <Button Margin="3" Content="A+d" HorizontalAlignment="Center" Click="IncreaseFontSizeBtn_Click" IsTabStop="False" />
+                                                                    <Button Margin="3" Content="A-" Click="DecreaseFontSizeBtn_Click" TabIndex="999" IsTabStop="False" />
 															  </DockPanel>
 
-															  <Button Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TextbausteineBearbeitenButton1" Content="@" FontFamily="Webdings" Click="EditTextbausteineClick" ToolTip="Textbausteine bearbeiten" />
+                                                                <Button Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TextbausteineBearbeitenButton1" Content="@" FontFamily="Webdings" Click="EditTextbausteineClick" ToolTip="Textbausteine bearbeiten" IsTabStop="False"/>
 															  <!--<localViewControls:TextModuleTreeViewControl x:Name="TextModuleTreeViewControl1" Grid.Row="0" Grid.Column="2" Margin="3" TextModuleSelected="TextModuleTreeViewControl_OnTextModuleSelected" />-->
 
-														      <Button Grid.Row="0" Grid.Column="2" Margin="3" x:Name="TextbausteineButton1" Content="Textbausteine" Click="ButtonBase_OnClick" />
+                                                                <Button Grid.Row="0" Grid.Column="2" Margin="3" x:Name="TextbausteineButton1" Content="Textbausteine" Click="ButtonBase_OnClick" IsTabStop="False"/>
                               
 															  <TextBox Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3" x:Name="dokumentationsTextBox"
 																	  Text="{val:ValidationBinding Path=PrototypeVM.Notice, UpdateSourceTrigger=PropertyChanged}"
@@ -957,12 +957,12 @@
 															  </Grid.RowDefinitions>
 
 															  <DockPanel Grid.Column="0" Grid.Row="0" HorizontalAlignment="Left">
-																  <Button Margin="3" Content="1" FontFamily="Webdings" Click="RTFVollbildDokuButton_OnClick" />
+                                                                    <Button Margin="3" Content="1" FontFamily="Webdings" Click="RTFVollbildDokuButton_OnClick" IsTabStop="False"/>
 															  </DockPanel>
 
-															  <Button Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TextbausteineBearbeitenButtonRTF1" Content="@" FontFamily="Webdings" Click="EditTextbausteineClick" ToolTip="Textbausteine bearbeiten" />
+                                                                <Button Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TextbausteineBearbeitenButtonRTF1" Content="@" FontFamily="Webdings" Click="EditTextbausteineClick" ToolTip="Textbausteine bearbeiten" IsTabStop="False"/>
 															  <!--<localViewControls:TextModuleTreeViewControl x:Name="TextModuleTreeViewControlRTF1" Grid.Row="0" Grid.Column="2" Margin="3" TextModuleSelected="TextModuleTreeViewControl_OnTextModuleSelected" />-->
-														      <Button Grid.Row="0" Grid.Column="2" Margin="3" x:Name="TextbausteineButtonRtf1" Content="Textbausteine" Click="ButtonBase_OnClick" />
+                                                                <Button Grid.Row="0" Grid.Column="2" Margin="3" x:Name="TextbausteineButtonRtf1" Content="Textbausteine" Click="ButtonBase_OnClick" IsTabStop="False"/>
                               
 														      <dxre:RichEditControl x:Name="richEditControl1" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3" HorizontalAlignment="Stretch" Margin="0" VerticalAlignment="Stretch" ActiveViewType="Simple" ContentChanged="RichEditControl1_OnContentChanged">
                                     <dxre:RichEditControl.BehaviorOptions>
@@ -988,14 +988,14 @@
 															  </Grid.RowDefinitions>
 
 															  <DockPanel Grid.Column="0" Grid.Row="0" HorizontalAlignment="Left">
-																  <Button Margin="3" Content="1" FontFamily="Webdings" Click="VollbildDokuButton_OnClick" />
-																  <Button Margin="3" Content="A+" HorizontalAlignment="Center" Click="IncreaseFontSizeBtn_Click" />
-																  <Button Margin="3" Content="A-" Click="DecreaseFontSizeBtn_Click" />
+                                                                    <Button Margin="3" Content="1" FontFamily="Webdings" Click="VollbildDokuButton_OnClick" IsTabStop="False"/>
+                                                                    <Button Margin="3" Content="A+" HorizontalAlignment="Center" Click="IncreaseFontSizeBtn_Click" IsTabStop="False"/>
+                                                                    <Button Margin="3" Content="A-" Click="DecreaseFontSizeBtn_Click" IsTabStop="False"/>
 															  </DockPanel>
 
-															  <Button Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TextbausteineBearbeitenButton2" Content="@" FontFamily="Webdings" Click="EditTextbausteineClick" ToolTip="Textbausteine bearbeiten" />
+                                                                <Button Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TextbausteineBearbeitenButton2" Content="@" FontFamily="Webdings" Click="EditTextbausteineClick" ToolTip="Textbausteine bearbeiten" IsTabStop="False"/>
 															  <!--<localViewControls:TextModuleTreeViewControl x:Name="TextModuleTreeViewControl2" Grid.Row="0" Grid.Column="2" Margin="3" TextModuleSelected="TextModuleTreeViewControl_OnTextModuleSelected" />-->
-														      <Button Grid.Row="0" Grid.Column="2" Margin="3" x:Name="TextbausteineButton2" Content="Textbausteine" Click="ButtonBase_OnClick" />
+                                                                <Button Grid.Row="0" Grid.Column="2" Margin="3" x:Name="TextbausteineButton2" Content="Textbausteine" Click="ButtonBase_OnClick" IsTabStop="False"/>
                               
 															  <TextBox Grid.Row="1" Grid.ColumnSpan="3" Grid.Column="0" x:Name="dokumentationsTextBox2"
                                                                     VerticalAlignment="Stretch"
@@ -1019,12 +1019,12 @@
 															  </Grid.RowDefinitions>
 
 															  <DockPanel Grid.Column="0" Grid.Row="0" HorizontalAlignment="Left">
-																  <Button Margin="3" Content="1" FontFamily="Webdings" Click="RTFVollbildDokuButton_OnClick" />
+                                                                    <Button Margin="3" Content="1" FontFamily="Webdings" Click="RTFVollbildDokuButton_OnClick" IsTabStop="False"/>
 															  </DockPanel>
 
-															  <Button Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TextbausteineBearbeitenButtonRTF2" Content="@" FontFamily="Webdings" Click="EditTextbausteineClick" ToolTip="Textbausteine bearbeiten" />
+                                                                <Button Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TextbausteineBearbeitenButtonRTF2" Content="@" FontFamily="Webdings" Click="EditTextbausteineClick" ToolTip="Textbausteine bearbeiten" IsTabStop="False"/>
 															  <!--<localViewControls:TextModuleTreeViewControl x:Name="TextModuleTreeViewControlRTF2" Grid.Row="0" Grid.Column="2" Margin="3" TextModuleSelected="TextModuleTreeViewControl_OnTextModuleSelected" />-->
-														      <Button Grid.Row="0" Grid.Column="2" Margin="3" x:Name="TextbausteineButtonRtf2" Content="Textbausteine" Click="ButtonBase_OnClick" />
+                                                                <Button Grid.Row="0" Grid.Column="2" Margin="3" x:Name="TextbausteineButtonRtf2" Content="Textbausteine" Click="ButtonBase_OnClick" IsTabStop="False"/>
 
                                 <dxre:RichEditControl x:Name="richEditControl2" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3" HorizontalAlignment="Stretch" Margin="0" VerticalAlignment="Stretch" ActiveViewType="Simple" ContentChanged="RichEditControl2_OnContentChanged">
 														          <dxre:RichEditControl.BehaviorOptions>
@@ -1050,14 +1050,14 @@
 															  </Grid.RowDefinitions>
 
 															  <DockPanel Grid.Column="0" Grid.Row="0" HorizontalAlignment="Left">
-																  <Button Margin="3" Content="1" FontFamily="Webdings" Click="VollbildDokuButton_OnClick" />
-																  <Button Margin="3" Content="A+" HorizontalAlignment="Center" Click="IncreaseFontSizeBtn_Click" />
-																  <Button Margin="3" Content="A-" Click="DecreaseFontSizeBtn_Click" />
+                                                                    <Button Margin="3" Content="1" FontFamily="Webdings" Click="VollbildDokuButton_OnClick" IsTabStop="False"/>
+                                                                    <Button Margin="3" Content="A+" HorizontalAlignment="Center" Click="IncreaseFontSizeBtn_Click" IsTabStop="False"/>
+                                                                    <Button Margin="3" Content="A-" Click="DecreaseFontSizeBtn_Click" IsTabStop="False"/>
 															  </DockPanel>
 
-															  <Button Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TextbausteineBearbeitenButton3" Content="@" FontFamily="Webdings" Click="EditTextbausteineClick" ToolTip="Textbausteine bearbeiten" />
+                                                                <Button Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TextbausteineBearbeitenButton3" Content="@" FontFamily="Webdings" Click="EditTextbausteineClick" ToolTip="Textbausteine bearbeiten" IsTabStop="False"/>
 															  <!--<localViewControls:TextModuleTreeViewControl x:Name="TextModuleTreeViewControl3" Grid.Row="0" Grid.Column="2" Margin="3" TextModuleSelected="TextModuleTreeViewControl_OnTextModuleSelected" />-->
-														      <Button Grid.Row="0" Grid.Column="2" Margin="3" x:Name="TextbausteineButton3" Content="Textbausteine" Click="ButtonBase_OnClick" />
+                                                                <Button Grid.Row="0" Grid.Column="2" Margin="3" x:Name="TextbausteineButton3" Content="Textbausteine" Click="ButtonBase_OnClick" IsTabStop="False"/>
                               
 															  <TextBox Grid.Row="1" Grid.ColumnSpan="3" Grid.Column="0" x:Name="dokumentationsTextBox3"
 																	  VerticalAlignment="Stretch"
@@ -1081,12 +1081,12 @@
 															  </Grid.RowDefinitions>
 
 															  <DockPanel Grid.Column="0" Grid.Row="0" HorizontalAlignment="Left">
-																  <Button Margin="3" Content="1" FontFamily="Webdings" Click="RTFVollbildDokuButton_OnClick" />
+                                                                    <Button Margin="3" Content="1" FontFamily="Webdings" Click="RTFVollbildDokuButton_OnClick" IsTabStop="False"/>
 															  </DockPanel>
 
-															  <Button Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TextbausteineBearbeitenButtonRTF3" Content="@" FontFamily="Webdings" Click="EditTextbausteineClick" ToolTip="Textbausteine bearbeiten" />
+                                                                <Button Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TextbausteineBearbeitenButtonRTF3" Content="@" FontFamily="Webdings" Click="EditTextbausteineClick" ToolTip="Textbausteine bearbeiten" IsTabStop="False"/>
 															  <!--<localViewControls:TextModuleTreeViewControl x:Name="TextModuleTreeViewControlRTF3" Grid.Row="0" Grid.Column="2" Margin="3" TextModuleSelected="TextModuleTreeViewControl_OnTextModuleSelected" />-->
-														      <Button Grid.Row="0" Grid.Column="2" Margin="3" x:Name="TextbausteineButtonRtf3" Content="Textbausteine" Click="ButtonBase_OnClick" />
+                                                                <Button Grid.Row="0" Grid.Column="2" Margin="3" x:Name="TextbausteineButtonRtf3" Content="Textbausteine" Click="ButtonBase_OnClick" IsTabStop="False"/>
                               
 															  <!--<dxre:RichEditControl Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3"/>-->
 														      <dxre:RichEditControl x:Name="richEditControl3" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3" HorizontalAlignment="Stretch" Margin="0" VerticalAlignment="Stretch" ActiveViewType="Simple" ContentChanged="RichEditControl3_OnContentChanged">
@@ -1112,14 +1112,14 @@
 															  </Grid.RowDefinitions>
 
 															  <DockPanel Grid.Column="0" Grid.Row="0" HorizontalAlignment="Left">
-																  <Button Margin="3" Content="1" FontFamily="Webdings" Click="VollbildDokuButton_OnClick" />
-																  <Button Margin="3" Content="A+" HorizontalAlignment="Center" Click="IncreaseFontSizeBtn_Click" />
-																  <Button Margin="3" Content="A-" Click="DecreaseFontSizeBtn_Click" />
+                                                                    <Button Margin="3" Content="1" FontFamily="Webdings" Click="VollbildDokuButton_OnClick" IsTabStop="False"/>
+                                                                    <Button Margin="3" Content="A+" HorizontalAlignment="Center" Click="IncreaseFontSizeBtn_Click" IsTabStop="False"/>
+                                                                    <Button Margin="3" Content="A-" Click="DecreaseFontSizeBtn_Click" IsTabStop="False"/>
 															  </DockPanel>
 
-															  <Button Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TextbausteineBearbeitenButton4" Content="@" FontFamily="Webdings" Click="EditTextbausteineClick" ToolTip="Textbausteine bearbeiten" />
+                                                                <Button Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TextbausteineBearbeitenButton4" Content="@" FontFamily="Webdings" Click="EditTextbausteineClick" ToolTip="Textbausteine bearbeiten" IsTabStop="False"/>
 															  <!--<localViewControls:TextModuleTreeViewControl x:Name="TextModuleTreeViewControl4" Grid.Row="0" Grid.Column="2" Margin="3" TextModuleSelected="TextModuleTreeViewControl_OnTextModuleSelected" />-->
-														      <Button Grid.Row="0" Grid.Column="2" Margin="3" x:Name="TextbausteineButton4" Content="Textbausteine" Click="ButtonBase_OnClick" />
+                                                                <Button Grid.Row="0" Grid.Column="2" Margin="3" x:Name="TextbausteineButton4" Content="Textbausteine" Click="ButtonBase_OnClick" IsTabStop="False"/>
                               
 															  <TextBox Grid.Row="1" Grid.ColumnSpan="3" Grid.Column="0" x:Name="dokumentationsTextBox4"
                                                                     VerticalAlignment="Stretch"
@@ -1143,12 +1143,12 @@
 															  </Grid.RowDefinitions>
 
 															  <DockPanel Grid.Column="0" Grid.Row="0" HorizontalAlignment="Left">
-																  <Button Margin="3" Content="1" FontFamily="Webdings" Click="RTFVollbildDokuButton_OnClick" />
+                                                                    <Button Margin="3" Content="1" FontFamily="Webdings" Click="RTFVollbildDokuButton_OnClick" IsTabStop="False"/>
 															  </DockPanel>
 
-															  <Button Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TextbausteineBearbeitenButtonRTF4" Content="@" FontFamily="Webdings" Click="EditTextbausteineClick" ToolTip="Textbausteine bearbeiten" />
+                                                                <Button Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TextbausteineBearbeitenButtonRTF4" Content="@" FontFamily="Webdings" Click="EditTextbausteineClick" ToolTip="Textbausteine bearbeiten" IsTabStop="False"/>
 															  <!--<localViewControls:TextModuleTreeViewControl x:Name="TextModuleTreeViewControlRTF4" Grid.Row="0" Grid.Column="2" Margin="3" TextModuleSelected="TextModuleTreeViewControl_OnTextModuleSelected" />-->
-														      <Button Grid.Row="0" Grid.Column="2" Margin="3" x:Name="TextbausteineButtonRtf4" Content="Textbausteine" Click="ButtonBase_OnClick" />
+                                                                <Button Grid.Row="0" Grid.Column="2" Margin="3" x:Name="TextbausteineButtonRtf4" Content="Textbausteine" Click="ButtonBase_OnClick" IsTabStop="False"/>
                               
 														      <dxre:RichEditControl x:Name="richEditControl4" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3" HorizontalAlignment="Stretch" Margin="0" VerticalAlignment="Stretch" ActiveViewType="Simple" ContentChanged="RichEditControl4_OnContentChanged">
 														          <dxre:RichEditControl.BehaviorOptions>
@@ -1173,14 +1173,14 @@
 															  </Grid.RowDefinitions>
 
 															  <DockPanel Grid.Column="0" Grid.Row="0" HorizontalAlignment="Left">
-																  <Button Margin="3" Content="1" FontFamily="Webdings" Click="VollbildDokuButton_OnClick" />
-																  <Button Margin="3" Content="A+" HorizontalAlignment="Center" Click="IncreaseFontSizeBtn_Click" />
-																  <Button Margin="3" Content="A-" Click="DecreaseFontSizeBtn_Click" />
+                                                                    <Button Margin="3" Content="1" FontFamily="Webdings" Click="VollbildDokuButton_OnClick" IsTabStop="False"/>
+                                                                    <Button Margin="3" Content="A+" HorizontalAlignment="Center" Click="IncreaseFontSizeBtn_Click" IsTabStop="False"/>
+                                                                    <Button Margin="3" Content="A-" Click="DecreaseFontSizeBtn_Click" IsTabStop="False"/>
 															  </DockPanel>
 
-															  <Button Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TextbausteineBearbeitenButton5" Content="@" FontFamily="Webdings" Click="EditTextbausteineClick" ToolTip="Textbausteine bearbeiten" />
+                                                                <Button Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TextbausteineBearbeitenButton5" Content="@" FontFamily="Webdings" Click="EditTextbausteineClick" ToolTip="Textbausteine bearbeiten" IsTabStop="False"/>
 															  <!--<localViewControls:TextModuleTreeViewControl x:Name="TextModuleTreeViewControl5" Grid.Row="0" Grid.Column="2" Margin="3" TextModuleSelected="TextModuleTreeViewControl_OnTextModuleSelected" />-->
-														      <Button Grid.Row="0" Grid.Column="2" Margin="3" x:Name="TextbausteineButton5" Content="Textbausteine" Click="ButtonBase_OnClick" />
+                                                                <Button Grid.Row="0" Grid.Column="2" Margin="3" x:Name="TextbausteineButton5" Content="Textbausteine" Click="ButtonBase_OnClick" IsTabStop="False"/>
                               
 															  <TextBox Grid.Row="1" Grid.ColumnSpan="3" Grid.Column="0" x:Name="dokumentationsTextBox5"
 																	  VerticalAlignment="Stretch"
@@ -1204,12 +1204,12 @@
 															  </Grid.RowDefinitions>
 
 															  <DockPanel Grid.Column="0" Grid.Row="0" HorizontalAlignment="Left">
-																  <Button Margin="3" Content="1" FontFamily="Webdings" Click="RTFVollbildDokuButton_OnClick" />
+                                                                    <Button Margin="3" Content="1" FontFamily="Webdings" Click="RTFVollbildDokuButton_OnClick" IsTabStop="False"/>
 															  </DockPanel>
 
-															  <Button Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TextbausteineBearbeitenButtonRTF5" Content="@" FontFamily="Webdings" Click="EditTextbausteineClick" ToolTip="Textbausteine bearbeiten" />
+                                                                <Button Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TextbausteineBearbeitenButtonRTF5" Content="@" FontFamily="Webdings" Click="EditTextbausteineClick" ToolTip="Textbausteine bearbeiten" IsTabStop="False"/>
 															  <!--<localViewControls:TextModuleTreeViewControl x:Name="TextModuleTreeViewControlRTF5" Grid.Row="0" Grid.Column="2" Margin="3" TextModuleSelected="TextModuleTreeViewControl_OnTextModuleSelected" />-->
-														      <Button Grid.Row="0" Grid.Column="2" Margin="3" x:Name="TextbausteineButtonRtf5" Content="Textbausteine" Click="ButtonBase_OnClick" />
+                                                                <Button Grid.Row="0" Grid.Column="2" Margin="3" x:Name="TextbausteineButtonRtf5" Content="Textbausteine" Click="ButtonBase_OnClick" IsTabStop="False"/>
                               
 														      <dxre:RichEditControl x:Name="richEditControl5" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3" HorizontalAlignment="Stretch" Margin="0" VerticalAlignment="Stretch" ActiveViewType="Simple" ContentChanged="RichEditControl5_OnContentChanged">
 														          <dxre:RichEditControl.BehaviorOptions>
diff --git a/BeWo/View/Navigation/Sorter/SupportConceptSorter.cs b/BeWo/View/Navigation/Sorter/SupportConceptSorter.cs
index 2ccb9aa0f..be9268dbe 100644
--- a/BeWo/View/Navigation/Sorter/SupportConceptSorter.cs
+++ b/BeWo/View/Navigation/Sorter/SupportConceptSorter.cs
@@ -16,7 +16,9 @@ namespace BeWo.View.Navigation.Sorter
                 list.Add(new SortItem("Vorname", "FirstName"));
                 list.Add(new SortItem("Startdatum", "StartDate"));
                 list.Add(new SortItem("Enddatum", "EndDate"));
+                list.Add(new SortItem("PLZ", "PostalCode"));
                 list.Add(new SortItem(Translator.Translate("Kostenträger"), "AllCostBearerNames"));
+                
 
                 return list;
             }
diff --git a/BeWo/View/Navigation/SupportConceptNavigationView.xaml.cs b/BeWo/View/Navigation/SupportConceptNavigationView.xaml.cs
index 3c5ea33e8..e2fd7d5b1 100644
--- a/BeWo/View/Navigation/SupportConceptNavigationView.xaml.cs
+++ b/BeWo/View/Navigation/SupportConceptNavigationView.xaml.cs
@@ -454,15 +454,36 @@ namespace BeWo.View.Navigation
 						CustomerReferenceNumber = kt.CustomerReferenceNumber, 
 						Notice                  = kt.Notice, 
 						Status                  = CostBearer2SupportConceptStatus.Created,
-						SupportConcept          = kt.SupportConcept,
-						ApprovalPeriodList      = new List<SupportConceptApprovalPeriodDC> { new SupportConceptApprovalPeriodDC
-						{
-							IsApprovedBEShifting = true, 
-							IsApprovedFixedAmountShifting = true, 
-							ApprovedBEInterval = SupportConceptApprovalInterval.Weekly
-						}}
+						SupportConcept          = kt.SupportConcept
 					};
+                    
+                    if (kt.ApprovalPeriodList != null && kt.ApprovalPeriodList.Count > 0)
+                    {
+                        var ap1 = kt.ApprovalPeriodList[0];
 
+                        rel.ApprovalPeriodList = new List<SupportConceptApprovalPeriodDC>();
+
+                        var newap = new SupportConceptApprovalPeriodDC
+                        {
+                            IsApprovedBEShifting = ap1.IsApprovedBEShifting,
+                            IsApprovedFixedAmountShifting = ap1.IsApprovedFixedAmountShifting,
+                            ApprovedBEInterval = ap1.ApprovedBEInterval
+                        };
+                        if (ap1.SupportConceptApprovalPeriodEmployeeRelations != null)
+                        {
+                            newap.SupportConceptApprovalPeriodEmployeeRelations = new List<SupportConceptApprovalPeriodEmployeeRelDC>();
+                            foreach (var item in ap1.SupportConceptApprovalPeriodEmployeeRelations)
+                            {
+                                newap.SupportConceptApprovalPeriodEmployeeRelations.Add(new SupportConceptApprovalPeriodEmployeeRelDC
+                                {
+                                    Betreuungsschluessel = item.Betreuungsschluessel,
+                                    Employee = item.Employee,
+                                    IsAbsolut = item.IsAbsolut
+                                });
+                            }
+                        }
+                        rel.ApprovalPeriodList.Add(newap);
+                    }
 					copy.CostBearerRelations.Add(rel);
 				}
 				
diff --git a/BeWo/View/Report/Finance/FinanceOverviewView.xaml.cs b/BeWo/View/Report/Finance/FinanceOverviewView.xaml.cs
index e5b7badd8..509545430 100644
--- a/BeWo/View/Report/Finance/FinanceOverviewView.xaml.cs
+++ b/BeWo/View/Report/Finance/FinanceOverviewView.xaml.cs
@@ -27,12 +27,12 @@ namespace BeWo.View.Report.Finance
             {
 				url += "&onlyNotApproved=1";
             }
-			var tempToken = string.Empty;
-			ServiceFacade.DoDownloadServiceSync(s => tempToken = s.CreateTemporaryToken(url, true));
-			var addChar = (url.Contains("?")) ? "&" : "?";
-			url = url + addChar + "token=" + tempToken;
+			//var tempToken = string.Empty;
+			//ServiceFacade.DoDownloadServiceSync(s => tempToken = s.CreateTemporaryToken(url, true));
+			//var addChar = (url.Contains("?")) ? "&" : "?";
+			//url = url + addChar + "token=" + tempToken;
 
-			url = BeWoWpfUtils.GetHTMLEncodedURL(url);
+			//url = BeWoWpfUtils.GetHTMLEncodedURL(url);
 
 			BeWoUtils.NavigateToReportUriWithDocumentPreviewControl(url, "Finanzauswertung", docPrevControl, null);
         }
diff --git a/BeWo/View/Report/Kilometerauswertung/KilometerauslastungsView.xaml b/BeWo/View/Report/Kilometerauswertung/KilometerauslastungsView.xaml
index 13f88da06..2e4b78c3d 100644
--- a/BeWo/View/Report/Kilometerauswertung/KilometerauslastungsView.xaml
+++ b/BeWo/View/Report/Kilometerauswertung/KilometerauslastungsView.xaml
@@ -11,9 +11,11 @@
       xmlns:controls="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
       xmlns:dxp="http://schemas.devexpress.com/winfx/2008/xaml/printing"
       xmlns:dxb="http://schemas.devexpress.com/winfx/2008/xaml/bars"
+      xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
       xmlns:dxpbars="http://schemas.devexpress.com/winfx/2008/xaml/printing/bars"
       xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
       xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
+      xmlns:localViewControls="clr-namespace:BeWo.View.Controls"
       d:DesignHeight="450" d:DesignWidth="800"
 
       Initialized="KilometerauslastungsView_OnInitialized"
@@ -26,6 +28,7 @@
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
             <Grid.RowDefinitions>
@@ -42,20 +45,31 @@
             <RadioButton x:Name="EmployeeKmReportRadioButton" Grid.Column="1" Grid.Row="0" Margin="3" VerticalAlignment="Center" VerticalContentAlignment="Center" Content="{markup:Translate Nach Mitarbeiter}" GroupName="ReportTypeRadioGroup" Checked="ToggleButton_OnChecked" />
 
             <CheckBox Grid.Column="0" Grid.Row="1" Margin="3" x:Name="AllCustomersCheckBox" VerticalAlignment="Center" VerticalContentAlignment="Center" Content="{markup:Translate Alle Klienten}" Checked="AllCustomersCheckBox_OnCheckedChanged" Unchecked="AllCustomersCheckBox_OnCheckedChanged" />
-            <controls:PopUpEdit Grid.Column="1" x:Name="CustomerPopUpEdit" Visibility="{Binding Path=CustomerPopUpEditVisibility, UpdateSourceTrigger=PropertyChanged}" Text="{Binding Path=SelectedCustomer.SimpleDescription, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" Grid.ColumnSpan="3" Grid.Row="1" Margin="3" PopUpClick="CustomersPopUpEdit_OnPopUpClick" Height="22" Cursor="Arrow" DeleteButtonVisibility="Collapsed" HorizontalAlignment="Stretch" />
+            <controls:PopUpEdit Grid.Column="1" x:Name="CustomerPopUpEdit" Visibility="{Binding Path=CustomerPopUpEditVisibility, UpdateSourceTrigger=PropertyChanged}" Text="{Binding Path=SelectedCustomer.SimpleDescription, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" Grid.ColumnSpan="4" Grid.Row="1" Margin="3" PopUpClick="CustomersPopUpEdit_OnPopUpClick" Height="22" Cursor="Arrow" DeleteButtonVisibility="Collapsed" HorizontalAlignment="Stretch" />
 
             <CheckBox Grid.Column="0" Grid.Row="1" Margin="3" x:Name="AllEmployeesCheckBox" VerticalAlignment="Center" VerticalContentAlignment="Center" Content="{markup:Translate Alle Mitarbeiter}" Checked="AllEmployeesCheckBox_OnChecked" Unchecked="AllEmployeesCheckBox_OnChecked" Visibility="Collapsed" />
-            <controls:PopUpEdit Grid.Column="1" x:Name="EmployeePopUpEdit"  Visibility="{Binding Path=EmployeePopUpEditVisibility, UpdateSourceTrigger=PropertyChanged}" Text="{Binding Path=SelectedEmployee.SimpleDescription, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" Grid.ColumnSpan="3" Grid.Row="1" Margin="3" PopUpClick="EmployeesPopUpEdit_OnPopUpClick" Height="22" Cursor="Arrow" DeleteButtonVisibility="Collapsed" HorizontalAlignment="Stretch" />
+            <controls:PopUpEdit Grid.Column="1" x:Name="EmployeePopUpEdit"  Visibility="{Binding Path=EmployeePopUpEditVisibility, UpdateSourceTrigger=PropertyChanged}" Text="{Binding Path=SelectedEmployee.SimpleDescription, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" Grid.ColumnSpan="4" Grid.Row="1" Margin="3" PopUpClick="EmployeesPopUpEdit_OnPopUpClick" Height="22" Cursor="Arrow" DeleteButtonVisibility="Collapsed" HorizontalAlignment="Stretch" />
 
-            <Label Grid.Column="0" Grid.Row="2" Margin="3" Content="Monat:" />
+            <Label Content="Startdatum:" Grid.Column="0" Grid.Row="2" VerticalAlignment="Center" />
+            <dxe:DateEdit MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="2" x:Name="datePickerStartDate" EditValue="{Binding StartDate}" Width="100" HorizontalAlignment="Left" Margin="3,0,0,0" />
+            <Label Content="Enddatum:" Grid.Column="2" Grid.Row="2" VerticalAlignment="Center" />
+            <dxe:DateEdit MaskType="DateTimeAdvancingCaret" Grid.Column="3" Grid.Row="2" x:Name="datePickerEndDate" EditValue="{Binding EndDate}" HorizontalAlignment="Left" Width="100" Margin="3,0,0,0" />
+            
+            
+            <!--<Label Grid.Column="0" Grid.Row="2" Margin="3" Content="Monat:" />
             <ComboBox Height="22" x:Name="ComboBoxMonth" ItemsSource="{Binding Path=MonthNames, UpdateSourceTrigger=PropertyChanged}" SelectedIndex="{Binding Path=SelectedMonthIndex, UpdateSourceTrigger=PropertyChanged}"  Grid.Row="2" Grid.Column="1" Margin="3" HorizontalAlignment="Left" Width="90" />
 
             <Label Grid.Column="2" Grid.Row="2" Margin="3" Content="Jahr:" />
-            <ComboBox Height="22" x:Name="ComboBoxYear" ItemsSource="{Binding Path=Years, UpdateSourceTrigger=PropertyChanged}" SelectedIndex="{Binding Path=SelectedYearIndex, UpdateSourceTrigger=PropertyChanged}" Grid.Row="2" Grid.Column="3" Margin="3" Width="90"></ComboBox>
+            <ComboBox Height="22" x:Name="ComboBoxYear" ItemsSource="{Binding Path=Years, UpdateSourceTrigger=PropertyChanged}" SelectedIndex="{Binding Path=SelectedYearIndex, UpdateSourceTrigger=PropertyChanged}" Grid.Row="2" Grid.Column="3" Margin="3" Width="90"></ComboBox>-->
 
-            <Button x:Name="ButtonGenerate" HorizontalAlignment="Left" Click="ButtonGenerate_OnClick" Grid.Column="0" Grid.Row="3" Margin="2,5,2,2" Content=" Erstellen " Height="23" IsEnabled="{Binding Path=IsCreateButtonEnabled, UpdateSourceTrigger=PropertyChanged}" />
+            <Label Grid.Row="3" Content="Leistungskategorien" Grid.Column="0" VerticalAlignment="Center" />
+            <!--<ListBox IsSynchronizedWithCurrentItem="True" Grid.Column="3" Grid.Row="1" Grid.RowSpan="3" Margin="10,0,0,0" x:Name="serviceCategoryList" Height="72" VerticalAlignment="Top" />-->
 
-            <dxp:DocumentPreviewControl x:Name="DocumentPreviewControl" Grid.Row="5" Grid.ColumnSpan="5" Grid.Column="0" Visibility="Collapsed" CommandBarStyle="Bars" dx:ThemeManager.ThemeName="Office2010Black">
+            <localViewControls:ComboBoxTreeViewControlV2 x:Name="ComboBoxTreeViewServiceCategory" Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="4" Margin="0,3,0,0" VerticalAlignment="Center" HorizontalAlignment="Stretch"/>
+            
+            <Button x:Name="ButtonGenerate" HorizontalAlignment="Left" Click="ButtonGenerate_OnClick" Grid.Column="0" Grid.Row="4" Margin="2,5,2,2" Content="   Erstellen   " IsEnabled="{Binding Path=IsCreateButtonEnabled, UpdateSourceTrigger=PropertyChanged}" />
+
+            <dxp:DocumentPreviewControl x:Name="DocumentPreviewControl" Grid.Row="5" Grid.ColumnSpan="6" Grid.Column="0" Visibility="Collapsed" CommandBarStyle="Bars" dx:ThemeManager.ThemeName="Office2010Black">
                 <dxp:DocumentPreviewControl.CommandProvider>
                     <dxp:DocumentCommandProvider>
                         <dxp:DocumentCommandProvider.Actions>
diff --git a/BeWo/View/Report/Kilometerauswertung/KilometerauslastungsView.xaml.cs b/BeWo/View/Report/Kilometerauswertung/KilometerauslastungsView.xaml.cs
index d7eeef533..5b56cdbdf 100644
--- a/BeWo/View/Report/Kilometerauswertung/KilometerauslastungsView.xaml.cs
+++ b/BeWo/View/Report/Kilometerauswertung/KilometerauslastungsView.xaml.cs
@@ -8,9 +8,12 @@ using System.Runtime.CompilerServices;
 using System.Windows;
 using System.Windows.Controls;
 using BeWo.Annotations;
+using BeWo.Core;
+using BeWo.Core.Service;
 using BeWo.ServiceProxy;
 using BS.Shared;
 using BS.Shared.Core;
+using BS.Shared.DataContracts;
 using BS.Shared.DataContracts.Compact;
 using ChatController.Utilities.Extensions;
 using DevExpress.Xpf.Core;
@@ -22,6 +25,10 @@ namespace BeWo.View.Report.Kilometerauswertung
     {
         public bool IsCreateButtonEnabled => ShouldDoListReport || _ReportType == KilometerauslastungsType.Customer && _SelectedCustomer != null || _ReportType == KilometerauslastungsType.Employee && _SelectedEmployee != null;
 
+        private DateTime _StartDate;
+
+        private DateTime _EndDate;
+
         private List<CompactCustomerDC> AllCustomers { get; set; } = new List<CompactCustomerDC>();
 
         private List<CompactEmployeeDC> AllEmployees { get; set; } = new List<CompactEmployeeDC>();
@@ -134,6 +141,36 @@ namespace BeWo.View.Report.Kilometerauswertung
             }
         }
 
+        public DateTime StartDate
+        {
+            get => _StartDate;
+
+            set
+            {
+                if (_StartDate != value)
+                {
+                    _StartDate = value;
+
+                    OnPropertyChanged(nameof(StartDate));
+                }
+            }
+        }
+
+        public DateTime EndDate
+        {
+            get => _EndDate;
+
+            set
+            {
+                if (_EndDate != value)
+                {
+                    _EndDate = value;
+
+                    OnPropertyChanged(nameof(EndDate));
+                }
+            }
+        }
+
         private KilometerauslastungsType _ReportType = KilometerauslastungsType.Customer;
 
 
@@ -143,11 +180,17 @@ namespace BeWo.View.Report.Kilometerauswertung
 
             DataContext = this;
 
+            
             var monthIndex = DateTime.Now.Month - 2;
 
             SelectedMonthIndex = monthIndex < 0 ? 11 : monthIndex;
 
-            
+            StartDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1).AddMonths(-1);
+            EndDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1).AddDays(-1);
+
+            ComboBoxTreeViewServiceCategory.Imitationheader.Width = 283;
+            InitServiceCategoryTree();
+
             InitYearComboBox();
             if (DateTime.Now.Month == 1)
             {
@@ -188,6 +231,40 @@ namespace BeWo.View.Report.Kilometerauswertung
             };
         }
 
+        private void InitServiceCategoryTree()
+        {
+            Cache.GetInstance().GetServiceCategoryDescriptionDict(cb =>
+                this.Dispatch(
+                    delegate
+                    {
+                        //ComboBoxTreeViewServiceCategory.ParentWindowHeight = ActualHeight;
+                        InitServiceCategoryTree(cb);
+                    }));
+
+        }
+
+        private void InitServiceCategoryTree(Dictionary<ServiceCategoryDC, List<ServiceDescriptionDC>> dict)
+        {
+            var categories = dict.Keys;
+            var tree = new List<ServiceCategoryTreeItem>();
+
+            foreach (var dc in categories)
+            {
+                var catItem = new ServiceCategoryTreeItem { ServiceCategory = dc, IsChecked = false };
+                foreach (var item in dict[dc])
+                {
+                    var descItem = new ServiceCategoryTreeItem
+                    {
+                        ServiceDescription = item,
+                        IsChecked = false
+                    };
+                    catItem.Children.Add(descItem);
+                }
+                tree.Add(catItem);
+            }
+            ComboBoxTreeViewServiceCategory.TreeViewSourceList = tree;
+        }
+
         private void InitYearComboBox()
         {
             var years = new List<int>();
@@ -226,42 +303,109 @@ namespace BeWo.View.Report.Kilometerauswertung
 
         private void ButtonGenerate_OnClick(object sender, RoutedEventArgs e)
         {
-            var selectedYear = Years[SelectedYearIndex];
+            //var selectedYear = Years[SelectedYearIndex];
 
-            var rangeDate = new DateTime(selectedYear, SelectedMonthIndex + 1, 1);
+            //var rangeDate = new DateTime(selectedYear, SelectedMonthIndex + 1, 1);
+            var url = string.Format("{0}/ReportView.aspx?type={1}&start={2:ddMMyyyy}&end={3:ddMMyyyy}", BeWoApp.SiteOfOrigin, ReportTypes.KilometerAuswertung, StartDate, EndDate);
 
-            if(ShouldDoListReport)
+            var oidList = new List<long>();
+
+            if (_ReportType == KilometerauslastungsType.Customer)
             {
-                if(_ReportType == KilometerauslastungsType.Customer)
+                url += "&cOids=";
+                if (ShouldDoListReport)
                 {
-                    ServiceFacade.DoReportServiceAsync(s => s.CreateKilometerauswertungForAllCustomers(AllCustomers.Select(customer => customer.CustomerOid).ToList(), rangeDate), ShowReport, true);
+                    oidList = AllCustomers.Select(c => c.CustomerOid).ToList();
                 }
-                else
+                else if (SelectedCustomer != null)
                 {
-                    ServiceFacade.DoReportServiceAsync(s => s.CreateKilometerauswertungForAllEmployees(AllEmployees.Select(employee => employee.EmployeeOid).ToList(), rangeDate), ShowReport, true);
+                    oidList.Add(SelectedCustomer.CustomerOid);
                 }
             }
             else
             {
-                if(_ReportType == KilometerauslastungsType.Customer)
+                url += "&eOids=";
+                if (ShouldDoListReport)
                 {
-                    if (SelectedCustomer != null)
-                    {
-                        ServiceFacade.DoReportServiceAsync(
-                            s => s.CreateKilometerauswertung(SelectedCustomer.CustomerOid, rangeDate), ShowReport,
-                            true);
-                    }
+                    oidList = AllEmployees.Select(emp => emp.EmployeeOid).ToList();
                 }
-                else
+                else if (SelectedEmployee != null)
                 {
-                    if (SelectedEmployee != null)
-                    {
-                        ServiceFacade.DoReportServiceAsync(
-                            s => s.CreateEmployeeKilometerauswertung(SelectedEmployee.EmployeeOid, rangeDate),
-                            ShowReport, true);
-                    }
+                    oidList.Add(SelectedEmployee.EmployeeOid);
                 }
             }
+            string oidString = "";
+            foreach (var item in oidList)
+            {
+                if (oidString.Length > 0)
+                {
+                    oidString += ",";
+                }
+                oidString += item;
+            }
+
+            url += oidString;
+
+            var sdList = new List<ServiceDescriptionDC>();
+
+            var sctree = ComboBoxTreeViewServiceCategory.TreeViewSourceList;
+
+            foreach (var sc in sctree)
+            {
+                sdList.AddRange(from sd in sc.Children where sd.IsChecked select sd.ServiceDescription);
+            }
+
+            if (sdList.Count > 0)
+            {
+                oidString = "";
+                foreach (var item in sdList)
+                {
+                    if (oidString.Length > 0)
+                    {
+                        oidString += ",";
+                    }
+                    oidString += item.ServiceDescriptionOid ?? 0;
+                }
+
+                url += "&sdOids=" + oidString;
+            }
+            //if (ShouldDoListReport)
+            //{
+            //    AllEmployees.Select(employee => employee.EmployeeOid).ToList()
+            //}
+            //else
+            //{
+            //    if(_ReportType == KilometerauslastungsType.Customer)
+            //    {
+            //        if (SelectedCustomer != null)
+            //        {
+            //            ServiceFacade.DoReportServiceAsync(
+            //                s => s.CreateKilometerauswertung(SelectedCustomer.CustomerOid, rangeDate), ShowReport,
+            //                true);
+            //        }
+            //    }
+            //    else
+            //    {
+            //        if (SelectedEmployee != null)
+            //        {
+            //            ServiceFacade.DoReportServiceAsync(
+            //                s => s.CreateEmployeeKilometerauswertung(SelectedEmployee.EmployeeOid, rangeDate),
+            //                ShowReport, true);
+            //        }
+            //    }
+            //}
+
+
+            BeWoUtils.NavigateToReportUriWithDocumentPreviewControl(url, "Kilometerauswertung", DocumentPreviewControl, null);
+
+            //var tempToken = string.Empty;
+            //ServiceFacade.DoDownloadServiceSync(s => tempToken = s.CreateTemporaryToken(url, true));
+            //var addChar = (url.Contains("?")) ? "&" : "?";
+            //url = url + addChar + "token=" + tempToken;
+
+            //url = BeWoWpfUtils.GetHTMLEncodedURL(url);
+
+            //BeWoUtils.NavigateToReportUriWithDocumentPreviewControl(url, "Finanzauswertung", docPrevControl, null);
         }
 
         private void ShowReport(MemoryStream reportStream)
diff --git a/BeWo/ViewModel/SupportConceptApprovalPeriodEmployeeRelVM.cs b/BeWo/ViewModel/SupportConceptApprovalPeriodEmployeeRelVM.cs
index dd572abf1..3be67b4f3 100644
--- a/BeWo/ViewModel/SupportConceptApprovalPeriodEmployeeRelVM.cs
+++ b/BeWo/ViewModel/SupportConceptApprovalPeriodEmployeeRelVM.cs
@@ -84,12 +84,12 @@ namespace BeWo.ViewModel
 
         protected override void InitByDataContract(SupportConceptApprovalPeriodEmployeeRelDC pDataContract)
         {
-            if (!IsNew)
-            {
+            //if (!IsNew)
+            //{
                 _Employee             = pDataContract.Employee;
                 _Betreuungsschluessel = pDataContract.Betreuungsschluessel;
                 _IsAbsolut            = pDataContract.IsAbsolut;
-            }
+            //}
         }
 
         protected override SupportConceptApprovalPeriodEmployeeRelDC MapToDataContract(SupportConceptApprovalPeriodEmployeeRelDC pDataContract, bool doCommit)
diff --git a/Data/Access/SearchDAO.cs b/Data/Access/SearchDAO.cs
index 7b33c7614..327932ff9 100644
--- a/Data/Access/SearchDAO.cs
+++ b/Data/Access/SearchDAO.cs
@@ -3817,7 +3817,7 @@ namespace BeWo.Data.Access
             return lCriteria.List<ServiceRecord>();
         }
 
-        public Dictionary<long, List<ServiceRecord>> FindListOfCustomerServiceRecordsForKilometerauswertung(List<long> customerOids, DateTimeSpan span)
+        public Dictionary<long, List<ServiceRecord>> FindListOfCustomerServiceRecordsForKilometerauswertung(List<long> customerOids, List<long> serviceDescriptionOids, DateTimeSpan span)
         {
             var lCriteria = CreateCriteria<ServiceRecord>()
                 .Add(Restrictions.In(nameof(ServiceRecord.CustomerOid), customerOids))
@@ -3839,9 +3839,12 @@ namespace BeWo.Data.Access
 
             var result = new Dictionary<long, List<ServiceRecord>>();
 
-            foreach(var serviceRecord in allServiceRecords)
+            foreach (var serviceRecord in allServiceRecords)
             {
-                result.AddOrUpdateValueInDictionary(serviceRecord.CustomerOid.Value, new List<ServiceRecord> {serviceRecord});
+                if (serviceDescriptionOids == null || serviceDescriptionOids.Contains(serviceRecord.ServiceDescription.Oid.Value))
+                {
+                    result.AddOrUpdateValueInDictionary(serviceRecord.CustomerOid.Value, new List<ServiceRecord> { serviceRecord });
+                }
             }
 
             return result;
@@ -3849,7 +3852,7 @@ namespace BeWo.Data.Access
 
         public bool CheckForAnyServiceRecordsWithDistanceValues(List<long> customerOids, DateTimeSpan span)
         {
-            return FindListOfCustomerServiceRecordsForKilometerauswertung(customerOids, span).Any();
+            return FindListOfCustomerServiceRecordsForKilometerauswertung(customerOids, null, span).Any();
         }
 
         public List<Customer> GetAllCustomersForEmployee(long? employeeOid)
@@ -3946,7 +3949,7 @@ namespace BeWo.Data.Access
             return lCriteria.List<ServiceRecord>();
         }
 
-        public Dictionary<long, List<ServiceRecord>> FindListOfEmployeeServiceRecordsForKilometerauswertung(List<long> employeeOids, DateTimeSpan span)
+        public Dictionary<long, List<ServiceRecord>> FindListOfEmployeeServiceRecordsForKilometerauswertung(List<long> employeeOids, List<long> serviceDescriptionOids, DateTimeSpan span)
         {
             var lCriteria = CreateCriteria<ServiceRecord>()
                 .Add(Restrictions.In(nameof(ServiceRecord.EmployeeOid), employeeOids))
@@ -3970,7 +3973,10 @@ namespace BeWo.Data.Access
 
             foreach(var serviceRecord in allServiceRecords)
             {
-                result.AddOrUpdateValueInDictionary(serviceRecord.EmployeeOid.Value, new List<ServiceRecord> {serviceRecord});
+                if (serviceDescriptionOids == null || serviceDescriptionOids.Contains(serviceRecord.ServiceDescription.Oid.Value))
+                {
+                    result.AddOrUpdateValueInDictionary(serviceRecord.EmployeeOid.Value, new List<ServiceRecord> { serviceRecord });
+                }
             }
 
             return result;
diff --git a/Host/ReportView.aspx.cs b/Host/ReportView.aspx.cs
index 6271ba345..1c6081b7c 100644
--- a/Host/ReportView.aspx.cs
+++ b/Host/ReportView.aspx.cs
@@ -174,6 +174,9 @@ namespace Host
                     case ReportTypes.RatingReport:
                         report = CreateRatingReport();
                         break;
+                    case ReportTypes.KilometerAuswertung:
+                        report = CreateKilometerAuswertung();
+                        break;
                     default:
 						report = CreateQueryReport();
 		                break;
@@ -835,6 +838,74 @@ namespace Host
             return reportCreator.CreateRatingReport(roid, scoid);
         }
 
+        private XtraReport CreateKilometerAuswertung()
+        {
+            DateTime start = DateTime.Now.Date;
+            DateTime end = DateTime.Now.Date;
+            String cOids = "";
+            String eOids = "";
+            String sdOids = "";
+
+            String date = Request.Params["start"];
+
+            if (!String.IsNullOrEmpty(date) && date.Length == 8)
+            {
+                DateTime dt;
+                if (DateTime.TryParse(
+                    String.Format("{0}.{1}.{2}", date.Substring(0, 2), date.Substring(2, 2), date.Substring(4, 4)), out dt))
+                {
+                    start = dt;
+                }
+            }
+            date = Request.Params["end"];
+
+            if (!String.IsNullOrEmpty(date) && date.Length == 8)
+            {
+                DateTime dt;
+                if (DateTime.TryParse(
+                    String.Format("{0}.{1}.{2}", date.Substring(0, 2), date.Substring(2, 2), date.Substring(4, 4)), out dt))
+                {
+                    end = dt;
+                }
+            }
+
+            cOids = Request.Params["cOids"];
+            eOids = Request.Params["eOids"];
+            var serviceDescriptionOids = new List<long>();
+            if (!String.IsNullOrEmpty(sdOids))
+            {
+                serviceDescriptionOids = sdOids.Split(',').Select(o => Int64.Parse(o)).ToList();
+            }
+
+            if (!String.IsNullOrEmpty(cOids))
+            {
+                var list = cOids.Split(',').Select(o => Int64.Parse(o)).ToList();
+                if (list.Count == 1)
+                {
+                    return reportCreator.CreateKilometerauswertung(list[0], serviceDescriptionOids, start, end);
+                }
+                else
+                {
+                    return reportCreator.CreateKilometerauswertungForAllCustomers(list, serviceDescriptionOids, start, end);
+                }
+            }
+            else if (!String.IsNullOrEmpty(eOids))
+            {
+                var list = eOids.Split(',').Select(o => Int64.Parse(o)).ToList();
+                if (list.Count == 1)
+                {
+                    return reportCreator.CreateEmployeeKilometerauswertung(list[0], serviceDescriptionOids, start, end);
+                }
+                else
+                {
+                    return reportCreator.CreateKilometerauswertungForAllEmployees(list, serviceDescriptionOids, start, end);
+                }
+            }
+
+            return new XtraReport();
+            
+        }
+
         private AbstractReportCreator GetReportCreator()
         {
             long? templateOid = null;
diff --git a/Host/Web.config b/Host/Web.config
index a2181a484..3cfe074b5 100644
--- a/Host/Web.config
+++ b/Host/Web.config
@@ -71,7 +71,7 @@
         <add assembly="DevExpress.Web.Resources.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
       </assemblies>
     </compilation>
-    <httpRuntime maxRequestLength="65536" executionTimeout="300" />
+    <httpRuntime maxRequestLength="65536" executionTimeout="300" maxQueryStringLength="65536" maxUrlLength="65536"/>
     <!--IIS 6-->
     <!--<httpModules>
     <add name="ASPHibernateSession" type="BeWo.Data.ASPHibernateSessionManager, BeWo.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null" />
@@ -196,6 +196,11 @@
     <handlers>
       <add type="DevExpress.Web.ASPxHttpHandlerModule, DevExpress.Web.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" verb="GET,POST" path="DX.ashx" name="ASPxHttpHandlerModule" preCondition="integratedMode" />
     </handlers>
+	  <security>
+		  <requestFiltering>
+			  <requestLimits maxQueryString="65536" maxUrl="65536" />
+		  </requestFiltering>
+	  </security>
   </system.webServer>
   <appSettings>
     <add key="SendMailOnError" value="false" />
diff --git a/Report/AbstractReportCreator.cs b/Report/AbstractReportCreator.cs
index bddced2e2..b87fecf33 100644
--- a/Report/AbstractReportCreator.cs
+++ b/Report/AbstractReportCreator.cs
@@ -86,13 +86,13 @@ namespace BeWo.Report
 
         public abstract XtraReport CreateRosterReportIst(long wOid, DateTime dt);
 
-        public abstract XtraReport CreateKilometerauswertung(long customerOid, DateTime rangeDate);
+        public abstract XtraReport CreateKilometerauswertung(long customerOid, List<long> serviceDescriptionOids, DateTime start, DateTime end);
 
-        public abstract XtraReport CreateKilometerauswertungForAllCustomers(List<long> customerOids, DateTime rangeDate);
+        public abstract XtraReport CreateKilometerauswertungForAllCustomers(List<long> customerOids, List<long> serviceDescriptionOids, DateTime start, DateTime end);
 
-        public abstract XtraReport CreateEmployeeKilometerauswertung(long employeeOid, DateTime range);
+        public abstract XtraReport CreateEmployeeKilometerauswertung(long employeeOid, List<long> serviceDescriptionOids, DateTime start, DateTime end);
 
-        public abstract XtraReport CreateKilometerauswertungForAllEmployees(List<long> employeeOids, DateTime rangeDate);
+        public abstract XtraReport CreateKilometerauswertungForAllEmployees(List<long> employeeOids, List<long> serviceDescriptionOids, DateTime start, DateTime end);
 
 		public abstract XtraReport CreateVorlagenReport(long template, List<long> objectOids, long table);
         public abstract XtraReport CreateAbwesenheitsPrintReport(List<long> oids, string titel);
diff --git a/Report/DefaultReportCreator.cs b/Report/DefaultReportCreator.cs
index 5d19279bd..abe79a0f3 100644
--- a/Report/DefaultReportCreator.cs
+++ b/Report/DefaultReportCreator.cs
@@ -946,38 +946,38 @@ namespace BeWo.Report
             return report as XtraReport;
         }
 
-        public override XtraReport CreateKilometerauswertung(long customerOid, DateTime rangeDate)
+        public override XtraReport CreateKilometerauswertung(long customerOid, List<long> serviceDescriptionOids, DateTime start, DateTime end)
         {
             var report = FindReportImp<KilometerauswertungsRO>();
 
-            report.SetReportDataSource(KilometerauswertungsRO.Create(MapperFactory.CompactCustomerDC_CustomerCompact.MapToNewDC(DAOFactory.GenericDAO.LoadByID<Customer>(customerOid)), rangeDate));
+            report.SetReportDataSource(KilometerauswertungsRO.Create(MapperFactory.CompactCustomerDC_CustomerCompact.MapToNewDC(DAOFactory.GenericDAO.LoadByID<Customer>(customerOid)), serviceDescriptionOids, start, end));
 
             return report as XtraReport;
         }
 
-        public override XtraReport CreateKilometerauswertungForAllCustomers(List<long> customerOids, DateTime rangeDate)
+        public override XtraReport CreateKilometerauswertungForAllCustomers(List<long> customerOids, List<long> serviceDescriptionOids, DateTime start, DateTime end)
         {
             var report = FindReportImp<KilometerauswertungsListRO>();
 
-            report.SetReportDataSource(KilometerauswertungsListRO.Create(MapperFactory.CompactCustomerDC_CustomerCompact.MapToNewDCs(DAOFactory.GenericDAO.LoadByIDs<Customer>(customerOids)), rangeDate));
+            report.SetReportDataSource(KilometerauswertungsListRO.Create(MapperFactory.CompactCustomerDC_CustomerCompact.MapToNewDCs(DAOFactory.GenericDAO.LoadByIDs<Customer>(customerOids)), serviceDescriptionOids, start, end));
 
             return report as XtraReport;
         }
 
-        public override XtraReport CreateEmployeeKilometerauswertung(long employeeOid, DateTime range)
+        public override XtraReport CreateEmployeeKilometerauswertung(long employeeOid, List<long> serviceDescriptionOids, DateTime start, DateTime end)
         {
             var report = FindReportImp<EmployeeKilometerauswertungsRO>();
 
-			report.SetReportDataSource(EmployeeKilometerauswertungsRO.Create(MapperFactory.CompactEmployeeDC_Employee.MapToNewDC(DAOFactory.GenericDAO.LoadByID<Employee>(employeeOid)), range));
+			report.SetReportDataSource(EmployeeKilometerauswertungsRO.Create(MapperFactory.CompactEmployeeDC_Employee.MapToNewDC(DAOFactory.GenericDAO.LoadByID<Employee>(employeeOid)), serviceDescriptionOids, start, end));
 
 			return report as XtraReport;
         }
 
-        public override XtraReport CreateKilometerauswertungForAllEmployees(List<long> employeeOids, DateTime rangeDate)
+        public override XtraReport CreateKilometerauswertungForAllEmployees(List<long> employeeOids, List<long> serviceDescriptionOids, DateTime start, DateTime end)
         {
             var report = FindReportImp<EmployeeKilometerauswertungsListRO>();
 
-			report.SetReportDataSource(EmployeeKilometerauswertungsListRO.Create(MapperFactory.CompactEmployeeDC_Employee.MapToNewDCs(DAOFactory.GenericDAO.LoadByIDs<Employee>(employeeOids)), rangeDate));
+			report.SetReportDataSource(EmployeeKilometerauswertungsListRO.Create(MapperFactory.CompactEmployeeDC_Employee.MapToNewDCs(DAOFactory.GenericDAO.LoadByIDs<Employee>(employeeOids)), serviceDescriptionOids, start, end));
 
             return report as XtraReport;
         }
diff --git a/Report/ReportObjects/EmployeeKilometerauswertungsListRO.cs b/Report/ReportObjects/EmployeeKilometerauswertungsListRO.cs
index afaa9e3e7..d0bf3e13f 100644
--- a/Report/ReportObjects/EmployeeKilometerauswertungsListRO.cs
+++ b/Report/ReportObjects/EmployeeKilometerauswertungsListRO.cs
@@ -12,16 +12,26 @@ namespace BeWo.Report.ReportObjects
     {
         public List<CompactEmployeeDC> AllEmployees { get; set; }
 
+        // Alt
         public DateTime MonthInformation { get; set; }
 
+        public DateTime StartDate { get; set; }
+
+        public DateTime EndDate { get; set; }
+
+        public List<long> LeistungenOids { get; set; }
+
         public List<Employee2EmployeeKilometerauswertungsEntry> Employees2Entries { get; set; } = new List<Employee2EmployeeKilometerauswertungsEntry>();
 
-        public static EmployeeKilometerauswertungsListRO Create(List<CompactEmployeeDC> employees, DateTime monthInformation)
+        public static EmployeeKilometerauswertungsListRO Create(List<CompactEmployeeDC> employees, List<long> leistungenOids, DateTime start, DateTime end)
         {
             var employeeKilometerauswertungsListRO = new EmployeeKilometerauswertungsListRO
             {
                 AllEmployees = employees,
-                MonthInformation = monthInformation
+                MonthInformation = start,
+                LeistungenOids = leistungenOids,
+                StartDate = start,
+                EndDate = end
             };
 
             employeeKilometerauswertungsListRO.CreateEntries();
@@ -31,14 +41,14 @@ namespace BeWo.Report.ReportObjects
 
         public void CreateEntries()
         {
-            var start = MonthInformation;
-            var end = start.AddMonths(1).AddTicks(-1);
+            var start = StartDate;
+            var end = EndDate.AddDays(1).AddTicks(-1);
 
             var timeSpan = new DateTimeSpan();
             timeSpan.StartDateTime = start;
             timeSpan.EndDateTime = end;
 
-            var rawData = DAOFactory.SearchDAO.FindListOfEmployeeServiceRecordsForKilometerauswertung(AllEmployees.Select(employee => employee.EmployeeOid).ToList(), timeSpan);
+            var rawData = DAOFactory.SearchDAO.FindListOfEmployeeServiceRecordsForKilometerauswertung(AllEmployees.Select(employee => employee.EmployeeOid).ToList(), LeistungenOids, timeSpan);
 
             foreach(var employeeOid2ServiceRecords in rawData)
             {
diff --git a/Report/ReportObjects/EmployeeKilometerauswertungsRO.cs b/Report/ReportObjects/EmployeeKilometerauswertungsRO.cs
index 980149c9d..a67bb6545 100644
--- a/Report/ReportObjects/EmployeeKilometerauswertungsRO.cs
+++ b/Report/ReportObjects/EmployeeKilometerauswertungsRO.cs
@@ -14,18 +14,30 @@ namespace BeWo.Report.ReportObjects
 
         public string EmployeeName => Employee?.ToString();
 
+        // Alt
         public DateTime MonthInformation { get; set; }
 
+        public DateTime StartDate { get; set; }
+
+        public DateTime EndDate { get; set; }
+
         public double TotalDistanceInMeters { get; set; }
 
+        public List<long> LeistungenOids { get; set; }
+
+         
+
         public List<EmployeeKilometerauswertungsEntry> Entries { get; set; }
 
-        public static EmployeeKilometerauswertungsRO Create(CompactEmployeeDC employee, DateTime monthInformation)
+        public static EmployeeKilometerauswertungsRO Create(CompactEmployeeDC employee, List<long> leistungenOids, DateTime start, DateTime end)
         {
             var employeeKilometerauswertung = new EmployeeKilometerauswertungsRO
             {
                 Employee = employee,
-                MonthInformation = monthInformation
+                MonthInformation = start,
+                LeistungenOids = leistungenOids,
+                StartDate = start,
+                EndDate = end
             };
 
             return employeeKilometerauswertung;
@@ -33,8 +45,8 @@ namespace BeWo.Report.ReportObjects
 
         public void CreateDistanceList()
         {
-            var start = MonthInformation;
-            var end = start.AddMonths(1).AddTicks(-1);
+            var start = StartDate;
+            var end = EndDate.AddDays(1).AddTicks(-1);
 
             var timeSpan = new DateTimeSpan();
             timeSpan.StartDateTime = start;
@@ -47,19 +59,22 @@ namespace BeWo.Report.ReportObjects
 
             foreach(var serviceRecord in serviceRecords.Where(serviceRecord => serviceRecord.DistanceInMeter.HasValue && serviceRecord.DistanceInMeter > 0 && serviceRecord.Start.HasValue))
             {
-                var distance = (serviceRecord.GroupPersonCount == null) ? (double)serviceRecord.DistanceInMeter.Value : (double)serviceRecord.DistanceInMeter.Value / (double)serviceRecord.GroupPersonCount;
-                var distanceRounded = Math.Round(distance, 2);
+                if (LeistungenOids == null || LeistungenOids.Contains(serviceRecord.ServiceDescription.Oid.Value))
+                {
+                    var distance = (serviceRecord.GroupPersonCount == null) ? (double)serviceRecord.DistanceInMeter.Value : (double)serviceRecord.DistanceInMeter.Value / (double)serviceRecord.GroupPersonCount;
+                    var distanceRounded = Math.Round(distance, 2);
 
-                TotalDistanceInMeters += distanceRounded;
+                    TotalDistanceInMeters += distanceRounded;
 
-                var e = new EmployeeKilometerauswertungsEntry(serviceRecord.Start, serviceRecord.End, distanceRounded, serviceRecord.Customer?.Person?.LastNameFirstName ?? string.Empty, serviceRecord.Notice, serviceRecord);
-                e.Notice = serviceRecord.Notice;
-                e.Notice2 = serviceRecord.Notice2;
-                e.Notice3 = serviceRecord.Notice3;
-                e.Notice4 = serviceRecord.Notice4;
-                e.Notice5 = serviceRecord.Notice5;
+                    var e = new EmployeeKilometerauswertungsEntry(serviceRecord.Start, serviceRecord.End, distanceRounded, serviceRecord.Customer?.Person?.LastNameFirstName ?? string.Empty, serviceRecord.Notice, serviceRecord);
+                    e.Notice = serviceRecord.Notice;
+                    e.Notice2 = serviceRecord.Notice2;
+                    e.Notice3 = serviceRecord.Notice3;
+                    e.Notice4 = serviceRecord.Notice4;
+                    e.Notice5 = serviceRecord.Notice5;
 
-                Entries.Add(e);
+                    Entries.Add(e);
+                }
             }
         }
     }
diff --git a/Report/ReportObjects/KilometerauswertungsListRO.cs b/Report/ReportObjects/KilometerauswertungsListRO.cs
index 96f770169..d7866c74f 100644
--- a/Report/ReportObjects/KilometerauswertungsListRO.cs
+++ b/Report/ReportObjects/KilometerauswertungsListRO.cs
@@ -12,17 +12,27 @@ namespace BeWo.Report.ReportObjects
     {
         public List<CompactCustomerDC> AllCustomers { get; set; }
 
+        // Alt
         public DateTime MonthInformation { get; set; }
 
+        public DateTime StartDate { get; set; }
+
+        public DateTime EndDate { get; set; }
+
+        public List<long> LeistungenOids { get; set; }
+
         public List<Customer2KilometerauswertungsEntry> Customer2Entries { get; set; } = new List<Customer2KilometerauswertungsEntry>();
 
 
-        public static KilometerauswertungsListRO Create(List<CompactCustomerDC> customers, DateTime monthInformation)
+        public static KilometerauswertungsListRO Create(List<CompactCustomerDC> customers, List<long> leistungenOids, DateTime start, DateTime end)
         {
             var kilometerauswertungsListRO = new KilometerauswertungsListRO
             {
                 AllCustomers = customers,
-                MonthInformation = monthInformation
+                MonthInformation = start,
+                LeistungenOids = leistungenOids,
+                StartDate = start,
+                EndDate = end
             };
 
             kilometerauswertungsListRO.CreateEntries();
@@ -32,14 +42,14 @@ namespace BeWo.Report.ReportObjects
 
         public void CreateEntries()
         {
-            var start = MonthInformation;
-            var end = start.AddMonths(1).AddTicks(-1);
+            var start = StartDate;
+            var end = EndDate.AddDays(1).AddTicks(-1);
 
             var timeSpan = new DateTimeSpan();
             timeSpan.StartDateTime = start;
             timeSpan.EndDateTime = end;
 
-            var rawData = DAOFactory.SearchDAO.FindListOfCustomerServiceRecordsForKilometerauswertung(AllCustomers.Select(customer => customer.CustomerOid).ToList(), timeSpan);
+            var rawData = DAOFactory.SearchDAO.FindListOfCustomerServiceRecordsForKilometerauswertung(AllCustomers.Select(customer => customer.CustomerOid).ToList(), LeistungenOids, timeSpan);
 
             foreach(var customerOid2Servicerecords in rawData)
             {
diff --git a/Report/ReportObjects/KilometerauswertungsRO.cs b/Report/ReportObjects/KilometerauswertungsRO.cs
index bc7614846..7691200b3 100644
--- a/Report/ReportObjects/KilometerauswertungsRO.cs
+++ b/Report/ReportObjects/KilometerauswertungsRO.cs
@@ -13,18 +13,28 @@ namespace BeWo.Report.ReportObjects
 
         public string CustomerName => Customer?.ToString();
 
+        // Alt
         public DateTime MonthInformation { get; set; }
 
+        public DateTime StartDate { get; set; }
+
+        public DateTime EndDate { get; set; }
+
         public double TotalDistanceInMeters { get; set; }
 
+        public List<long> LeistungenOids { get; set; }
+
         public List<KilometerauswertungsEntry> Entries { get; set; }
 
-        public static KilometerauswertungsRO Create(CompactCustomerDC customer, DateTime monthInformation)
+        public static KilometerauswertungsRO Create(CompactCustomerDC customer, List<long> leistungenOids, DateTime start, DateTime end)
         {
             var kilometerauswertung = new KilometerauswertungsRO
             {
-                Customer = customer, 
-                MonthInformation = monthInformation
+                Customer = customer,
+                MonthInformation = start,
+                LeistungenOids = leistungenOids,
+                StartDate = start,
+                EndDate = end
             };
 
             return kilometerauswertung;
@@ -32,8 +42,8 @@ namespace BeWo.Report.ReportObjects
 
         public void CreateDistanceList()
         {
-            var start = MonthInformation;
-            var end = start.AddMonths(1).AddTicks(-1);
+            var start = StartDate;
+            var end = EndDate.AddDays(1).AddTicks(-1);
 
             var timeSpan = new DateTimeSpan();
             timeSpan.StartDateTime = start;
@@ -44,20 +54,23 @@ namespace BeWo.Report.ReportObjects
             Entries = new List<KilometerauswertungsEntry>();
             TotalDistanceInMeters = 0;
 
-            foreach(var serviceRecord in serviceRecords.Where(serviceRecord => serviceRecord.DistanceInMeter.HasValue && serviceRecord.DistanceInMeter > 0 && serviceRecord.Start.HasValue))
+            foreach (var serviceRecord in serviceRecords.Where(serviceRecord => serviceRecord.DistanceInMeter.HasValue && serviceRecord.DistanceInMeter > 0 && serviceRecord.Start.HasValue))
             {
-                var distance = (serviceRecord.GroupPersonCount == null) ? (double)serviceRecord.DistanceInMeter.Value : (double)serviceRecord.DistanceInMeter.Value / (double)serviceRecord.GroupPersonCount;
-                var distanceRounded = Math.Round(distance, 2);
-                TotalDistanceInMeters += distanceRounded;
+                if (LeistungenOids == null || LeistungenOids.Contains(serviceRecord.ServiceDescription.Oid.Value))
+                {
+                    var distance = (serviceRecord.GroupPersonCount == null) ? (double)serviceRecord.DistanceInMeter.Value : (double)serviceRecord.DistanceInMeter.Value / (double)serviceRecord.GroupPersonCount;
+                    var distanceRounded = Math.Round(distance, 2);
+                    TotalDistanceInMeters += distanceRounded;
 
-                var e = new KilometerauswertungsEntry(serviceRecord.Start, serviceRecord.End, distanceRounded, serviceRecord.Employee.Person.LastNameFirstName);
-                e.Notice = serviceRecord.Notice;
-                e.Notice2 = serviceRecord.Notice2;
-                e.Notice3 = serviceRecord.Notice3;
-                e.Notice4 = serviceRecord.Notice4;
-                e.Notice5 = serviceRecord.Notice5;
+                    var e = new KilometerauswertungsEntry(serviceRecord.Start, serviceRecord.End, distanceRounded, serviceRecord.Employee.Person.LastNameFirstName);
+                    e.Notice = serviceRecord.Notice;
+                    e.Notice2 = serviceRecord.Notice2;
+                    e.Notice3 = serviceRecord.Notice3;
+                    e.Notice4 = serviceRecord.Notice4;
+                    e.Notice5 = serviceRecord.Notice5;
 
-                Entries.Add(e);
+                    Entries.Add(e);
+                }
             }
 
             Entries = Entries.OrderBy(o => o.Datum).ToList();
diff --git a/ReportImp/ASBHammReports/Import/AbschlagszahlungImport.cs b/ReportImp/ASBHammReports/Import/AbschlagszahlungImport.cs
index 33b59ff9f..390c09e66 100644
--- a/ReportImp/ASBHammReports/Import/AbschlagszahlungImport.cs
+++ b/ReportImp/ASBHammReports/Import/AbschlagszahlungImport.cs
@@ -54,7 +54,6 @@ namespace ASBHamm.Import
                 result.ResultMessage = String.Format("Die Daten wurden erfolgreich importiert.\nEs wurden {0} neu importiert. {1} waren bereits vorhanden.\n\nFolgende Zahlungen konnten nicht importiert werden:\n{2}", importDaten, vorhandenDaten, importresult);
             }
 
-            
 
             return result;
 
@@ -185,7 +184,7 @@ namespace ASBHamm.Import
             {
                 var fields = line.Split(';');
 
-                if (fields.Length >= 8)
+                if (fields.Length >= 6)
                 {
                     DateTime buchungstag = DateTime.Now;
                     if (DateTime.TryParse(fields[0], out buchungstag) && !String.IsNullOrEmpty(fields[4]) && !fields[4].Contains("Verwendungszweck"))
@@ -225,33 +224,35 @@ namespace ASBHamm.Import
         {
             List<string> newlines = new List<string>();
             String[] lines = importfile.Split('\n');
-
+            List<string> linesOhneHeader = new List<string>();
+            if (lines.Length > 0)
+            {
+                //Remove Header
+                foreach (var item in lines)
+                {
+                    if (!item.Contains("Verwendungszweck"))
+                    {
+                        linesOhneHeader.Add(item);
+                    }
+                }
+            }
             int nr = 0;
             String newLine = "";
-            foreach (var item in lines)
+            foreach (var item in linesOhneHeader)
             {
-                if (nr++ == 0)
+                var fields = item.Split(';');
+                DateTime buchungstag = DateTime.Now;
+                if (!DateTime.TryParse(fields[0], out buchungstag))
                 {
-                    newlines.Add(item);
+                    newLine += item;
                 }
                 else
                 {
-                    
-                    var fields = item.Split(';');
-                    DateTime buchungstag = DateTime.Now;
-                    if (!DateTime.TryParse(fields[0], out buchungstag))
+                    if (!String.IsNullOrEmpty(newLine))
                     {
-                        newLine += item;
+                        newlines.Add(newLine);
                     }
-                    else
-                    {
-                        if (!String.IsNullOrEmpty(newLine))
-                        {
-                            newlines.Add(newLine);
-                        }
-                        newLine = item;
-                    }
-
+                    newLine = item;
                 }
             }
 
diff --git a/ReportImp/AidsHilfeDuisburg/Invoicing/SettlementInvoiceCreation.cs b/ReportImp/AidsHilfeDuisburg/Invoicing/SettlementInvoiceCreation.cs
index 3c0654e3d..cd85a262b 100644
--- a/ReportImp/AidsHilfeDuisburg/Invoicing/SettlementInvoiceCreation.cs
+++ b/ReportImp/AidsHilfeDuisburg/Invoicing/SettlementInvoiceCreation.cs
@@ -80,7 +80,7 @@ namespace AidsHilfeDuisburg.Invoicing
 			var cb2sc = MapperFactory.SupportConceptCostBearerRelDC_CostBearer2SupportConcept.MapToNewDC(DAOFactory.GenericDAO.GetByID<CostBearer2SupportConcept>(si.CostBearer2SupportConceptOid.Value));
 			foreach (var ap in accountingPeriods)
 			{
-				if (ap.ServiceCategory.Name.Contains("Assistenz"))
+				if (ap.ServiceCategory != null && ap.ServiceCategory.Name.Contains("Assistenz"))
 					continue;
 
 				InvoiceItemDC ii = CreateInvoiceItemForAccountingPeriod(ap);
diff --git a/ReportImp/AkggMid/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/AkggMid/CustomMitarbeiterstundenkontoBerechnung.cs
index 2029d4be6..cc1a08af2 100644
--- a/ReportImp/AkggMid/CustomMitarbeiterstundenkontoBerechnung.cs
+++ b/ReportImp/AkggMid/CustomMitarbeiterstundenkontoBerechnung.cs
@@ -28,6 +28,17 @@ namespace AkggMid
 		protected override void StarteBerechnung(DateTime berichtsAnfang, DateTime berichtsEnde, MitarbeiterstundenkontoRO.EmployeeDetail empDetail)
 		{
 			BerechneFerienTage = true;
+
+			var c = empDetail.Employee.GetValidContractForDate(berichtsAnfang);
+			if (c != null && c.EmploymentType != null)
+            {
+				if (c.EmploymentType.Name.Contains("Verwaltung") || c.EmploymentType.Name.Contains("Teamleitung"))
+                {
+					BerechneFerienTage = false;
+                }
+
+			}
+			
 		}
 
 		public override decimal GetFeiertagsFaktor(DateTime start)
diff --git a/ReportImp/AkggMid/CustomReportCreator.cs b/ReportImp/AkggMid/CustomReportCreator.cs
index e065cfd16..fae460baa 100644
--- a/ReportImp/AkggMid/CustomReportCreator.cs
+++ b/ReportImp/AkggMid/CustomReportCreator.cs
@@ -47,6 +47,10 @@ namespace AkggMid
 
         public override XtraReport CreateServiceOverviewSingleCustomerReport(long customerOid, int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay)
         {   
+            if (customerOid == 0)
+            {
+                return CreateSbdLeistungsnachweisForSingleCustomerReport(customerOid, month, year, orgaOid, empOid, serviceCategoryOid ?? 0, startDay, endDay, false, "hessen");
+            }
             var ro = ServicesOverviewRO.Create(customerOid, month, year, false, orgaOid, empOid, startDay, endDay, serviceCategoryOid);
             var lServiceOverviewSingleCustomerReport = ErstelleReport(ro);
 
diff --git a/ReportImp/AkggMid/LeistungsnachweisHelper.cs b/ReportImp/AkggMid/LeistungsnachweisHelper.cs
index 5909b9874..5598f6f6d 100644
--- a/ReportImp/AkggMid/LeistungsnachweisHelper.cs
+++ b/ReportImp/AkggMid/LeistungsnachweisHelper.cs
@@ -23,7 +23,7 @@ namespace AkggMid
 
                 if (!day2Detail.ContainsKey(sr.StartDate.Day))
                 {
-                    sr.StartDateString = String.Format("{0:dd}.", sr.StartDate);
+                    sr.StartDateString = String.Format("{0:dddd dd.MM.}", sr.StartDate);
                     day2Detail.Add(sr.StartDate.Day, sr);
                     result.Add(sr);
                 }
@@ -74,25 +74,27 @@ namespace AkggMid
 
             var abrAbwTagDict = GetAbrechenbareAbwesenheiten(pRO);
 
-            for (int i = 1; i <= 31; i++)
+            double wochensumme = 0;
+            for (int i = 1; i <= pRO.EndDate.Day; i++)
             {
                 if (!day2Detail.ContainsKey(i))
                 {
+                    //Erstelle Dummy Records für fehlende Tage
                     var newSr = new ServicesOverviewRO.ServiceDetail();
                     if (i <= pRO.EndDate.Day)
                     {
                         newSr.StartDate = new DateTime(pRO.StartDate.Year, pRO.StartDate.Month, i);
-                        newSr.StartDateString = String.Format("{0:dd}.", newSr.StartDate);
+                        newSr.StartDateString = String.Format("{0:dddd dd.MM.}", newSr.StartDate);
 
                         if (abrAbwTagDict.ContainsKey(newSr.StartDate))
                         {
                             newSr.Minutes = BerechneMinutenProTag(BerechneStundenProWoche(pRO, newSr.StartDate));
-                            newSr.Notice = "Erster Tag Abwesenheit";
+                            newSr.Notice = "Abwesenheit (erstattet)";
                         }
                     }
                     else
                     {
-                        newSr.StartDateString = String.Format("{0}.", i);
+                        newSr.StartDateString = String.Format("", i);
                     }
 
                     result.Add(newSr);
@@ -100,8 +102,27 @@ namespace AkggMid
                 }
                 else
                 {
-                    day2Detail[i].Minutes = Rundeauf15Minuten(day2Detail[i].Minutes);
+                    //day2Detail[i].Minutes = Rundeauf15Minuten(day2Detail[i].Minutes);
+                    
                 }
+
+                //Erstelle Dummy Record für Wochensumme
+                var record = day2Detail[i];
+                day2Detail[i].TimeRangeString = String.Format("{0:00}", i); // Benutzer TimeRangeString für die Sortierung
+                wochensumme += record.Minutes;
+                if (record.StartDate.DayOfWeek == DayOfWeek.Friday || i == pRO.EndDate.Day)
+                {
+                    var newSr = new ServicesOverviewRO.ServiceDetail();
+                    newSr.StartDateString = "";
+                    newSr.Notice = "Wochensumme";
+                    newSr.IstFerien = true;
+                    newSr.TimeRangeString = String.Format("{0:00}z", i);
+                    newSr.Minutes = Rundeauf15Minuten(wochensumme);
+                    wochensumme = 0;
+                    result.Add(newSr);
+                }
+
+
             }
 
             double minutenGesamt = 0;
@@ -115,10 +136,23 @@ namespace AkggMid
                 {
                     record.Notice5 = "";
                 }
-                minutenGesamt += record.Minutes;
+                if (record.IstFerien) // Wochensumme
+                {
+                    minutenGesamt += record.Minutes;
+                }
+                
+
+                if (record.StartDate.DayOfWeek == DayOfWeek.Saturday)
+                {
+                    record.IstSamstag = true;
+                }
+                else if (record.StartDate.DayOfWeek == DayOfWeek.Sunday)
+                {
+                    record.IstSonntag = true;
+                }
             }
             pRO.TotalFLM = minutenGesamt;
-            return result.OrderBy(r => r.StartDateString).ToList();
+            return result.OrderBy(r => r.TimeRangeString).ToList();
         }
 
         public static void PruefeWochenBudget(ServicesOverviewRO ro)
@@ -266,7 +300,7 @@ namespace AkggMid
 
         public static Dictionary<DateTime, bool> GetAbrechenbareAbwesenheiten(ServicesOverviewRO ro)
         {
-            //Herr Kloss meint, der erste Tag einer Abwesenheit darf ein fünftel der Wochenstundenzahl abgerechnet werden, aber nur bis 5 mal im Zeitraum 01.01.2022 bis 30.06.2022 und bis 10 mal im Schuljahr ab 2023/2024
+            //Herr Kloss meint, der erste Tag einer Abwesenheit darf ein fünftel der Wochenstundenzahl abgerechnet werden, aber nur bis 5 mal im Zeitraum 01.01.2023 bis 21.07.2023 und bis 10 mal im Schuljahr ab 2023/2024
 
             DateTime startSchuljahr = DateTime.MinValue;
             DateTime endeSchuljahr = DateTime.MinValue;
@@ -285,10 +319,10 @@ namespace AkggMid
 
             int maxAnzahl = 10;
 
-            if (startSchuljahr < new DateTime(2022, 6, 30))
+            if (startSchuljahr < new DateTime(2023, 7, 21))
             {
-                startSchuljahr = new DateTime(2022, 1, 1);
-                endeSchuljahr = new DateTime(2022, 6, 30);
+                startSchuljahr = new DateTime(2023, 1, 1);
+                endeSchuljahr = new DateTime(2023, 7, 21);
 
                 maxAnzahl = 5;
             }
@@ -297,35 +331,67 @@ namespace AkggMid
 
             Dictionary<DateTime, bool> abrechenbareTage = new Dictionary<DateTime, bool>();
 
-            DateTime lastend = DateTime.MinValue;
-            foreach (var at in ro.Abwesenheiten) //sortieren?
+            foreach (var at in ro.Abwesenheiten)
             {
                 if (at.Start >= startSchuljahr && at.Start <= endeSchuljahr && (at.End == null || at.End >= startSchuljahr))
                 {
-                    //Prüfe ob mindestens ein Tag zwischen zwei Abwesenheiten liegt.
-                    var days = at.Start.Value.Subtract(lastend).TotalDays;
-                    if (days > 1)
-                    {
-                        
-                        if (gesamtAnzahl <= maxAnzahl)
-                        {
-                            abrechenbareTage.Add(at.Start.Value, true);
 
+                    DateTime dtIterator = at.Start.Value;
+                    DateTime end = endeSchuljahr;
+                    if (at.End.HasValue)
+                    {
+                        end = at.End.Value;
+                    }
+                    
+
+                    while (dtIterator <= end && gesamtAnzahl <= maxAnzahl)
+                    {
+                        if (dtIterator.DayOfWeek != DayOfWeek.Saturday && dtIterator.DayOfWeek != DayOfWeek.Sunday)
+                        {
+                            abrechenbareTage.Add(dtIterator, true);
                             gesamtAnzahl++;
                         }
+                        dtIterator = dtIterator.AddDays(1);
                     }
+                    
+                    
                 }
 
-                if (at.End.HasValue)
-                {
-                    lastend = at.End.Value;
-                }
-                else
-                {
-                    lastend = DateTime.MaxValue;
-                }
             }
 
+            //int gesamtAnzahl = 0;
+
+            //Dictionary<DateTime, bool> abrechenbareTage = new Dictionary<DateTime, bool>();
+
+            //DateTime lastend = DateTime.MinValue;
+            //foreach (var at in ro.Abwesenheiten)
+            //{
+            //    if (at.Start >= startSchuljahr && at.Start <= endeSchuljahr && (at.End == null || at.End >= startSchuljahr))
+            //    {
+            //        //Prüfe ob mindestens ein Tag zwischen zwei Abwesenheiten liegt.
+            //        var days = at.Start.Value.Subtract(lastend).TotalDays;
+            //        if (days > 1)
+            //        {
+
+            //            if (gesamtAnzahl <= maxAnzahl)
+            //            {
+            //                abrechenbareTage.Add(at.Start.Value, true);
+
+            //                gesamtAnzahl++;
+            //            }
+            //        }
+            //    }
+
+            //    if (at.End.HasValue)
+            //    {
+            //        lastend = at.End.Value;
+            //    }
+            //    else
+            //    {
+            //        lastend = DateTime.MaxValue;
+            //    }
+            //}
+
             return abrechenbareTage;
         }
 
diff --git a/ReportImp/AkggMid/LeistungsnachweisJugendamt.cs b/ReportImp/AkggMid/LeistungsnachweisJugendamt.cs
index d34966680..ed08c5629 100644
--- a/ReportImp/AkggMid/LeistungsnachweisJugendamt.cs
+++ b/ReportImp/AkggMid/LeistungsnachweisJugendamt.cs
@@ -34,7 +34,7 @@ namespace AkggMid
 
             pRO.Services = ErstelleDummyRecords(pRO);
 
-            LeistungsnachweisHelper.PruefeWochenBudget(pRO);
+            //LeistungsnachweisHelper.PruefeWochenBudget(pRO);
 
             var abrAbwTagDict = LeistungsnachweisHelper.GetAbrechenbareAbwesenheiten(pRO);
 
@@ -46,7 +46,7 @@ namespace AkggMid
             
             foreach (var record in pRO.Services)
             {
-                if (record.ServiceDescription != "Übertrag:")
+                if (record.ServiceDescription != "Übertrag:" && record.ServiceDescription != "Wochensumme")
                 {
                     if (abrAbwTagDict.ContainsKey(record.StartDate.Date))
                     {
@@ -56,17 +56,22 @@ namespace AkggMid
                         }
                         
                     }
-                    record.Minutes = LeistungsnachweisHelper.Rundeauf15Minuten(record.Minutes);
+                    //record.Minutes = LeistungsnachweisHelper.Rundeauf15Minuten(record.Minutes);
 
                     if (record.StartDate.Day <= 16)
                     {
                         summe1bis16 += record.Minutes;
                     }
-                    summeGesamt += record.Minutes;
+                    
                 }
                 else
                 {
-                    record.Minutes = summe1bis16;
+                    //record.Minutes = summe1bis16;
+                }
+
+                if (record.ServiceDescription == "Wochensumme")
+                {
+                    summeGesamt += record.Minutes;
                 }
             }
 
@@ -85,12 +90,21 @@ namespace AkggMid
                 var istErsterTagAbwesend = abrAbwTagDict.ContainsKey(record.StartDate.Date);
                 if (istErsterTagAbwesend)
                 {
-                    sdd.FLSString = String.Format("Erster Tag Abwesenheit {0:0.00}", sdd.FLS);
+                    sdd.FLSString = String.Format("Abwesenheit (erstattet) {0:0.00}", sdd.FLS);
                 }
                 else
                 {
                     sdd.FLSString = String.Format("{0:0.00}", sdd.FLS);
                 }
+                if (record.StartDate.DayOfWeek == DayOfWeek.Sunday || record.StartDate.DayOfWeek == DayOfWeek.Saturday)
+                {
+                    sdd.IsBillable = true;
+                    sdd.FLSString = "";
+                }
+                if (record.ServiceDescription == "Übertrag:" || String.IsNullOrEmpty(record.ServiceDescription))
+                {
+                    sdd.FLSString = "";
+                }
                 sdd.ServiceDescription = record.ServiceDescription;
                 sdd.StartDate = record.StartDate;
 
@@ -101,20 +115,28 @@ namespace AkggMid
                 }
                 else
                 {
+                    
                     sdd = servicesDouble[i - servicesDouble.Count];
                     sdd.Minutes2 = record.Minutes;
                     sdd.FLS2 = sdd.Minutes2 / 60;
 
                     if (istErsterTagAbwesend)
                     {
-                        sdd.FLSString2 = String.Format("Erster Tag Abwesenheit {0:0.00}", sdd.FLS2);
+                        sdd.FLSString2 = String.Format("Abwesenheit (erstattet) {0:0.00}", sdd.FLS2);
                     }
                     else
                     {
                         sdd.FLSString2 = String.Format("{0:0.00}", sdd.FLS2);
                     }
-                   
-
+                    if (record.StartDate.DayOfWeek == DayOfWeek.Sunday || record.StartDate.DayOfWeek == DayOfWeek.Saturday)
+                    {
+                        sdd.IsBillable2 = true;
+                        sdd.FLSString2 = "";
+                    }
+                    if (record.ServiceDescription == "Übertrag:" || String.IsNullOrEmpty(record.ServiceDescription))
+                    {
+                        sdd.FLSString2 = "";
+                    }
                     sdd.ServiceDescription2 = record.ServiceDescription;
                 }
 
@@ -125,7 +147,8 @@ namespace AkggMid
 
             pRO.ServicesDouble = servicesDouble;
 
-            cellSumme1.Text = String.Format("{0:0.00}", summe1bis16 / 60);
+            //cellSumme1.Text = String.Format("{0:0.00}", summe1bis16 / 60);
+            cellSumme1.Text = "";
             pRO.TotalFLM = summeGesamt;
 
             this.bindingSource1.DataSource = pRO;
@@ -162,7 +185,7 @@ namespace AkggMid
         {
             Dictionary<int, ServicesOverviewRO.ServiceDetail> day2Detail = new Dictionary<int, ServicesOverviewRO.ServiceDetail>();
 
-            var result = new List<ServicesOverviewRO.ServiceDetail>();
+            
             foreach (var sr in pRO.Services)
             {
                 if (!day2Detail.ContainsKey(sr.StartDate.Day))
@@ -191,23 +214,22 @@ namespace AkggMid
                 }
             }
 
-            double minutenGesamt = 0;
-
-            for (int i = 1; i <= 32; i++)
+            var result = new List<ServicesOverviewRO.ServiceDetail>();
+            for (int i = 1; i <= pRO.EndDate.Day + 1; i++)
             {
                 // Es wird ein Übertrag Dummy erzeugt, daher 32 statt 31 Einträge
-                
                 if (i == 17)
                 {
                     var uebertrag = new ServicesOverviewRO.ServiceDetail();
-                    uebertrag.Minutes = minutenGesamt;
+                    //uebertrag.Minutes = minutenGesamt;
                     uebertrag.ServiceDescription = "Übertrag:";
+                    uebertrag.ServiceCategory = String.Format("{0:00}", i);
                     result.Add(uebertrag);
                 }
                 else
                 {
                     int tag = i;
-                    if (i > 16)
+                    if (i > 17)
                     {
                         tag = i - 1;
                     }
@@ -215,30 +237,87 @@ namespace AkggMid
                     if (!day2Detail.ContainsKey(tag))
                     {
                         var newSr = new ServicesOverviewRO.ServiceDetail();
-                        var maxDay = pRO.EndDate.Day;
-                        if (tag <= maxDay)
+                        if (tag <= pRO.EndDate.Day)
                         {
                             newSr.StartDate = new DateTime(pRO.StartDate.Year, pRO.StartDate.Month, tag);
-                            newSr.ServiceDescription = String.Format("{0:dd}", newSr.StartDate);
                         }
-                        else
-                            newSr.ServiceDescription = String.Format("{0}.", tag);
-
-
-
-                        result.Add(newSr);
+                        
                         day2Detail.Add(tag, newSr);
                     }
-                    else
+                    result.Add(day2Detail[tag]);
+                    if (day2Detail[tag].StartDate > DateTime.MinValue)
                     {
-                        var sr = day2Detail[tag];
-                        result.Add(sr);
-                        minutenGesamt += sr.Minutes;
-                        sr.ServiceDescription = String.Format("{0:dd}", sr.StartDate);
+                        day2Detail[tag].ServiceDescription = String.Format("{0:dddd dd.MM.}", day2Detail[tag].StartDate);
                     }
+                    day2Detail[tag].ServiceCategory = String.Format("{0:00}", tag);
                 }
             }
-            return result;
+
+            //Erstelle Wochensummen
+            double wochensumme = 0;
+            for (int i = 1; i <= pRO.EndDate.Day; i++)
+            {
+                var record = day2Detail[i];
+
+                wochensumme += record.Minutes;
+                if (record.StartDate.DayOfWeek == DayOfWeek.Friday || i == pRO.EndDate.Day)
+                {
+                    var newSr = new ServicesOverviewRO.ServiceDetail();
+                    newSr.ServiceDescription = "Wochensumme";
+                    newSr.ServiceCategory = String.Format("{0:00}z", i);
+                    newSr.Minutes = LeistungsnachweisHelper.Rundeauf15Minuten(wochensumme);
+                    wochensumme = 0;
+                    result.Add(newSr);
+                }
+            }
+
+            result = result.OrderBy(r => r.ServiceCategory).ToList();
+
+            int uebertragPos = 0;
+            int index = 1;
+            foreach (var item in result)
+            {
+                if (item.ServiceDescription == "Übertrag:")
+                {
+                    uebertragPos = index;
+                }
+                index++;
+            }
+
+            var haelfte = Math.Ceiling(result.Count / 2m);
+            if (uebertragPos <= haelfte)
+            {
+                //fülle vorne Leerpositionen auf
+                while (uebertragPos <= haelfte)
+                {
+                    var newSr = new ServicesOverviewRO.ServiceDetail();
+
+                    newSr.ServiceCategory = String.Format("16z{0:00}", haelfte);
+                    result.Add(newSr);
+                    uebertragPos++;
+                }
+            }
+            else if (uebertragPos > haelfte + 1)
+            {
+                while (uebertragPos > haelfte + 1)
+                {
+                    //fülle hinten eine Leerposition auf
+                    var newSr = new ServicesOverviewRO.ServiceDetail();
+                    newSr.ServiceCategory = "zzz";
+                    result.Add(newSr);
+                    uebertragPos--;
+                }
+            }
+            var mod = result.Count % 2;
+            if (mod > 0) // nicht durch 2 teilbar also füge einen Leerdummy ein, damit die Tabelle auf zwei Spalten aufgeteilt werden kann.
+            {
+                var newSr = new ServicesOverviewRO.ServiceDetail();
+                newSr.ServiceCategory = "zzz";
+                result.Add(newSr);
+
+            }
+            
+            return result.OrderBy(r => r.ServiceCategory).ToList();
         }
 
         
diff --git a/ReportImp/AkggMid/LeistungsnachweisJugendamt.designer.cs b/ReportImp/AkggMid/LeistungsnachweisJugendamt.designer.cs
index fb5180e0e..243554f6e 100644
--- a/ReportImp/AkggMid/LeistungsnachweisJugendamt.designer.cs
+++ b/ReportImp/AkggMid/LeistungsnachweisJugendamt.designer.cs
@@ -35,10 +35,13 @@ namespace AkggMid
             this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable();
             this.xrTableRowDetail = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.ruleIstWE1 = new DevExpress.XtraReports.UI.FormattingRule();
+            this.ruleIstWochensumme1 = new DevExpress.XtraReports.UI.FormattingRule();
             this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.ruleIstWE2 = new DevExpress.XtraReports.UI.FormattingRule();
+            this.ruleIstWochensumme2 = new DevExpress.XtraReports.UI.FormattingRule();
             this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.ruleIstFerien = new DevExpress.XtraReports.UI.FormattingRule();
             this.Title = new DevExpress.XtraReports.UI.XRControlStyle();
             this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle();
             this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle();
@@ -110,7 +113,6 @@ namespace AkggMid
             this.xrTableDetail.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableDetail.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.xrTableDetail.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
             this.xrTableDetail.Name = "xrTableDetail";
             this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 1, 0, 100F);
@@ -130,7 +132,6 @@ namespace AkggMid
             this.xrTableCell10,
             this.xrTableCell1,
             this.xrTableCell3});
-            this.xrTableRowDetail.FormattingRules.Add(this.ruleIstFerien);
             this.xrTableRowDetail.Name = "xrTableRowDetail";
             this.xrTableRowDetail.Weight = 0.88D;
             // 
@@ -138,51 +139,80 @@ namespace AkggMid
             // 
             this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServicesDouble.ServiceDescription")});
+            this.xrTableCell7.FormattingRules.Add(this.ruleIstWE1);
+            this.xrTableCell7.FormattingRules.Add(this.ruleIstWochensumme1);
             this.xrTableCell7.Name = "xrTableCell7";
             this.xrTableCell7.StylePriority.UseFont = false;
             this.xrTableCell7.StylePriority.UsePadding = false;
             this.xrTableCell7.StylePriority.UseTextAlignment = false;
             this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            this.xrTableCell7.Weight = 0.17931038221254292D;
+            this.xrTableCell7.Weight = 0.19310348870362559D;
+            // 
+            // ruleIstWE1
+            // 
+            this.ruleIstWE1.Condition = "[IsBillable]";
+            this.ruleIstWE1.DataMember = "ServicesDouble";
+            this.ruleIstWE1.Formatting.BackColor = System.Drawing.Color.LightGray;
+            this.ruleIstWE1.Name = "ruleIstWE1";
+            // 
+            // ruleIstWochensumme1
+            // 
+            this.ruleIstWochensumme1.Condition = "[ServiceDescription] == \'Wochensumme\'";
+            this.ruleIstWochensumme1.DataMember = "ServicesDouble";
+            this.ruleIstWochensumme1.Formatting.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+            this.ruleIstWochensumme1.Name = "ruleIstWochensumme1";
             // 
             // xrTableCell10
             // 
             this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServicesDouble.FLSString", "{0:0.00}")});
+            this.xrTableCell10.FormattingRules.Add(this.ruleIstWE1);
+            this.xrTableCell10.FormattingRules.Add(this.ruleIstWochensumme1);
             this.xrTableCell10.Name = "xrTableCell10";
-            this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 1, 0, 100F);
+            this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 1, 0, 100F);
             this.xrTableCell10.StylePriority.UsePadding = false;
             this.xrTableCell10.StylePriority.UseTextAlignment = false;
-            this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-            this.xrTableCell10.Weight = 0.27586213054549774D;
+            this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell10.Weight = 0.26206902405441507D;
             // 
             // xrTableCell1
             // 
             this.xrTableCell1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServicesDouble.ServiceDescription2")});
+            this.xrTableCell1.FormattingRules.Add(this.ruleIstWE2);
+            this.xrTableCell1.FormattingRules.Add(this.ruleIstWochensumme2);
             this.xrTableCell1.Name = "xrTableCell1";
             this.xrTableCell1.StylePriority.UseTextAlignment = false;
             this.xrTableCell1.Text = "xrTableCell1";
             this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            this.xrTableCell1.Weight = 0.17931038510791891D;
+            this.xrTableCell1.Weight = 0.19310349159900159D;
+            // 
+            // ruleIstWE2
+            // 
+            this.ruleIstWE2.Condition = "[IsBillable2]";
+            this.ruleIstWE2.DataMember = "ServicesDouble";
+            this.ruleIstWE2.Formatting.BackColor = System.Drawing.Color.LightGray;
+            this.ruleIstWE2.Name = "ruleIstWE2";
+            // 
+            // ruleIstWochensumme2
+            // 
+            this.ruleIstWochensumme2.Condition = "[ServiceDescription2] == \'Wochensumme\'";
+            this.ruleIstWochensumme2.DataMember = "ServicesDouble";
+            this.ruleIstWochensumme2.Formatting.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+            this.ruleIstWochensumme2.Name = "ruleIstWochensumme2";
             // 
             // xrTableCell3
             // 
             this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServicesDouble.FLSString2")});
+            this.xrTableCell3.FormattingRules.Add(this.ruleIstWE2);
+            this.xrTableCell3.FormattingRules.Add(this.ruleIstWochensumme2);
             this.xrTableCell3.Name = "xrTableCell3";
-            this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 1, 0, 100F);
+            this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 1, 0, 100F);
             this.xrTableCell3.StylePriority.UsePadding = false;
             this.xrTableCell3.StylePriority.UseTextAlignment = false;
-            this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-            this.xrTableCell3.Weight = 0.27586213054549774D;
-            // 
-            // ruleIstFerien
-            // 
-            this.ruleIstFerien.Condition = "[IstSamstag]  Or [IstSonntag] Or [IstFeiertag] Or [IstFerien]";
-            this.ruleIstFerien.DataMember = "Services";
-            this.ruleIstFerien.Formatting.BackColor = System.Drawing.Color.LightSteelBlue;
-            this.ruleIstFerien.Name = "ruleIstFerien";
+            this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell3.Weight = 0.26206902405441507D;
             // 
             // Title
             // 
@@ -416,7 +446,7 @@ namespace AkggMid
             // 
             // xrRichText2
             // 
-            this.xrRichText2.Font = new System.Drawing.Font("Arial", 11F);
+            this.xrRichText2.Font = new System.Drawing.Font("Arial", 10F);
             this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 405.2083F);
             this.xrRichText2.Name = "xrRichText2";
             this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
@@ -425,7 +455,7 @@ namespace AkggMid
             // 
             // xrLabel4
             // 
-            this.xrLabel4.Font = new System.Drawing.Font("Arial", 11F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel4.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 252.7082F);
             this.xrLabel4.Multiline = true;
             this.xrLabel4.Name = "xrLabel4";
@@ -495,7 +525,7 @@ namespace AkggMid
             // 
             this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
             this.xrTable1});
-            this.GroupHeader1.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.GroupHeader1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.GroupHeader1.HeightF = 44F;
             this.GroupHeader1.Name = "GroupHeader1";
             this.GroupHeader1.StylePriority.UseFont = false;
@@ -540,25 +570,25 @@ namespace AkggMid
             this.xrTableCell2.StylePriority.UseTextAlignment = false;
             this.xrTableCell2.Text = "Datum";
             this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            this.xrTableCell2.Weight = 0.17931041215187443D;
+            this.xrTableCell2.Weight = 0.19310352058560765D;
             // 
             // xrTableCell22
             // 
             this.xrTableCell22.Name = "xrTableCell22";
             this.xrTableCell22.Text = "Stundenzahl";
-            this.xrTableCell22.Weight = 0.27586216741799308D;
+            this.xrTableCell22.Weight = 0.26206905898425986D;
             // 
             // xrTableCell5
             // 
             this.xrTableCell5.Name = "xrTableCell5";
             this.xrTableCell5.Text = "Datum";
-            this.xrTableCell5.Weight = 0.17931040901019618D;
+            this.xrTableCell5.Weight = 0.1931035174439294D;
             // 
             // xrTableCell4
             // 
             this.xrTableCell4.Name = "xrTableCell4";
             this.xrTableCell4.Text = "Stundenzahl";
-            this.xrTableCell4.Weight = 0.27586216804632868D;
+            this.xrTableCell4.Weight = 0.26206905961259547D;
             // 
             // xrTableRow4
             // 
@@ -577,22 +607,22 @@ namespace AkggMid
             this.xrTableCell6.StylePriority.UsePadding = false;
             this.xrTableCell6.StylePriority.UseTextAlignment = false;
             this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            this.xrTableCell6.Weight = 0.17931041215187443D;
+            this.xrTableCell6.Weight = 0.19310352058560765D;
             // 
             // xrTableCell8
             // 
             this.xrTableCell8.Name = "xrTableCell8";
-            this.xrTableCell8.Weight = 0.27586216741799308D;
+            this.xrTableCell8.Weight = 0.26206905898425986D;
             // 
             // xrTableCell9
             // 
             this.xrTableCell9.Name = "xrTableCell9";
-            this.xrTableCell9.Weight = 0.17931040901019618D;
+            this.xrTableCell9.Weight = 0.1931035174439294D;
             // 
             // xrTableCell11
             // 
             this.xrTableCell11.Name = "xrTableCell11";
-            this.xrTableCell11.Weight = 0.27586216804632868D;
+            this.xrTableCell11.Weight = 0.26206905961259547D;
             // 
             // GroupFooter1
             // 
@@ -608,7 +638,6 @@ namespace AkggMid
             this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTable2.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
             this.xrTable2.Name = "xrTable2";
             this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 1, 0, 100F);
@@ -628,7 +657,6 @@ namespace AkggMid
             this.cellSumme1,
             this.xrTableCell14,
             this.xrTableCell15});
-            this.xrTableRow2.FormattingRules.Add(this.ruleIstFerien);
             this.xrTableRow2.Name = "xrTableRow2";
             this.xrTableRow2.Weight = 0.88D;
             // 
@@ -638,37 +666,42 @@ namespace AkggMid
             this.xrTableCell12.StylePriority.UseFont = false;
             this.xrTableCell12.StylePriority.UsePadding = false;
             this.xrTableCell12.StylePriority.UseTextAlignment = false;
-            this.xrTableCell12.Text = "Summe:";
             this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            this.xrTableCell12.Weight = 0.17931038221254295D;
+            this.xrTableCell12.Weight = 0.19310348870362562D;
             // 
             // cellSumme1
             // 
             this.cellSumme1.Name = "cellSumme1";
+            this.cellSumme1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 1, 0, 100F);
+            this.cellSumme1.StylePriority.UsePadding = false;
             this.cellSumme1.StylePriority.UseTextAlignment = false;
-            this.cellSumme1.Text = "Erster Tag Abwesenheit 0.00";
-            this.cellSumme1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-            this.cellSumme1.Weight = 0.27586213054549774D;
+            this.cellSumme1.Text = "Abwesenheit (erstattet) 0.00";
+            this.cellSumme1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.cellSumme1.Weight = 0.26206902405441507D;
             // 
             // xrTableCell14
             // 
-            this.xrTableCell14.Font = new System.Drawing.Font("Arial", 11F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell14.Font = new System.Drawing.Font("Arial", 10F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.xrTableCell14.Name = "xrTableCell14";
             this.xrTableCell14.StylePriority.UseFont = false;
             this.xrTableCell14.StylePriority.UseTextAlignment = false;
             this.xrTableCell14.Text = "Gesamt:";
             this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            this.xrTableCell14.Weight = 0.17931038510791891D;
+            this.xrTableCell14.Weight = 0.19310349159900159D;
             // 
             // xrTableCell15
             // 
             this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "fieldTotalStd", "{0:0.00}")});
+            this.xrTableCell15.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.xrTableCell15.Name = "xrTableCell15";
+            this.xrTableCell15.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 1, 0, 100F);
+            this.xrTableCell15.StylePriority.UseFont = false;
+            this.xrTableCell15.StylePriority.UsePadding = false;
             this.xrTableCell15.StylePriority.UseTextAlignment = false;
             this.xrTableCell15.Text = "xrTableCell3";
-            this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-            this.xrTableCell15.Weight = 0.27586213054549774D;
+            this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell15.Weight = 0.26206902405441507D;
             // 
             // xrLabel6
             // 
@@ -733,7 +766,10 @@ namespace AkggMid
             this.DisplayName = "Stundenzettel";
             this.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
-            this.ruleIstFerien});
+            this.ruleIstWE1,
+            this.ruleIstWE2,
+            this.ruleIstWochensumme1,
+            this.ruleIstWochensumme2});
             this.Margins = new System.Drawing.Printing.Margins(70, 70, 60, 40);
             this.PageHeight = 1169;
             this.PageWidth = 827;
@@ -769,7 +805,7 @@ namespace AkggMid
         private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
         private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
-        private DevExpress.XtraReports.UI.FormattingRule ruleIstFerien;
+        private DevExpress.XtraReports.UI.FormattingRule ruleIstWE1;
         private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
         private DevExpress.XtraReports.UI.DetailReportBand DetailReport2;
         private DevExpress.XtraReports.UI.DetailBand Detail3;
@@ -815,5 +851,8 @@ namespace AkggMid
         private DevExpress.XtraReports.UI.XRLabel xrLabel3;
         private DevExpress.XtraReports.UI.XRLabel xrLabel1;
         private DevExpress.XtraReports.UI.XRRichText xrRichText1;
+        private DevExpress.XtraReports.UI.FormattingRule ruleIstWE2;
+        private DevExpress.XtraReports.UI.FormattingRule ruleIstWochensumme1;
+        private DevExpress.XtraReports.UI.FormattingRule ruleIstWochensumme2;
     }
 }
diff --git a/ReportImp/AkggMid/LeistungsnachweisJugendamt.resx b/ReportImp/AkggMid/LeistungsnachweisJugendamt.resx
index 2a4894360..9c9c2e0ea 100644
--- a/ReportImp/AkggMid/LeistungsnachweisJugendamt.resx
+++ b/ReportImp/AkggMid/LeistungsnachweisJugendamt.resx
@@ -118,10 +118,10 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="xrRichText3.SerializableRtfString" xml:space="preserve">
-    <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAMgBcAGYAcwAyADIAXABjAGYAMQAgAEYAXAB1ADIANQAyAFwAJwBmAGMAcgAgAGQAaQBlACAAUwBjAGgAdQBsAGEAcwBzAGkAcwB0AGUAbgB6ACAAfQB7AFwAYgBcAGYAMgBcAGYAcwAyADIAXABjAGYAMQAgAGYAXAB1ADIANQAyAFwAJwBmAGMAcgAgAFsAQwB1AHMAdABvAG0AZQByAEYAaQByAHMAdABOAGEAbQBlAF0AIABbAEMAdQBzAHQAbwBtAGUAcgBMAGEAcwB0AE4AYQBtAGUAXQB9AHsAXABmADIAXABmAHMAMgAyAFwAYwBmADEAIAAgAGQAdQByAGMAaAAgAHUAbgBzAGUAcgBlACAATQBpAHQAYQByAGIAZQBpAHQAZQByAGkAbgAvAHUAbgBzAGUAcgBlAG4AIABNAGkAdABhAHIAYgBlAGkAdABlAHIAfQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABiAFwAZgAxAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAfQA=</value>
+    <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGwAYQBuAGcANwBcAGwAYQBuAGcAZgBlADcAXABmADIAXABmAHMAMgAwAFwAYwBmADEAIABGAFwAdQAyADUAMgBcACcAZgBjAHIAIABkAGkAZQAgAFMAYwBoAHUAbABhAHMAcwBpAHMAdABlAG4AegAgAH0AewBcAGwAYQBuAGcANwBcAGwAYQBuAGcAZgBlADcAXABiAFwAZgAyAFwAZgBzADIAMABcAGMAZgAxACAAZgBcAHUAMgA1ADIAXAAnAGYAYwByACAAWwBDAHUAcwB0AG8AbQBlAHIARgBpAHIAcwB0AE4AYQBtAGUAXQAgAFsAQwB1AHMAdABvAG0AZQByAEwAYQBzAHQATgBhAG0AZQBdAH0AewBcAGwAYQBuAGcANwBcAGwAYQBuAGcAZgBlADcAXABmADIAXABmAHMAMgAwAFwAYwBmADEAIAAgAGQAdQByAGMAaAAgAHUAbgBzAGUAcgBlACAATQBpAHQAYQByAGIAZQBpAHQAZQByAGkAbgAvAHUAbgBzAGUAcgBlAG4AIABNAGkAdABhAHIAYgBlAGkAdABlAHIAfQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABiAFwAZgAxAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAfQA=</value>
   </data>
   <data name="xrRichText2.SerializableRtfString" xml:space="preserve">
-    <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAMgBcAGYAcwAyADIAXABjAGYAMQAgAHMAdABlAGwAbABlAG4AIAB3AGkAcgAgAGcAZQBtAFwAdQAyADIAOABcACcAZQA0AFwAdQAyADIAMwBcACcAZABmACAAZABlAHIAIABhAGsAdAB1AGUAbABsAGUAbgAgAEsAbwBzAHQAZQBuAHoAdQBzAGkAYwBoAGUAcgB1AG4AZwAgAGYAbwBsAGcAZQBuAGQAZQAgAEIAZQB0AHIAZQB1AHUAbgBnAHMAbABlAGkAcwB0AHUAbgBnAGUAbgAgAGkAbgAgAFIAZQBjAGgAbgB1AG4AZwA6AH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYgBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A</value>
+    <value>ewBcAHIAdABmADEAXABhAG4AcwBpAGMAcABnADEAMgA1ADIADQAKAHsADQAKAFwAZgBvAG4AdAB0AGIAbAANAAoAewBcAGYAMAAgAFQAaQBtAGUAcwAgAE4AZQB3ACAAUgBvAG0AYQBuADsAfQANAAoAewBcAGYAMQAgAEEAcgBpAGEAbAA7AH0ADQAKAH0ADQAKAHsADQAKAFwAYwBvAGwAbwByAHQAYgBsAA0ACgA7AA0ACgBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAA7AA0ACgBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMgA1ADUAOwANAAoAfQANAAoAXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcAB7AFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAZgAxAFwAZgBzADIAMABcAGMAZgAxACAAcwB0AGUAbABsAGUAbgAgAHcAaQByACAAZwBlAG0AXAB1ADIAMgA4AFwAJwBlADQAXAB1ADIAMgAzAFwAJwBkAGYAIABkAGUAcgAgAGEAawB0AHUAZQBsAGwAZQBuACAASwBvAHMAdABlAG4AegB1AHMAaQBjAGgAZQByAHUAbgBnACAAZgBvAGwAZwBlAG4AZABlACAAQgBlAHQAcgBlAHUAdQBuAGcAcwBsAGUAaQBzAHQAdQBuAGcAZQBuACAAaQBuACAAUgBlAGMAaABuAHUAbgBnADoAfQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABiAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAfQANAAoAfQANAAoA</value>
   </data>
   <data name="xrRichText1.SerializableRtfString" xml:space="preserve">
     <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGwAMgA1ADgAXABzAGwAbQB1AGwAdAAxAFwAcwBhADEANgAwAHsAXABmADIAXABmAHMAMgAwAFwAYwBmADEAIABTAGUAaQB0AGUAIAB9AHsAXABiAFwAZgAyAFwAZgBzADIAMABcAGMAZgAxACAAMwB9AHsAXABmADIAXABmAHMAMgAwAFwAYwBmADEAIAAgAHYAbwBuACAAfQB7AFwAYgBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgADMAfQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A</value>
diff --git a/ReportImp/AkggMid/LeistungsnachweisSozialamt.cs b/ReportImp/AkggMid/LeistungsnachweisSozialamt.cs
index 8c238b026..eecd21d93 100644
--- a/ReportImp/AkggMid/LeistungsnachweisSozialamt.cs
+++ b/ReportImp/AkggMid/LeistungsnachweisSozialamt.cs
@@ -39,7 +39,7 @@ namespace AkggMid
 
             pRO.Services = LeistungsnachweisHelper.ErstelleDummyRecords(pRO);
 
-            LeistungsnachweisHelper.PruefeWochenBudget(pRO);
+            //LeistungsnachweisHelper.PruefeWochenBudget(pRO);
 
             lblWegbegleitung.Text = String.Format("Kostenzusicherung: bis zu {0:0.00} Stunden pro Woche", pRO.ApprovedFLSPerWeek);
             if (pRO.CustomerOid > 0)
diff --git a/ReportImp/AkggMid/LeistungsnachweisSozialamt.designer.cs b/ReportImp/AkggMid/LeistungsnachweisSozialamt.designer.cs
index 5e445e2b2..b83ff6bc8 100644
--- a/ReportImp/AkggMid/LeistungsnachweisSozialamt.designer.cs
+++ b/ReportImp/AkggMid/LeistungsnachweisSozialamt.designer.cs
@@ -36,6 +36,7 @@ namespace AkggMid
             this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.ruleIstWochensumme = new DevExpress.XtraReports.UI.FormattingRule();
             this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
             this.ruleIstFerien = new DevExpress.XtraReports.UI.FormattingRule();
             this.Title = new DevExpress.XtraReports.UI.XRControlStyle();
@@ -70,9 +71,9 @@ namespace AkggMid
             this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             this.fieldStd = new DevExpress.XtraReports.UI.CalculatedField();
             this.fieldTotalStd = new DevExpress.XtraReports.UI.CalculatedField();
-            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
@@ -119,50 +120,65 @@ namespace AkggMid
             // 
             this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StartDateString")});
-            this.xrTableCell7.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell7.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.xrTableCell7.Name = "xrTableCell7";
-            this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F);
+            this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
             this.xrTableCell7.StylePriority.UseFont = false;
             this.xrTableCell7.StylePriority.UsePadding = false;
             this.xrTableCell7.StylePriority.UseTextAlignment = false;
-            this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
-            this.xrTableCell7.Weight = 0.082758637235592125D;
+            this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            this.xrTableCell7.Weight = 0.16551729289685321D;
             // 
             // xrTableCell33
             // 
             this.xrTableCell33.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice5")});
+            this.xrTableCell33.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.xrTableCell33.Name = "xrTableCell33";
+            this.xrTableCell33.StylePriority.UseFont = false;
             this.xrTableCell33.StylePriority.UseTextAlignment = false;
             this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
-            this.xrTableCell33.Weight = 0.15172417105235991D;
+            this.xrTableCell33.Weight = 0.1379310740526733D;
             // 
             // xrTableCell10
             // 
             this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.fieldStd", "{0:0.00}")});
+            this.xrTableCell10.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell10.FormattingRules.Add(this.ruleIstWochensumme);
             this.xrTableCell10.Name = "xrTableCell10";
+            this.xrTableCell10.StylePriority.UseFont = false;
             this.xrTableCell10.StylePriority.UseTextAlignment = false;
             this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
-            this.xrTableCell10.Weight = 0.096551746578181469D;
+            this.xrTableCell10.Weight = 0.082758644316841892D;
+            // 
+            // ruleIstWochensumme
+            // 
+            this.ruleIstWochensumme.Condition = "[IstFerien]";
+            this.ruleIstWochensumme.DataMember = "Services";
+            this.ruleIstWochensumme.Formatting.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.ruleIstWochensumme.Name = "ruleIstWochensumme";
             // 
             // xrTableCell8
             // 
             this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice")});
+            this.xrTableCell8.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell8.FormattingRules.Add(this.ruleIstWochensumme);
             this.xrTableCell8.Multiline = true;
             this.xrTableCell8.Name = "xrTableCell8";
             this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 1, 0, 100F);
+            this.xrTableCell8.StylePriority.UseFont = false;
             this.xrTableCell8.StylePriority.UsePadding = false;
             this.xrTableCell8.StylePriority.UseTextAlignment = false;
             this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
-            this.xrTableCell8.Weight = 0.68551730120552135D;
+            this.xrTableCell8.Weight = 0.63034484480528641D;
             // 
             // ruleIstFerien
             // 
-            this.ruleIstFerien.Condition = "[IstSamstag]  Or [IstSonntag] Or [IstFeiertag] Or [IstFerien]";
+            this.ruleIstFerien.Condition = "[IstSamstag]  Or [IstSonntag]";
             this.ruleIstFerien.DataMember = "Services";
-            this.ruleIstFerien.Formatting.BackColor = System.Drawing.Color.LightSteelBlue;
+            this.ruleIstFerien.Formatting.BackColor = System.Drawing.Color.LightGray;
             this.ruleIstFerien.Name = "ruleIstFerien";
             // 
             // Title
@@ -276,7 +292,7 @@ namespace AkggMid
             this.lblWegbegleitung.StylePriority.UseBorders = false;
             this.lblWegbegleitung.StylePriority.UseFont = false;
             this.lblWegbegleitung.StylePriority.UseTextAlignment = false;
-            this.lblWegbegleitung.Text = "Kostenzusicherung: bis zu xx Stunden pro Woche (incl. Wegbegleitung)";
+            this.lblWegbegleitung.Text = "Kostenzusicherung: bis zu xx Stunden pro Woche";
             this.lblWegbegleitung.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
             // 
             // lblMonat
@@ -309,17 +325,19 @@ namespace AkggMid
             // 
             this.Detail3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
             this.xrTableDetail});
+            this.Detail3.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.Detail3.HeightF = 20F;
             this.Detail3.Name = "Detail3";
-            this.Detail3.SortFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] {
-            new DevExpress.XtraReports.UI.GroupField("StartDateString", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)});
+            this.Detail3.StylePriority.UseFont = false;
             // 
             // GroupHeader1
             // 
             this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
             this.xrTable1});
+            this.GroupHeader1.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.GroupHeader1.HeightF = 40F;
             this.GroupHeader1.Name = "GroupHeader1";
+            this.GroupHeader1.StylePriority.UseFont = false;
             // 
             // xrTable1
             // 
@@ -354,13 +372,13 @@ namespace AkggMid
             // xrTableCell2
             // 
             this.xrTableCell2.Name = "xrTableCell2";
-            this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(10, 0, 0, 0, 100F);
+            this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
             this.xrTableCell2.StylePriority.UseFont = false;
             this.xrTableCell2.StylePriority.UsePadding = false;
             this.xrTableCell2.StylePriority.UseTextAlignment = false;
             this.xrTableCell2.Text = "Datum";
             this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            this.xrTableCell2.Weight = 0.082758653115741931D;
+            this.xrTableCell2.Weight = 0.16551731815647225D;
             // 
             // xrTableCell4
             // 
@@ -368,13 +386,13 @@ namespace AkggMid
             this.xrTableCell4.StylePriority.UseTextAlignment = false;
             this.xrTableCell4.Text = "Kind krank oder abwesend";
             this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            this.xrTableCell4.Weight = 0.15172419902616882D;
+            this.xrTableCell4.Weight = 0.13793109958629718D;
             // 
             // xrTableCell22
             // 
             this.xrTableCell22.Name = "xrTableCell22";
             this.xrTableCell22.Text = "Anzahl Stunden";
-            this.xrTableCell22.Weight = 0.096551756976587869D;
+            this.xrTableCell22.Weight = 0.082758662798370117D;
             // 
             // xrTableCell6
             // 
@@ -383,7 +401,7 @@ namespace AkggMid
             this.xrTableCell6.StylePriority.UsePadding = false;
             this.xrTableCell6.StylePriority.UseTextAlignment = false;
             this.xrTableCell6.Text = "Kommentar";
-            this.xrTableCell6.Weight = 0.68551742679489935D;
+            this.xrTableCell6.Weight = 0.63034495537225843D;
             // 
             // GroupFooter1
             // 
@@ -518,6 +536,10 @@ namespace AkggMid
             this.xrLabel1.Text = "Summe der gel. Stunden: [fieldTotalStd!0.00]";
             this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
             // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
+            // 
             // fieldStd
             // 
             this.fieldStd.DataMember = "Services";
@@ -531,10 +553,6 @@ namespace AkggMid
             this.fieldTotalStd.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
             this.fieldTotalStd.Name = "fieldTotalStd";
             // 
-            // bindingSource1
-            // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
-            // 
             // LeistungsnachweisSozialamt
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -551,7 +569,8 @@ namespace AkggMid
             this.DisplayName = "Stundenzettel";
             this.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
-            this.ruleIstFerien});
+            this.ruleIstFerien,
+            this.ruleIstWochensumme});
             this.Margins = new System.Drawing.Printing.Margins(40, 40, 50, 40);
             this.PageHeight = 1169;
             this.PageWidth = 827;
@@ -615,5 +634,6 @@ namespace AkggMid
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
         private DevExpress.XtraReports.UI.XRLabel xrLabel1;
+        private DevExpress.XtraReports.UI.FormattingRule ruleIstWochensumme;
     }
 }
diff --git a/ReportImp/AkggMid/LeistungsnachweisSozialamtMitBlutzucker.designer.cs b/ReportImp/AkggMid/LeistungsnachweisSozialamtMitBlutzucker.designer.cs
index e3e426da7..ffcd84d9b 100644
--- a/ReportImp/AkggMid/LeistungsnachweisSozialamtMitBlutzucker.designer.cs
+++ b/ReportImp/AkggMid/LeistungsnachweisSozialamtMitBlutzucker.designer.cs
@@ -36,6 +36,7 @@ namespace AkggMid
             this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.ruleIstWochensumme = new DevExpress.XtraReports.UI.FormattingRule();
             this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
             this.ruleIstFerien = new DevExpress.XtraReports.UI.FormattingRule();
@@ -72,9 +73,9 @@ namespace AkggMid
             this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             this.fieldStd = new DevExpress.XtraReports.UI.CalculatedField();
             this.fieldTotalStd = new DevExpress.XtraReports.UI.CalculatedField();
-            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
@@ -96,7 +97,7 @@ namespace AkggMid
             this.xrTableDetail.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.xrTableDetail.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
             this.xrTableDetail.Name = "xrTableDetail";
-            this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
+            this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 1, 0, 100F);
             this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.xrTableRowDetail});
             this.xrTableDetail.SizeF = new System.Drawing.SizeF(736.9999F, 20F);
@@ -116,70 +117,85 @@ namespace AkggMid
             this.xrTableCell8});
             this.xrTableRowDetail.FormattingRules.Add(this.ruleIstFerien);
             this.xrTableRowDetail.Name = "xrTableRowDetail";
-            this.xrTableRowDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 1, 0, 100F);
-            this.xrTableRowDetail.StylePriority.UsePadding = false;
             this.xrTableRowDetail.Weight = 0.8D;
             // 
             // xrTableCell7
             // 
             this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StartDateString")});
-            this.xrTableCell7.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell7.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.xrTableCell7.Name = "xrTableCell7";
-            this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F);
+            this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
             this.xrTableCell7.StylePriority.UseFont = false;
             this.xrTableCell7.StylePriority.UsePadding = false;
             this.xrTableCell7.StylePriority.UseTextAlignment = false;
-            this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
-            this.xrTableCell7.Weight = 0.082758637235592125D;
+            this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            this.xrTableCell7.Weight = 0.16551729289685321D;
             // 
             // xrTableCell33
             // 
             this.xrTableCell33.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice5")});
+            this.xrTableCell33.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.xrTableCell33.Name = "xrTableCell33";
+            this.xrTableCell33.StylePriority.UseFont = false;
             this.xrTableCell33.StylePriority.UseTextAlignment = false;
             this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
-            this.xrTableCell33.Weight = 0.15172417105235991D;
+            this.xrTableCell33.Weight = 0.1379310740526733D;
             // 
             // xrTableCell10
             // 
             this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.fieldStd", "{0:0.00}")});
+            this.xrTableCell10.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell10.FormattingRules.Add(this.ruleIstWochensumme);
             this.xrTableCell10.Name = "xrTableCell10";
+            this.xrTableCell10.StylePriority.UseFont = false;
             this.xrTableCell10.StylePriority.UseTextAlignment = false;
             this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
-            this.xrTableCell10.Weight = 0.096551746578181469D;
+            this.xrTableCell10.Weight = 0.082758644316841892D;
+            // 
+            // ruleIstWochensumme
+            // 
+            this.ruleIstWochensumme.Condition = "[IstFerien]";
+            this.ruleIstWochensumme.DataMember = "Services";
+            this.ruleIstWochensumme.Formatting.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.ruleIstWochensumme.Name = "ruleIstWochensumme";
             // 
             // xrTableCell11
             // 
             this.xrTableCell11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice3")});
+            this.xrTableCell11.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.xrTableCell11.Multiline = true;
             this.xrTableCell11.Name = "xrTableCell11";
             this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 1, 0, 100F);
+            this.xrTableCell11.StylePriority.UseFont = false;
             this.xrTableCell11.StylePriority.UsePadding = false;
             this.xrTableCell11.StylePriority.UseTextAlignment = false;
             this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
-            this.xrTableCell11.Weight = 0.33103458914460726D;
+            this.xrTableCell11.Weight = 0.13793106803775299D;
             // 
             // xrTableCell8
             // 
             this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice")});
+            this.xrTableCell8.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell8.FormattingRules.Add(this.ruleIstWochensumme);
             this.xrTableCell8.Multiline = true;
             this.xrTableCell8.Name = "xrTableCell8";
             this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 1, 0, 100F);
+            this.xrTableCell8.StylePriority.UseFont = false;
             this.xrTableCell8.StylePriority.UsePadding = false;
             this.xrTableCell8.StylePriority.UseTextAlignment = false;
             this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
-            this.xrTableCell8.Weight = 0.35448271206091408D;
+            this.xrTableCell8.Weight = 0.49241377676753351D;
             // 
             // ruleIstFerien
             // 
-            this.ruleIstFerien.Condition = "[IstSamstag]  Or [IstSonntag] Or [IstFeiertag] Or [IstFerien]";
+            this.ruleIstFerien.Condition = "[IstSamstag]  Or [IstSonntag]";
             this.ruleIstFerien.DataMember = "Services";
-            this.ruleIstFerien.Formatting.BackColor = System.Drawing.Color.LightSteelBlue;
+            this.ruleIstFerien.Formatting.BackColor = System.Drawing.Color.LightGray;
             this.ruleIstFerien.Name = "ruleIstFerien";
             // 
             // Title
@@ -293,7 +309,7 @@ namespace AkggMid
             this.lblWegbegleitung.StylePriority.UseBorders = false;
             this.lblWegbegleitung.StylePriority.UseFont = false;
             this.lblWegbegleitung.StylePriority.UseTextAlignment = false;
-            this.lblWegbegleitung.Text = "Kostenzusicherung: bis zu xx Stunden pro Woche (incl. Wegbegleitung)";
+            this.lblWegbegleitung.Text = "Kostenzusicherung: bis zu xx Stunden pro Woche";
             this.lblWegbegleitung.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
             // 
             // lblMonat
@@ -326,17 +342,19 @@ namespace AkggMid
             // 
             this.Detail3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
             this.xrTableDetail});
+            this.Detail3.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.Detail3.HeightF = 20F;
             this.Detail3.Name = "Detail3";
-            this.Detail3.SortFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] {
-            new DevExpress.XtraReports.UI.GroupField("StartDateString", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)});
+            this.Detail3.StylePriority.UseFont = false;
             // 
             // GroupHeader1
             // 
             this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
             this.xrTable1});
+            this.GroupHeader1.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.GroupHeader1.HeightF = 40F;
             this.GroupHeader1.Name = "GroupHeader1";
+            this.GroupHeader1.StylePriority.UseFont = false;
             // 
             // xrTable1
             // 
@@ -372,13 +390,13 @@ namespace AkggMid
             // xrTableCell2
             // 
             this.xrTableCell2.Name = "xrTableCell2";
-            this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(10, 0, 0, 0, 100F);
+            this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
             this.xrTableCell2.StylePriority.UseFont = false;
             this.xrTableCell2.StylePriority.UsePadding = false;
             this.xrTableCell2.StylePriority.UseTextAlignment = false;
             this.xrTableCell2.Text = "Datum";
             this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            this.xrTableCell2.Weight = 0.082758653115741931D;
+            this.xrTableCell2.Weight = 0.16551731815647225D;
             // 
             // xrTableCell4
             // 
@@ -386,13 +404,13 @@ namespace AkggMid
             this.xrTableCell4.StylePriority.UseTextAlignment = false;
             this.xrTableCell4.Text = "Kind krank oder abwesend";
             this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            this.xrTableCell4.Weight = 0.15172419902616882D;
+            this.xrTableCell4.Weight = 0.13793109958629718D;
             // 
             // xrTableCell22
             // 
             this.xrTableCell22.Name = "xrTableCell22";
             this.xrTableCell22.Text = "Anzahl Stunden";
-            this.xrTableCell22.Weight = 0.096551756976587869D;
+            this.xrTableCell22.Weight = 0.082758662798370117D;
             // 
             // xrTableCell25
             // 
@@ -400,7 +418,7 @@ namespace AkggMid
             this.xrTableCell25.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 0, 0, 100F);
             this.xrTableCell25.StylePriority.UsePadding = false;
             this.xrTableCell25.Text = "BZ-Messung";
-            this.xrTableCell25.Weight = 0.33103463234721159D;
+            this.xrTableCell25.Weight = 0.13793109286269983D;
             // 
             // xrTableCell6
             // 
@@ -409,7 +427,7 @@ namespace AkggMid
             this.xrTableCell6.StylePriority.UsePadding = false;
             this.xrTableCell6.StylePriority.UseTextAlignment = false;
             this.xrTableCell6.Text = "Kommentar";
-            this.xrTableCell6.Weight = 0.35448279444768777D;
+            this.xrTableCell6.Weight = 0.49241386250955854D;
             // 
             // GroupFooter1
             // 
@@ -544,6 +562,10 @@ namespace AkggMid
             this.xrLabel1.Text = "Summe der gel. Stunden: [fieldTotalStd!0.00]";
             this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
             // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
+            // 
             // fieldStd
             // 
             this.fieldStd.DataMember = "Services";
@@ -557,10 +579,6 @@ namespace AkggMid
             this.fieldTotalStd.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
             this.fieldTotalStd.Name = "fieldTotalStd";
             // 
-            // bindingSource1
-            // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
-            // 
             // LeistungsnachweisSozialamtMitBlutzucker
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -577,7 +595,8 @@ namespace AkggMid
             this.DisplayName = "Stundenzettel";
             this.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
-            this.ruleIstFerien});
+            this.ruleIstFerien,
+            this.ruleIstWochensumme});
             this.Margins = new System.Drawing.Printing.Margins(40, 40, 50, 40);
             this.PageHeight = 1169;
             this.PageWidth = 827;
@@ -643,5 +662,6 @@ namespace AkggMid
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
         private DevExpress.XtraReports.UI.XRLabel xrLabel1;
+        private DevExpress.XtraReports.UI.FormattingRule ruleIstWochensumme;
     }
 }
diff --git a/ReportImp/AkggMid/LeistungsnachweisSozialamtMitBlutzuckerPumpe.cs b/ReportImp/AkggMid/LeistungsnachweisSozialamtMitBlutzuckerPumpe.cs
index 7fb88cc28..6f0cd64c0 100644
--- a/ReportImp/AkggMid/LeistungsnachweisSozialamtMitBlutzuckerPumpe.cs
+++ b/ReportImp/AkggMid/LeistungsnachweisSozialamtMitBlutzuckerPumpe.cs
@@ -42,7 +42,6 @@ namespace AkggMid
             LeistungsnachweisHelper.PruefeWochenBudget(pRO);
 
             lblWegbegleitung.Text = String.Format("Kostenzusicherung: bis zu {0:0.00} Stunden pro Woche", pRO.ApprovedFLSPerWeek);
-
             if (pRO.CustomerOid > 0)
             {
                 var c = DAOFactory.GenericDAO.LoadByID<Customer>(pRO.CustomerOid);
diff --git a/ReportImp/AkggMid/LeistungsnachweisSozialamtMitBlutzuckerPumpe.designer.cs b/ReportImp/AkggMid/LeistungsnachweisSozialamtMitBlutzuckerPumpe.designer.cs
index e8a0ef0de..4823129b9 100644
--- a/ReportImp/AkggMid/LeistungsnachweisSozialamtMitBlutzuckerPumpe.designer.cs
+++ b/ReportImp/AkggMid/LeistungsnachweisSozialamtMitBlutzuckerPumpe.designer.cs
@@ -74,9 +74,10 @@ namespace AkggMid
             this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             this.fieldStd = new DevExpress.XtraReports.UI.CalculatedField();
             this.fieldTotalStd = new DevExpress.XtraReports.UI.CalculatedField();
-            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            this.ruleIstWochensumme = new DevExpress.XtraReports.UI.FormattingRule();
             ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
@@ -125,72 +126,84 @@ namespace AkggMid
             // 
             this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StartDateString")});
-            this.xrTableCell7.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell7.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.xrTableCell7.Name = "xrTableCell7";
-            this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F);
+            this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
             this.xrTableCell7.StylePriority.UseFont = false;
             this.xrTableCell7.StylePriority.UsePadding = false;
             this.xrTableCell7.StylePriority.UseTextAlignment = false;
-            this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
-            this.xrTableCell7.Weight = 0.082758637235592125D;
+            this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            this.xrTableCell7.Weight = 0.16551729289685321D;
             // 
             // xrTableCell33
             // 
             this.xrTableCell33.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice5")});
+            this.xrTableCell33.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.xrTableCell33.Name = "xrTableCell33";
+            this.xrTableCell33.StylePriority.UseFont = false;
             this.xrTableCell33.StylePriority.UseTextAlignment = false;
             this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
-            this.xrTableCell33.Weight = 0.15172417105235991D;
+            this.xrTableCell33.Weight = 0.1379310740526733D;
             // 
             // xrTableCell10
             // 
             this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.fieldStd", "{0:0.00}")});
+            this.xrTableCell10.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell10.FormattingRules.Add(this.ruleIstWochensumme);
             this.xrTableCell10.Name = "xrTableCell10";
+            this.xrTableCell10.StylePriority.UseFont = false;
             this.xrTableCell10.StylePriority.UseTextAlignment = false;
             this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
-            this.xrTableCell10.Weight = 0.096551746578181469D;
+            this.xrTableCell10.Weight = 0.082758644316841892D;
             // 
             // xrTableCell9
             // 
             this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice4", "{0:0.00}")});
+            this.xrTableCell9.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.xrTableCell9.Multiline = true;
             this.xrTableCell9.Name = "xrTableCell9";
+            this.xrTableCell9.StylePriority.UseFont = false;
             this.xrTableCell9.StylePriority.UseTextAlignment = false;
             this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
-            this.xrTableCell9.Weight = 0.23448280716830916D;
+            this.xrTableCell9.Weight = 0.22068971543027552D;
             // 
             // xrTableCell11
             // 
             this.xrTableCell11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice3")});
+            this.xrTableCell11.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.xrTableCell11.Multiline = true;
             this.xrTableCell11.Name = "xrTableCell11";
             this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 1, 0, 100F);
+            this.xrTableCell11.StylePriority.UseFont = false;
             this.xrTableCell11.StylePriority.UsePadding = false;
             this.xrTableCell11.StylePriority.UseTextAlignment = false;
             this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
-            this.xrTableCell11.Weight = 0.15172416997504459D;
+            this.xrTableCell11.Weight = 0.12413796545236544D;
             // 
             // xrTableCell8
             // 
             this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice")});
+            this.xrTableCell8.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell8.FormattingRules.Add(this.ruleIstWochensumme);
             this.xrTableCell8.Multiline = true;
             this.xrTableCell8.Name = "xrTableCell8";
             this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 1, 0, 100F);
+            this.xrTableCell8.StylePriority.UseFont = false;
             this.xrTableCell8.StylePriority.UsePadding = false;
             this.xrTableCell8.StylePriority.UseTextAlignment = false;
             this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
-            this.xrTableCell8.Weight = 0.29931032406216762D;
+            this.xrTableCell8.Weight = 0.28551716392264553D;
             // 
             // ruleIstFerien
             // 
-            this.ruleIstFerien.Condition = "[IstSamstag]  Or [IstSonntag] Or [IstFeiertag] Or [IstFerien]";
+            this.ruleIstFerien.Condition = "[IstSamstag]  Or [IstSonntag]";
             this.ruleIstFerien.DataMember = "Services";
-            this.ruleIstFerien.Formatting.BackColor = System.Drawing.Color.LightSteelBlue;
+            this.ruleIstFerien.Formatting.BackColor = System.Drawing.Color.LightGray;
             this.ruleIstFerien.Name = "ruleIstFerien";
             // 
             // Title
@@ -337,17 +350,19 @@ namespace AkggMid
             // 
             this.Detail3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
             this.xrTableDetail});
+            this.Detail3.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.Detail3.HeightF = 20F;
             this.Detail3.Name = "Detail3";
-            this.Detail3.SortFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] {
-            new DevExpress.XtraReports.UI.GroupField("StartDateString", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)});
+            this.Detail3.StylePriority.UseFont = false;
             // 
             // GroupHeader1
             // 
             this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
             this.xrTable1});
+            this.GroupHeader1.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.GroupHeader1.HeightF = 40F;
             this.GroupHeader1.Name = "GroupHeader1";
+            this.GroupHeader1.StylePriority.UseFont = false;
             // 
             // xrTable1
             // 
@@ -384,13 +399,13 @@ namespace AkggMid
             // xrTableCell2
             // 
             this.xrTableCell2.Name = "xrTableCell2";
-            this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(10, 0, 0, 0, 100F);
+            this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
             this.xrTableCell2.StylePriority.UseFont = false;
             this.xrTableCell2.StylePriority.UsePadding = false;
             this.xrTableCell2.StylePriority.UseTextAlignment = false;
             this.xrTableCell2.Text = "Datum";
             this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            this.xrTableCell2.Weight = 0.082758653115741931D;
+            this.xrTableCell2.Weight = 0.16551731815647225D;
             // 
             // xrTableCell4
             // 
@@ -398,13 +413,13 @@ namespace AkggMid
             this.xrTableCell4.StylePriority.UseTextAlignment = false;
             this.xrTableCell4.Text = "Kind krank oder abwesend";
             this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            this.xrTableCell4.Weight = 0.15172419902616882D;
+            this.xrTableCell4.Weight = 0.13793109958629718D;
             // 
             // xrTableCell22
             // 
             this.xrTableCell22.Name = "xrTableCell22";
             this.xrTableCell22.Text = "Anzahl Stunden";
-            this.xrTableCell22.Weight = 0.096551756976587869D;
+            this.xrTableCell22.Weight = 0.082758662798370117D;
             // 
             // xrTableCell5
             // 
@@ -412,7 +427,7 @@ namespace AkggMid
             this.xrTableCell5.Name = "xrTableCell5";
             this.xrTableCell5.StylePriority.UseTextAlignment = false;
             this.xrTableCell5.Text = "Blutzucker Messungen\r\nSichtprotokoll der Pumpe";
-            this.xrTableCell5.Weight = 0.2344828346622162D;
+            this.xrTableCell5.Weight = 0.22068975626896009D;
             // 
             // xrTableCell25
             // 
@@ -420,7 +435,7 @@ namespace AkggMid
             this.xrTableCell25.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 0, 0, 100F);
             this.xrTableCell25.StylePriority.UsePadding = false;
             this.xrTableCell25.Text = "BZ-Messung";
-            this.xrTableCell25.Weight = 0.1517241954444819D;
+            this.xrTableCell25.Weight = 0.12413798604143085D;
             // 
             // xrTableCell6
             // 
@@ -429,7 +444,7 @@ namespace AkggMid
             this.xrTableCell6.StylePriority.UsePadding = false;
             this.xrTableCell6.StylePriority.UseTextAlignment = false;
             this.xrTableCell6.Text = "Kommentar";
-            this.xrTableCell6.Weight = 0.29931039668820125D;
+            this.xrTableCell6.Weight = 0.28551721306186745D;
             // 
             // GroupFooter1
             // 
@@ -564,6 +579,10 @@ namespace AkggMid
             this.xrLabel1.Text = "Summe der gel. Stunden: [fieldTotalStd!0.00]";
             this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
             // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
+            // 
             // fieldStd
             // 
             this.fieldStd.DataMember = "Services";
@@ -577,9 +596,12 @@ namespace AkggMid
             this.fieldTotalStd.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
             this.fieldTotalStd.Name = "fieldTotalStd";
             // 
-            // bindingSource1
+            // ruleIstWochensumme
             // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
+            this.ruleIstWochensumme.Condition = "[IstFerien]";
+            this.ruleIstWochensumme.DataMember = "Services";
+            this.ruleIstWochensumme.Formatting.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.ruleIstWochensumme.Name = "ruleIstWochensumme";
             // 
             // LeistungsnachweisSozialamtMitBlutzuckerPumpe
             // 
@@ -597,7 +619,8 @@ namespace AkggMid
             this.DisplayName = "Stundenzettel";
             this.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
-            this.ruleIstFerien});
+            this.ruleIstFerien,
+            this.ruleIstWochensumme});
             this.Margins = new System.Drawing.Printing.Margins(40, 40, 50, 40);
             this.PageHeight = 1169;
             this.PageWidth = 827;
@@ -665,5 +688,6 @@ namespace AkggMid
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
         private DevExpress.XtraReports.UI.XRLabel xrLabel1;
+        private DevExpress.XtraReports.UI.FormattingRule ruleIstWochensumme;
     }
 }
diff --git a/ReportImp/AkggMid/Mitarbeiterarbeitszeitkonto.cs b/ReportImp/AkggMid/Mitarbeiterarbeitszeitkonto.cs
index 4f7b57241..ac4e33737 100644
--- a/ReportImp/AkggMid/Mitarbeiterarbeitszeitkonto.cs
+++ b/ReportImp/AkggMid/Mitarbeiterarbeitszeitkonto.cs
@@ -44,13 +44,20 @@ namespace AkggMid
             {
                 foreach (var day in empDetail.Days)
                 {
+					string custom6 = "";
+					string custom7 = "";
+					string custom8 = "";
+					string custom9 = "";
+
+					if (day.AbsenceTimes != null && day.AbsenceTimes.Count > 0)
+                    {
+						var hours = day.HoursSick + day.HoursInVacation;
+						custom7 = day.AbsenceTimes[0].AbsenceReason.Description + "\n";
+						custom9 += string.Format("{0:0.00}\n", hours);
+						empDetail.StundenGesamtIst += hours;
+					}
 					if (day.ServiceRecords != null)
                     {
-						string custom6 = "";
-						string custom7 = "";
-						string custom8 = "";
-						string custom9 = "";
-
 						if (day.IstFeiertag)
                         {
 							custom6 += "keine*r\n";
@@ -65,13 +72,13 @@ namespace AkggMid
 							custom8 += sr.ServiceDescription.Name + "\n";
 							custom9 += string.Format("{0:0.00}\n", sr.RoundedDuration / 60);
 						}
-						
-						day.Custom6 = custom6;
-						day.Custom7 = custom7;
-						day.Custom8 = custom8;
-						day.Custom9 = custom9;
 					}
-                }
+
+					day.Custom6 = custom6;
+					day.Custom7 = custom7;
+					day.Custom8 = custom8;
+					day.Custom9 = custom9;
+				}
             }
 
             this.bindingSource1.DataSource = pRO;
diff --git a/ReportImp/AkggMid/Mitarbeiterarbeitszeitkonto.designer.cs b/ReportImp/AkggMid/Mitarbeiterarbeitszeitkonto.designer.cs
index 18e9aa5c7..e5514b023 100644
--- a/ReportImp/AkggMid/Mitarbeiterarbeitszeitkonto.designer.cs
+++ b/ReportImp/AkggMid/Mitarbeiterarbeitszeitkonto.designer.cs
@@ -30,8 +30,6 @@ namespace AkggMid
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary();
-            DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary();
             this.Detail = new DevExpress.XtraReports.UI.DetailBand();
             this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
             this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
@@ -598,13 +596,10 @@ namespace AkggMid
             // 
             this.xrTableCell7.Borders = DevExpress.XtraPrinting.BorderSide.None;
             this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.fieldHours")});
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenGesamtIst", "{0:0.00}")});
             this.xrTableCell7.Name = "xrTableCell7";
             this.xrTableCell7.StylePriority.UseBorders = false;
             this.xrTableCell7.StylePriority.UseTextAlignment = false;
-            xrSummary1.FormatString = "{0:0.00}";
-            xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
-            this.xrTableCell7.Summary = xrSummary1;
             this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
             this.xrTableCell7.Weight = 0.46630256045757434D;
             // 
@@ -779,17 +774,12 @@ namespace AkggMid
             this.cellSumHoursInVacationDecimal.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.cellSumHoursInVacationDecimal.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.HoursInVacation")});
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenGesamtIst", "{0:0.00}")});
             this.cellSumHoursInVacationDecimal.Multiline = true;
             this.cellSumHoursInVacationDecimal.Name = "cellSumHoursInVacationDecimal";
             this.cellSumHoursInVacationDecimal.StylePriority.UseBackColor = false;
             this.cellSumHoursInVacationDecimal.StylePriority.UseBorders = false;
             this.cellSumHoursInVacationDecimal.StylePriority.UseTextAlignment = false;
-            xrSummary2.FormatString = "{0:0.00}";
-            xrSummary2.IgnoreNullValues = true;
-            xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
-            this.cellSumHoursInVacationDecimal.Summary = xrSummary2;
-            this.cellSumHoursInVacationDecimal.Text = "cellSumHoursInVacationDecimal";
             this.cellSumHoursInVacationDecimal.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
             this.cellSumHoursInVacationDecimal.Weight = 0.085029315396800059D;
             // 
diff --git a/ReportImp/ChristinaFrommen/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/ChristinaFrommen/CustomMitarbeiterstundenkontoBerechnung.cs
index 3495ed02c..df4308693 100644
--- a/ReportImp/ChristinaFrommen/CustomMitarbeiterstundenkontoBerechnung.cs
+++ b/ReportImp/ChristinaFrommen/CustomMitarbeiterstundenkontoBerechnung.cs
@@ -70,19 +70,12 @@ namespace ChristinaFrommen
                                 }
                             }
 
-                            if (UseServiceDescriptionPercentage())
+                            if (item.ServiceDescription.Name == "Fehlkontakte")
                             {
-                                decimal prozent = item.ServiceDescription.ServiceCategory.ProzentStundenkonto ?? item.ServiceDescription.ServiceCategory.ProzentAbrechnung;
-                                if (item.ServiceDescription.ProzentStundenkonto.HasValue)
-                                {
-                                    prozent = item.ServiceDescription.ProzentStundenkonto.Value;
-                                }
-
-                                if (prozent < 100)
-                                    durationNA = duration * (100 - prozent) / 100;
-                                duration *= (prozent / 100);
-
+                                durationNA = duration * 0.2m;
+                                duration *= 0.8m;
                             }
+                            
 
                             if (item.ServiceDescription != null &&
                                 item.ServiceDescription.ServiceCategory != null &&
@@ -107,10 +100,6 @@ namespace ChristinaFrommen
             return sum;
         }
 
-        public override bool UseServiceDescriptionPercentage()
-        {
-            return true;
-        }
     }
 }
         
diff --git a/ReportImp/HphBersenbrueckAtz/ServicesOverviewReport.Designer.cs b/ReportImp/HphBersenbrueckAtz/ServicesOverviewReport.Designer.cs
index dd6f4d7c4..a9e20254d 100644
--- a/ReportImp/HphBersenbrueckAtz/ServicesOverviewReport.Designer.cs
+++ b/ReportImp/HphBersenbrueckAtz/ServicesOverviewReport.Designer.cs
@@ -73,6 +73,8 @@ namespace BeWo.HphBersenbrueckAtz
             this.formattingRuleEmployeeName = new DevExpress.XtraReports.UI.FormattingRule();
             this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
             this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+            this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblStandort = new DevExpress.XtraReports.UI.XRLabel();
             ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
@@ -373,15 +375,14 @@ namespace BeWo.HphBersenbrueckAtz
             // 
             this.formattingRuleStartDate.Condition = "[StartDate2]  < [StartDate]";
             this.formattingRuleStartDate.DataMember = "ServicesDouble";
-            // 
-            // 
-            // 
             this.formattingRuleStartDate.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
             this.formattingRuleStartDate.Name = "formattingRuleStartDate";
             // 
             // ReportHeader
             // 
             this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel5,
+            this.lblStandort,
             this.xrLabel11,
             this.xrPictureBox1,
             this.lblTitel,
@@ -395,7 +396,7 @@ namespace BeWo.HphBersenbrueckAtz
             this.xrLabel22,
             this.xrLabel1});
             this.ReportHeader.Font = new System.Drawing.Font("Arial", 11F);
-            this.ReportHeader.HeightF = 340F;
+            this.ReportHeader.HeightF = 350F;
             this.ReportHeader.Name = "ReportHeader";
             this.ReportHeader.StylePriority.UseFont = false;
             // 
@@ -444,7 +445,7 @@ namespace BeWo.HphBersenbrueckAtz
             this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainAttendant")});
             this.xrLabel8.Font = new System.Drawing.Font("Arial", 11F);
-            this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(148.7549F, 294.375F);
+            this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(148.75F, 280F);
             this.xrLabel8.Multiline = true;
             this.xrLabel8.Name = "xrLabel8";
             this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
@@ -459,7 +460,7 @@ namespace BeWo.HphBersenbrueckAtz
             // 
             this.xrLabel6.Borders = DevExpress.XtraPrinting.BorderSide.None;
             this.xrLabel6.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
-            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 294.375F);
+            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 280F);
             this.xrLabel6.Multiline = true;
             this.xrLabel6.Name = "xrLabel6";
             this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
@@ -477,7 +478,7 @@ namespace BeWo.HphBersenbrueckAtz
             this.xrLabel13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "Costbearer")});
             this.xrLabel13.Font = new System.Drawing.Font("Arial", 11F);
-            this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(148.7549F, 260.8333F);
+            this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(148.75F, 250F);
             this.xrLabel13.Name = "xrLabel13";
             this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
             this.xrLabel13.SizeF = new System.Drawing.SizeF(349.8284F, 20.00002F);
@@ -493,7 +494,7 @@ namespace BeWo.HphBersenbrueckAtz
             this.xrLabel4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerName")});
             this.xrLabel4.Font = new System.Drawing.Font("Arial", 11F);
-            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(148.7549F, 227.2916F);
+            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(148.75F, 220F);
             this.xrLabel4.Name = "xrLabel4";
             this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
             this.xrLabel4.SizeF = new System.Drawing.SizeF(349.8285F, 20F);
@@ -507,7 +508,7 @@ namespace BeWo.HphBersenbrueckAtz
             // 
             this.xrLabel2.Borders = DevExpress.XtraPrinting.BorderSide.None;
             this.xrLabel2.Font = new System.Drawing.Font("Arial", 11F);
-            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(148.7549F, 190.625F);
+            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(148.75F, 190F);
             this.xrLabel2.Multiline = true;
             this.xrLabel2.Name = "xrLabel2";
             this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
@@ -523,7 +524,7 @@ namespace BeWo.HphBersenbrueckAtz
             // 
             this.xrLabel9.Borders = DevExpress.XtraPrinting.BorderSide.None;
             this.xrLabel9.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
-            this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 260.8333F);
+            this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 250F);
             this.xrLabel9.Multiline = true;
             this.xrLabel9.Name = "xrLabel9";
             this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
@@ -539,7 +540,7 @@ namespace BeWo.HphBersenbrueckAtz
             // 
             this.xrLabel3.Borders = DevExpress.XtraPrinting.BorderSide.None;
             this.xrLabel3.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
-            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 227.2916F);
+            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 220F);
             this.xrLabel3.Multiline = true;
             this.xrLabel3.Name = "xrLabel3";
             this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
@@ -570,7 +571,7 @@ namespace BeWo.HphBersenbrueckAtz
             // 
             this.xrLabel1.Borders = DevExpress.XtraPrinting.BorderSide.None;
             this.xrLabel1.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
-            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 190.625F);
+            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 190F);
             this.xrLabel1.Multiline = true;
             this.xrLabel1.Name = "xrLabel1";
             this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
@@ -586,9 +587,6 @@ namespace BeWo.HphBersenbrueckAtz
             // 
             this.formattingRuleServiceDesc.Condition = "[StartDate2] < [StartDate]";
             this.formattingRuleServiceDesc.DataMember = "ServicesDouble";
-            // 
-            // 
-            // 
             this.formattingRuleServiceDesc.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
             this.formattingRuleServiceDesc.Name = "formattingRuleServiceDesc";
             // 
@@ -596,9 +594,6 @@ namespace BeWo.HphBersenbrueckAtz
             // 
             this.formattingRuleCostBearer.Condition = "[StartDate2] < [StartDate]";
             this.formattingRuleCostBearer.DataMember = "ServicesDouble";
-            // 
-            // 
-            // 
             this.formattingRuleCostBearer.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
             this.formattingRuleCostBearer.Name = "formattingRuleCostBearer";
             // 
@@ -606,9 +601,6 @@ namespace BeWo.HphBersenbrueckAtz
             // 
             this.formattingRuleEmployeeName.Condition = "[StartDate2] < [StartDate]";
             this.formattingRuleEmployeeName.DataMember = "ServicesDouble";
-            // 
-            // 
-            // 
             this.formattingRuleEmployeeName.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
             this.formattingRuleEmployeeName.Name = "formattingRuleEmployeeName";
             // 
@@ -622,6 +614,37 @@ namespace BeWo.HphBersenbrueckAtz
             this.bottomMarginBand1.HeightF = 30F;
             this.bottomMarginBand1.Name = "bottomMarginBand1";
             // 
+            // xrLabel5
+            // 
+            this.xrLabel5.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.xrLabel5.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
+            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 310F);
+            this.xrLabel5.Multiline = true;
+            this.xrLabel5.Name = "xrLabel5";
+            this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrLabel5.SizeF = new System.Drawing.SizeF(122.7084F, 20F);
+            this.xrLabel5.StylePriority.UseBorders = false;
+            this.xrLabel5.StylePriority.UseFont = false;
+            this.xrLabel5.StylePriority.UsePadding = false;
+            this.xrLabel5.StylePriority.UseTextAlignment = false;
+            this.xrLabel5.Text = "Standort:";
+            this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // lblStandort
+            // 
+            this.lblStandort.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.lblStandort.Font = new System.Drawing.Font("Arial", 11F);
+            this.lblStandort.LocationFloat = new DevExpress.Utils.PointFloat(148.75F, 310F);
+            this.lblStandort.Multiline = true;
+            this.lblStandort.Name = "lblStandort";
+            this.lblStandort.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.lblStandort.SizeF = new System.Drawing.SizeF(349.8285F, 20F);
+            this.lblStandort.StylePriority.UseBorders = false;
+            this.lblStandort.StylePriority.UseFont = false;
+            this.lblStandort.StylePriority.UsePadding = false;
+            this.lblStandort.StylePriority.UseTextAlignment = false;
+            this.lblStandort.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
             // NachweisTherapieeinheiten
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -640,7 +663,7 @@ namespace BeWo.HphBersenbrueckAtz
             this.PageHeight = 1169;
             this.PageWidth = 827;
             this.PaperKind = System.Drawing.Printing.PaperKind.A4;
-            this.Version = "13.2";
+            this.Version = "17.1";
             ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
@@ -658,7 +681,6 @@ namespace BeWo.HphBersenbrueckAtz
         private DevExpress.XtraReports.UI.XRTable xrTable3;
         private DevExpress.XtraReports.UI.XRTableRow xrTableRow6;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
-        private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
 		private DevExpress.XtraReports.UI.XRLabel xrLabel1;
         private DevExpress.XtraReports.UI.XRTable xrTableServiceRecords1;
         private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
@@ -693,5 +715,8 @@ namespace BeWo.HphBersenbrueckAtz
         private DevExpress.XtraReports.UI.XRLabel lblTitel;
         private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
         private DevExpress.XtraReports.UI.XRLabel xrLabel11;
+        private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel5;
+        private DevExpress.XtraReports.UI.XRLabel lblStandort;
     }
 }
diff --git a/ReportImp/HphBersenbrueckAtz/ServicesOverviewReport.cs b/ReportImp/HphBersenbrueckAtz/ServicesOverviewReport.cs
index ecb03e0cc..693f48eb2 100644
--- a/ReportImp/HphBersenbrueckAtz/ServicesOverviewReport.cs
+++ b/ReportImp/HphBersenbrueckAtz/ServicesOverviewReport.cs
@@ -99,11 +99,35 @@ namespace BeWo.HphBersenbrueckAtz
 		        
 	        }
 			//lblFLSGesamt.Text = String.Format("entspricht {0:0.##} FLS", pRO.TotalFLMBillable / 60);
-			
+			SetzeStandort(pRO);
+
             this.bindingSource1.DataSource = pRO;
         }
 
-		private void SetVarFieldValues(ServicesOverviewRO pRO)
+        private void SetzeStandort(ServicesOverviewRO ro)
+        {
+			if (ro.CostBearer2SupportConceptList != null && ro.CostBearer2SupportConceptList.Count > 0)
+			{
+				var c2s = ro.CostBearer2SupportConceptList[0];
+
+				Customer c = c2s.SupportConcept.Customer;
+
+				foreach (var vv in c.VarFieldValueList)
+				{
+					var varFieldValue = Utils.XMLDeserializeFromString(vv.SerializedValue, Type.GetType(vv.TypeName));
+					if (varFieldValue != null)
+					{
+						if (vv.VarFieldDefOid.Value == 1)
+						{
+							lblStandort.Text = varFieldValue.ToString();
+						}
+					}
+				}
+
+			}
+		}
+
+        private void SetVarFieldValues(ServicesOverviewRO pRO)
 		{
 			String allLeben = ""; // Oid = 16
 			String indBasis = ""; // Oid = 17
diff --git a/ReportImp/HphBersenbrueckFreizeitUndReisen/Abrechnung/CustomInvoiceCreation.cs b/ReportImp/HphBersenbrueckFreizeitUndReisen/Abrechnung/CustomInvoiceCreation.cs
index 6a6c8fcae..8c60b7516 100644
--- a/ReportImp/HphBersenbrueckFreizeitUndReisen/Abrechnung/CustomInvoiceCreation.cs
+++ b/ReportImp/HphBersenbrueckFreizeitUndReisen/Abrechnung/CustomInvoiceCreation.cs
@@ -169,7 +169,7 @@ namespace HphBersenbrueckFreizeitUndReisen.Abrechnung
 			SetSelbstzahlerAdresse(invoice, customer, sc);
 
 			ErstelleRechnungspositionen(invoice, invoicePeriod, "Selbstzahler", serviceRecords, customer);
-
+			ErstelleRechnungspositionen(invoice, invoicePeriod, "Sachkosten", serviceRecords, customer);
 
 			return invoice;
 		}
@@ -242,7 +242,7 @@ namespace HphBersenbrueckFreizeitUndReisen.Abrechnung
 
             foreach (var item in serviceRecords)
             {
-				if (item.ServiceDescription.Category.Name != "Selbstzahler")
+				if (item.ServiceDescription.Category.Name != "Selbstzahler" && item.ServiceDescription.Category.Name != "Sachkosten")
 				{
 					if (!categories.ContainsKey(item.ServiceDescription.Category.Name))
                     {
diff --git a/ReportImp/InputFamilienhilfe/RechnungNeu.Designer.cs b/ReportImp/InputFamilienhilfe/RechnungNeu.Designer.cs
index e50432cf9..6ed7209fc 100644
--- a/ReportImp/InputFamilienhilfe/RechnungNeu.Designer.cs
+++ b/ReportImp/InputFamilienhilfe/RechnungNeu.Designer.cs
@@ -65,6 +65,7 @@ namespace InputFamilienhilfe.Neu
             this.lblFrist = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
             this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
@@ -82,6 +83,7 @@ namespace InputFamilienhilfe.Neu
             // ReportHeader
             // 
             this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrPageInfo2,
             this.xrLine2,
             this.xrLabel13,
             this.xrLabel14,
@@ -115,7 +117,7 @@ namespace InputFamilienhilfe.Neu
             // xrLabel13
             // 
             this.xrLabel13.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(337.5041F, 331.8334F);
+            this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(337.5041F, 338.8334F);
             this.xrLabel13.Multiline = true;
             this.xrLabel13.Name = "xrLabel13";
             this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -126,7 +128,7 @@ namespace InputFamilienhilfe.Neu
             // xrLabel14
             // 
             this.xrLabel14.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(337.5041F, 359.8333F);
+            this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(337.5041F, 366.8333F);
             this.xrLabel14.Multiline = true;
             this.xrLabel14.Name = "xrLabel14";
             this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -137,7 +139,7 @@ namespace InputFamilienhilfe.Neu
             // xrLabel12
             // 
             this.xrLabel12.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(244.8639F, 359.8333F);
+            this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(244.8639F, 366.8333F);
             this.xrLabel12.Multiline = true;
             this.xrLabel12.Name = "xrLabel12";
             this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -150,7 +152,7 @@ namespace InputFamilienhilfe.Neu
             this.xrLabel11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")});
             this.xrLabel11.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(139.7237F, 359.8333F);
+            this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(139.7237F, 366.8333F);
             this.xrLabel11.Multiline = true;
             this.xrLabel11.Name = "xrLabel11";
             this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -163,7 +165,7 @@ namespace InputFamilienhilfe.Neu
             this.xrLabel9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceNumber")});
             this.xrLabel9.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(139.7237F, 331.8334F);
+            this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(139.7237F, 338.8334F);
             this.xrLabel9.Multiline = true;
             this.xrLabel9.Name = "xrLabel9";
             this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -174,7 +176,7 @@ namespace InputFamilienhilfe.Neu
             // xrLabel8
             // 
             this.xrLabel8.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(244.8639F, 331.8334F);
+            this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(244.8639F, 338.8334F);
             this.xrLabel8.Multiline = true;
             this.xrLabel8.Name = "xrLabel8";
             this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -185,7 +187,7 @@ namespace InputFamilienhilfe.Neu
             // xrLabel7
             // 
             this.xrLabel7.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(20.41687F, 359.8333F);
+            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(20.41687F, 366.8333F);
             this.xrLabel7.Multiline = true;
             this.xrLabel7.Name = "xrLabel7";
             this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -196,7 +198,7 @@ namespace InputFamilienhilfe.Neu
             // xrLabel6
             // 
             this.xrLabel6.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(20.41687F, 331.8334F);
+            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(20.41687F, 338.8334F);
             this.xrLabel6.Multiline = true;
             this.xrLabel6.Name = "xrLabel6";
             this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -229,13 +231,13 @@ namespace InputFamilienhilfe.Neu
             // 
             this.xrLabel3.Font = new System.Drawing.Font("Arial", 7F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.xrLabel3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(54)))), ((int)(((byte)(141)))));
-            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(508.6668F, 265.3879F);
+            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(508.67F, 281F);
             this.xrLabel3.Multiline = true;
             this.xrLabel3.Name = "xrLabel3";
-            this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel3.SizeF = new System.Drawing.SizeF(185F, 47.83344F);
+            this.xrLabel3.SizeF = new System.Drawing.SizeF(185F, 41.16681F);
             this.xrLabel3.StylePriority.UseFont = false;
             this.xrLabel3.StylePriority.UseForeColor = false;
+            this.xrLabel3.StylePriority.UsePadding = false;
             this.xrLabel3.Text = "Aalen, [InvoiceDate]";
             // 
             // lblRechnungstext
@@ -315,7 +317,7 @@ namespace InputFamilienhilfe.Neu
             // 
             this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
             this.xrRichText2});
-            this.bottomMarginBand1.HeightF = 52F;
+            this.bottomMarginBand1.HeightF = 52.5F;
             this.bottomMarginBand1.Name = "bottomMarginBand1";
             // 
             // xrRichText2
@@ -323,7 +325,7 @@ namespace InputFamilienhilfe.Neu
             this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
             this.xrRichText2.Name = "xrRichText2";
             this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
-            this.xrRichText2.SizeF = new System.Drawing.SizeF(690.7501F, 52.5F);
+            this.xrRichText2.SizeF = new System.Drawing.SizeF(700F, 52.5F);
             // 
             // GroupHeader1
             // 
@@ -360,7 +362,6 @@ namespace InputFamilienhilfe.Neu
             this.xrLabel10});
             this.GroupFooter1.HeightF = 337.8889F;
             this.GroupFooter1.Name = "GroupFooter1";
-            this.GroupFooter1.PrintAtBottom = true;
             // 
             // xrLabel2
             // 
@@ -402,6 +403,19 @@ namespace InputFamilienhilfe.Neu
             // 
             this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
             // 
+            // xrPageInfo2
+            // 
+            this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 7F);
+            this.xrPageInfo2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(54)))), ((int)(((byte)(141)))));
+            this.xrPageInfo2.Format = "Seite {0} von {1}";
+            this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(508.67F, 252F);
+            this.xrPageInfo2.Name = "xrPageInfo2";
+            this.xrPageInfo2.SizeF = new System.Drawing.SizeF(185.0002F, 23F);
+            this.xrPageInfo2.StylePriority.UseFont = false;
+            this.xrPageInfo2.StylePriority.UseForeColor = false;
+            this.xrPageInfo2.StylePriority.UseTextAlignment = false;
+            this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            // 
             // Rechnung
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -466,5 +480,6 @@ namespace InputFamilienhilfe.Neu
         private DevExpress.XtraReports.UI.XRLabel lblFrist;
         private DevExpress.XtraReports.UI.XRRichText xrRichText4;
         private DevExpress.XtraReports.UI.XRLabel xrLabel2;
+        private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo2;
     }
 }
diff --git a/ReportImp/InputFamilienhilfe/RechnungNeu.resx b/ReportImp/InputFamilienhilfe/RechnungNeu.resx
index bc248b7bb..b45d1f195 100644
--- a/ReportImp/InputFamilienhilfe/RechnungNeu.resx
+++ b/ReportImp/InputFamilienhilfe/RechnungNeu.resx
@@ -121,7 +121,7 @@
     <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABBAHIAaQBhAGwAOwB9AH0AewBcAGMAbwBsAG8AcgB0AGIAbAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADAAIAA7AFwAcgBlAGQAMABcAGcAcgBlAGUAbgAwAFwAYgBsAHUAZQAyADUANQAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADUANABcAGIAbAB1AGUAMQA0ADEAIAA7AH0AewBcACoAXABkAGUAZgBjAGgAcAAgAFwAZgBzADIAMgB9AHsAXABzAHQAeQBsAGUAcwBoAGUAZQB0ACAAewBcAHEAbABcAGYAcwAyADIAIABOAG8AcgBtAGEAbAA7AH0AewBcAHMAMQBcAHMAYgBhAHMAZQBkAG8AbgAwAFwAcwBuAGUAeAB0ADEAXABxAGwAXABoAHkAcABoAHAAYQByADAAXABmADEAXABmAHMAMgAyACAATgBvACAAUwBwAGEAYwBpAG4AZwA7AH0AewBcACoAXABjAHMAMgBcAGYAcwAyADIAXABjAGYAMQAgAEQAZQBmAGEAdQBsAHQAIABQAGEAcgBhAGcAcgBhAHAAaAAgAEYAbwBuAHQAOwB9AHsAXAAqAFwAYwBzADMAXABzAGIAYQBzAGUAZABvAG4AMgBcAGYAcwAyADIAXABjAGYAMQAgAEwAaQBuAGUAIABOAHUAbQBiAGUAcgA7AH0AewBcACoAXABjAHMANABcAHUAbABcAGYAcwAyADIAXABjAGYAMgAgAEgAeQBwAGUAcgBsAGkAbgBrADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABmAHMAMgAyAFwAcQBsAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBiADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHQAMwBcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAATgBvAHIAbQBhAGwAIABUAGEAYgBsAGUAOwB9AHsAXAAqAFwAdABzADYAXAB0AHMAcgBvAHcAZABcAHMAYgBhAHMAZQBkAG8AbgA1AFwAZgBzADIAMgBcAHEAbABcAHQAcgBiAHIAZAByAHQAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAbABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBiAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAaABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgB2AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABUAGEAYgBsAGUAIABTAGkAbQBwAGwAZQAgADEAOwB9AH0AewBcACoAXABsAGkAcwB0AG8AdgBlAHIAcgBpAGQAZQB0AGEAYgBsAGUAfQBcAG4AbwB1AGkAYwBvAG0AcABhAHQAXABzAHAAbAB5AHQAdwBuAGkAbgBlAFwAaAB0AG0AYQB1AHQAcwBwAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHMAMQBcAHEAbABcAGgAeQBwAGgAcABhAHIAMABcAHMAYgAxADIAMAB7AFwAYgBcAGYAMQBcAGYAcwAxADQAXABjAGYAMwAgAEoAdQBnAGUAbgBkAC0AIAB1AG4AZAAgAEYAYQBtAGkAbABpAGUAbgBoAGkAbABmAGUAfQB7AFwAZgAxAFwAZgBzADEANABcAGMAZgAzACAAIAB9AFwAZgAxAFwAZgBzADIAMgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcwAxAFwAcQBsAFwAaAB5AHAAaABwAGEAcgAwAFwAcwBiADYAMAB7AFwAYgBcAGYAMQBcAGYAcwAxADQAXABjAGYAMwAgAEUAaQBuAGcAbABpAGUAZABlAHIAdQBuAGcAcwBoAGkAbABmAGUAfQB7AFwAZgAxAFwAZgBzADEANABcAGMAZgAzACAAXABsAGkAbgBlACAAfQBcAGYAMQBcAGYAcwAyADIAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHMAMQBcAHEAbABcAGgAeQBwAGgAcABhAHIAMABcAHMAbAAyADYANABcAHMAbABtAHUAbAB0ADEAXABzAGIAMQAyADAAewBcAGIAXABmADEAXABmAHMAMQA0AFwAYwBmADMAIABLAG8AbgB0AGEAawB0AGQAYQB0AGUAbgA6AH0AXABmADEAXABmAHMAMgAyAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABzADEAXABxAGwAXABoAHkAcABoAHAAYQByADAAXABzAGwAMgA2ADQAXABzAGwAbQB1AGwAdAAxAHsAXABmADEAXABmAHMAMQA0AFwAYwBmADMAIABrAG8AbgB0AGEAawB0AEAAaQBuAHAAdQB0AC0AbwBzAHQAYQBsAGIALgBkAGUAfQBcAGYAMQBcAGYAcwAyADIAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHMAMQBcAHEAbABcAGgAeQBwAGgAcABhAHIAMABcAG8AdQB0AGwAaQBuAGUAbABlAHYAZQBsADAAXABzAGwAMgAwADAAXABzAGwAbQB1AGwAdAAwAHsAXABmADEAXABmAHMAMQA0AFwAYwBmADMAIABUAGUAbAAuADoAIAAwADcAMwA2ADEALQA1ADIAOQAwADEANQAxAH0AXABmADEAXABmAHMAMQA0AFwAYwBmADMAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABzADEAXABxAGwAXABoAHkAcABoAHAAYQByADAAXABvAHUAdABsAGkAbgBlAGwAZQB2AGUAbAAwAFwAcwBsADIAMAAwAFwAcwBsAG0AdQBsAHQAMABcAGYAMQBcAGYAcwAxADQAXABjAGYAMwBcAHAAYQByAH0A</value>
   </data>
   <data name="xrRichText3.SerializableRtfString" xml:space="preserve">
-    <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABBAHIAaQBhAGwAOwB9AH0AewBcAGMAbwBsAG8AcgB0AGIAbAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADAAIAA7AFwAcgBlAGQAMABcAGcAcgBlAGUAbgAwAFwAYgBsAHUAZQAyADUANQAgADsAfQB7AFwAKgBcAGQAZQBmAGMAaABwACAAXABmAHMAMgAyAH0AewBcAHMAdAB5AGwAZQBzAGgAZQBlAHQAIAB7AFwAcQBsAFwAZgBzADIAMgAgAE4AbwByAG0AYQBsADsAfQB7AFwAKgBcAGMAcwAxAFwAZgBzADIAMgBcAGMAZgAxACAARABlAGYAYQB1AGwAdAAgAFAAYQByAGEAZwByAGEAcABoACAARgBvAG4AdAA7AH0AewBcACoAXABjAHMAMgBcAHMAYgBhAHMAZQBkAG8AbgAxAFwAZgBzADIAMgBcAGMAZgAxACAATABpAG4AZQAgAE4AdQBtAGIAZQByADsAfQB7AFwAKgBcAGMAcwAzAFwAdQBsAFwAZgBzADIAMgBcAGMAZgAyACAASAB5AHAAZQByAGwAaQBuAGsAOwB9AHsAXAAqAFwAdABzADQAXAB0AHMAcgBvAHcAZABcAGYAcwAyADIAXABxAGwAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgByADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAHIAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAdAAzAFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABOAG8AcgBtAGEAbAAgAFQAYQBiAGwAZQA7AH0AewBcACoAXAB0AHMANQBcAHQAcwByAG8AdwBkAFwAcwBiAGEAcwBlAGQAbwBuADQAXABmAHMAMgAyAFwAcQBsAFwAdAByAGIAcgBkAHIAdABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBsAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAcgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBoAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHYAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgByADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAHIAMQAwADgAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAFQAYQBiAGwAZQAgAFMAaQBtAHAAbABlACAAMQA7AH0AfQB7AFwAKgBcAGwAaQBzAHQAbwB2AGUAcgByAGkAZABlAHQAYQBiAGwAZQB9AFwAbgBvAHUAaQBjAG8AbQBwAGEAdABcAHMAcABsAHkAdAB3AG4AaQBuAGUAXABoAHQAbQBhAHUAdABzAHAAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAdQBsAFwAZgAxAFwAZgBzADEANgBcAGMAZgAxACAAaQBuAHAAdQB0ACAATwBzAHQAYQBsAGIAIAAtACAAUgBlAGIAZQBrAGsAYQAgAEgAXAB1ADIAMgA4AFwAJwBlADQAdQBcAHUAMgAyADMAXAAnAGQAZgBsAGUAcgAtAEQAcgBvAGUAcwBlACwAIABGAHIAaQBlAGQAcgBpAGMAaABzAHQAcgBhAFwAdQAyADIAMwBcACcAZABmAGUAIAA1ACwAIAA3ADMANAAzADAAIABBAGEAbABlAG4AfQBcAGYAcwAyADIAXABjAGYAMQBcAHAAYQByAH0A</value>
+    <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABBAHIAaQBhAGwAOwB9AH0AewBcAGMAbwBsAG8AcgB0AGIAbAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADAAIAA7AFwAcgBlAGQAMABcAGcAcgBlAGUAbgAwAFwAYgBsAHUAZQAyADUANQAgADsAfQB7AFwAKgBcAGQAZQBmAGMAaABwACAAXABmAHMAMgAyAH0AewBcAHMAdAB5AGwAZQBzAGgAZQBlAHQAIAB7AFwAcQBsAFwAZgBzADIAMgAgAE4AbwByAG0AYQBsADsAfQB7AFwAKgBcAGMAcwAxAFwAZgBzADIAMgBcAGMAZgAxACAARABlAGYAYQB1AGwAdAAgAFAAYQByAGEAZwByAGEAcABoACAARgBvAG4AdAA7AH0AewBcACoAXABjAHMAMgBcAHMAYgBhAHMAZQBkAG8AbgAxAFwAZgBzADIAMgBcAGMAZgAxACAATABpAG4AZQAgAE4AdQBtAGIAZQByADsAfQB7AFwAKgBcAGMAcwAzAFwAdQBsAFwAZgBzADIAMgBcAGMAZgAyACAASAB5AHAAZQByAGwAaQBuAGsAOwB9AHsAXAAqAFwAdABzADQAXAB0AHMAcgBvAHcAZABcAGYAcwAyADIAXABxAGwAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgByADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAHIAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAdAAzAFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABOAG8AcgBtAGEAbAAgAFQAYQBiAGwAZQA7AH0AewBcACoAXAB0AHMANQBcAHQAcwByAG8AdwBkAFwAcwBiAGEAcwBlAGQAbwBuADQAXABmAHMAMgAyAFwAcQBsAFwAdAByAGIAcgBkAHIAdABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBsAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAcgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBoAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHYAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgByADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAHIAMQAwADgAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAFQAYQBiAGwAZQAgAFMAaQBtAHAAbABlACAAMQA7AH0AfQB7AFwAKgBcAGwAaQBzAHQAbwB2AGUAcgByAGkAZABlAHQAYQBiAGwAZQB9AFwAbgBvAHUAaQBjAG8AbQBwAGEAdABcAHMAcABsAHkAdAB3AG4AaQBuAGUAXABoAHQAbQBhAHUAdABzAHAAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAdQBsAFwAZgAxAFwAZgBzADEANgBcAGMAZgAxACAAaQBuAHAAdQB0AH0AewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXAB1AGwAXABmADEAXABmAHMAMQA2AFwAYwBmADEAIAAsAH0AewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXAB1AGwAXABmADEAXABmAHMAMQA2AFwAYwBmADEAIAAgAH0AewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXAB1AGwAXABmADEAXABmAHMAMQA2AFwAYwBmADEAIABGAHIAaQBlAGQAcgBpAGMAaABzAHQAcgBhAFwAdQAyADIAMwBcACcAZABmAGUAIAA1ACwAIAA3ADMANAAzADAAIABBAGEAbABlAG4AfQBcAGYAcwAyADIAXABjAGYAMQBcAHAAYQByAH0A</value>
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="xrPictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -1086,7 +1086,7 @@
 </value>
   </data>
   <data name="xrRichText2.SerializableRtfString" xml:space="preserve">
-    <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABBAHIAaQBhAGwAOwB9AH0AewBcAGMAbwBsAG8AcgB0AGIAbAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADAAIAA7AFwAcgBlAGQAMABcAGcAcgBlAGUAbgAwAFwAYgBsAHUAZQAyADUANQAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADUANABcAGIAbAB1AGUAMQA0ADEAIAA7AH0AewBcACoAXABkAGUAZgBjAGgAcAAgAFwAZgBzADIAMgB9AHsAXABzAHQAeQBsAGUAcwBoAGUAZQB0ACAAewBcAHEAbABcAGYAcwAyADIAIABOAG8AcgBtAGEAbAA7AH0AewBcAHMAMQBcAHMAYgBhAHMAZQBkAG8AbgAwAFwAcwBuAGUAeAB0ADEAXABxAGwAXABzAGwAMgA3ADUAXABzAGwAbQB1AGwAdAAxAFwAcwBhADIAMAAwAFwAZgAxAFwAZgBzADIANAAgAFIAYQBoAG0AZQBuAGkAbgBoAGEAbAB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAZgBzADIAMgBcAGMAZgAxACAARABlAGYAYQB1AGwAdAAgAFAAYQByAGEAZwByAGEAcABoACAARgBvAG4AdAA7AH0AewBcACoAXABjAHMAMwBcAHMAYgBhAHMAZQBkAG8AbgAyAFwAZgBzADIAMgBcAGMAZgAxACAATABpAG4AZQAgAE4AdQBtAGIAZQByADsAfQB7AFwAKgBcAGMAcwA0AFwAdQBsAFwAZgBzADIAMgBcAGMAZgAyACAASAB5AHAAZQByAGwAaQBuAGsAOwB9AHsAXAAqAFwAdABzADUAXAB0AHMAcgBvAHcAZABcAGYAcwAyADIAXABxAGwAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgByADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAHIAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAdAAzAFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABOAG8AcgBtAGEAbAAgAFQAYQBiAGwAZQA7AH0AewBcACoAXAB0AHMANgBcAHQAcwByAG8AdwBkAFwAcwBiAGEAcwBlAGQAbwBuADUAXABmAHMAMgAyAFwAcQBsAFwAdAByAGIAcgBkAHIAdABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBsAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAcgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBoAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHYAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgByADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAHIAMQAwADgAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAFQAYQBiAGwAZQAgAFMAaQBtAHAAbABlACAAMQA7AH0AfQB7AFwAKgBcAGwAaQBzAHQAbwB2AGUAcgByAGkAZABlAHQAYQBiAGwAZQB9AFwAbgBvAHUAaQBjAG8AbQBwAGEAdABcAHMAcABsAHkAdAB3AG4AaQBuAGUAXABoAHQAbQBhAHUAdABzAHAAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcwAxAFwAcQBjAFwAcwBsADIAMAAwAFwAcwBsAG0AdQBsAHQAMAB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMQBcAGYAcwAxADYAXABjAGYAMwAgAGkAbgBwAHUAdAAgAE8AcwB0AGEAbABiACAAXAB1ADgAMgAxADEAXAAnADkANgAgAFIAZQBiAGUAawBrAGEAIABIAFwAdQAyADIAOABcACcAZQA0AHUAXAB1ADIAMgAzAFwAJwBkAGYAbABlAHIALQBEAHIAbwBlAHMAZQAgAHwAIABGAHIAaQBlAGQAcgBpAGMAaABzAHQAcgAuACAANQAgAHwAIAA3ADMANAAzADAAIABBAGEAbABlAG4AIAB8ACAAVABlAGwAZQBmAG8AbgAgADAANwAzADYAMQAtADkAMgA0ADgAMAA1ADIAIAB8ACAARgBhAHgAIAAwADcAMwA2ADEALQA5ADcANQAyADUANgAwACAAfAAgAEkASwAtAE4AcgAuACAANAA2ADAAOAAyADUANAA0ADkAfQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADEAXABmAHMAMQA2AFwAYwBmADMAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABzADEAXABxAGMAXABzAGwAMgAwADAAXABzAGwAbQB1AGwAdAAwAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAxAFwAZgBzADEANgBcAGMAZgAzACAASwByAGUAaQBzAHMAcABhAHIAawBhAHMAcwBlACAASABlAGkAZABlAG4AaABlAGkAbQAgAHwAIABCAEkAQwA6ACAAUwBPAEwAQQBEAEUAUwAxAEgARABIACAAfAAgAEkAQgBBAE4AOgAgAEQARQA5ADUAIAA2ADMAMgA1ACAAMAAwADMAMAAgADAAMAA0ADYAIAAwADUANwA4ACAAMgA4AH0AXABmADEAXABmAHMAMgA0AFwAYwBmADEAXABwAGEAcgB9AA==</value>
+    <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABBAHIAaQBhAGwAOwB9AH0AewBcAGMAbwBsAG8AcgB0AGIAbAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADAAIAA7AFwAcgBlAGQAMABcAGcAcgBlAGUAbgAwAFwAYgBsAHUAZQAyADUANQAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADUANABcAGIAbAB1AGUAMQA0ADEAIAA7AH0AewBcACoAXABkAGUAZgBjAGgAcAAgAFwAZgBzADIAMgB9AHsAXABzAHQAeQBsAGUAcwBoAGUAZQB0ACAAewBcAHEAbABcAGYAcwAyADIAIABOAG8AcgBtAGEAbAA7AH0AewBcAHMAMQBcAHMAYgBhAHMAZQBkAG8AbgAwAFwAcwBuAGUAeAB0ADEAXABxAGwAXABzAGwAMgA3ADUAXABzAGwAbQB1AGwAdAAxAFwAcwBhADIAMAAwAFwAZgAxAFwAZgBzADIANAAgAFIAYQBoAG0AZQBuAGkAbgBoAGEAbAB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAZgBzADIAMgBcAGMAZgAxACAARABlAGYAYQB1AGwAdAAgAFAAYQByAGEAZwByAGEAcABoACAARgBvAG4AdAA7AH0AewBcACoAXABjAHMAMwBcAHMAYgBhAHMAZQBkAG8AbgAyAFwAZgBzADIAMgBcAGMAZgAxACAATABpAG4AZQAgAE4AdQBtAGIAZQByADsAfQB7AFwAKgBcAGMAcwA0AFwAdQBsAFwAZgBzADIAMgBcAGMAZgAyACAASAB5AHAAZQByAGwAaQBuAGsAOwB9AHsAXAAqAFwAdABzADUAXAB0AHMAcgBvAHcAZABcAGYAcwAyADIAXABxAGwAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgByADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAHIAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAdAAzAFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABOAG8AcgBtAGEAbAAgAFQAYQBiAGwAZQA7AH0AewBcACoAXAB0AHMANgBcAHQAcwByAG8AdwBkAFwAcwBiAGEAcwBlAGQAbwBuADUAXABmAHMAMgAyAFwAcQBsAFwAdAByAGIAcgBkAHIAdABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBsAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAcgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBoAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHYAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgByADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAHIAMQAwADgAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAFQAYQBiAGwAZQAgAFMAaQBtAHAAbABlACAAMQA7AH0AfQB7AFwAKgBcAGwAaQBzAHQAbwB2AGUAcgByAGkAZABlAHQAYQBiAGwAZQB9AFwAbgBvAHUAaQBjAG8AbQBwAGEAdABcAHMAcABsAHkAdAB3AG4AaQBuAGUAXABoAHQAbQBhAHUAdABzAHAAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcwAxAFwAcQBjAFwAcwBsADIAMAAwAFwAcwBsAG0AdQBsAHQAMAB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMQBcAGYAcwAxADYAXABjAGYAMwAgAGkAbgBwAHUAdAAgAE8AcwB0AGEAbABiACAAXAB1ADgAMgAxADEAXAAnADkANgAgAFIAZQBiAGUAawBrAGEAIABIAFwAdQAyADIAOABcACcAZQA0AHUAXAB1ADIAMgAzAFwAJwBkAGYAbABlAHIALQBEAHIAbwBlAHMAZQAgAHwAIABGAHIAaQBlAGQAcgBpAGMAaABzAHQAcgAuACAANQAgAHwAIAA3ADMANAAzADAAIABBAGEAbABlAG4AIAB8ACAAVABlAGwAZQBmAG8AbgAgADAANwAzADYAMQAtADkAMgA0ADgAMAA1ADIAIAB8ACAARgBhAHgAIAAwADcAMwA2ADEALQA5ADcANQAyADUANgAwACAAfAAgAEkASwAtAE4AcgAuACAANAA2ADAAOAAyADUANAA0ADkAfQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADEAXABmAHMAMQA2AFwAYwBmADMAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABzADEAXABxAGMAXABzAGwAMgAwADAAXABzAGwAbQB1AGwAdAAwAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAxAFwAZgBzADEANgBcAGMAZgAzACAASwByAGUAaQBzAHMAcABhAHIAawBhAHMAcwBlACAASABlAGkAZABlAG4AaABlAGkAbQAgAHwAIABCAEkAQwA6ACAAUwBPAEwAQQBEAEUAUwAxAEgARABIACAAfAAgAEkAQgBBAE4AOgAgAEQARQA5ADUAIAA2ADMAMgA1ACAAMAAwADMAMAAgADAAMAA0ADYAIAAwADUANwA4ACAAMgA4AH0AewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADEAXABmAHMAMQA2AFwAYwBmADMAIAAgAHwAIABGAGkAbgBhAG4AdABhAG0AdAAgAEEAYQB9AHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAxAFwAZgBzADEANgBcAGMAZgAzACAAbABlAG4AIAB8ACAAUwB0AGUAfQB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMQBcAGYAcwAxADYAXABjAGYAMwAgAHUAZQByAH0AewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADEAXABmAHMAMQA2AFwAYwBmADMAIABuAHUAbQBtAGUAcgA6ACAANQAwADIANgA2AC8AMwAxADYAMAA4AH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAxAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAfQA=</value>
   </data>
   <data name="xrPictureBox2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
diff --git a/ReportService/ServiceImplementations/ReportServiceImp.cs b/ReportService/ServiceImplementations/ReportServiceImp.cs
index 73be96bc2..66f7c9233 100644
--- a/ReportService/ServiceImplementations/ReportServiceImp.cs
+++ b/ReportService/ServiceImplementations/ReportServiceImp.cs
@@ -273,7 +273,7 @@ namespace ReportingService.ServiceImplementations
         {
             var reportCreator = GetReportCreator();
 
-            var report = reportCreator.CreateKilometerauswertung(customerOid, rangeDate);
+            var report = reportCreator.CreateKilometerauswertung(customerOid, null, new DateTime(rangeDate.Year, rangeDate.Month, 1), new DateTime(rangeDate.Year, rangeDate.Month, 1).AddMonths(1).AddDays(-1));
 
             return report == null ? null : CreateReportStream(report);
         }
@@ -282,9 +282,9 @@ namespace ReportingService.ServiceImplementations
         {
             var reportCreator = GetReportCreator();
 
-            var report = reportCreator.CreateKilometerauswertungForAllCustomers(customerOids, rangeDate);
+            var report = reportCreator.CreateKilometerauswertungForAllCustomers(customerOids, null, new DateTime(rangeDate.Year, rangeDate.Month, 1), new DateTime(rangeDate.Year, rangeDate.Month, 1).AddMonths(1).AddDays(-1));
 
-            return report == null ? null : CreateReportStream(report);
+			return report == null ? null : CreateReportStream(report);
         }
 
         public bool CheckForAnyServiceRecordsWithDistanceValues(List<long> customerOids, DateTimeSpan span)
@@ -296,7 +296,7 @@ namespace ReportingService.ServiceImplementations
         {
             var reportCreator = GetReportCreator();
 
-            var report = reportCreator.CreateEmployeeKilometerauswertung(employeeOid, range);
+            var report = reportCreator.CreateEmployeeKilometerauswertung(employeeOid, null, range, range);
 
             return report == null ? null : CreateReportStream(report);
         }
@@ -305,7 +305,7 @@ namespace ReportingService.ServiceImplementations
         {
             var reportCreator = GetReportCreator();
 
-            var report = reportCreator.CreateKilometerauswertungForAllEmployees(employeeOids, rangeDate);
+            var report = reportCreator.CreateKilometerauswertungForAllEmployees(employeeOids, null, new DateTime(rangeDate.Year, rangeDate.Month, 1), new DateTime(rangeDate.Year, rangeDate.Month, 1).AddMonths(1).AddDays(-1));
 
 			return report == null ? null : CreateReportStream(report);
 		}
@@ -315,9 +315,9 @@ namespace ReportingService.ServiceImplementations
         {
             var reportCreator = GetReportCreator(tenant);
 
-            var report = reportCreator.CreateKilometerauswertungForAllCustomers(customerOids, rangeDate);
+            var report = reportCreator.CreateKilometerauswertungForAllCustomers(customerOids, null, new DateTime(rangeDate.Year, rangeDate.Month, 1), new DateTime(rangeDate.Year, rangeDate.Month, 1).AddMonths(1).AddDays(-1));
 
-            return report == null ? null : CreateReportStream(report);
+			return report == null ? null : CreateReportStream(report);
         }
 
         public MemoryStream CreateMedikamentenlistenReport(long mvlOid, string tenant)
diff --git a/Service/Dokumentverwaltung/DokumentManager.cs b/Service/Dokumentverwaltung/DokumentManager.cs
index 57ad4b1af..8936876b5 100644
--- a/Service/Dokumentverwaltung/DokumentManager.cs
+++ b/Service/Dokumentverwaltung/DokumentManager.cs
@@ -20,7 +20,7 @@ namespace BeWo.Service.Dokumentverwaltung
             bool templateFolder = folder.Any(f => f.SystemEntryID.Equals(SystemEntryID.TemplateDirectory));
             var folderDCList = new List<BeWoFolderDC>();
 
-            foreach (BeWoFolder item in folder)
+            foreach (BeWoFolder item in folder.OrderBy(f => f.Name))
             {
                 folderDCList.Add(MapperFactory.BeWoFolderDC_BeWoFolder.MapToNewDC(item));
             }
@@ -28,12 +28,12 @@ namespace BeWo.Service.Dokumentverwaltung
             IEnumerable<FileAttachmentInfo> files = DAOFactory.SearchDAO.FindFileAttachmentInfos(pObjectTid, pObjectOid);
             var fileDCList = new List<FileAttachmentDC>();
 
-            foreach (FileAttachmentInfo item in files)
+            foreach (FileAttachmentInfo item in files.OrderBy(f => f.Path))
             {
                 fileDCList.Add(MapperFactory.FileAttachmentDC_FileAttachmentInfo.MapToNewDC(item));
             }
 
-            Thread.Sleep(500);
+            //Thread.Sleep(500);
 
             return CreateFolderTree(folderDCList, fileDCList, pObjectTid, pObjectOid, templateFolder);
            
diff --git a/Service/ServiceImplementations/EmployeeServiceImp.cs b/Service/ServiceImplementations/EmployeeServiceImp.cs
index 68953f094..404f7558b 100644
--- a/Service/ServiceImplementations/EmployeeServiceImp.cs
+++ b/Service/ServiceImplementations/EmployeeServiceImp.cs
@@ -1083,7 +1083,7 @@ namespace BeWo.Service.ServiceImplementations
             {
                 var groups = GetAllGroupsContainingMemberOfEmployee(employeeOid);
 
-                return MapperFactory.GroupOfPeopleDC_GroupOfPeople.MapToNewDCs(groups);
+                return MapperFactory.GroupOfPeopleDC_GroupOfPeople.MapToNewDCs(groups.OrderBy(g => g.Name));
             }
             catch (Exception e)
             {
diff --git a/Shared/DataContracts/Compact/ClientPartials/CompactSupportConceptDC.cs b/Shared/DataContracts/Compact/ClientPartials/CompactSupportConceptDC.cs
index 45a44a8c0..f3035d32f 100644
--- a/Shared/DataContracts/Compact/ClientPartials/CompactSupportConceptDC.cs
+++ b/Shared/DataContracts/Compact/ClientPartials/CompactSupportConceptDC.cs
@@ -82,6 +82,11 @@ namespace BS.Shared.DataContracts.Compact
         {
             get
             {
+                if (this.Customer != null && !String.IsNullOrWhiteSpace(this.Customer.CustomerAlias))
+                {
+                    return String.Format("{0} ({1}) {2}", this.Customer, this.Customer.CustomerAlias, this.Customer.DateOfBirthString);
+                }
+                
                 return this.Customer + " " + this.Customer.DateOfBirthString;
             }
         }
@@ -146,6 +151,9 @@ namespace BS.Shared.DataContracts.Compact
                 string fr = string.Join(" ", this.CustomerReferenceNumbers.ToArray()) + " " + this.Customer + " " + Customer.CustomerAlias;
 
                 fr += " " + string.Join(" ", this.CostBearerDetailStrings.ToArray());
+
+                fr += " " + this.Customer.PostalCode;
+
                 return fr;
             }
         }
@@ -172,6 +180,14 @@ namespace BS.Shared.DataContracts.Compact
             }
         }
 
+        public string PostalCode
+        {
+            get
+            {
+                return this.Customer.PostalCode;
+            }
+        }
+
         public Brush ForegroundBrush
         {
             get
@@ -425,10 +441,16 @@ namespace BS.Shared.DataContracts.Compact
 
                 String str = cbstr.ToString();
 
+                if (!String.IsNullOrEmpty(cb.CustomerReferenceNumber))
+                {
+                    str = String.Format("{0}, {1}", str, cb.CustomerReferenceNumber);
+                }
+
                 if (!String.IsNullOrEmpty(cb.Bezeichnung))
                 {
                     str = String.Format("{0} {1}", cb.Bezeichnung, str);
                 }
+               
                 this._CostBearerDetailStrings.Add(str);
             }
 
diff --git a/Shared/DataContracts/ReportTypes.cs b/Shared/DataContracts/ReportTypes.cs
index 492e1de3a..55ea8839a 100644
--- a/Shared/DataContracts/ReportTypes.cs
+++ b/Shared/DataContracts/ReportTypes.cs
@@ -36,6 +36,7 @@
         AbwesenheitsPrintReport,
         MitarbeiterKlientenReport,
         HilfeplanStatistik,
-        RatingReport
+        RatingReport,
+        KilometerAuswertung
     }
 }
\ No newline at end of file