Gitignore update

Launcher Path beim erneuten Einloggen anzeigen
Waiting entfernt bei "Zurück zu login"
2024-06-07 14:35:13 +02:00 · 2024-06-07 14:33:47 +02:00 · 2024-06-07 14:20:43 +02:00 · 2024-06-07 13:42:25 +02:00 · 2024-06-06 15:42:04 +02:00 · 2024-06-06 13:02:19 +02:00
32724 changed files with 1673667 additions and 12940798 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+.cr
+.editorconfig
 /BeWoOhneReports.v12.suo
 /BeWo/bin
 /BeWo/obj
@@ -7,6 +9,7 @@
 /BeWoPlanerAndroid/obj
 /BeWoPlanerMobil/bin
 /BeWoPlanerMobil/obj
+/BeWoTest
 /Host/bin
 /Host/obj
 /Controls/bin
@@ -584,13 +587,34 @@ obj
 /SharedLauncher/obj
 /BeWoLauncher/bin
 /BeWoLauncher/obj
-/UnitTests/bin
-/UnitTests/obj
 /DownloadServer/bin
 /DownloadServer/obj
-/BeWoTest/bin
-/BeWoTest/obj
-/UnitTestProject472/bin
-/UnitTestProject472/obj
-/UnitTestProject45/bin
-/UnitTestProject45/obj
+/BeWoPlanerMobil/node_modules/.bin/escodegen
+/BeWoPlanerMobil/node_modules/.bin/escodegen.cmd
+/BeWoPlanerMobil/node_modules/.bin/escodegen.ps1
+/BeWoPlanerMobil/node_modules/.bin/esgenerate
+/BeWoPlanerMobil/node_modules/.bin/esgenerate.cmd
+/BeWoPlanerMobil/node_modules/.bin/esgenerate.ps1
+/BeWoPlanerMobil/node_modules/.bin/esparse
+/BeWoPlanerMobil/node_modules/.bin/esparse.cmd
+/BeWoPlanerMobil/node_modules/.bin/esparse.ps1
+/BeWoPlanerMobil/node_modules/.bin/esvalidate
+/BeWoPlanerMobil/node_modules/.bin/esvalidate.cmd
+/BeWoPlanerMobil/node_modules/.bin/esvalidate.ps1
+/BeWoPlanerMobil/node_modules/.bin/pegjs
+/BeWoPlanerMobil/node_modules/.bin/pegjs.cmd
+/BeWoPlanerMobil/node_modules/.bin/pegjs.ps1
+/BeWoPlanerMobilAllReports.sln
+/ReportImp/Lazy/CustomMitarbeiterstundenkontoBerechnung.cs
+/ReportImp/Lazy/Lazy.csproj
+/ReportImp/Lazy/Mitarbeiterstundenkonto.cs
+/ReportImp/Lazy/Mitarbeiterstundenkonto.designer.cs
+/ReportImp/Lazy/Mitarbeiterstundenkonto.resx
+/ReportImp/Lazy/Properties/AssemblyInfo.cs
+/ReportImp/Lazy/Properties/licenses.licx
+/CustomerDlls
+/Dakota/bin
+/Dakota/obj
+/BeWoDatabaseTerminator/BeWoDatabaseTerminator/bin/Debug
+/BeWoDatabaseTerminator/BeWoDatabaseTerminator/bin/Release
+/ReportImp/TestLWV
--- a/BeWo.sln
+++ b/BeWo.sln
@@ -485,7 +485,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BetreuwoWesel", "ReportImp\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WahlEv", "ReportImp\WahlEv\WahlEv.csproj", "{68BC6F76-7C77-4959-BC88-27696BBA41F5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BHVBergischeHauspflege", "ReportImp\BHVBergischeHauspflege\BHVBergischeHauspflege.csproj", "{375E3B1B-633A-477B-B0CF-C3A430B4A62D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BHVBergischeHauspflege", "ReportImp\BHVBergischeHauspflege\BHVBergischeHauspflege.csproj", "{F63DB13E-7930-4D8D-8C2F-B83B25502A9D}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MuenchenerAidsHilfeEV", "ReportImp\MuenchenerAidsHilfeEV\MuenchenerAidsHilfeEV.csproj", "{F781BCF9-647F-441E-A3BD-9DC1FDBCA1A4}"
 EndProject
@@ -599,6 +599,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Inkomm", "ReportImp\Inkomm\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MalteserJohanniterJohanneshaus", "ReportImp\MalteserJohanniterJohanneshaus\MalteserJohanniterJohanneshaus.csproj", "{28331CB1-17FD-4B58-A837-E0249CAAC535}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dakota", "Dakota\Dakota.csproj", "{47331732-DD96-4075-869F-83AA9F3F9937}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeWoLauncher", "BeWoLauncher\BeWoLauncher.csproj", "{E3BA193A-A64F-4CE6-91BE-F54E551797BE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharedLauncher", "SharedLauncher\SharedLauncher.csproj", "{EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DownloadServer", "DownloadServer\DownloadServer.csproj", "{18019E8C-C6DA-4B1B-9C2B-908BC14911AB}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|.NET = Debug|.NET
@@ -3866,22 +3874,22 @@ Global
 		{68BC6F76-7C77-4959-BC88-27696BBA41F5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{68BC6F76-7C77-4959-BC88-27696BBA41F5}.Release|x86.ActiveCfg = Release|Any CPU
 		{68BC6F76-7C77-4959-BC88-27696BBA41F5}.Release|x86.Build.0 = Release|Any CPU
-		{375E3B1B-633A-477B-B0CF-C3A430B4A62D}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{375E3B1B-633A-477B-B0CF-C3A430B4A62D}.Debug|.NET.Build.0 = Debug|Any CPU
-		{375E3B1B-633A-477B-B0CF-C3A430B4A62D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{375E3B1B-633A-477B-B0CF-C3A430B4A62D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{375E3B1B-633A-477B-B0CF-C3A430B4A62D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{375E3B1B-633A-477B-B0CF-C3A430B4A62D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{375E3B1B-633A-477B-B0CF-C3A430B4A62D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{375E3B1B-633A-477B-B0CF-C3A430B4A62D}.Debug|x86.Build.0 = Debug|Any CPU
-		{375E3B1B-633A-477B-B0CF-C3A430B4A62D}.Release|.NET.ActiveCfg = Release|Any CPU
-		{375E3B1B-633A-477B-B0CF-C3A430B4A62D}.Release|.NET.Build.0 = Release|Any CPU
-		{375E3B1B-633A-477B-B0CF-C3A430B4A62D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{375E3B1B-633A-477B-B0CF-C3A430B4A62D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{375E3B1B-633A-477B-B0CF-C3A430B4A62D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{375E3B1B-633A-477B-B0CF-C3A430B4A62D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{375E3B1B-633A-477B-B0CF-C3A430B4A62D}.Release|x86.ActiveCfg = Release|Any CPU
-		{375E3B1B-633A-477B-B0CF-C3A430B4A62D}.Release|x86.Build.0 = Release|Any CPU
+		{F63DB13E-7930-4D8D-8C2F-B83B25502A9D}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{F63DB13E-7930-4D8D-8C2F-B83B25502A9D}.Debug|.NET.Build.0 = Debug|Any CPU
+		{F63DB13E-7930-4D8D-8C2F-B83B25502A9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F63DB13E-7930-4D8D-8C2F-B83B25502A9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F63DB13E-7930-4D8D-8C2F-B83B25502A9D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F63DB13E-7930-4D8D-8C2F-B83B25502A9D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F63DB13E-7930-4D8D-8C2F-B83B25502A9D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F63DB13E-7930-4D8D-8C2F-B83B25502A9D}.Debug|x86.Build.0 = Debug|Any CPU
+		{F63DB13E-7930-4D8D-8C2F-B83B25502A9D}.Release|.NET.ActiveCfg = Release|Any CPU
+		{F63DB13E-7930-4D8D-8C2F-B83B25502A9D}.Release|.NET.Build.0 = Release|Any CPU
+		{F63DB13E-7930-4D8D-8C2F-B83B25502A9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F63DB13E-7930-4D8D-8C2F-B83B25502A9D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F63DB13E-7930-4D8D-8C2F-B83B25502A9D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{F63DB13E-7930-4D8D-8C2F-B83B25502A9D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{F63DB13E-7930-4D8D-8C2F-B83B25502A9D}.Release|x86.ActiveCfg = Release|Any CPU
+		{F63DB13E-7930-4D8D-8C2F-B83B25502A9D}.Release|x86.Build.0 = Release|Any CPU
 		{F781BCF9-647F-441E-A3BD-9DC1FDBCA1A4}.Debug|.NET.ActiveCfg = Debug|Any CPU
 		{F781BCF9-647F-441E-A3BD-9DC1FDBCA1A4}.Debug|.NET.Build.0 = Debug|Any CPU
 		{F781BCF9-647F-441E-A3BD-9DC1FDBCA1A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -4778,6 +4786,70 @@ Global
 		{28331CB1-17FD-4B58-A837-E0249CAAC535}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{28331CB1-17FD-4B58-A837-E0249CAAC535}.Release|x86.ActiveCfg = Release|Any CPU
 		{28331CB1-17FD-4B58-A837-E0249CAAC535}.Release|x86.Build.0 = Release|Any CPU
+		{47331732-DD96-4075-869F-83AA9F3F9937}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{47331732-DD96-4075-869F-83AA9F3F9937}.Debug|.NET.Build.0 = Debug|Any CPU
+		{47331732-DD96-4075-869F-83AA9F3F9937}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{47331732-DD96-4075-869F-83AA9F3F9937}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{47331732-DD96-4075-869F-83AA9F3F9937}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{47331732-DD96-4075-869F-83AA9F3F9937}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{47331732-DD96-4075-869F-83AA9F3F9937}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{47331732-DD96-4075-869F-83AA9F3F9937}.Debug|x86.Build.0 = Debug|Any CPU
+		{47331732-DD96-4075-869F-83AA9F3F9937}.Release|.NET.ActiveCfg = Release|Any CPU
+		{47331732-DD96-4075-869F-83AA9F3F9937}.Release|.NET.Build.0 = Release|Any CPU
+		{47331732-DD96-4075-869F-83AA9F3F9937}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{47331732-DD96-4075-869F-83AA9F3F9937}.Release|Any CPU.Build.0 = Release|Any CPU
+		{47331732-DD96-4075-869F-83AA9F3F9937}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{47331732-DD96-4075-869F-83AA9F3F9937}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{47331732-DD96-4075-869F-83AA9F3F9937}.Release|x86.ActiveCfg = Release|Any CPU
+		{47331732-DD96-4075-869F-83AA9F3F9937}.Release|x86.Build.0 = Release|Any CPU
+		{E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Debug|.NET.Build.0 = Debug|Any CPU
+		{E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Debug|x86.Build.0 = Debug|Any CPU
+		{E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Release|.NET.ActiveCfg = Release|Any CPU
+		{E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Release|.NET.Build.0 = Release|Any CPU
+		{E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Release|x86.ActiveCfg = Release|Any CPU
+		{E3BA193A-A64F-4CE6-91BE-F54E551797BE}.Release|x86.Build.0 = Release|Any CPU
+		{EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Debug|.NET.Build.0 = Debug|Any CPU
+		{EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Debug|x86.Build.0 = Debug|Any CPU
+		{EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Release|.NET.ActiveCfg = Release|Any CPU
+		{EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Release|.NET.Build.0 = Release|Any CPU
+		{EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Release|x86.ActiveCfg = Release|Any CPU
+		{EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}.Release|x86.Build.0 = Release|Any CPU
+		{18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Debug|.NET.Build.0 = Debug|Any CPU
+		{18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Debug|x86.Build.0 = Debug|Any CPU
+		{18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Release|.NET.ActiveCfg = Release|Any CPU
+		{18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Release|.NET.Build.0 = Release|Any CPU
+		{18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Release|x86.ActiveCfg = Release|Any CPU
+		{18019E8C-C6DA-4B1B-9C2B-908BC14911AB}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -5016,7 +5088,7 @@ Global
 		{2C075472-0BEE-46CA-A996-7E0FB2B1A717} = {D8A691C5-146D-4613-86CC-438F02FE9106}
 		{DF3E1CBE-16A6-4533-8C22-0C43EEFE771B} = {D8A691C5-146D-4613-86CC-438F02FE9106}
 		{68BC6F76-7C77-4959-BC88-27696BBA41F5} = {D8A691C5-146D-4613-86CC-438F02FE9106}
-		{375E3B1B-633A-477B-B0CF-C3A430B4A62D} = {D8A691C5-146D-4613-86CC-438F02FE9106}
+		{F63DB13E-7930-4D8D-8C2F-B83B25502A9D} = {D8A691C5-146D-4613-86CC-438F02FE9106}
 		{F781BCF9-647F-441E-A3BD-9DC1FDBCA1A4} = {D8A691C5-146D-4613-86CC-438F02FE9106}
 		{22787692-B2AD-445D-93DB-D3B9F51F0257} = {D8A691C5-146D-4613-86CC-438F02FE9106}
 		{D2668FF9-5A6B-497F-876D-C560919BA30C} = {D8A691C5-146D-4613-86CC-438F02FE9106}
@@ -5073,6 +5145,9 @@ Global
 		{50AFC9EA-61A7-4D3B-B8E6-82CABD29A421} = {D8A691C5-146D-4613-86CC-438F02FE9106}
 		{AD3876F3-40C0-47CF-BA36-687139903F87} = {D8A691C5-146D-4613-86CC-438F02FE9106}
 		{28331CB1-17FD-4B58-A837-E0249CAAC535} = {D8A691C5-146D-4613-86CC-438F02FE9106}
+		{47331732-DD96-4075-869F-83AA9F3F9937} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
+		{E3BA193A-A64F-4CE6-91BE-F54E551797BE} = {E7543C39-A44C-40C9-82C9-E7FAA2D9A852}
+		{18019E8C-C6DA-4B1B-9C2B-908BC14911AB} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9}
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -9,14 +9,14 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>BeWo</RootNamespace>
    <AssemblyName>BeWoPlaner</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
    <WarningLevel>4</WarningLevel>
    <EnableSecurityDebugging>true</EnableSecurityDebugging>
    <TargetZone>Internet</TargetZone>
    <GenerateManifests>true</GenerateManifests>
-    <SignManifests>true</SignManifests>
+    <SignManifests>false</SignManifests>
    <ManifestKeyFile>
    </ManifestKeyFile>
    <ManifestCertificateThumbprint>8CA4066C36C87B745E4016FDA715A6DB16FCFFA9</ManifestCertificateThumbprint>
@@ -42,13 +42,13 @@
    <InstallUrl>https://app.ownsoft.de/</InstallUrl>
    <TargetCulture>de-DE</TargetCulture>
    <ProductName>BeWoPlaner</ProductName>
-    <PublisherName>beyondSoft GmbH</PublisherName>
-    <MinimumRequiredVersion>2.0.1.220</MinimumRequiredVersion>
+    <PublisherName>ownSoft GmbH</PublisherName>
+    <MinimumRequiredVersion>2.0.1.236</MinimumRequiredVersion>
    <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
    <WebPage>publish.htm</WebPage>
    <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
    <TrustUrlParameters>true</TrustUrlParameters>
-    <ApplicationRevision>221</ApplicationRevision>
+    <ApplicationRevision>237</ApplicationRevision>
    <ApplicationVersion>2.0.1.%2a</ApplicationVersion>
    <UseApplicationTrust>false</UseApplicationTrust>
    <CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -98,45 +98,54 @@
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\Lib\Blacklight.Wpf.Controls.dll</HintPath>
    </Reference>
-    <Reference Include="DevExpress.Charts.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Pdf.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Printing.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Data.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Office.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.RichEdit.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.RichEdit.v17.1.Export, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Utils.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Mvvm.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Web.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Xpf.Accordion.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Xpf.Core.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Xpf.Charts.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Xpf.Docking.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Xpf.DocumentViewer.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.Xpf.Grid.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Xpf.Grid.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Xpf.Layout.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Xpf.LayoutControl.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Xpf.PivotGrid.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Xpf.Printing.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Xpf.Ribbon.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Xpf.RichEdit.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Xpf.Scheduler.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Xpf.Themes.LightGray.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Xpf.Themes.Office2010Black.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Xpf.Themes.Office2013.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Xpf.Themes.Office2016White.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraBars.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraEditors.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraPrinting.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraCharts.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.PivotGrid.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Sparkline.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.CodeParser.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraGrid.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraScheduler.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraScheduler.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Charts.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.DataAccess.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Pdf.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Printing.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Drawing.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Data.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Office.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.RichEdit.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.RichEdit.v23.2.Export, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Utils.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Mvvm.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Web.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Xpf.Accordion.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Xpf.CodeView.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Data.Desktop.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Xpf.Core.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Xpf.Charts.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Xpf.Docking.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Xpf.DocumentViewer.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Xpf.Grid.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Xpf.Grid.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Xpf.Layout.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Xpf.LayoutControl.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Xpf.PivotGrid.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Xpf.Controls.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Xpf.Printing.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Xpf.Ribbon.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Images.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Xpf.Office.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Xpf.RichEdit.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Xpf.Scheduler.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Xpf.Themes.LightGray.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Xpf.Themes.Office2010Black.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Xpf.Themes.Office2013.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Xpf.Themes.Office2016White.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Xpo.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraBars.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraEditors.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraPrinting.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraCharts.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.PivotGrid.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Sparkline.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.CodeParser.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraGrid.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraScheduler.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraScheduler.v23.2.Core.Desktop, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraScheduler.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="Microsoft.CSharp" />
    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
@@ -227,6 +236,10 @@
      <Generator>MSBuild:Compile</Generator>
      <SubType>Designer</SubType>
    </Page>
+    <Page Include="SchulbegleitenderDienst\View\SbdOrganisationView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
    <Page Include="SchulbegleitenderDienst\View\SbdAdminView.xaml">
      <Generator>MSBuild:Compile</Generator>
      <SubType>Designer</SubType>
@@ -293,6 +306,10 @@
      <Generator>MSBuild:Compile</Generator>
      <SubType>Designer</SubType>
    </Page>
+    <Page Include="View\Controls\GkvAbrechnungDetailControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
    <Page Include="View\Controls\MonthPicker.xaml">
      <Generator>MSBuild:Compile</Generator>
      <SubType>Designer</SubType>
@@ -309,10 +326,26 @@
      <Generator>MSBuild:Compile</Generator>
      <SubType>Designer</SubType>
    </Page>
+    <Page Include="View\Controls\TextViewer.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
    <Page Include="View\Controls\ValueListEntryEditControl.xaml">
      <Generator>MSBuild:Compile</Generator>
      <SubType>Designer</SubType>
    </Page>
+    <Page Include="View\Detail\Accounting\DigitalInvoiceOverview.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="View\Detail\Accounting\GkvAbrechnungOverview.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="View\Detail\Accounting\NewGkvAbrechnungPopUpView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
    <Page Include="View\Detail\DebugMessageLogView.xaml">
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
@@ -453,6 +486,10 @@
      <Generator>MSBuild:Compile</Generator>
      <SubType>Designer</SubType>
    </Page>
+    <Page Include="View\ExceptionMessageBoxWithSupportMail.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
    <Page Include="View\HomeView.xaml">
      <Generator>MSBuild:Compile</Generator>
      <SubType>Designer</SubType>
@@ -799,6 +836,7 @@
    <Compile Include="ConfirmDemoDialog.xaml.cs">
      <DependentUpon>ConfirmDemoDialog.xaml</DependentUpon>
    </Compile>
+    <Compile Include="Loader.cs" />
    <Compile Include="MultiLanguage\Markup\TranslateExtension.cs" />
    <Compile Include="MultiLanguage\ServiceTranslator.cs" />
    <Compile Include="ownChat\OwnChatHelper.cs" />
@@ -807,6 +845,7 @@
      <DependentUpon>ProxyLoginView.xaml</DependentUpon>
    </Compile>
    <Compile Include="Scheduler\Converter\AptToServRecsIconVisibilityConverter.cs" />
+    <Compile Include="Scheduler\Converter\ToolTipTimeConverter.cs" />
    <Compile Include="Scheduler\Utils\AppointmentExtensions.cs" />
    <Compile Include="Scheduler\Utils\Utils.cs" />
    <Compile Include="Scheduler\ViewModel\CustomFieldStorage.cs" />
@@ -839,6 +878,9 @@
    <Compile Include="SchulbegleitenderDienst\View\AbsenceTimeEditView.xaml.cs">
      <DependentUpon>AbsenceTimeEditView.xaml</DependentUpon>
    </Compile>
+    <Compile Include="SchulbegleitenderDienst\View\SbdOrganisationView.xaml.cs">
+      <DependentUpon>SbdOrganisationView.xaml</DependentUpon>
+    </Compile>
    <Compile Include="SchulbegleitenderDienst\View\SbdAdminView.xaml.cs">
      <DependentUpon>SbdAdminView.xaml</DependentUpon>
    </Compile>
@@ -924,7 +966,9 @@
    <Compile Include="ViewModel\DocumentTreeItemVM.cs" />
    <Compile Include="ViewModel\DokumentvorlageVM.cs" />
    <Compile Include="ViewModel\GeschenkterUrlaubstagVM.cs" />
+    <Compile Include="ViewModel\ListViewModel\GkvAbrechnungListVM.cs" />
    <Compile Include="ViewModel\ListViewModel\PreisListVM.cs" />
+    <Compile Include="ViewModel\GkvAbrechnungVM.cs" />
    <Compile Include="ViewModel\PreisVM.cs" />
    <Compile Include="ViewModel\PrintSelectionVM.cs" />
    <Compile Include="ViewModel\QuittierungsbelegsstatusVM.cs" />
@@ -1018,6 +1062,7 @@
    <Compile Include="ViewModel\OrganisationPersonRelationVM.cs" />
    <Compile Include="ViewModel\TextModuleVM.cs" />
    <Compile Include="ViewModel\VerordnungslistenVM.cs" />
+    <Compile Include="View\BeWoWindowBuilder.cs" />
    <Compile Include="View\Controls\DPCtrlEmployeeContractTooltip.xaml.cs">
      <DependentUpon>DPCtrlEmployeeContractTooltip.xaml</DependentUpon>
    </Compile>
@@ -1033,6 +1078,9 @@
    <Compile Include="View\Controls\DPCtrlSoll.cs" />
    <Compile Include="View\Controls\DPCtrlUrlaubKrankheit.cs" />
    <Compile Include="View\Controls\DPCtrlZeitkonto.cs" />
+    <Compile Include="View\Controls\GkvAbrechnungDetailControl.xaml.cs">
+      <DependentUpon>GkvAbrechnungDetailControl.xaml</DependentUpon>
+    </Compile>
    <Compile Include="View\Controls\MonthPicker.xaml.cs">
      <DependentUpon>MonthPicker.xaml</DependentUpon>
    </Compile>
@@ -1049,9 +1097,21 @@
    <Compile Include="View\Controls\ListboxSelectControl.xaml.cs">
      <DependentUpon>ListboxSelectControl.xaml</DependentUpon>
    </Compile>
+    <Compile Include="View\Controls\TextViewer.xaml.cs">
+      <DependentUpon>TextViewer.xaml</DependentUpon>
+    </Compile>
    <Compile Include="View\Controls\ValueListEntryEditControl.xaml.cs">
      <DependentUpon>ValueListEntryEditControl.xaml</DependentUpon>
    </Compile>
+    <Compile Include="View\Detail\Accounting\DigitalInvoiceOverview.xaml.cs">
+      <DependentUpon>DigitalInvoiceOverview.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\Detail\Accounting\GkvAbrechnungOverview.xaml.cs">
+      <DependentUpon>GkvAbrechnungOverview.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\Detail\Accounting\NewGkvAbrechnungPopUpView.xaml.cs">
+      <DependentUpon>NewGkvAbrechnungPopUpView.xaml</DependentUpon>
+    </Compile>
    <Compile Include="View\Detail\DebugMessageLogView.xaml.cs">
      <DependentUpon>DebugMessageLogView.xaml</DependentUpon>
    </Compile>
@@ -1164,6 +1224,9 @@
    <Compile Include="View\Detail\SupportConceptGoalRatingView.xaml.cs">
      <DependentUpon>SupportConceptGoalRatingView.xaml</DependentUpon>
    </Compile>
+    <Compile Include="View\ExceptionMessageBoxWithSupportMail.xaml.cs">
+      <DependentUpon>ExceptionMessageBoxWithSupportMail.xaml</DependentUpon>
+    </Compile>
    <Compile Include="View\HomeView.xaml.cs">
      <DependentUpon>HomeView.xaml</DependentUpon>
    </Compile>
@@ -2453,6 +2516,10 @@
      <Project>{D5E53B0F-BF5A-41E8-93E2-0F32845FC729}</Project>
      <Name>Controls</Name>
    </ProjectReference>
+    <ProjectReference Include="..\SharedLauncher\SharedLauncher.csproj">
+      <Project>{EFE05C79-E0DD-4311-8B90-A8DA7EBDF36F}</Project>
+      <Name>SharedLauncher</Name>
+    </ProjectReference>
    <ProjectReference Include="..\Shared\Shared.csproj">
      <Project>{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}</Project>
      <Name>Shared</Name>
@@ -2548,7 +2615,7 @@
      <IncludeHash>True</IncludeHash>
      <FileType>Assembly</FileType>
    </PublishFile>
-    <PublishFile Include="DevExpress.Charts.v17.1.Core">
+    <PublishFile Include="DevExpress.Charts.v23.2.Core">
      <Visible>False</Visible>
      <Group>
      </Group>
@@ -2558,7 +2625,7 @@
      <IncludeHash>True</IncludeHash>
      <FileType>Assembly</FileType>
    </PublishFile>
-    <PublishFile Include="DevExpress.Data.v17.1">
+    <PublishFile Include="DevExpress.Data.v23.2">
      <Visible>False</Visible>
      <Group>
      </Group>
@@ -2568,7 +2635,7 @@
      <IncludeHash>True</IncludeHash>
      <FileType>Assembly</FileType>
    </PublishFile>
-    <PublishFile Include="DevExpress.Data.v17.1.Linq">
+    <PublishFile Include="DevExpress.Data.v23.2.Linq">
      <Visible>False</Visible>
      <Group>
      </Group>
@@ -2578,7 +2645,7 @@
      <IncludeHash>True</IncludeHash>
      <FileType>Assembly</FileType>
    </PublishFile>
-    <PublishFile Include="DevExpress.Office.v17.1.Core">
+    <PublishFile Include="DevExpress.Office.v23.2.Core">
      <Visible>False</Visible>
      <Group>
      </Group>
@@ -2588,7 +2655,7 @@
      <IncludeHash>True</IncludeHash>
      <FileType>Assembly</FileType>
    </PublishFile>
-    <PublishFile Include="DevExpress.PivotGrid.v17.1.Core">
+    <PublishFile Include="DevExpress.PivotGrid.v23.2.Core">
      <Visible>False</Visible>
      <Group>
      </Group>
@@ -2598,7 +2665,7 @@
      <IncludeHash>True</IncludeHash>
      <FileType>Assembly</FileType>
    </PublishFile>
-    <PublishFile Include="DevExpress.Printing.v17.1.Core">
+    <PublishFile Include="DevExpress.Printing.v23.2.Core">
      <Visible>False</Visible>
      <Group>
      </Group>
@@ -2608,7 +2675,7 @@
      <IncludeHash>True</IncludeHash>
      <FileType>Assembly</FileType>
    </PublishFile>
-    <PublishFile Include="DevExpress.RichEdit.v17.1.Core">
+    <PublishFile Include="DevExpress.RichEdit.v23.2.Core">
      <Visible>False</Visible>
      <Group>
      </Group>
@@ -2618,7 +2685,7 @@
      <IncludeHash>True</IncludeHash>
      <FileType>Assembly</FileType>
    </PublishFile>
-    <PublishFile Include="DevExpress.RichEdit.v17.1.Export">
+    <PublishFile Include="DevExpress.RichEdit.v23.2.Export">
      <Visible>False</Visible>
      <Group>
      </Group>
@@ -2628,7 +2695,7 @@
      <IncludeHash>True</IncludeHash>
      <FileType>Assembly</FileType>
    </PublishFile>
-    <PublishFile Include="DevExpress.Sparkline.v17.1.Core">
+    <PublishFile Include="DevExpress.Sparkline.v23.2.Core">
      <Visible>False</Visible>
      <Group>
      </Group>
@@ -2638,7 +2705,7 @@
      <IncludeHash>True</IncludeHash>
      <FileType>Assembly</FileType>
    </PublishFile>
-    <PublishFile Include="DevExpress.Utils.v17.1">
+    <PublishFile Include="DevExpress.Utils.v23.2">
      <Visible>False</Visible>
      <Group>
      </Group>
@@ -2648,7 +2715,7 @@
      <IncludeHash>True</IncludeHash>
      <FileType>Assembly</FileType>
    </PublishFile>
-    <PublishFile Include="DevExpress.Xpf.Accordion.v17.1">
+    <PublishFile Include="DevExpress.Xpf.Accordion.v23.2">
      <Visible>False</Visible>
      <Group>
      </Group>
@@ -2658,7 +2725,7 @@
      <IncludeHash>True</IncludeHash>
      <FileType>Assembly</FileType>
    </PublishFile>
-    <PublishFile Include="DevExpress.Xpf.Charts.v17.1">
+    <PublishFile Include="DevExpress.Xpf.Charts.v23.2">
      <Visible>False</Visible>
      <Group>
      </Group>
@@ -2668,7 +2735,7 @@
      <IncludeHash>True</IncludeHash>
      <FileType>Assembly</FileType>
    </PublishFile>
-    <PublishFile Include="DevExpress.Xpf.Core.v17.1">
+    <PublishFile Include="DevExpress.Xpf.Core.v23.2">
      <Visible>False</Visible>
      <Group>
      </Group>
@@ -2678,7 +2745,7 @@
      <IncludeHash>True</IncludeHash>
      <FileType>Assembly</FileType>
    </PublishFile>
-    <PublishFile Include="DevExpress.Xpf.Docking.v17.1">
+    <PublishFile Include="DevExpress.Xpf.Docking.v23.2">
      <Visible>False</Visible>
      <Group>
      </Group>
@@ -2688,7 +2755,7 @@
      <IncludeHash>True</IncludeHash>
      <FileType>Assembly</FileType>
    </PublishFile>
-    <PublishFile Include="DevExpress.Xpf.Grid.v17.1">
+    <PublishFile Include="DevExpress.Xpf.Grid.v23.2">
      <Visible>False</Visible>
      <Group>
      </Group>
@@ -2698,7 +2765,7 @@
      <IncludeHash>True</IncludeHash>
      <FileType>Assembly</FileType>
    </PublishFile>
-    <PublishFile Include="DevExpress.Xpf.Grid.v17.1.Core">
+    <PublishFile Include="DevExpress.Xpf.Grid.v23.2.Core">
      <Visible>False</Visible>
      <Group>
      </Group>
@@ -2708,7 +2775,7 @@
      <IncludeHash>True</IncludeHash>
      <FileType>Assembly</FileType>
    </PublishFile>
-    <PublishFile Include="DevExpress.Xpf.Layout.v17.1.Core">
+    <PublishFile Include="DevExpress.Xpf.Layout.v23.2.Core">
      <Visible>False</Visible>
      <Group>
      </Group>
@@ -2718,7 +2785,7 @@
      <IncludeHash>True</IncludeHash>
      <FileType>Assembly</FileType>
    </PublishFile>
-    <PublishFile Include="DevExpress.Xpf.Mvvm.v17.1">
+    <PublishFile Include="DevExpress.Xpf.Mvvm.v23.2">
      <Visible>False</Visible>
      <Group>
      </Group>
@@ -2728,7 +2795,7 @@
      <IncludeHash>True</IncludeHash>
      <FileType>Assembly</FileType>
    </PublishFile>
-    <PublishFile Include="DevExpress.Xpf.Printing.v17.1">
+    <PublishFile Include="DevExpress.Xpf.Printing.v23.2">
      <Visible>False</Visible>
      <Group>
      </Group>
@@ -2738,7 +2805,7 @@
      <IncludeHash>True</IncludeHash>
      <FileType>Assembly</FileType>
    </PublishFile>
-    <PublishFile Include="DevExpress.Xpf.Printing.v17.1.Core">
+    <PublishFile Include="DevExpress.Xpf.Printing.v23.2.Core">
      <Visible>False</Visible>
      <Group>
      </Group>
@@ -2748,7 +2815,7 @@
      <IncludeHash>True</IncludeHash>
      <FileType>Assembly</FileType>
    </PublishFile>
-    <PublishFile Include="DevExpress.Xpf.Ribbon.v17.1">
+    <PublishFile Include="DevExpress.Xpf.Ribbon.v23.2">
      <Visible>False</Visible>
      <Group>
      </Group>
@@ -2758,7 +2825,7 @@
      <IncludeHash>True</IncludeHash>
      <FileType>Assembly</FileType>
    </PublishFile>
-    <PublishFile Include="DevExpress.Xpf.Scheduler.v17.1">
+    <PublishFile Include="DevExpress.Xpf.Scheduler.v23.2">
      <Visible>False</Visible>
      <Group>
      </Group>
@@ -2768,7 +2835,7 @@
      <IncludeHash>True</IncludeHash>
      <FileType>Assembly</FileType>
    </PublishFile>
-    <PublishFile Include="DevExpress.Xpf.Themes.LightGray.v17.1">
+    <PublishFile Include="DevExpress.Xpf.Themes.LightGray.v23.2">
      <Visible>False</Visible>
      <Group>
      </Group>
@@ -2778,7 +2845,7 @@
      <IncludeHash>True</IncludeHash>
      <FileType>Assembly</FileType>
    </PublishFile>
-    <PublishFile Include="DevExpress.Xpf.Themes.Office2007Black.v17.1">
+    <PublishFile Include="DevExpress.Xpf.Themes.Office2007Black.v23.2">
      <Visible>False</Visible>
      <Group>
      </Group>
@@ -2788,7 +2855,7 @@
      <IncludeHash>True</IncludeHash>
      <FileType>Assembly</FileType>
    </PublishFile>
-    <PublishFile Include="DevExpress.Xpf.Themes.Office2010Black.v17.1">
+    <PublishFile Include="DevExpress.Xpf.Themes.Office2010Black.v23.2">
      <Visible>False</Visible>
      <Group>
      </Group>
@@ -2798,7 +2865,7 @@
      <IncludeHash>True</IncludeHash>
      <FileType>Assembly</FileType>
    </PublishFile>
-    <PublishFile Include="DevExpress.Xpf.Themes.Office2013.v17.1">
+    <PublishFile Include="DevExpress.Xpf.Themes.Office2013.v23.2">
      <Visible>False</Visible>
      <Group>
      </Group>
@@ -2808,7 +2875,7 @@
      <IncludeHash>True</IncludeHash>
      <FileType>Assembly</FileType>
    </PublishFile>
-    <PublishFile Include="DevExpress.Xpf.Themes.Office2016White.v17.1">
+    <PublishFile Include="DevExpress.Xpf.Themes.Office2016White.v23.2">
      <Visible>False</Visible>
      <Group>
      </Group>
@@ -2818,7 +2885,7 @@
      <IncludeHash>True</IncludeHash>
      <FileType>Assembly</FileType>
    </PublishFile>
-    <PublishFile Include="DevExpress.XtraBars.v17.1">
+    <PublishFile Include="DevExpress.XtraBars.v23.2">
      <Visible>False</Visible>
      <Group>
      </Group>
@@ -2828,7 +2895,7 @@
      <IncludeHash>True</IncludeHash>
      <FileType>Assembly</FileType>
    </PublishFile>
-    <PublishFile Include="DevExpress.XtraCharts.v17.1">
+    <PublishFile Include="DevExpress.XtraCharts.v23.2">
      <Visible>False</Visible>
      <Group>
      </Group>
@@ -2838,7 +2905,7 @@
      <IncludeHash>True</IncludeHash>
      <FileType>Assembly</FileType>
    </PublishFile>
-    <PublishFile Include="DevExpress.XtraEditors.v17.1">
+    <PublishFile Include="DevExpress.XtraEditors.v23.2">
      <Visible>False</Visible>
      <Group>
      </Group>
@@ -2848,7 +2915,7 @@
      <IncludeHash>True</IncludeHash>
      <FileType>Assembly</FileType>
    </PublishFile>
-    <PublishFile Include="DevExpress.XtraNavBar.v17.1">
+    <PublishFile Include="DevExpress.XtraNavBar.v23.2">
      <Visible>False</Visible>
      <Group>
      </Group>
@@ -2858,7 +2925,7 @@
      <IncludeHash>True</IncludeHash>
      <FileType>Assembly</FileType>
    </PublishFile>
-    <PublishFile Include="DevExpress.XtraPivotGrid.v17.1">
+    <PublishFile Include="DevExpress.XtraPivotGrid.v23.2">
      <Visible>False</Visible>
      <Group>
      </Group>
@@ -2868,7 +2935,7 @@
      <IncludeHash>True</IncludeHash>
      <FileType>Assembly</FileType>
    </PublishFile>
-    <PublishFile Include="DevExpress.XtraPrinting.v17.1">
+    <PublishFile Include="DevExpress.XtraPrinting.v23.2">
      <Visible>False</Visible>
      <Group>
      </Group>
@@ -2878,7 +2945,7 @@
      <IncludeHash>True</IncludeHash>
      <FileType>Assembly</FileType>
    </PublishFile>
-    <PublishFile Include="DevExpress.XtraReports.v17.1">
+    <PublishFile Include="DevExpress.XtraReports.v23.2">
      <Visible>False</Visible>
      <Group>
      </Group>
@@ -2888,7 +2955,7 @@
      <IncludeHash>True</IncludeHash>
      <FileType>Assembly</FileType>
    </PublishFile>
-    <PublishFile Include="DevExpress.XtraScheduler.v17.1">
+    <PublishFile Include="DevExpress.XtraScheduler.v23.2">
      <Visible>False</Visible>
      <Group>
      </Group>
@@ -2898,7 +2965,7 @@
      <IncludeHash>True</IncludeHash>
      <FileType>Assembly</FileType>
    </PublishFile>
-    <PublishFile Include="DevExpress.XtraScheduler.v17.1.Core">
+    <PublishFile Include="DevExpress.XtraScheduler.v23.2.Core">
      <Visible>False</Visible>
      <Group>
      </Group>
@@ -2908,7 +2975,7 @@
      <IncludeHash>True</IncludeHash>
      <FileType>Assembly</FileType>
    </PublishFile>
-    <PublishFile Include="DevExpress.XtraScheduler.v17.1.Reporting">
+    <PublishFile Include="DevExpress.XtraScheduler.v23.2.Reporting">
      <Visible>False</Visible>
      <Group>
      </Group>
@@ -2918,7 +2985,7 @@
      <IncludeHash>True</IncludeHash>
      <FileType>Assembly</FileType>
    </PublishFile>
-    <PublishFile Include="DevExpress.XtraTreeList.v17.1">
+    <PublishFile Include="DevExpress.XtraTreeList.v23.2">
      <Visible>False</Visible>
      <Group>
      </Group>
@@ -3053,6 +3120,12 @@
  <ItemGroup>
    <Resource Include="Ressources\Icons\Copy24.png" />
  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Ressources\Icons\AB.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Ressources\Icons\BoyAndGirl.png" />
+  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <PropertyGroup>
    <PostBuildEvent>
--- a/BeWo/BeWo.csproj.user
+++ b/BeWo/BeWo.csproj.user
@@ -2,13 +2,14 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <PublishUrlHistory>D:\Projects\beyondsoft\BeWoPlaner\Publish\|publish\|D:\Projects\beyondsoft\BeWoPlaner\PublishTest\|D:\Projects\beyondsoft\BeWoPlaner\PublishDev\|D:\Projects\beyondsoft\BeWoPlaner\Publish45\</PublishUrlHistory>
-    <InstallUrlHistory>https://app.ownsoft.de/|http://app.beyondsoft.de/|http://app.beyondsoft.de/test/|http://app.beyondsoft.de/dev/|http://app.beyondsoft.de/sbdtest/</InstallUrlHistory>
+    <InstallUrlHistory>https://app.ownsoft.de/|https://app.ownsoft.de/dev/|http://app.ownsoft.de/dev/|http://app.beyondsoft.de/dev/|http://app.beyondsoft.de/</InstallUrlHistory>
    <SupportUrlHistory />
    <UpdateUrlHistory>https://app.ownsoft.de/|https://app.ownsoft.de/bewoplaner.application/</UpdateUrlHistory>
    <BootstrapperUrlHistory />
    <ErrorReportUrlHistory />
    <FallbackCulture>de-DE</FallbackCulture>
    <VerifyUploadedFiles>false</VerifyUploadedFiles>
+    <ProjectView>ProjectFiles</ProjectView>
  </PropertyGroup>
  <PropertyGroup>
    <EnableSecurityDebugging>false</EnableSecurityDebugging>
--- a/BeWo/BeWoApp.xaml
+++ b/BeWo/BeWoApp.xaml
@@ -89,7 +89,7 @@
                                    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="5,3,5,3" OpacityMask="{x:Null}" SnapsToDevicePixels="True">
                                        <Grid.ColumnDefinitions>
                                            <ColumnDefinition Width="Auto" />
-                                            <ColumnDefinition Width="Auto" MinWidth="250" />
+                                            <ColumnDefinition Width="Auto" MinWidth="400" />
                                            <ColumnDefinition Width="*" />
                                            <ColumnDefinition Width="Auto" />
                                            <ColumnDefinition Width="Auto" />
--- a/BeWo/BeWoApp.xaml.cs
+++ b/BeWo/BeWoApp.xaml.cs
@@ -33,6 +33,7 @@ using ChatController.HauptKlassen;
 using DevExpress.Xpf.Core;
 using DevExpress.Xpf.Grid;
 using DevExpress.XtraScheduler;
+using BS.SharedLauncher.Information;

 namespace BeWo
 {
@@ -49,8 +50,8 @@ namespace BeWo
 		public static LoginControl LoginControl;

 		public static MainControl MainControl;
-	    public static string ShortVersion = "3.13";
-        public static string Version = "Version 3.13";
+	    public static string ShortVersion = "3.20";
+        public static string Version = "Version 3.20 (GKV Test)";

 		public static int RenderTier = 0;

@@ -204,7 +205,9 @@ namespace BeWo
                var showInfoButtonInCalender				  = false;


-                AppSettings.ShowAdvisedAttendedFlag = false;
+
+
+				AppSettings.ShowAdvisedAttendedFlag = false;
                var timeRecordingMenuName = string.Empty;

 				if (_Mandator != null)
@@ -256,14 +259,15 @@ namespace BeWo
                    {
 						AppSettings.EinheitZeiterfassung = "0";
 					}
-					if (AppSettings.EinheitZeiterfassung == "1")
+					if (AppSettings.EinheitZeiterfassung == "0")
+					{
+						AppSettings.LetzteZeiterfassungsDauer = ZeiterfassungsDauer.Minuten;
+					}
+					else if (AppSettings.EinheitZeiterfassung == "1")
 					{
 						AppSettings.LetzteZeiterfassungsDauer = ZeiterfassungsDauer.Stunden;
 					}
-					else
-                    {
-						AppSettings.LetzteZeiterfassungsDauer = ZeiterfassungsDauer.Minuten;
-					}
+
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.IsZeiterfassDateNormal);
 					if(val != null && val.Equals("0"))
 					{
@@ -365,6 +369,33 @@ namespace BeWo
 						showDienstplanung = true;
 					}

+					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.Arbeitszeiterfassung);
+					if (val != null && val.Equals("1"))
+					{
+						AppSettings.Arbeitszeiterfassung = true;
+					}
+					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.EnableArbeitszeiterfassung);
+					if (val != null && val.Equals("1"))
+					{
+						AppSettings.EnableArbeitszeiterfassung = true;
+					}
+					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.EnableAutomaticPauses);
+					if (val != null && val.Equals("1"))
+					{
+						AppSettings.EnableAutomaticPauses = true;
+					}
+					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.EnableRestTimeWarning);
+					if (val != null && val.Equals("1"))
+					{
+						AppSettings.EnableRestTimeWarning = true;
+					}
+					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.MaxWorkTimeHoursBeforeWarning);
+					int hours;
+					if (Int32.TryParse(val, out hours))
+					{
+						AppSettings.MaxWorkTimeHoursBeforeWarning = hours;
+					}
+
 					var anzahl = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.DienstplanungStandardZeilenAnzahl);
 					if (anzahl != null)
 					{
@@ -456,6 +487,11 @@ namespace BeWo
 					{
 						AppSettings.ShowKlientenBetreuungszeiten = true;
 					}
+					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.FilterGroupServiceCategories);
+					if (val != null && val.Equals("0"))
+					{
+						AppSettings.FilterGroupServiceCategories = false;
+					}
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowInfoButtonInCalender);
 					if (val != null && val.Equals("1"))
 					{
@@ -464,15 +500,31 @@ namespace BeWo
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.AllowStorno);
 					AppSettings.AllowStorno = val != null && val.Equals("1");

+					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.UseDistanceApi);
+					AppSettings.UseDistanceApi = val != null && val.Equals("1");
+
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowHilfeplanStatistikReport);
 					AppSettings.ShowHilfeplanStatistikReport = val != null && val.Equals("1");

+                    val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.MoKSessionTimeout);
+                    if(int.TryParse(val, out var sessionTimeout))
+                    {
+                        AppSettings.MoKSessionTimeout = sessionTimeout;
+                    }
+
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ServiceRecordAllowChangeHours);
 					if (val != null)
 					{
 						_AppSettings.ServiceRecordAllowChangeHours = Convert.ToInt32(val);
 					}

+					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.AllowGkvAbrechnung);
+					AppSettings.AllowGkvAbrechnung = val != null && val.Equals("1");
+
+					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowImportAbschlagszahlungen);
+					AppSettings.ShowImportAbschlagszahlungen = val != null && val.Equals("1");
+
+
 					switch (_Mandator.BeWoClientType)
 					{
 						case 1:
@@ -528,7 +580,7 @@ namespace BeWo
 				showBetrag = true;
 				showPivotGrid = true;
 				showArbeitszeiten = true;
-				showMarker = true;
+				//showMarker = true;
 				showUrlaubsplanung = true;
 				showDienstplanung = true;
 				showHilfeplanBezeichnung = true;
@@ -576,28 +628,36 @@ namespace BeWo
 			}
 		}

-		internal static Uri SiteOfOrigin
+        internal static Uri SiteOfOrigin
+        {
+            get
+            {
+                return new Uri(SessionInformation.Connection.CoreServerAddressExact ?? SiteOfOrigin2.ToString());
+            }
+        }
+
+		internal static Uri SiteOfOrigin2
 		{
 			get
 			{
 				String url = "";
 #if DEBUG
 				url = String.Format("http://localhost:3777/Host");
-				//return new Uri("https://app4.bewoplaner.de/service");
+				//return new Uri("https://app5.bewoplaner.de/service");
 				//url = String.Format("app1.bewoplaner.de/service");
 #endif

 				if (!String.IsNullOrEmpty(ServerAddress) && String.IsNullOrEmpty(url))
-                {
+				{
 					url = ServerAddress.ToLower();
 				}
-				

-                if (url.IndexOf("localhost") < 0)
+
+				if (url.IndexOf("localhost") < 0)
 				{
 					int i;

-					
+
 					if (Int32.TryParse(url, out i))
 						url = "app" + url;

@@ -605,17 +665,17 @@ namespace BeWo
 					{
 						url += ".bewoplaner.de";
 					}
-					
-                    //if (url.IndexOf("/service45") < 0)
-                    //{
-                    //	url += "/service45";
-                    //}
-                    if (url.IndexOf("/service") < 0)
-                    {
-                        url += "/service";
-                    }

-                    return new Uri(String.Format("https://{0}", url));
+					//if (url.IndexOf("/service45") < 0)
+					//{
+					//	url += "/service45";
+					//}
+					if (url.IndexOf("/service") < 0)
+					{
+						url += "/service";
+					}
+
+					return new Uri(String.Format("https://{0}", url));
 				}
 				return new Uri(url);
 			}
@@ -658,19 +718,31 @@ namespace BeWo
 			{
 				string localAppData = Environment.GetFolderPath(
 					Environment.SpecialFolder.LocalApplicationData);
-				string companyFilePath
+
+				string companyFilePathBS
 					= Path.Combine(localAppData, "beyondSoft");
+				string bewoFilePathBS
+					= Path.Combine(companyFilePathBS, "BeWoPlaner");

-				if (!Directory.Exists(companyFilePath))
-					Directory.CreateDirectory(companyFilePath);
+				string companyFilePathOS
+					= Path.Combine(localAppData, "ownSoft");

-				string bewoFilePath
-					= Path.Combine(companyFilePath, "BeWoPlaner");
+				if (!Directory.Exists(companyFilePathOS))
+					Directory.CreateDirectory(companyFilePathOS);

-				if (!Directory.Exists(bewoFilePath))
-					Directory.CreateDirectory(bewoFilePath);

-				return bewoFilePath;
+				string bewoFilePathOS
+					= Path.Combine(companyFilePathOS, "BeWoPlaner");
+
+				if (!Directory.Exists(bewoFilePathOS))
+					Directory.CreateDirectory(bewoFilePathOS);
+
+				//return bewoFilePathBS; // raus
+
+				CheckOldBSPathAndCopyFiles(bewoFilePathBS, bewoFilePathOS);
+
+
+				return bewoFilePathOS;
 			}
 			catch (Exception ex)
 			{
@@ -681,6 +753,32 @@ namespace BeWo
 			return Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
 		}

+        private static void CheckOldBSPathAndCopyFiles(string companyFilePathBS, string companyFilePathOS)
+        {
+            if (Directory.Exists(companyFilePathBS))
+            {
+				var bsFiles = Directory.GetFiles(companyFilePathBS);
+
+				if (bsFiles.Length > 0)
+                {
+					var osFiles = Directory.GetFiles(companyFilePathOS);
+					if (osFiles.Length == 0)
+					{
+						foreach (var file in bsFiles)
+						{
+							File.Move(file, Path.Combine(companyFilePathOS, Path.GetFileName(file)));
+						}
+
+						Directory.Delete(companyFilePathBS);
+					}
+					
+                }
+				
+				//var p = Directory.GetParent(companyFilePathBS);
+				//Directory.Delete(Directory.GetParent(companyFilePathBS).FullName);
+			}
+        }
+
        internal static bool HasLoggedOnUserRight(UserRightType[] pRight)
 		{
 			if (LoggedOnUser != null)
@@ -706,7 +804,7 @@ namespace BeWo
 			return false;
 		}

-		internal static void SaveAppSettings()
+        internal static void SaveAppSettings()
 		{
 			if (_AppSettings != null && _LoggedOnUser != null && _AppSettings.IsDirty)
 			{
@@ -724,6 +822,7 @@ namespace BeWo
 			    UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.ZeigeNurMeineTermine, _AppSettings.ZeigeNurMeineTermine ? "1" : "0", _LoggedOnUser.Settings);
 			    UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.LastSelectedServiceRecordTimeIntervalDays, _AppSettings.LastSelectedServiceRecordTimeIntervalDays.ToString(), _LoggedOnUser.Settings);
 				UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.LastSelectedServiceRecordMonth, _AppSettings.LastSelectedServiceRecordMonth.ToString(), _LoggedOnUser.Settings);
+				UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.LastKassenSortOrder, _AppSettings.LastKassenSortOrder.ToString(), _LoggedOnUser.Settings);
 				UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.LetzteZeiterfassungsDauer, ((int)_AppSettings.LetzteZeiterfassungsDauer).ToString(), _LoggedOnUser.Settings);
 				UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.SchedulerViewType, ((int) _AppSettings.SchedulerViewType).ToString(), _LoggedOnUser.Settings);
 				UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.SchedulerTimelineViewDayCount, (_AppSettings.SchedulerTimelineViewDayCount).ToString(), _LoggedOnUser.Settings);
@@ -753,7 +852,23 @@ namespace BeWo
 		{
 			if (MainControl != null)
 			{
-				MainControl.Dispatcher.BeginInvoke(DispatcherPriority.Normal, (Action) (() => MainControl.ShowControlAsModalPopup(new ExceptionMessageBox(message, ex, showDetails))));
+				
+
+
+				MainControl.Dispatcher.BeginInvoke(DispatcherPriority.Normal, (Action) (() =>
+				{
+					UserControl exControl = null;
+					if (showDetails && BeWoApp.LoggedOnUser != null && BeWoApp.LoggedOnUser.HasRight(BS.Shared.UserRightType.Support_View))
+					{
+						exControl = new ExceptionMessageBoxWithSupportMail(ex);
+					}
+					else
+					{
+						exControl = new ExceptionMessageBox(message, ex, showDetails);
+					}
+
+					MainControl.ShowControlAsModalPopup(exControl);
+				}));
 			}
 			else if (LoginControl != null)
 			{
@@ -821,6 +936,16 @@ namespace BeWo
 			};

 			FrameworkElement.LanguageProperty.OverrideMetadata(typeof (FrameworkElement), new FrameworkPropertyMetadata(XmlLanguage.GetLanguage(CultureInfo.CurrentCulture.IetfLanguageTag)));
+
+			var args = e.Args;
+
+			if (args.Length > 0)
+			{
+				var success = SessionInformation.LoadPipe(args[0]);
+
+				if(success)
+					Loader.Load();
+			}
 		}

 		private static void ReloadSettings(List<SettingsDC> settings)
@@ -910,7 +1035,12 @@ namespace BeWo
 				{
 					_AppSettings.LastSelectedServiceRecordMonth = Convert.ToDateTime(UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.LastSelectedServiceRecordMonth, settings));
 				}
-				
+
+				val = UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.LastKassenSortOrder, settings);
+				if (val != null)
+				{
+					_AppSettings.LastKassenSortOrder = Convert.ToInt32(UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.LastKassenSortOrder, settings));
+				}

 				val = UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.LetzteZeiterfassungsDauer, settings);
 				if(val != null)
@@ -1066,7 +1196,7 @@ namespace BeWo

 			if (string.IsNullOrEmpty(username) || !username.Equals(_LoggedOnUser.LoginName, StringComparison.OrdinalIgnoreCase))
 			{
-				MessageBox.Show("Das Programm kann nur " + BS.Shared.Translation.Translator.Translate("vom Benutzer") + " '" + _LoggedOnUser.LoginName + "' entsperrt werden.", "Fehler bei der Anmeldung", MessageBoxButton.OK, MessageBoxImage.Exclamation);
+				MessageBox.Show("Das Programm kann nur " + BS.SharedLauncher.Translation.Translator.Translate("vom Benutzer") + " '" + _LoggedOnUser.LoginName + "' entsperrt werden.", "Fehler bei der Anmeldung", MessageBoxButton.OK, MessageBoxImage.Exclamation);
 				return;
 			}

@@ -1076,7 +1206,7 @@ namespace BeWo
 			{
 				if (!r.Equals(UserValidationResult.UserValid))
 				{
-					MessageBox.Show("Anmeldeinformationen nicht bekannt. Bitte überprüfen Sie den " + BS.Shared.Translation.Translator.Translate("Benutzernamen") + " und das Passwort!", "Fehler bei der Anmeldung", MessageBoxButton.OK, MessageBoxImage.Exclamation);
+					MessageBox.Show("Anmeldeinformationen nicht bekannt. Bitte überprüfen Sie den " + BS.SharedLauncher.Translation.Translator.Translate("Benutzernamen") + " und das Passwort!", "Fehler bei der Anmeldung", MessageBoxButton.OK, MessageBoxImage.Exclamation);
 					return;
 				}

@@ -1135,7 +1265,7 @@ namespace BeWo
 				tenant = "5473568546";
 #endif

-                var login = new Login(tenant, serverUrl =>
+                var login = new ChatController.HauptKlassen.Login(tenant, serverUrl =>
                {
                    if (!string.IsNullOrWhiteSpace(serverUrl))
                    {
--- a/BeWo/ConfirmDemoDialog.xaml
+++ b/BeWo/ConfirmDemoDialog.xaml
@@ -17,7 +17,7 @@
                    <RowDefinition Height="Auto" />
                    <RowDefinition Height="Auto" />
                </Grid.RowDefinitions>
-                <Image Grid.Row="0" HorizontalAlignment="Left" VerticalAlignment="Top" Source="Ressources\Icons\bewoplaner_logo_big.png"  Height="45" Margin="7,7,0,0"/>
+                <Image Grid.Row="0" HorizontalAlignment="Left" VerticalAlignment="Top" Source="Ressources\Icons\bewoplaner_logo_small.png"  Height="45" Margin="7,7,0,0"/>
                <Grid Grid.Row="1" Margin="0,10,0,0">
                    <Grid.ColumnDefinitions>
                        <ColumnDefinition Width="*" />
--- a/BeWo/Converter/BoolScaleTransformConverter.cs
+++ b/BeWo/Converter/BoolScaleTransformConverter.cs
@@ -4,9 +4,6 @@ using System.Globalization;
 using System.Linq;
 using System.Windows.Data;
 using System.Windows.Media;
-
-using BeWo.View;
-
 using BS.Shared;
 using BS.Shared.Core;

@@ -29,11 +26,15 @@ namespace BeWo.Converter
    {
        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
        {
-            var i = (value as IEnumerable<UserRightType>).ToList();
+            if(!(value is IEnumerable<UserRightType> iEnumerable))
+            {
+                return value;
+            }

-            i.Remove(UserRightType.None);
+            var userRights = iEnumerable.ToList();
+            userRights.Remove(UserRightType.None);

-            return (i != null) ? i.Select(r => EnumTranslations.UserRightType2Translations.Single(f => f.Key == r)).OrderBy(l => l.Value).ToDictionary(t => t.Key, t => t.Value) : value;
+            return userRights.Select(right => EnumTranslations.UserRightType2Translations.Single(right2Translation => right2Translation.Key == right)).OrderBy(right2Translation => right2Translation.Value).ToDictionary(right2Translation => right2Translation.Key, right2Translation => right2Translation.Value);
        }

        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
--- a/BeWo/Core/BeWoUtils.cs
+++ b/BeWo/Core/BeWoUtils.cs
@@ -1644,9 +1644,12 @@ namespace BeWo.Core
        //    }
        //}

-        public static void OpenMailClient(string mailAddress, string subject = "")
+        public static void OpenMailClient(string mailAddress, string subject = "", string body = "")
        {
-            var mailCmd = string.Format(@"mailto:{0}?subject={1}", mailAddress, subject);
+            //mailAddress = "cb@ownsoft.de";
+            //subject = "Betreff";
+            
+            var mailCmd = string.Format(@"mailto:{0}?subject={1}&body={2}", mailAddress, subject, body);

            System.Diagnostics.Process.Start(mailCmd);
        }
@@ -1688,7 +1691,10 @@ namespace BeWo.Core
            {
                dc.CostBearer2SupportConceptOid = relDc.CostBearer2SupportConceptOid;
            }
-
+            else
+            {
+                dc.CostBearer2SupportConceptOid = null;
+            }
            var validationResults = new List<ServiceRecordValidationResultDC>();

            var maxdays = BeWoApp.AppSettings.MaxDaysEditServiceRecordsAllowed;
@@ -1748,10 +1754,10 @@ namespace BeWo.Core
                        case ServiceRecordValidationResult.ServiceRecordOverlapping:
 							if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ServiceRecord_AllowCreateOverlappingFLS))
                            {
-                                MessageBox.Show($"An dem gewählten Datum '{vm.StartDate.ToShortDateString()} {vm.StartDate.ToShortTimeString()}' existiert bereits ein Eintrag ({result.Message} bei " + BS.Shared.Translation.Translator.Translate("Klient/in") + " " + result.CustomerName + ") .\nSpeichern nicht möglich.", "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Information);
+                                MessageBox.Show($"An dem gewählten Datum '{vm.StartDate.ToShortDateString()} {vm.StartDate.ToShortTimeString()}' existiert bereits ein Eintrag ({result.Message} bei " + BS.SharedLauncher.Translation.Translator.Translate("Klient/in") + " " + result.CustomerName + ") .\nSpeichern nicht möglich.", "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Information);
                                lValid = false;
                            }
-							else if (MessageBox.Show($"An dem gewählten Datum '{vm.StartDate.ToShortDateString()} {vm.StartDate.ToShortTimeString()}' existiert bereits ein Eintrag ({result.Message} bei " + BS.Shared.Translation.Translator.Translate("Klient/in") + " " + result.CustomerName + ").\nMöchten Sie trotzdem speichern?", "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
+							else if (MessageBox.Show($"An dem gewählten Datum '{vm.StartDate.ToShortDateString()} {vm.StartDate.ToShortTimeString()}' existiert bereits ein Eintrag ({result.Message} bei " + BS.SharedLauncher.Translation.Translator.Translate("Klient/in") + " " + result.CustomerName + ").\nMöchten Sie trotzdem speichern?", "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
                            {
                                lValid = false;
                                exitLoop = true;
@@ -1774,17 +1780,17 @@ namespace BeWo.Core
                            var klient = "diesen Hilfeplan";
                            if (!string.IsNullOrEmpty(result.CustomerName))
                            {
-                                klient = BS.Shared.Translation.Translator.Translate("Klient/in") + " " + result.CustomerName;
+                                klient = BS.SharedLauncher.Translation.Translator.Translate("Klient/in") + " " + result.CustomerName;
                            }

-                            var msg = string.Format("Die für {2} genehmigten FLS ({0:N}) werden mit diesem Eintrag überschritten. ({1:N}).", result.ApprovedHours, result.HoursNew, klient);
+                            var msg = string.Format("Die für {2} genehmigten FLS ({0:N}) werden mit diesem Eintrag ({1:N}) überschritten.", result.ApprovedHours, result.HoursNew, klient);

                            if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ServiceRecord_AllowCreateMoreFLSThanApproved))
                            {
-								MessageBox.Show(msg + ").\nSpeichern nicht möglich.", "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Information);
+								MessageBox.Show(msg + "\nSpeichern nicht möglich.", "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Information);
                                lValid = false;
                            }
-							else if (MessageBox.Show(msg + ").\nMöchten Sie trotzdem speichern?", "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
+							else if (MessageBox.Show(msg + "\nMöchten Sie trotzdem speichern?", "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
                            {
                                lValid = false;
                                exitLoop = true;
@@ -1794,7 +1800,7 @@ namespace BeWo.Core
                            var klient2 = "diesen Hilfeplan";
                            if (!string.IsNullOrEmpty(result.CustomerName))
                            {
-                                klient2 = BS.Shared.Translation.Translator.Translate("Klient/in") + " " + result.CustomerName;
+                                klient2 = BS.SharedLauncher.Translation.Translator.Translate("Klient/in") + " " + result.CustomerName;
                            }
                            if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.BookServiceRecordAfterSettlementInvoice))
                            {
@@ -1891,7 +1897,7 @@ namespace BeWo.Core
            else
            {
                var msg = vm.GroupOid != null
-                    ? "ACHTUNG, wenn Sie fortfahren, löschen Sie die gesamte Gruppenbuchung.\nWenn Sie nur einzelne " + BS.Shared.Translation.Translator.Translate("Klienten") + " aus der Gruppe entfernen möchten,\neditieren Sie die Gruppe und entfernen den Klienten aus der Liste aller Hilfepläne.\nSind Sie sicher, dass Sie den gesamten Gruppeneintrag löschen möchten?"
+                    ? "ACHTUNG, wenn Sie fortfahren, löschen Sie die gesamte Gruppenbuchung.\nWenn Sie nur einzelne " + BS.SharedLauncher.Translation.Translator.Translate("Klienten") + " aus der Gruppe entfernen möchten,\neditieren Sie die Gruppe und entfernen den Klienten aus der Liste aller Hilfepläne.\nSind Sie sicher, dass Sie den gesamten Gruppeneintrag löschen möchten?"
                    : "Sind Sie sicher, dass Sie den gewählten Eintrag löschen möchten?";

                if (MessageBox.Show(msg, "Eintrag löschen", MessageBoxButton.YesNo, MessageBoxImage.Warning) !=
@@ -1958,7 +1964,7 @@ namespace BeWo.Core

 	    public static void ShowReportWindow(MemoryStream ms, string title, DocumentPreviewControl documentPreviewControl = null)
 	    {
-			 var report = new XtraReport();
+	        var report = new XtraReport();

 			try
 			{
--- a/BeWo/Core/Config/AppSettings.cs
+++ b/BeWo/Core/Config/AppSettings.cs
@@ -26,7 +26,8 @@ namespace BeWo.Core.Config

        private bool _showExpiredSupportConcepts = true;
        private bool _showServiceRecordGridControl;
-        
+        private bool _filterGroupServiceCategories = true;
+
        private WindowStateType mWindowStateType = WindowStateType.Default;

        private ServiceRecordTimeInterval mLastSelectedServiceRecordTimeInterval = ServiceRecordTimeInterval.All;
@@ -37,7 +38,7 @@ namespace BeWo.Core.Config

        private DateTime mLastSelectedServiceRecordMonth = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1);

-
+        private int mLastKassenSortOrder = 1;

        private ZeiterfassungsDauer mLetzteZeiterfassungsDauer = ZeiterfassungsDauer.Minuten;

@@ -52,6 +53,8 @@ namespace BeWo.Core.Config
            DienstplanungStandardZeilenAnzahl = 1;
        }

+        public int MoKSessionTimeout { get; set; } = 20;
+
        public bool IsServiceRecordNoticeMandatory
        {
            get { return mIsServiceRecordNoticeMandatory; }
@@ -334,6 +337,22 @@ namespace BeWo.Core.Config
            }

            
+        }
+
+        public int LastKassenSortOrder
+        {
+            get { return mLastKassenSortOrder; }
+
+            set
+            {
+                if (mLastKassenSortOrder != value)
+                {
+                    mLastKassenSortOrder = value;
+                    IsDirty = true;
+                }
+            }
+
+
        }

        public int ServiceRecordAllowChangeHours
@@ -405,18 +424,30 @@ namespace BeWo.Core.Config
        public bool DontShowSpitzabrechnung { get; set; }
        public bool ShowDienstplanung { get; set; }

+        public bool Arbeitszeiterfassung { get; set; }
+        public bool EnableArbeitszeiterfassung { get; set; }
+        public bool EnableAutomaticPauses { get; set; }
+        public bool EnableRestTimeWarning { get; set; }
+        public int MaxWorkTimeHoursBeforeWarning { get; set; }
+
        public int DienstplanungStandardZeilenAnzahl { get; set; }

        public bool ShowInfoButtonInCalender{ get; set; }

        public bool AllowStorno { get; set; }
-        
+
+        public bool UseDistanceApi { get; set; }
+
        public bool ShowEmployeeSignature { get; set; }

        public bool SetStartTimeToEndTimeAfterSave { get; set; }

        public bool ShowHilfeplanStatistikReport { get; set; }

+        public bool AllowGkvAbrechnung { get; set; }
+
+        public bool ShowImportAbschlagszahlungen { get; set; }
+
        private SchedulerViewType _SchedulerViewType;
        public SchedulerViewType SchedulerViewType
        {
@@ -460,5 +491,12 @@ namespace BeWo.Core.Config
        }

        public bool ShowKlientenBetreuungszeiten { get; set; }
+
+        public bool FilterGroupServiceCategories
+        {
+            get { return _filterGroupServiceCategories; }
+
+            set { _filterGroupServiceCategories = value; }
+        }
    }
 }
--- a/BeWo/Core/Service/Cache.cs
+++ b/BeWo/Core/Service/Cache.cs
@@ -551,5 +551,44 @@ namespace BeWo.Core.Service

 		    return mAllCompactCustomers;
 	    }
+
+        public void GetSchedulerObjects(Action<List<CompactCustomerDC>, List<CompactEmployeeDC>, Dictionary<ValueListEntryDC, List<ResourceDC>>> callback)
+        {
+            GetAllActiveEmployeesCompact(allEmployees =>
+            {
+                GetAllActiveCustomersCompact(allCustomers =>
+                {
+                    GetCategories2ResourcesDictionary(resourceDictionary =>
+                    {
+                        if(!BeWoApp.LoggedOnUser.HasRight(UserRightType.KalenderMitarbeitertermineAnsehen))
+                        {
+                            allEmployees = new List<CompactEmployeeDC> { BeWoApp.CompactLoggedOnEmployee };
+                        }
+
+                        var darfKlientenAnsichtSehen = BeWoApp.LoggedOnUser.HasRight(UserRightType.Customer_ViewMyTeams) || BeWoApp.LoggedOnUser.HasRight(UserRightType.Customer_ViewMyCustomers) || BeWoApp.LoggedOnUser.HasRight(UserRightType.CustomerView_View);
+                        var darfTermineAllerKlientenSehen = BeWoApp.LoggedOnUser.HasRight(UserRightType.KalenderKliententermineAlleAnsehen);
+
+                        if(darfKlientenAnsichtSehen)
+                        {
+                            if(!darfTermineAllerKlientenSehen || !BeWoApp.LoggedOnUser.HasRight(UserRightType.CustomerView_View))
+                            {
+                                allCustomers = allCustomers.Where(w => w.IsRelatedToEmployee).ToList();
+                            }
+                        }
+                        else
+                        {
+                            allCustomers.Clear();
+                        }
+
+                        if(!BeWoApp.LoggedOnUser.HasRight(UserRightType.KalenderRessourcentermineAnsehen))
+                        {
+                            resourceDictionary.Clear();
+                        }
+
+                        callback(allCustomers, allEmployees, resourceDictionary);
+                    });
+                });
+            });
+        }
    }
 }
--- a/BeWo/Core/Service/SupportConceptService.cs
+++ b/BeWo/Core/Service/SupportConceptService.cs
@@ -344,6 +344,7 @@ namespace BeWo.Core.Service

        public static CompactSupportConceptDC HoleHilfeplanAusListe(List<CompactSupportConceptDC> scList, CompactCustomerDC customerCompact, DateTime firstTime, DateTime lastTime)
        {
+            CompactSupportConceptDC result = null; 
            foreach (var sc in scList)
            {
                if (sc.Customer.Oid == customerCompact.Oid)
@@ -353,10 +354,14 @@ namespace BeWo.Core.Service
                    {
                        return sc;
                    }
+                    if (result == null || sc.EndDate.HasValue && sc.EndDate > result.EndDate)
+                    {
+                        result = sc;
+                    }
                }
            }

-            return null;
+            return result;
        }
    }
 }
--- a/BeWo/EnterTenantDialog.xaml
+++ b/BeWo/EnterTenantDialog.xaml
@@ -17,7 +17,7 @@
                    <RowDefinition Height="Auto" />
                    <RowDefinition Height="Auto" />
                </Grid.RowDefinitions>
-                <Image Grid.Row="0" HorizontalAlignment="Left" VerticalAlignment="Top" Source="Ressources\Icons\bewoplaner_logo_big.png"  Height="45" Margin="7,7,0,0"/>
+                <Image Grid.Row="0" HorizontalAlignment="Left" VerticalAlignment="Top" Source="Ressources\Icons\bewoplaner_logo_small.png"  Height="45" Margin="7,7,0,0"/>
                <Grid Grid.Row="1">
                    <Grid.ColumnDefinitions>
                        <ColumnDefinition Width="*" />
--- a/BeWo/Loader.cs
+++ b/BeWo/Loader.cs
@@ -0,0 +1,38 @@
+using BeWo.ServiceProxy;
+using BS.SharedLauncher.Information;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.IO.Pipes;
+using System.Linq;
+using System.Windows;
+
+namespace BeWo
+{
+    public static class Loader
+    {
+        public static bool Loaded { get; set; }
+
+        static Loader()
+        {
+            Loaded = false;
+        }
+        
+        public static void Load()
+        {
+            BeWoApp.UserName = SessionInformation.Login.Username;
+            BeWoApp.UserPassword = SessionInformation.Login.Password;
+            BeWoApp.ServerName = SessionInformation.Connection.Servername;
+            BeWoApp.Tenant = SessionInformation.Login.Tenant;
+            BeWoApp.ServerAddress = SessionInformation.Connection.CoreServerAddress;
+            BeWoApp.ShortVersion = SessionInformation.Session.Version;
+            BeWoApp.Version = "Version " + SessionInformation.Session.Version;
+
+            BeWoApp.LoggedOnUser = ServiceFacade.DoUserServiceSync(s => s.LoadUserByNameAndPassword(BeWoApp.UserName, BeWoApp.UserPassword));
+            BeWoApp.Mandator = ServiceFacade.DoOperationsServiceSync(s => s.GetMandator());
+
+            Loaded = true;
+        }
+    }
+}
+
--- a/BeWo/LockedPage.xaml
+++ b/BeWo/LockedPage.xaml
@@ -44,7 +44,7 @@
                            <RowDefinition Height="Auto" />
                            <RowDefinition Height="Auto" />
                        </Grid.RowDefinitions>
-                        <Image Grid.Row="0" Grid.ColumnSpan="4" HorizontalAlignment="Left" VerticalAlignment="Top" Source="Ressources\Icons\bewoplaner_logo_big.png"  Height="45" Margin="7,7,0,0"/>
+                        <Image Grid.Row="0" Grid.ColumnSpan="4" HorizontalAlignment="Left" VerticalAlignment="Top" Source="Ressources\Icons\bewoplaner_logo_small.png"  Height="45" Margin="7,7,0,0"/>
                        <Label VerticalAlignment="Top" HorizontalAlignment="Right" Content="Version x.x.x" Foreground="#FF818181" Margin="5,7,3,0" Grid.Row="0" Grid.ColumnSpan="4" Grid.Column="0" FontSize="10" x:Name="LblVersion" />
                        <StackPanel Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="2" Margin="0,100,0,0" MaxWidth="330">
                            <Label x:Name="lblGesperrt" Content="Gesperrt" Foreground="#FF000000" FontSize="12" FontWeight="Bold" Margin="0,30,0,0" HorizontalAlignment="Center" />
--- a/BeWo/LockedPage.xaml.cs
+++ b/BeWo/LockedPage.xaml.cs
@@ -10,7 +10,7 @@ namespace BeWo
            Loaded += LockedPage_Loaded;

            LblVersion.Content = BeWoApp.Version;
-            lblGesperrt.Content = $"Gesperrt von " + BS.Shared.Translation.Translator.Translate("BenutzerSingular") + " " + BeWoApp.LoggedOnUser.Employee.FirstName + " " + BeWoApp.LoggedOnUser.Employee.LastName;
+            lblGesperrt.Content = $"Gesperrt von " + BS.SharedLauncher.Translation.Translator.Translate("BenutzerSingular") + " " + BeWoApp.LoggedOnUser.Employee.FirstName + " " + BeWoApp.LoggedOnUser.Employee.LastName;
        }

        private void LockedPage_Loaded(object sender, RoutedEventArgs e)
--- a/BeWo/LoginControl.xaml
+++ b/BeWo/LoginControl.xaml
@@ -198,3 +198,5 @@
      <Border x:Name="profileEditPopUp" />
    </Grid>
 </UserControl>
+
+    
--- a/BeWo/LoginControl.xaml.cs
+++ b/BeWo/LoginControl.xaml.cs
@@ -29,8 +29,8 @@ using BeWo.Security;
 using BeWo.ServiceProxy;
 using BeWo.View;
 using BeWo.View.Detail;
-using BS.Shared.Translation;
 using Path = System.IO.Path;
+using BS.SharedLauncher.Translation;

 namespace BeWo
 {
@@ -675,7 +675,6 @@ namespace BeWo
 			}


-
 			if (ProfileList.Count == 0 || profileSelectionComboBox.SelectedItem == null)
 			{
 				MessageBox.Show(
@@ -729,7 +728,7 @@ namespace BeWo
        }
 		
        private void Login(WaitLayer2 lWaitLayer, String lUserName, String lPassword, String lTenant, String lPIN)
-        {
+        { 
            try
            {
                //1. Versuch
@@ -769,7 +768,7 @@ namespace BeWo
                    this.Dispatch(delegate
                    {
                        grid_root.Children.Remove(lWaitLayer);
-                        MessageBox.Show("Anmeldeinformationen nicht bekannt. Bitte überprüfen Sie den " + BS.Shared.Translation.Translator.Translate("Benutzernamen") + "  und das Passwort!", "Fehler bei der Anmeldung", MessageBoxButton.OK, MessageBoxImage.Exclamation);
+                        MessageBox.Show("Anmeldeinformationen nicht bekannt. Bitte überprüfen Sie den " + BS.SharedLauncher.Translation.Translator.Translate("Benutzernamen") + "  und das Passwort!", "Fehler bei der Anmeldung", MessageBoxButton.OK, MessageBoxImage.Exclamation);
                    });
                }
                if (result == UserValidationResult.EmployeeDeleted)
@@ -1419,4 +1418,4 @@ namespace BeWo
            return key1.Equals(key2);
        }
    }
-}
+}
--- a/BeWo/MainControl.xaml
+++ b/BeWo/MainControl.xaml
@@ -309,7 +309,7 @@
                                    </TransformGroup>
                                </Button.RenderTransform>
                            </localView:ImageButton>
-                            <localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, QueryView_View"
+                            <localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, QueryView_View, Analysis_ServiceOverview_View, Analysis_Auslastung_View, Analysis_AuslastungAllEmployee_View, Analysis_AuslastungTeam_View, Kilometerauswertung_View, KilometerauswertungEigene_View, BewertungAuswertung_View, PivotTabelleAnsehen, DienstplanungAnsehen, AbwesenheitsPlanungAnsehen, Mitarbeiterstundenkonto_ViewAll, Mitarbeiterstundenkonto_ViewSelf, Mitarbeiterstundenkonto_ViewTeams, Jahresbericht, Auswertungen_BerichteAnsehen, Auswertungen_StundenuebersichtAnsehen, Auswertungen_HilfeplanuebersichtAnsehen"
                                    x:Name="button_Reports" Click="button_Reports_Click"
                                    Style="{StaticResource NavBarButton}"
                                    Content="{t:Translate AuswertungenMenuItem}"
--- a/BeWo/MainControl.xaml.cs
+++ b/BeWo/MainControl.xaml.cs
@@ -29,7 +29,7 @@ using BeWo.ViewModel;
 using BS.Shared;
 using BS.Shared.DataContracts;
 using BS.Shared.Extensions;
-using BS.Shared.Translation;
+using BS.SharedLauncher.Translation;
 using Hyperlink = System.Windows.Documents.Hyperlink;

 namespace BeWo
@@ -79,8 +79,34 @@ namespace BeWo

 			//EditorLocalizer.Active = new CustomDXEditorLocalizer();
 			//SchedulerControlLocalizer.Active = new CustomSchedulerLocalizer();
-		    //GridControlLocalizer.Active = new CustomGridLocalizer();
-            
+			//GridControlLocalizer.Active = new CustomGridLocalizer();
+
+			// ToDo: Testen!
+   //         var bewoClientType = BeWoApp.Mandator.BeWoClientType;
+			//var hasKilometerauswertung = BeWoApp.AppSettings.ShowDistanceFields && (BeWoApp.LoggedOnUser.HasRight(UserRightType.Kilometerauswertung_View) || BeWoApp.LoggedOnUser.HasRight(UserRightType.KilometerauswertungEigene_View));
+			//var hideAuswertungen = !BeWoApp.LoggedOnUser.HasRight(UserRightType.Auswertungen_BerichteAnsehen) &&
+   //                                !BeWoApp.LoggedOnUser.HasRight(UserRightType.Auswertungen_StundenuebersichtAnsehen) &&
+   //                                !BeWoApp.LoggedOnUser.HasRight(UserRightType.Auswertungen_HilfeplanuebersichtAnsehen) &&
+   //                                !BeWoApp.LoggedOnUser.HasRight(UserRightType.Analysis_ServiceOverview_View) &&
+   //                                !BeWoApp.LoggedOnUser.HasRight(UserRightType.Analysis_Auslastung_View) &&
+   //                                (bewoClientType != 3 || !BeWoApp.LoggedOnUser.HasRight(UserRightType.Analysis_EmployeeOverviewAll_View)) &&
+   //                                (BeWoApp.Tenant == "3010479871" || (!BeWoApp.LoggedOnUser.HasRight(UserRightType.Mitarbeiterstundenkonto_ViewAll) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.Mitarbeiterstundenkonto_ViewSelf) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.Mitarbeiterstundenkonto_ViewTeams))) &&
+   //                                !BeWoApp.LoggedOnUser.HasRight(UserRightType.Jahresbericht) &&
+   //                                !BeWoApp.Mandator.AllowSbd &&
+   //                                !(BeWoApp.AppSettings.ShowPivotGrid && BeWoApp.LoggedOnUser.HasRight(UserRightType.PivotTabelleAnsehen)) &&
+   //                                !(BeWoApp.AppSettings.ShowDienstplanung && BeWoApp.LoggedOnUser.HasRight(UserRightType.DienstplanungAnsehen)) &&
+   //                                !(BeWoApp.AppSettings.ShowUrlaubsplanung && BeWoApp.LoggedOnUser.HasRight(UserRightType.AbwesenheitsPlanungAnsehen)) &&
+   //                                !BeWoApp.LoggedOnUser.HasRight(UserRightType.BewertungAuswertung_View) &&
+   //                                !BeWoApp.LoggedOnUser.HasRight(UserRightType.Analysis_ServiceOverview_View) &&
+   //                                !hasKilometerauswertung;
+
+			
+
+
+			//if(hideAuswertungen)
+   //         {
+   //             button_Reports.Visibility = Visibility.Collapsed;
+   //         }

 			OpenedModalViewWindows = new List<ModalViewWindow>();

@@ -670,7 +696,7 @@ namespace BeWo

 		public bool DoSaveCheck()
 		{
-			return _CurrentDetailView == null || _CurrentDetailView.DoSaveCheck();
+			return _CurrentDetailView is null || _CurrentDetailView.DoSaveCheck();
 		}

 		private void InitCommandBindings()
@@ -680,7 +706,7 @@ namespace BeWo
 					ApplicationCommands.Save,
 					(s, e) =>
 					{
-						if (_CurrentModalPopup == null)
+						if (_CurrentModalPopup is null)
 						{
 							_CurrentDetailView.SaveData();
 						}
@@ -691,13 +717,13 @@ namespace BeWo
 					},
 					(s, e) =>
 					{
-						if (_CurrentModalPopup == null)
+						if (_CurrentModalPopup is null)
 						{
-							e.CanExecute = _CurrentDetailView != null ? _CurrentDetailView.IsDirty : false;
+							e.CanExecute = _CurrentDetailView?.IsDirty ?? false;
 						}
 						else
 						{
-							e.CanExecute = _CurrentDetailView != null && (_CurrentModalPopup is BeWoView && ((BeWoView) _CurrentModalPopup).IsDirty);
+							e.CanExecute = _CurrentDetailView != null && (_CurrentModalPopup is BeWoView view && view.IsDirty);
 						}
 					}));

@@ -1162,7 +1188,8 @@ namespace BeWo

 			var cancelButton = new Button {Content = "Schließen"};
 			cancelButton.Margin = new Thickness(5);
-
+			cancelButton.Width = 100;
+			cancelButton.HorizontalAlignment = HorizontalAlignment.Right;
 			var mailLabel = new Label
 			{
 				Content = "Support-Mail schreiben",
--- a/BeWo/MainWindow.xaml
+++ b/BeWo/MainWindow.xaml
@@ -2,7 +2,7 @@
        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
        Title="BeWoPlaner" Height="768" Width="1024" WindowStartupLocation="CenterScreen" WindowState="Maximized"
-              BorderThickness="1" Closing="MainWindow_OnClosing">
+              BorderThickness="1" Closing="MainWindow_OnClosing" SourceInitialized="Window_SourceInitialized">
    <Grid x:Name="rootGrid">
        
    </Grid>
--- a/BeWo/MainWindow.xaml.cs
+++ b/BeWo/MainWindow.xaml.cs
@@ -4,7 +4,7 @@ using System.Threading;
 using System.Windows;
 using BeWo.Core.Config;
 using BeWo.MultiLanguage;
-using BS.Shared.Translation;
+using BS.SharedLauncher.Translation;
 using DevExpress.Xpf.Core;

 namespace BeWo
@@ -19,7 +19,48 @@ namespace BeWo
            InitializeComponent();

            ApplicationThemeHelper.ApplicationThemeName = "Office2010Black";
-            ShowLoginControl();
+
+            if (Loader.Loaded)
+                ShowNewWay();
+            else
+                ShowOldWay(false);
+                //throw new Exception("Loader failed");
+        }
+
+        private void ShowNewWay()
+        {
+            Translator t = new Translator(new ServiceTranslator());
+            //WebRequest.DefaultWebProxy 
+
+            //System.Net.WebRequest.GetSystemWebProxy()
+            rootGrid.Children.Clear();
+
+            MainControl mc = new MainControl();
+            mc.IsMaximized = BeWoApp.AppSettings.WindowState == AppSettings.WindowStateType.Maximised;
+
+            mc.LogoutClicked += new EventHandler(mc_LogoutClicked);
+            rootGrid.Children.Add(mc);
+        }
+
+        private void ShowOldWay(bool skiplogin)
+        {
+            if (skiplogin)
+            {
+                throw new NotImplementedException("47845978233134");
+
+                // Muss hier ggf string anpassen
+                //Loader.Load("tedemo?undemo?pwdemo?ip?sn1?cs?vr1.0.4.1");
+                //ShowNewWay();
+            }
+            else
+            {
+                //WebRequest.DefaultWebProxy 
+
+                //System.Net.WebRequest.GetSystemWebProxy()
+                var lc = new LoginControl();
+                rootGrid.Children.Add(lc);
+                lc.LoginSuccessful += lc_LoginSuccessful;
+            }
        }

        private void ShowLoginControl()
@@ -66,7 +107,11 @@ namespace BeWo
        {
            rootGrid.Children.Clear();
            BeWoApp.MainControl = null;
-            ShowLoginControl();
+            
+            if(Loader.Loaded)
+                Application.Current.Shutdown(100);
+            else
+                ShowLoginControl();
        }

        private void MainWindow_OnClosing(object sender, CancelEventArgs e)
@@ -105,5 +150,12 @@ namespace BeWo

            Application.Current.Shutdown();
        }
+
+        private void Window_SourceInitialized(object sender, EventArgs e)
+        {
+            Console.WriteLine("GUI geladen");
+
+            Thread.Sleep(500);
+        }
    }
 }
--- a/BeWo/MultiLanguage/Markup/TranslateExtension.cs
+++ b/BeWo/MultiLanguage/Markup/TranslateExtension.cs
@@ -1,6 +1,6 @@
-using System;
+using BS.SharedLauncher.Translation;
+using System;
 using System.Windows.Markup;
-using BS.Shared.Translation;

 namespace BeWo.MultiLanguage.Markup
 {
--- a/BeWo/MultiLanguage/ServiceTranslator.cs
+++ b/BeWo/MultiLanguage/ServiceTranslator.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using BeWo.ServiceProxy;
-using BS.Shared.Translation;
+using BS.SharedLauncher.Translation;
 using DevExpress.Xpo.Logger;

 namespace BeWo.MultiLanguage
--- a/BeWo/PasswortSecurity/PasswortSicherheit.cs
+++ b/BeWo/PasswortSecurity/PasswortSicherheit.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
@@ -11,272 +8,424 @@ using BS.Shared.Extensions;

 namespace BeWo.PasswortSecurity
 {
-    class PasswortSicherheit
+    internal class PasswortSicherheit
    {
-        #region Variablen
+        #region Konstanten und Variablen
+        private const string Numbers = "0123456789";
+        private const string LowercaseLetters = "abcdefghijklmnopqrstuvwxyz";
+        private const string UppercaseLetters = "ABDEFGHIJKLMNOPQRSTUVWXYZ";
+        private const string LowercaseUmlauts = "äöüß";
+        private const string UppercaseUmlauts = "ÄÖÜ";
+        private const string SpecialCharacters = "\\\"\'µ@€!&/()=?+#*,.-;:_><|§$%'{[]}´`^°~²³";

-        private const string zahlen = "0123456789";
-        private const string grossBuchstaben = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-        private const string kleinBuchstaben = "abcdefghijklmnopqrstuvwxyz";

-        private const string grossBuchstabenSonderLevel = "ÄÖÜ";
-        private const string kleinBuchstabenSonderLevel = "äöüß";
+        private const string numbers = "0123456789";
+        private const string uppercaseLetters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+        private const string lowercaseLetters = "abcdefghijklmnopqrstuvwxyz";

-        private const string sonderzeichenLevel1 = "\\\"\'µ@€!";
-        private const string sonderzeichenLevel2 = "&/()=?+#*";
-        private const string sonderzeichenLevel3 = ",.-;:_><|";
-        private const string sonderzeichenLevel4 = "§$%'{[]}´";
-        private const string sonderzeichenLevel5 = "`^°~²³";
+        private const string uppercaseUmlauts = "ÄÖÜ";
+        private const string lowercaseUmlauts = "äöüß";

-        private string letztespw = "";
-        private bool retschalter = false;
-        private int distanz = 0;
+        private const string specialCharacters1 = "\\\"\'µ@€!";
+        private const string specialCharacters2 = "&/()=?+#*";
+        private const string specialCharacters3 = ",.-;:_><|";
+        private const string specialCharacters4 = "§$%'{[]}´";
+        private const string specialCharacters5 = "`^°~²³";

-        int score = 0;
-        int letzterwert = 0;
-        bool schalter = false;
+        private string partialPassword = "";
+        private bool isPartial;
+        private int passwordLengthDifference;
+
+        int score;
+        int previousValue;
+        bool schalter;
        List<int> letztewerte = new List<int>();

        #endregion
-
+        /*
+         * Länge prüfen und welche Zeichen vorhanden sind
+         */
        #region Passwort Stärke Ermitteln und Anzeigen
-        public Label ErmittleUndZeigePasswortStaerke(string s,Label lblPwAnzeige)
+
+        //public static Label ShowPasswordStrengthLabel(string passwordToValidate, Label passwordStrengthLabel)
+        //{
+        //    var passwordStrength = CalculatePasswordStrength(passwordToValidate);
+
+        //    var visibility = Visibility.Visible;
+        //    var content = "Passwortstärke: ";
+        //    var foreground = new SolidColorBrush(Colors.Black);
+
+        //    switch(passwordStrength)
+        //    {
+        //        case 0:
+        //            content += "sehr schwach";
+        //            foreground = new SolidColorBrush(Colors.Red);
+        //            break;
+        //        case 1:
+        //            content += "schwach";
+        //            foreground = new SolidColorBrush(Colors.OrangeRed);
+        //            break;
+        //        case 2:
+        //            content += "mittel";
+        //            foreground = new SolidColorBrush(Colors.Yellow);
+        //            break;
+        //        case 3:
+        //            content += "stark";
+        //            foreground = new SolidColorBrush(Colors.Green);
+        //            break;
+        //        case 4:
+        //            content += "sehr stark";
+        //            foreground = new SolidColorBrush(Colors.Green);
+        //            break;
+        //        default:
+        //            visibility = Visibility.Hidden;
+        //            content = string.Empty;
+        //            break;
+        //    }
+
+        //    passwordStrengthLabel.Visibility = visibility;
+        //    passwordStrengthLabel.Foreground = foreground;
+        //    passwordStrengthLabel.Content = content;
+
+        //    return passwordStrengthLabel;
+        //}
+
+        //private static int CalculatePasswordStrength(string passwordToValidate)
+        //{
+        //    var length = passwordToValidate?.Length ?? 0;
+        //    if(string.IsNullOrEmpty(passwordToValidate) || length < 6)
+        //    {
+        //        return -1;
+        //    }
+
+        //    var score = 0;
+
+        //    if(length < 9)
+        //    {
+        //        score += 1;
+        //    }
+        //    else if(length < 12)
+        //    {
+        //        score += 2;
+        //    }
+        //    else if(length < 18)
+        //    {
+        //        score += 3;
+        //    }
+        //    else
+        //    {
+        //        score += 4;
+        //    }
+
+        //    var numberCount = passwordToValidate.Count(c => Numbers.Contains(c));
+        //    var lowercaseLetterCount = passwordToValidate.Count(c => LowercaseLetters.Contains(c));
+        //    var uppercaseLetterCount = passwordToValidate.Count(c => UppercaseLetters.Contains(c));
+        //    var lowercaseUmlautsCount = passwordToValidate.Count(c => LowercaseUmlauts.Contains(c));
+        //    var uppercaseUmlautsCount = passwordToValidate.Count(c => UppercaseUmlauts.Contains(c));
+        //    var specialCharacterCount = passwordToValidate.Count(c => SpecialCharacters.Contains(c));
+
+        //    score += numberCount * 3;
+        //    score += lowercaseLetterCount * 2;
+        //    score += uppercaseLetterCount * 3;
+        //    score += lowercaseUmlautsCount * 2;
+        //    score += uppercaseUmlautsCount * 2;
+        //    score += specialCharacterCount * 4;
+
+        //    if(score < 16)
+        //    {
+        //        return 0;
+        //    }
+
+        //    if(score < 56)
+        //    {
+        //        return 1;
+        //    }
+
+        //    if(score < 116)
+        //    {
+        //        return 2;
+        //    }
+
+        //    return score < 156 ? 3 : 4;
+        //}
+
+        // Score, PreivousValue, Schalter, und LetzteWerte werden im Objekt gepeichert.
+        public Label ErmittleUndZeigePasswortStaerke(string passwordToValidate, Label passwordLabel)
        {
-            if (!s.IsNullOrEmpty())
+            if (!passwordToValidate.IsNullOrEmpty())
            {
-                string sx = "";
-
-                int i = -1;
+                var sx = "";
+                var passwordStrength = -1;
                
-                foreach (var item in s)
+                // Es wird durch jedes Zeichen des Passworts einzeln gegangen
+                foreach (var token in passwordToValidate)
                {
-                    sx += item.ToString();
+                    sx += token.ToString();

-                    if (sx.Length < letztespw.Length)
+                    if (sx.Length < partialPassword.Length)
                    {
-                        retschalter = true;
-                        distanz = letztespw.Length - sx.Length;
+                        isPartial = true;
+                        passwordLengthDifference = partialPassword.Length - sx.Length;
                    }

-                    if (!letztespw.Equals(sx))
-                        letztespw = sx;
+                    if (!partialPassword.Equals(sx))
+                    {
+                        partialPassword = sx;
+                    }

-                    i = PasswortStaerkeErmittler(sx); 
+                    passwordStrength = PasswortStaerkeErmittler(sx); 
                }
                
-                return ZeigePwStaerke(i, lblPwAnzeige);
+                return ZeigePwStaerke(passwordStrength, passwordLabel);
            }
-            else
-            {             
-                score = 0;
-                letzterwert = 0;
+
+            score = 0;
+            previousValue = 0;
                
-                return ZeigePwStaerke(-1, lblPwAnzeige);
-            }
+            return ZeigePwStaerke(-1, passwordLabel);
        }

-        private int PasswortStaerkeErmittler(string neuesPwBox)
+        private int PasswortStaerkeErmittler(string passwordToValidate)
        {
-            int i = 0;
-            letzterwert = 0;
-            //############### Score System  ############          
+            var passwordStrength = 0;
+            previousValue = 0;

-            if (retschalter == true)
+            // Es handelt sich nur um einen Teil des zu überprüfenden Passworts
+            if (isPartial)
            {
-                if (distanz == 1)
+                // Der zu überprüfende Teil ist nur ein Zeichen
+                if (passwordLengthDifference == 1)
                {
                    score -= letztewerte.Last();
                    letztewerte.RemoveAt(letztewerte.Count - 1);
                }
+                // Der zu überprüfende Teil ist mehr als ein Zeichen
                else
                {
-                    for (int s = 0; s < distanz; s++)
+                    for (int s = 0; s < passwordLengthDifference; s++)
                    {
                        score -= letztewerte.Last();
                        letztewerte.RemoveAt(letztewerte.Count - 1);
                    }
                }

-                retschalter = false;
-
-                //letzterwert = 0;
+                isPartial = false;
            }
            else
            {
-                //Passwort Längen Bonus Punkte 
-                if (neuesPwBox.Length >= 6 && neuesPwBox.Length < 9)
+                //Passwortlängen Bonuspunkte 
+                if (passwordToValidate.Length >= 6 && passwordToValidate.Length < 9)
                {
                    score += 1;
-                    letzterwert = 1;
+                    previousValue = 1;
                    schalter = true;
                }

-                if (neuesPwBox.Length >= 9 && neuesPwBox.Length < 12)
+                if (passwordToValidate.Length >= 9 && passwordToValidate.Length < 12)
                {
                    score += 2;
-                    letzterwert = 2;
+                    previousValue = 2;
                    schalter = true;
                }

-                if (neuesPwBox.Length >= 12 && neuesPwBox.Length < 18)
+                if (passwordToValidate.Length >= 12 && passwordToValidate.Length < 18)
                {
                    score += 3;
-                    letzterwert = 3;
+                    previousValue = 3;
                    schalter = true;
                }

-                if (neuesPwBox.Length >= 18)
+                if (passwordToValidate.Length >= 18)
                {
                    score += 4;
-                    letzterwert = 4;
+                    previousValue = 4;
                    schalter = true;
                }

-                //Zahlen und Buchstaben 
-                if (neuesPwBox.Any(x => zahlen.Contains(x)))
+                //Zahlen 
+                if (passwordToValidate.Any(x => numbers.Contains(x)))
                {
                    score += 3;

-                    if (schalter == true)
-                        letzterwert += 3;
+                    if (schalter)
+                    {
+                        previousValue += 3;
+                    }
                    else
-                        letzterwert = 3;
+                    {
+                        previousValue = 3;
+                    }
                }

-                if (neuesPwBox.Any(x => grossBuchstaben.Contains(x)))
+                // Großbuchstaben
+                if (passwordToValidate.Any(x => uppercaseLetters.Contains(x)))
                {
                    score += 3;

-                    if (schalter == true)
-                        letzterwert += 3;
+                    if (schalter)
+                    {
+                        previousValue += 3;
+                    }
                    else
-                        letzterwert = 3;
+                    {
+                        previousValue = 3;
+                    }
                }

-                if (neuesPwBox.Any(x => grossBuchstabenSonderLevel.Contains(x)))
+                // Großumlaute
+                if (passwordToValidate.Any(x => uppercaseUmlauts.Contains(x)))
                {
                    score += 2;

-                    if (schalter == true)
-                        letzterwert += 2;
+                    if (schalter)
+                    {
+                        previousValue += 2;
+                    }
                    else
-                        letzterwert = 2;
+                    {
+                        previousValue = 2;
+                    }
                }

-                if (neuesPwBox.Any(x => kleinBuchstaben.Contains(x)))
+                if (passwordToValidate.Any(x => lowercaseLetters.Contains(x)))
                {
                    score += 2;

-                    if (schalter == true)
-                        letzterwert += 2;
+                    if (schalter)
+                    {
+                        previousValue += 2;
+                    }
                    else
-                        letzterwert = 2;
+                    {
+                        previousValue = 2;
+                    }
                }

-                if (neuesPwBox.Any(x => kleinBuchstabenSonderLevel.Contains(x)))
+                // Kleinumlaute
+                if (passwordToValidate.Any(x => lowercaseUmlauts.Contains(x)))
                {
                    score += 2;

-                    if (schalter == true)
-                        letzterwert += 2;
+                    if (schalter)
+                    {
+                        previousValue += 2;
+                    }
                    else
-                        letzterwert = 2;
+                    {
+                        previousValue = 2;
+                    }
                }

                // Sonderzeichen 
-
-                if (neuesPwBox.Any(x => sonderzeichenLevel1.Contains(x)))
+                if (passwordToValidate.Any(x => specialCharacters1.Contains(x)))
                {
                    score += 4;

-                    if (schalter == true)
-                        letzterwert += 4;
+                    if (schalter)
+                    {
+                        previousValue += 4;
+                    }
                    else
-                        letzterwert = 4;
+                    {
+                        previousValue = 4;
+                    }
                }

-                if (neuesPwBox.Any(x => sonderzeichenLevel2.Contains(x)))
+                // Sonderzeichen 2
+                if (passwordToValidate.Any(x => specialCharacters2.Contains(x)))
                {
                    score += 4;

-                    if (schalter == true)
-                        letzterwert += 4;
+                    if (schalter)
+                        previousValue += 4;
                    else
-                        letzterwert = 4;
+                        previousValue = 4;
                }

-                if (neuesPwBox.Any(x => sonderzeichenLevel3.Contains(x)))
+                // Sonderzeichen 3
+                if(passwordToValidate.Any(x => specialCharacters3.Contains(x)))
                {
                    score += 4;

-                    if (schalter == true)
-                        letzterwert += 4;
+                    if (schalter)
+                    {
+                        previousValue += 4;
+                    }
                    else
-                        letzterwert = 4;
+                    {
+                        previousValue = 4;
+                    }
                }

-                if (neuesPwBox.Any(x => sonderzeichenLevel4.Contains(x)))
+                // Sonderzeichen 4
+                if(passwordToValidate.Any(x => specialCharacters4.Contains(x)))
                {
                    score += 4;

-                    if (schalter == true)
-                        letzterwert += 4;
+                    if (schalter)
+                    {
+                        previousValue += 4;
+                    }
                    else
-                        letzterwert = 4;
+                    {
+                        previousValue = 4;
+                    }
                }

-                if (neuesPwBox.Any(x => sonderzeichenLevel5.Contains(x)))
+                // Sonderzeichen 5
+                if(passwordToValidate.Any(x => specialCharacters5.Contains(x)))
                {
                    score += 4;

-                    if (schalter == true)
-                        letzterwert += 4;
+                    if (schalter)
+                    {
+                        previousValue += 4;
+                    }
                    else
-                        letzterwert = 4;
+                    {
+                        previousValue = 4;
+                    }
                }

-                letztewerte.Add(letzterwert);
+                letztewerte.Add(previousValue);
            }

-            //#########################################
-
-            // ########################################### PasswortStärke Bereich ##########################       
            //Sehr Schwach
            if (score <= 15)
            {
-                i = 0;
+                passwordStrength = 0;
            }

            //Schwach
            if (score >= 16 && score <= 55)
            {
-                i = 1;
+                passwordStrength = 1;
            }

            //Mittelmäßig
            if (score >= 56 && score <= 115)
            {
-                i = 2;
+                passwordStrength = 2;
            }

            //Stark
            if (score >= 116 && score <= 155)
            {
-                i = 3;
+                passwordStrength = 3;
            }

            //Sehr Stark
            if (score >= 156)
            {
-                i = 4;
+                passwordStrength = 4;
            }

-            return i;
+            return passwordStrength;
        }

-        private Label ZeigePwStaerke(int i, Label passwortprüfer)
+        private Label ZeigePwStaerke(int passwordStrength, Label passwortprüfer)
        {
-            switch (i)
+            switch (passwordStrength)
            {
                case -1:
                     passwortprüfer.Visibility = Visibility.Hidden; 
@@ -337,14 +486,14 @@ namespace BeWo.PasswortSecurity
                {
                    sx += item.ToString();

-                    if (sx.Length < letztespw.Length)
+                    if (sx.Length < partialPassword.Length)
                    {
-                        retschalter = true;
-                        distanz = letztespw.Length - sx.Length;
+                        isPartial = true;
+                        passwordLengthDifference = partialPassword.Length - sx.Length;
                    }

-                    if (!letztespw.Equals(sx))
-                        letztespw = sx;
+                    if (!partialPassword.Equals(sx))
+                        partialPassword = sx;

                    i = PasswortStaerkeErmittler(sx);
                }
@@ -354,7 +503,7 @@ namespace BeWo.PasswortSecurity
            else
            {
                score = 0;
-                letzterwert = 0;
+                previousValue = 0;

                return ZeigeSecutityStaerke(-1);
            }
--- a/BeWo/Properties/Resources.Designer.cs
+++ b/BeWo/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace BeWo.Properties {
    // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
    // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
    // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    internal class Resources {
--- a/BeWo/Properties/Settings.Designer.cs
+++ b/BeWo/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace BeWo.Properties {
    
    
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.0.1.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
        
        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
--- a/BeWo/Properties/licenses.licx
+++ b/BeWo/Properties/licenses.licx
@@ -1 +1 @@
-DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
--- a/BeWo/PwVergessenView.xaml.cs
+++ b/BeWo/PwVergessenView.xaml.cs
@@ -31,7 +31,7 @@ namespace BeWo
 			var benutzername = BenutzernamenTextBox.Text;
 			if (benutzername.Equals(""))
 			{
-				MessageBox.Show("Bitte geben Sie einen " + BS.Shared.Translation.Translator.Translate("Benutzernamen") + " an", "Passwort anfordern fehlgeschlagen", MessageBoxButton.OK, MessageBoxImage.Information);
+				MessageBox.Show("Bitte geben Sie einen " + BS.SharedLauncher.Translation.Translator.Translate("Benutzernamen") + " an", "Passwort anfordern fehlgeschlagen", MessageBoxButton.OK, MessageBoxImage.Information);
 				return;
 			}

@@ -42,7 +42,7 @@ namespace BeWo
 		{
 			if(email.Equals("") || !hatEmail)
 			{
-				MessageBox.Show("Es konnte " + BS.Shared.Translation.Translator.Translate("kein Benutzer") + " mit diesem Namen gefunden werden oder " + BS.Shared.Translation.Translator.Translate("der Benutzer") + " hat keine E-Mail Adresse hinterlegt\nBitte wenden Sie sich an " + BS.Shared.Translation.Translator.Translate("Ihren Systemadministrator") + ".", "Passwort anfordern fehlgeschlagen", MessageBoxButton.OK, MessageBoxImage.Information);
+				MessageBox.Show("Es konnte " + BS.SharedLauncher.Translation.Translator.Translate("kein Benutzer") + " mit diesem Namen gefunden werden oder " + BS.SharedLauncher.Translation.Translator.Translate("der Benutzer") + " hat keine E-Mail Adresse hinterlegt\nBitte wenden Sie sich an " + BS.SharedLauncher.Translation.Translator.Translate("Ihren Systemadministrator") + ".", "Passwort anfordern fehlgeschlagen", MessageBoxButton.OK, MessageBoxImage.Information);
 				return;
 			}

--- a/BeWo/Ressources/Icons/AB.png
+++ b/BeWo/Ressources/Icons/AB.png
--- a/BeWo/Ressources/Icons/BoyAndGirl.png
+++ b/BeWo/Ressources/Icons/BoyAndGirl.png
--- a/BeWo/Scheduler/Converter/ToolTipTimeConverter.cs
+++ b/BeWo/Scheduler/Converter/ToolTipTimeConverter.cs
@@ -0,0 +1,75 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+using BeWo.Scheduler.ViewModel;
+using BS.Shared.Extensions;
+using DevExpress.Xpf.Scheduler.Drawing;
+using DevExpress.XtraScheduler;
+
+namespace BeWo.Scheduler.Converter
+{
+    public class ToolTipTimeConverter : IMultiValueConverter
+    {
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            if(values is null || values.Length != 2)
+            {
+                return null;
+            }
+
+            if(values[0] is VisualAppointmentViewInfo visualAppointmentViewInfo && values[1] is TimeInterval timeInterval)
+            {
+                if(visualAppointmentViewInfo.CustomViewInfo is CustomFieldCollection customFieldCollection && customFieldCollection[nameof(CustomFieldStorage)] is CustomFieldStorage customFieldStorage)
+                {
+                    // ToDo: Bei Terminen einer Serie stimmen die Angaben nicht immer! Ist erst in DevExpress-Version 19.2.6 gefixt!
+                    var isAbsenceTime = customFieldStorage.IsAbsenceTime;
+                    var isTask = customFieldStorage.IsTask;
+
+                    // Bei Abwesenheit einen Tag abziehen
+                    var start = visualAppointmentViewInfo.AppointmentStart;
+                    var end = visualAppointmentViewInfo.AppointmentEnd; // Jahr ist 9999, wenn es in der Datenbank null ist
+
+                    var noEnd = end.Year == 9999;
+
+                    if(isAbsenceTime)
+                    {
+                        // Ende kann null sein
+                        // Selber Tag? Hat Ende?
+                        if(noEnd)
+                        {
+                            return start.GetIntervalDescription(end);
+                        }
+
+                        // Bei ganztägigen Abwesenheiten
+                        if(start.IsTimeZero() && end.IsTimeZero() && end.AddDays(-1) > start)
+                        {
+                            end = end.AddDays(-1);
+                        }
+
+                        return start.GetIntervalDescription(end);
+                    }
+                    
+                    if(isTask)
+                    {
+                        return noEnd ? string.Empty : $"bis {end:dd.MM.yyyy HH:mm}";
+                    }
+
+                    if(start.IsTimeZero() && end.IsTimeZero() && end.AddDays(-1) > start)
+                    {
+                        end = end.AddDays(-1);
+                    }
+
+                    return start.GetIntervalDescription(end).TrimStart();
+                }
+            }
+
+            return null;
+        }
+
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
+}
--- a/BeWo/Scheduler/View/NewSchedulerView.xaml
+++ b/BeWo/Scheduler/View/NewSchedulerView.xaml
@@ -28,12 +28,12 @@
 			<view:NichtNochEinConverter x:Key="NichtNochEinConverter" />
            <view:InformationButtonVisibilityConverter x:Key="InformationButtonVisibilityConverter" />
 			<localSchConv:AptToServRecsIconVisibilityConverter x:Key="AptToServRecsIconVisibilityConverter" />
+			<localSchConv:ToolTipTimeConverter x:Key="ToolTipTimeConverter" />
            <!-- Region Appointment Templates -->

            <!-- Region VerticalAppointmentTemplate -->
+			<!-- Wird für alle nicht-ganztäglichen Termine benutzt außer in der Monatsansicht -->
 		    <ControlTemplate x:Key="{dxscht:SchedulerViewThemeKey ResourceKey=VerticalAppointmentTemplate, IsThemeIndependent=true}" TargetType="{x:Type dxschint:VisualVerticalAppointmentControl}">
-            <!--<dxschint:AppointmentColorConvertControl x:Name="clrConvCtrl" ControlColor="{TemplateBinding ViewInfo, Converter={StaticResource AppointmentBackgroundConverter}}" SnapsToDevicePixels="True">-->
-			<!-- TODO: ändern! -->
                <dxschint:AppointmentColorConvertControl x:Name="clrConvCtrl" ControlColor="{Binding Path=ViewInfo.CustomViewInfo[CustomFieldStorage].BackgroundColor.GradientStops[0].Color, RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="True">
 					<VisualStateManager.VisualStateGroups>
 						<VisualStateGroup x:Name="DraggedStates">
@@ -67,7 +67,8 @@
 					<Grid x:Name="PART_ToolTipContainer" dxsch:SchedulerControl.HitTestType="AppointmentContent" dxsch:SchedulerControl.SelectableIntervalViewInfo="{TemplateBinding ViewInfo}" Tag="{TemplateBinding ViewInfo}">
 						<!-- Region AppointmentToolTip -->
 						<ToolTipService.ToolTip>
-							<ToolTip Content="{TemplateBinding ViewInfo}" ContentTemplate="{Binding ViewInfo.View.AppointmentToolTipContentTemplate, RelativeSource={RelativeSource TemplatedParent}, UpdateSourceTrigger=PropertyChanged}"
+							<ToolTip Content="{TemplateBinding ViewInfo}" 
+                                     ContentTemplate="{Binding ViewInfo.View.AppointmentToolTipContentTemplate, RelativeSource={RelativeSource TemplatedParent}, UpdateSourceTrigger=PropertyChanged}"
 									 Visibility="{Binding ViewInfo.View.AppointmentToolTipVisibility, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ToolTipVisibilityConverter}}">
 							</ToolTip>
 						</ToolTipService.ToolTip>
@@ -147,7 +148,6 @@
                        <TextBlock Grid.Row="1" Text="{Binding Location}" TextWrapping="Wrap" Margin="6,0,0,3" Foreground="{Binding Path=CustomViewInfo[CustomFieldStorage].ForegroundColor}" />
 					</Grid>
 					<dxschint:AppointmentImagesControl Grid.Column="1" Margin="0,0,4,0"  ViewInfo="{Binding}" Orientation="Vertical" SnapsToDevicePixels="True" />
-					<!-- ToDo: Neuen Converter schreiben, der prüft, ob in der Liste ServiceRecords sind -->
                    <Image Grid.Row="0" Grid.Column="2" Margin="-4,-2,6,0"
                           Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage], Converter={StaticResource AptToServRecsIconVisibilityConverter}}" Source="/BeWoPlaner;component/Ressources/Icons/HistoryDisabled.png" 
                           SnapsToDevicePixels="True" Height="20" Width="20" VerticalAlignment="Top" />
@@ -190,8 +190,9 @@
 					</dxschint:AppointmentColorConvertControl.BaseBrushColors>
 					<Grid x:Name="PART_ToolTipContainer" dxsch:SchedulerControl.HitTestType="AppointmentContent" dxsch:SchedulerControl.SelectableIntervalViewInfo="{TemplateBinding ViewInfo}">
                        <ToolTipService.ToolTip>
-                            <ToolTip Content="{TemplateBinding ViewInfo}" ContentTemplate="{Binding ViewInfo.View.AppointmentToolTipContentTemplate, RelativeSource={RelativeSource TemplatedParent}, UpdateSourceTrigger=PropertyChanged}"
-									 Visibility="{Binding ViewInfo.View.AppointmentToolTipVisibility, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ToolTipVisibilityConverter}}">
+                            <ToolTip Content="{TemplateBinding ViewInfo}"
+                                     ContentTemplate="{Binding ViewInfo.View.AppointmentToolTipContentTemplate, RelativeSource={RelativeSource TemplatedParent}, UpdateSourceTrigger=PropertyChanged}"
+                                     Visibility="{Binding ViewInfo.View.AppointmentToolTipVisibility, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ToolTipVisibilityConverter}}">
                            </ToolTip>
                        </ToolTipService.ToolTip>
                        <dxschint:AppointmentBorder x:Name="back" DefaultCornerRadius="4" Opacity="1" ViewInfo="{TemplateBinding ViewInfo}"
@@ -323,6 +324,7 @@
 						<RowDefinition Height="Auto" />
 						<RowDefinition Height="Auto" />
 						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
                        <RowDefinition Height="Auto" />
                        <RowDefinition Height="Auto" />
 					</Grid.RowDefinitions>
@@ -330,29 +332,36 @@
 						<ColumnDefinition Width="Auto" />
 						<ColumnDefinition Width="*" />
 					</Grid.ColumnDefinitions>
-					
-					<Grid Grid.Row="0" Grid.Column="0" Margin="0,0,3,0" Grid.ColumnSpan="2">
+					<Grid Grid.Row="1" Grid.Column="0" Margin="0,0,3,0" Grid.ColumnSpan="2">
 						<Grid.ColumnDefinitions>
 							<ColumnDefinition Width="Auto" />
 							<ColumnDefinition Width="*" />
 						</Grid.ColumnDefinitions>
-						<StackPanel Grid.Column="0" Orientation="Horizontal" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTipTimeVisibility}">
-						    <TextBlock Text="{Binding Path=StartTimeText}" />
-                            <TextBlock Text=" - " />
-						    <TextBlock Text="{Binding Path=EndTimeText}" />
-							<TextBlock Text=" Uhr" Margin="0,0,4,0" />
-						</StackPanel>
-                        <TextBlock Grid.Column="1" Text="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTip}" TextWrapping="Wrap" MaxWidth="{Binding Path=ActualWidth, Source={x:Reference Scheduler}}" />
+						<StackPanel Grid.Column="0" 
+                                    Orientation="Horizontal" 
+                                    Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTipTimeVisibility}">
+                            <TextBlock Margin="0,0,4,0">
+								<TextBlock.Text>
+                                    <MultiBinding Converter="{StaticResource ToolTipTimeConverter}">
+                                        <Binding />
+                                        <Binding Path="FetchingInterval" RelativeSource="{RelativeSource AncestorType={x:Type view:NewSchedulerView}}" />
+                                    </MultiBinding>
+                                </TextBlock.Text>
+                            </TextBlock>
+                        </StackPanel>
+                        <TextBlock Grid.Column="1" Text="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTip}" 
+                                   TextWrapping="Wrap" 
+                                   MaxWidth="{Binding Path=ActualWidth, Source={x:Reference Scheduler}}" />
 					</Grid>
-					<Separator Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Height="1" Background="DimGray" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTipTrennstrichVisibility}" />
+					<Separator Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Height="1" Background="DimGray" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTipTrennstrichVisibility}" />
 					
-					<TextBlock Margin="0,0,3,0" Grid.Row="2" Grid.Column="0" Text="Ressourcen:" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTipResourcesVisibility}" />
-					<TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding Path=CustomViewInfo, Converter={StaticResource AppointmentToolTipConverter}, ConverterParameter=Ressourcen}"
+					<TextBlock Margin="0,0,3,0" Grid.Row="3" Grid.Column="0" Text="Ressourcen:" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTipResourcesVisibility}" />
+					<TextBlock Grid.Row="3" Grid.Column="1" Text="{Binding Path=CustomViewInfo, Converter={StaticResource AppointmentToolTipConverter}, ConverterParameter=Ressourcen}"
 							   Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTipResourcesVisibility}" />

-					<TextBlock Margin="0,0,3,0" Grid.Row="3" Grid.Column="0" Text="{t:Translate MitarbeiterPlural:}" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTipEmployeesVisibility}" />
+					<TextBlock Margin="0,0,3,0" Grid.Row="4" Grid.Column="0" Text="{t:Translate MitarbeiterPlural:}" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTipEmployeesVisibility}" />

-					<ListView Margin="-6,-3,0,0" Grid.Row="3" Background="Transparent" BorderThickness="0" ItemsSource="{Binding Path=CustomViewInfo[CustomFieldStorage].EmployeeList}" Grid.Column="1" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTipEmployeesVisibility}" Name="ToolTipEmployeeList">
+					<ListView Margin="-6,-3,0,0" Grid.Row="4" Background="Transparent" BorderThickness="0" ItemsSource="{Binding Path=CustomViewInfo[CustomFieldStorage].EmployeeList}" Grid.Column="1" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTipEmployeesVisibility}" Name="ToolTipEmployeeList">
 						<ListView.ItemsPanel>
 							<ItemsPanelTemplate>
 								<WrapPanel Width="{Binding (FrameworkElement.ActualWidth), RelativeSource={RelativeSource AncestorType=ScrollContentPresenter}}"
@@ -375,13 +384,13 @@
 						</ListView.ItemTemplate>
 					</ListView>
 					
-					<TextBlock Margin="0,0,3,0" Grid.Row="4" Grid.Column="0" Text="{markup:Translate Klienten:}" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTipCustomersVisibility}" />
-					<TextBlock Grid.Row="4" Grid.Column="1" Text="{Binding Path=CustomViewInfo, Converter={StaticResource AppointmentToolTipConverter}, ConverterParameter=Klienten}"
+					<TextBlock Margin="0,0,3,0" Grid.Row="5" Grid.Column="0" Text="{markup:Translate Klienten:}" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTipCustomersVisibility}" />
+					<TextBlock Grid.Row="5" Grid.Column="1" Text="{Binding Path=CustomViewInfo, Converter={StaticResource AppointmentToolTipConverter}, ConverterParameter=Klienten}"
 							       Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTipCustomersVisibility}" />
                    <!-- Separator und "Angelegt von: " mit dem Namen des Originators -->
-                    <Separator Grid.Row="5" Grid.ColumnSpan="2" Height="1" Background="DimGray" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].CanBeEdited, Converter={StaticResource BoolVisibilityConverter}}" />
-                    <TextBlock Margin="0,0,3,0" Grid.Row="6" Grid.Column="0" Text="Angelegt von:" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].CanBeEdited, Converter={StaticResource BoolVisibilityConverter}}" />
-                    <TextBlock Margin="0,0,3,0" Grid.Row="6" Grid.Column="1" Text="{Binding Path=CustomViewInfo[CustomFieldStorage].Originator}" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].CanBeEdited, Converter={StaticResource BoolVisibilityConverter}}" />
+                    <Separator Grid.Row="6" Grid.ColumnSpan="2" Grid.Column="0" Height="1" Background="DimGray" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].CanBeEdited, Converter={StaticResource BoolVisibilityConverter}}" />
+                    <TextBlock Margin="0,0,3,0" Grid.Row="7" Grid.Column="0" Text="Angelegt von:" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].CanBeEdited, Converter={StaticResource BoolVisibilityConverter}}" />
+                    <TextBlock Margin="0,0,3,0" Grid.Row="7" Grid.Column="1" Text="{Binding Path=CustomViewInfo[CustomFieldStorage].Originator}" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].CanBeEdited, Converter={StaticResource BoolVisibilityConverter}}" />
                </Grid>
 			</DataTemplate>

@@ -963,8 +972,7 @@
                                    AllowAppointmentCreate="AllowAppointmentCreateEvent"
 							        AllowAppointmentDragBetweenResources="AllowAppointmentAenderung"
 							        AllowAppointmentDelete="AllowAppointmentAenderung" 
-                                    ActiveViewType="WorkWeek"
-                                    >
+                                    ActiveViewType="WorkWeek">
 				        <dxsch:SchedulerControl.DayView>
 					        <dxsch:DayView AppointmentToolTipContentTemplate="{StaticResource {dxscht:SchedulerViewThemeKey ResourceKey=AppointmentToolTipContentTemplate}}" />
 				        </dxsch:SchedulerControl.DayView>
--- a/BeWo/Scheduler/View/NewSchedulerView.xaml.cs
+++ b/BeWo/Scheduler/View/NewSchedulerView.xaml.cs
@@ -29,8 +29,7 @@ using BS.Shared.Core;
 using BS.Shared.DataContracts;
 using BS.Shared.DataContracts.Compact;
 using BS.Shared.Extensions;
-using BS.Shared.Translation;
-
+using BS.SharedLauncher.Translation;
 using DevExpress.Xpf.Bars;
 using DevExpress.Xpf.Editors;
 using DevExpress.Xpf.Scheduler;
@@ -248,22 +247,22 @@ namespace BeWo.Scheduler.View

        private bool CheckCats2ResourcesForEqualitiy(Dictionary<ValueListEntryDC, List<ResourceDC>> dic2)
        {
-            if(_Category2ResourcesDictionary == null && dic2 != null || dic2 == null && _Category2ResourcesDictionary != null)
+            if(_Category2ResourcesDictionary is null && dic2 != null || dic2 is null && _Category2ResourcesDictionary != null)
            {
                return false;
            }

-            return _Category2ResourcesDictionary == null && dic2 == null || _Category2ResourcesDictionary != null && dic2 != null && _Category2ResourcesDictionary.Count == dic2.Count && _Category2ResourcesDictionary.Except(dic2).Any();
+            return _Category2ResourcesDictionary is null && dic2 is null || _Category2ResourcesDictionary != null && dic2 != null && _Category2ResourcesDictionary.Count == dic2.Count && _Category2ResourcesDictionary.Except(dic2).Any();
        }

        private static bool ListEquals<T>(IReadOnlyCollection<T> list1, ICollection<T> list2)
        {
-            if(list1 == null && list2 == null)
+            if(list1 is null && list2 is null)
            {
                return true;
            }

-            if(list1 == null && list2 != null || list1 != null && list2 == null)
+            if(list1 is null && list2 != null || list1 != null && list2 is null)
            {
                return false;
            }
@@ -432,52 +431,9 @@ namespace BeWo.Scheduler.View
            ConstructObject();
        }

-        private void GetCacheObjects(Action<List<CompactCustomerDC>, List<CompactEmployeeDC>, Dictionary<ValueListEntryDC, List<ResourceDC>>> callback)
+        private static void GetCacheObjects(Action<List<CompactCustomerDC>, List<CompactEmployeeDC>, Dictionary<ValueListEntryDC, List<ResourceDC>>> callback)
        {
-            Cache.GetInstance().GetAllActiveEmployeesCompact(allEmployees =>
-            {
-                this.Dispatch(() =>
-                {
-                    Cache.GetInstance().GetAllActiveCustomersCompact(allCustomers =>
-                    {
-                        this.Dispatch(() =>
-                        {
-                            Cache.GetInstance().GetCategories2ResourcesDictionary(resourceDictionary =>
-                            {
-                                this.Dispatch(() =>
-                                {
-                                    if(!BeWoApp.LoggedOnUser.HasRight(UserRightType.KalenderMitarbeitertermineAnsehen))
-                                    {
-                                        allEmployees = new List<CompactEmployeeDC> {BeWoApp.CompactLoggedOnEmployee};
-                                    }
-
-                                    var darfKlientenAnsichtSehen = BeWoApp.LoggedOnUser.HasRight(UserRightType.Customer_ViewMyTeams) || BeWoApp.LoggedOnUser.HasRight(UserRightType.Customer_ViewMyCustomers) || BeWoApp.LoggedOnUser.HasRight(UserRightType.CustomerView_View);
-                                    var darfTermineAllerKlientenSehen = BeWoApp.LoggedOnUser.HasRight(UserRightType.KalenderKliententermineAlleAnsehen);
-
-                                    if(darfKlientenAnsichtSehen)
-                                    {
-                                        if(!darfTermineAllerKlientenSehen || !BeWoApp.LoggedOnUser.HasRight(UserRightType.CustomerView_View))
-                                        {
-                                            allCustomers = allCustomers.Where(w => w.IsRelatedToEmployee).ToList();
-                                        }
-                                    }
-                                    else
-                                    {
-                                        allCustomers.Clear();
-                                    }
-
-                                    if(!BeWoApp.LoggedOnUser.HasRight(UserRightType.KalenderRessourcentermineAnsehen))
-                                    {
-                                        resourceDictionary.Clear();
-                                    }
-
-                                    callback(allCustomers, allEmployees, resourceDictionary);
-                                });
-                            });
-                        });
-                    });
-                });
-            });
+            Cache.GetInstance().GetSchedulerObjects(callback);
        }

        private void ConstructObject()
@@ -625,6 +581,12 @@ namespace BeWo.Scheduler.View
            BeWoApp.AppSettings.SchedulerViewType = schedulerViewType;

            var settings = ViewModel.GetActiveSettings();
+
+            if(settings is null)
+            {
+                return;
+            }
+
            BeWoApp.AppSettings.SchedulerTimelineViewDayCount = settings.TimelineIntervalCount;

            BeWoApp.SaveAppSettings();
@@ -673,20 +635,20 @@ namespace BeWo.Scheduler.View
                        var ausnahmen = item.GetExceptions();
                        foreach(var exc in ausnahmen)
                        {
-                            var b = exc.GetSourceObject(Scheduler.GetCoreStorage()) as IBeWoAppointment;
-                            if(b?.CustomFields == null)
+                            var beWoAppointment = exc.GetSourceObject(Scheduler.GetCoreStorage()) as IBeWoAppointment;
+                            if(beWoAppointment?.CustomFields is null)
                            {
                                continue;
                            }

-                            foreach(var field in b.CustomFields)
+                            foreach(var field in beWoAppointment.CustomFields)
                            {
                                exc.CustomFields[field.Key] = field.Value;
                            }
                        }
                    }

-                    if(bapp?.CustomFields == null)
+                    if(bapp?.CustomFields is null)
                    {
                        continue;
                    }
@@ -1350,14 +1312,14 @@ namespace BeWo.Scheduler.View

            if(_IsNew)
            {
-                var n = new ObservableCollection<Employee2SchedulerAppointmentDC>(SelectedEmployees.Select(item => new Employee2SchedulerAppointmentDC {Employee = item, ParticipationAnswer = ParticipationAnswer.Offen}).ToList());
-                e.Appointment.CF_EmployeeList(n);
+                var employees2Appointments = new ObservableCollection<Employee2SchedulerAppointmentDC>(SelectedEmployees.Select(item => new Employee2SchedulerAppointmentDC {Employee = item, ParticipationAnswer = ParticipationAnswer.Offen}).ToList());
+                e.Appointment.CF_EmployeeList(employees2Appointments);
                e.Appointment.CF_CustomerList(new List<CompactCustomerDC>(SelectedCustomers));
                e.Appointment.CF_ResourceList(new List<ResourceDC>(SelectedResources));
            }

            var form = ViewModel.GetEditAppointmentForm(control, e.Appointment);
-            if(form == null)
+            if(form is null)
            {
                if(_IsNew)
                {
@@ -1525,9 +1487,11 @@ namespace BeWo.Scheduler.View

        private void Scheduler_AppointmentViewInfoCustomizing(object sender, AppointmentViewInfoCustomizingEventArgs e)
        {
+            var appointment = e.ViewInfo.Appointment;
+            
            var customFields = e.ViewInfo.Appointment.CustomFields;

-            if(customFields[nameof(CustomFieldStorage)] == null)
+            if(customFields[nameof(CustomFieldStorage)] is null)
            {
                return;
            }
@@ -1659,38 +1623,9 @@ namespace BeWo.Scheduler.View
        {
            var neueListe = new SchedulerAppointmentListVM(_Liste, AllCustomers, AllEmployees, Category2ResourcesDictionary);

-            var vm = neueListe;
+            var zuBestaetigen = InitAppointmentsToAnswer(neueListe);

-            var zuBestaetigen = vm.Appointments.Where(app =>
-            {
-                var customFieldStorage = (CustomFieldStorage) app.CustomFields[nameof(CustomFieldStorage)];
-
-                var originator = customFieldStorage.Originator;
-
-                if(customFieldStorage.EmployeeList == null || originator.EmployeeOid == BeWoApp.LoggedOnEmployee.EmployeeOid.Value)
-                {
-                    return false;
-                }
-
-                var empList = customFieldStorage.EmployeeList;
-
-                return empList.Any(a => a.Employee.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid) && a.ParticipationAnswer == ParticipationAnswer.Offen);
-            }).ToList();
-
-            var updates = vm.Appointments.Where(app =>
-            {
-                var customFieldStorage = (CustomFieldStorage) app.CustomFields[nameof(CustomFieldStorage)];
-
-                if(customFieldStorage.Originator == null || customFieldStorage.EmployeeList == null)
-                {
-                    return false;
-                }
-
-                var empList = customFieldStorage.EmployeeList;
-                var or = customFieldStorage.Originator;
-
-                return or.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid) && empList.Any(a => a.IsPChanged && a.ParticipationAnswer != ParticipationAnswer.Offen && a.ParticipationAnswer != ParticipationAnswer.Verstrichen && !a.Employee.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid));
-            }).ToList();
+            var updates = InitAppointmentStatusUpdates(neueListe);

            if(!zuBestaetigen.Any() && !updates.Any())
            {
@@ -1706,6 +1641,43 @@ namespace BeWo.Scheduler.View
            requestAnswerView.Show();
        }

+        public static List<IBeWoAppointment> InitAppointmentsToAnswer(SchedulerAppointmentListVM listVm)
+        {
+            return listVm.Appointments.Where(app =>
+            {
+                var customFieldStorage = (CustomFieldStorage)app.CustomFields[nameof(CustomFieldStorage)];
+
+                var originator = customFieldStorage.Originator;
+
+                if(customFieldStorage.EmployeeList is null || originator.EmployeeOid == BeWoApp.LoggedOnEmployee.EmployeeOid.Value)
+                {
+                    return false;
+                }
+
+                var empList = customFieldStorage.EmployeeList;
+
+                return empList.Any(a => a.Employee.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid) && a.ParticipationAnswer == ParticipationAnswer.Offen);
+            }).ToList();
+        }
+
+        public static List<IBeWoAppointment> InitAppointmentStatusUpdates(SchedulerAppointmentListVM listVm)
+        {
+            return listVm.Appointments.Where(app =>
+            {
+                var customFieldStorage = (CustomFieldStorage)app.CustomFields[nameof(CustomFieldStorage)];
+
+                if(customFieldStorage.Originator is null || customFieldStorage.EmployeeList is null)
+                {
+                    return false;
+                }
+
+                var empList = customFieldStorage.EmployeeList;
+                var or = customFieldStorage.Originator;
+
+                return or.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid) && empList.Any(a => a.IsPChanged && a.ParticipationAnswer != ParticipationAnswer.Offen && a.ParticipationAnswer != ParticipationAnswer.Verstrichen && !a.Employee.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid));
+            }).ToList();
+        }
+
        private void RequestAnswerViewClosedEvent(object sender, EventArgs e)
        {
            ReloadVM(true);
@@ -1982,14 +1954,14 @@ namespace BeWo.Scheduler.View

        private void MeinTB_OnChecked(object sender, RoutedEventArgs e)
        {
-            var tb = (ToggleButton) sender;
+            var toggleButton = (ToggleButton) sender;

-            if(tb?.IsChecked == null)
+            if(toggleButton?.IsChecked is null)
            {
                return;
            }

-            if(!tb.IsChecked.Value)
+            if(!toggleButton.IsChecked.Value)
            {
                MitarbeiterSuchGrid.Visibility = Visibility.Collapsed;
                MitarbeiterSuchTextBox.Clear();
@@ -2003,14 +1975,14 @@ namespace BeWo.Scheduler.View

        private void MeinTB2_OnChecked(object sender, RoutedEventArgs e)
        {
-            var tb = (ToggleButton) sender;
+            var toggleButton = (ToggleButton) sender;

-            if(tb?.IsChecked == null)
+            if(toggleButton?.IsChecked is null)
            {
                return;
            }

-            if(!tb.IsChecked.Value)
+            if(!toggleButton.IsChecked.Value)
            {
                KlientenSuchGrid.Visibility = Visibility.Collapsed;
                KlientenSuchTextBox.Clear();
@@ -2037,6 +2009,8 @@ namespace BeWo.Scheduler.View
        private bool _ReloadingViewModel;
        private DateTime? _LastFetchingDateTime;

+        public TimeInterval FetchingInterval { get; set; }
+
        private void ReloadVM(bool shouldForceReload = false)
        {
            if(_ReloadingViewModel)
@@ -2046,7 +2020,7 @@ namespace BeWo.Scheduler.View

            _ReloadingViewModel = true;

-            if(ViewModel == null)
+            if(ViewModel is null)
            {
                _ReloadingViewModel = false;
                return;
@@ -2056,7 +2030,7 @@ namespace BeWo.Scheduler.View
            var start = range.Start;
            var end = range.End;

-            var newFetchingInterval = new TimeInterval(start - FetchPadding, end + FetchPadding);
+            FetchingInterval = new TimeInterval(start - FetchPadding, end + FetchPadding);

            var selectedEmployeeOids = SelectedEmployees.Select(s => s.EmployeeOid).ToList();
            var selectedCustomerOids = SelectedCustomers.Select(s => s.CustomerOid).ToList();
@@ -2068,18 +2042,18 @@ namespace BeWo.Scheduler.View
            var showOnlyMyAppointments = ZeigeNurMeineTermine;
            var showAbsenceTimes = AbwesenheitenEinAusCheckBox.IsChecked != null && AbwesenheitenEinAusCheckBox.IsChecked.Value;

-            if(!shouldForceReload && newFetchingInterval.Equals(_LastFetchedInterval))
+            if(!shouldForceReload && FetchingInterval.Equals(_LastFetchedInterval))
            {
                _ReloadingViewModel = false;
                return;
            }

-            _LastFetchedInterval = newFetchingInterval;
+            _LastFetchedInterval = FetchingInterval;

            ReloadAppointmentViewModel(start, end, selectedEmployeeOids, selectedCustomerOids, selectedResourceOids, employeesOnly, customersOnly, resourcesOnly, onlyPrivateAppointments, showOnlyMyAppointments, showAbsenceTimes);
        }

-        public void ReloadAppointmentViewModel(DateTime pIntervalStart, DateTime pIntervalEnd, List<long> pSelectedEmployees, List<long> pSelectedCustomer, List<long> pSelectedResources, bool pEmployeesOnly, bool pCustomersOnly, bool pResourcesOnly, bool pPrivateAppointmentsOnly, bool pOnlyMyAppointments, bool pShouldShowAbsenceTimes)
+        public void ReloadAppointmentViewModel(DateTime pIntervalStart, DateTime pIntervalEnd, List<long> pSelectedEmployees, List<long> pSelectedCustomer, List<long> pSelectedResources, bool pEmployeesOnly, bool pCustomersOnly, bool pResourcesOnly, bool pPrivateAppointmentsOnly, bool pOnlyMyAppointments, bool pShouldShowAbsenceTimes, Action callback = null)
        {
            ResetDeletionMode();

@@ -2111,7 +2085,7 @@ namespace BeWo.Scheduler.View
                                            {
                                                var prefilteredAppointments = appointments.Where(w => (w.EmployeeList.Count == 0 && w.Originator.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid) ||
                                                                                                       w.EmployeeList.Count > 0 && w.EmployeeList.Any(a => a.Employee.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid)) ||
-                                                                                                       BeWoUtils.HasRight(UserRightType.KalenderMitarbeitertermineAnsehen)) && (!w.EmployeeList.TrueForAll(e2a => e2a.ParticipationAnswer == ParticipationAnswer.Absage) || w.EmployeeList == null || w.EmployeeList.Count == 0)).ToList();
+                                                                                                       BeWoUtils.HasRight(UserRightType.KalenderMitarbeitertermineAnsehen)) && (!w.EmployeeList.TrueForAll(e2a => e2a.ParticipationAnswer == ParticipationAnswer.Absage) || w.EmployeeList is null || w.EmployeeList.Count == 0)).ToList();

                                                var anonymizedAppointments = appointments.Where(w => w.CanBeEdited == false && w.IsTask == false).ToList();

@@ -2146,9 +2120,9 @@ namespace BeWo.Scheduler.View
                                                SelectedCustomers = AllCustomers.Where(w => SelectedCustomers.Any(a => a.CustomerOid.Equals(w.CustomerOid))).ToList();
                                                SelectedResources = AllResources.Where(w => SelectedResources.Any(a => a.ResourceOid.Equals(w.ResourceOid))).ToList();

-                                                var items = SelectedItems;
+                                                //var items = SelectedItems;

-                                                var testtesttest = ViewModel.ActiveAppointmentViewModel;
+                                                //var testtesttest = ViewModel.ActiveAppointmentViewModel;

                                                _ReloadingViewModel = false;

@@ -2165,7 +2139,7 @@ namespace BeWo.Scheduler.View

                                                    if(oid != null)
                                                    {
-                                                        appointmentToOpen = apps.Find(app =>
+                                                        appointmentToOpen = apps.FirstOrDefault(app =>
                                                        {
                                                            var oidValue = app.CF_SchedulerAppointmentOid();

@@ -2180,7 +2154,7 @@ namespace BeWo.Scheduler.View
                                                    }
                                                    else if(_SelectedAppointmentFromHomePanelView.RecurrenceId != null && _SelectedAppointmentFromHomePanelView.RecurrenceIndex > 0)
                                                    {
-                                                        appointmentToOpen = apps.Find(appointment => appointment.RecurrenceInfo.Id.ToString().Equals(_SelectedAppointmentFromHomePanelView.RecurrenceId));
+                                                        appointmentToOpen = apps.FirstOrDefault(appointment => appointment.RecurrenceInfo.Id.ToString().Equals(_SelectedAppointmentFromHomePanelView.RecurrenceId));

                                                        if(appointmentToOpen != null)
                                                        {
@@ -2190,6 +2164,8 @@ namespace BeWo.Scheduler.View

                                                    _IsComingFromHomeDragPanel = false;
                                                }
+
+                                                callback?.Invoke();
                                            });
                                        });
                                    });
@@ -2208,7 +2184,9 @@ namespace BeWo.Scheduler.View
            var dialog = new SaveFileDialog {Filter = "iCalendar files (*.ics)|*.ics", FilterIndex = 1};

            if(dialog.ShowDialog() != true)
+            {
                return;
+            }

            using(var stream = dialog.OpenFile())
            {
@@ -2218,11 +2196,14 @@ namespace BeWo.Scheduler.View

        private void ExportAppointmentsAs_iCal(Stream stream)
        {
-            if(stream == null)
+            if(stream is null)
+            {
                return;
+            }
+
            try
            {
-                var productIdentifier = string.Format("-//{0}//DXScheduler iCalendarExchange Example//DE", BeWoApp.Mandator);
+                var productIdentifier = $"-//{BeWoApp.Mandator}//DXScheduler iCalendarExchange Example//DE";
                var exporter = new iCalendarExporter(Scheduler.GetCoreStorage()) {ProductIdentifier = productIdentifier};

                exporter.AppointmentExporting += OnAppointmentExporting;
@@ -2230,7 +2211,7 @@ namespace BeWo.Scheduler.View
            }
            catch(Exception e)
            {
-                MessageBox.Show(string.Format("Der Kalender konnte leider nicht exportiert werden.\n{0}", e.Message), "Fehler beim Export", MessageBoxButton.OK, MessageBoxImage.Error);
+                MessageBox.Show($"Der Kalender konnte leider nicht exportiert werden.\n{e.Message}", "Fehler beim Export", MessageBoxButton.OK, MessageBoxImage.Error);
            }
        }

@@ -2333,7 +2314,7 @@ namespace BeWo.Scheduler.View

                var neu = new List<Appointment>();

-                foreach (var app in kollektionOhneAusnahmen.Where(w => !ausnahmen.Select(s => s.RecurrenceIndex).Contains(w.RecurrenceIndex)))
+                foreach(var app in kollektionOhneAusnahmen.Where(w => !ausnahmen.Select(s => s.RecurrenceIndex).Contains(w.RecurrenceIndex)))
                {
                    var recurrenceId = app.RecurrenceInfo.Id.ToString();
                    
@@ -2345,7 +2326,7 @@ namespace BeWo.Scheduler.View
                    neu.AddIfNotIn(app);
                }

-                if (ausnahmen.Count > 0)
+                if(ausnahmen.Count > 0)
                {
                    kollektionOhneAusnahmen = kollektionOhneAusnahmen.Where(w => !ausnahmen.Select(s => s.RecurrenceIndex).Contains(w.RecurrenceIndex)).ToList();
                }
@@ -2355,7 +2336,7 @@ namespace BeWo.Scheduler.View
                    var recurrenceId = appointment.RecurrenceInfo.Id.ToString();
                    var recurrenceIndex = appointment.RecurrenceIndex;

-                    if (!(appointment.IsOccurrence && deletedOccurrences.Any(a => a.RecurrenceIdReference == recurrenceId && a.RecurrenceIndexReference == recurrenceIndex)))
+                    if(!(appointment.IsOccurrence && deletedOccurrences.Any(a => a.RecurrenceIdReference == recurrenceId && a.RecurrenceIndexReference == recurrenceIndex)))
                    {
                        serienTermine.AddIfNotIn(new SchedulerAppointmentDC
                        {
@@ -2425,14 +2406,16 @@ namespace BeWo.Scheduler.View

        public void PreselectCustomer(long pCustomerOid)
        {
-            if(AllCustomers.Any(c => c.CustomerOid.Equals(pCustomerOid)))
+            if(!AllCustomers.Any(c => c.CustomerOid.Equals(pCustomerOid)))
            {
-                SelectedCustomers = new List<CompactCustomerDC> {AllCustomers.Find(f => f.CustomerOid.Equals(pCustomerOid))};
-
-                OnPropertyChanged(nameof(SelectedCustomers));
-                OnPropertyChanged(nameof(SelectedItems));
-                OnPropertyChanged(nameof(GefilterteKlienten));
+                return;
            }
+
+            SelectedCustomers = new List<CompactCustomerDC> {AllCustomers.Find(f => f.CustomerOid.Equals(pCustomerOid))};
+
+            OnPropertyChanged(nameof(SelectedCustomers));
+            OnPropertyChanged(nameof(SelectedItems));
+            OnPropertyChanged(nameof(GefilterteKlienten));
        }

        private void DateNavigator_OnSelectedDatesChanged(object sender, EventArgs e)
@@ -2444,6 +2427,7 @@ namespace BeWo.Scheduler.View
            var selectedDates = navigator.SelectedDates;

            var isSelectedDateFetched = _LastFetchedInterval.ContainsEveryDateFromList(selectedDates);
+
            if(!isSelectedDateFetched && !(_LastFetchedInterval.Start.Equals(new DateTime(1, 1, 1, 0, 0, 0)) && _LastFetchedInterval.End.Equals(new DateTime(1, 1, 1, 0, 30, 0))))
            {
                ReloadVM();
@@ -2492,26 +2476,28 @@ namespace BeWo.Scheduler.View

        private void NurMeineTermineEinAusCheckBox_OnChecked(object sender, RoutedEventArgs e)
        {
-            var cb = (CheckBox) sender;
+            var checkBox = (CheckBox) sender;

-            if(CheckBoxConverter != null && BeWoApp.CompactLoggedOnEmployee != null)
+            if(CheckBoxConverter is null || BeWoApp.CompactLoggedOnEmployee is null)
            {
-                if(cb.IsChecked != null && cb.IsChecked.Value)
-                {
-                    SelectedEmployees = new List<CompactEmployeeDC> {BeWoApp.CompactLoggedOnEmployee};
-                    CheckBoxConverter.AktuellerMitarbeiter = BeWoApp.CompactLoggedOnEmployee;
-                }
-                else if(cb.IsChecked != null && !cb.IsChecked.Value && SelectedEmployees.Count == 1)
-                {
-                    SelectedEmployees.Remove(BeWoApp.CompactLoggedOnEmployee);
-                    CheckBoxConverter.AktuellerMitarbeiter = null;
-                }
-
-                OnPropertyChanged(nameof(SelectedEmployees));
-                OnPropertyChanged(nameof(SelectedItems));
-
-                ReloadVM(true);
+                return;
            }
+
+            if(checkBox.IsChecked != null && checkBox.IsChecked.Value)
+            {
+                SelectedEmployees = new List<CompactEmployeeDC> {BeWoApp.CompactLoggedOnEmployee};
+                CheckBoxConverter.AktuellerMitarbeiter = BeWoApp.CompactLoggedOnEmployee;
+            }
+            else if(checkBox.IsChecked != null && !checkBox.IsChecked.Value && SelectedEmployees.Count == 1)
+            {
+                SelectedEmployees.Remove(BeWoApp.CompactLoggedOnEmployee);
+                CheckBoxConverter.AktuellerMitarbeiter = null;
+            }
+
+            OnPropertyChanged(nameof(SelectedEmployees));
+            OnPropertyChanged(nameof(SelectedItems));
+
+            ReloadVM(true);
        }

        private void AbwesenheitenEinAusCheckBox_OnChecked(object sender, RoutedEventArgs e)
@@ -2554,15 +2540,17 @@ namespace BeWo.Scheduler.View

        private void Scheduler_OnInplaceEditorShowing(object sender, InplaceEditorEventArgs e)
        {
-            if(_IsNew)
+            if(!_IsNew)
            {
-                var n = new ObservableCollection<Employee2SchedulerAppointmentDC>(SelectedEmployees.Select(item => new Employee2SchedulerAppointmentDC {Employee = item, ParticipationAnswer = ParticipationAnswer.Offen}).ToList());
-                e.Appointment.CF_EmployeeList(n);
-                e.Appointment.CF_CustomerList(new List<CompactCustomerDC>(SelectedCustomers));
-                e.Appointment.CF_ResourceList(new List<ResourceDC>(SelectedResources));
-
-                _IsNew = false;
+                return;
            }
+
+            var n = new ObservableCollection<Employee2SchedulerAppointmentDC>(SelectedEmployees.Select(item => new Employee2SchedulerAppointmentDC {Employee = item, ParticipationAnswer = ParticipationAnswer.Offen}).ToList());
+            e.Appointment.CF_EmployeeList(n);
+            e.Appointment.CF_CustomerList(new List<CompactCustomerDC>(SelectedCustomers));
+            e.Appointment.CF_ResourceList(new List<ResourceDC>(SelectedResources));
+
+            _IsNew = false;
        }

        private void ButtonDeleteAppointmentsInInterval_Click(object sender, RoutedEventArgs e)
@@ -2658,14 +2646,14 @@ namespace BeWo.Scheduler.View

            var appointmentDC = appointmentVM?.CommitToDataContract();

-            if(appointmentDC?.SchedulerAppointmentOid == null || appointmentDC.NewSchedulerAppointmentVersion == null || appointmentToRestore.Type != AppointmentType.ChangedOccurrence)
+            if(appointmentDC?.SchedulerAppointmentOid is null || appointmentDC.NewSchedulerAppointmentVersion is null || appointmentToRestore.Type != AppointmentType.ChangedOccurrence)
            {
                return;
            }

            ServiceFacade.DoResourceServiceAsync(s => s.GetSchedulerAppointmentByid(appointmentDC.SchedulerAppointmentOid.Value), appointment =>
            {
-                if(appointment.SchedulerAppointmentOid == null || appointment.NewSchedulerAppointmentVersion == null)
+                if(appointment.SchedulerAppointmentOid is null || appointment.NewSchedulerAppointmentVersion is null)
                {
                    return;
                }
@@ -2696,8 +2684,8 @@ namespace BeWo.Scheduler.View

        private void ShowTasksCheckBox_OnClick(object sender, RoutedEventArgs e)
        {
-            var cb = (CheckBox) sender;
-            IsTasksVisible = cb.IsChecked ?? false;
+            var checkBox = (CheckBox) sender;
+            IsTasksVisible = checkBox.IsChecked ?? false;

            ReloadVM(true);
        }
@@ -2737,15 +2725,15 @@ namespace BeWo.Scheduler.View
        {
            var storageAppointments = Scheduler.Storage.AppointmentStorage.Items.ToList();

-            var sb = new StringBuilder();
-            sb.Append("AppointmentStorage-Inhalt:\n");
+            var stringBuilder = new StringBuilder();
+            stringBuilder.Append("AppointmentStorage-Inhalt:\n");

            foreach(var app in storageAppointments)
            {
-                sb.Append($"{app.Subject} {app.Start:dd.MM.yyyy HH:mm}-{app.End:dd.MM.yyyy HH:mm}\n");
+                stringBuilder.Append($"{app.Subject} {app.Start:dd.MM.yyyy HH:mm}-{app.End:dd.MM.yyyy HH:mm}\n");
            }

-            WriteToDebug(sb.ToString());
+            WriteToDebug(stringBuilder.ToString());
        }

        private void Scheduler_OnAppointmentDrop(object sender, AppointmentDragEventArgs e)
@@ -2858,9 +2846,9 @@ namespace BeWo.Scheduler.View

    public static class ViewTypeConvert
    {
-        public static AppointmentViewType ToAppointmentViewType(SchedulerViewType svt)
+        public static AppointmentViewType ToAppointmentViewType(SchedulerViewType schedulerViewType)
        {
-            switch(svt)
+            switch(schedulerViewType)
            {
                case SchedulerViewType.Day:
                    return AppointmentViewType.Day;
@@ -2918,7 +2906,7 @@ namespace BeWo.Scheduler.View
            {
                var customFieldStorage = (CustomFieldStorage)customFields[nameof(CustomFieldStorage)];

-                if (customFieldStorage != null && parameter != null && parameter.Equals("AlleRessourcen"))
+                if(customFieldStorage != null && parameter != null && parameter.Equals("AlleRessourcen"))
                {
                    return customFieldStorage.ResourceList;
                }
@@ -2941,7 +2929,7 @@ namespace BeWo.Scheduler.View
            {
                var customFields = (CustomFieldCollection) value;

-                if(customFields == null)
+                if(customFields is null)
                {
                    return string.Empty;
                }
@@ -2954,7 +2942,7 @@ namespace BeWo.Scheduler.View
                var tooltip = string.Empty;
                var seperator = "; ";

-                if(parameter == null)
+                if(parameter is null)
                {
                    return tooltip;
                }
@@ -3180,7 +3168,7 @@ namespace BeWo.Scheduler.View
            {
                var customFields = (CustomFieldCollection) value;

-                if(customFields == null)
+                if(customFields is null)
                {
                    return new SolidColorBrush(Color.FromRgb(192, 255, 208));
                }
@@ -3210,32 +3198,32 @@ namespace BeWo.Scheduler.View
    {
        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
        {
-            if(value is Employee2SchedulerAppointmentDC employee2SchedulerAppointment)
+            if(!(value is Employee2SchedulerAppointmentDC employee2SchedulerAppointment))
            {
-                if (parameter != null && parameter.Equals("GibName"))
-                {
-                    return employee2SchedulerAppointment.Employee.DetailDescription;
-                }
-
-                var color = Color.FromRgb(255, 255, 255);
-
-                switch (employee2SchedulerAppointment.ParticipationAnswer)
-                {
-                    case ParticipationAnswer.Vorbehalt:
-                        color = Color.FromRgb(185, 39, 217);
-                        break;
-                    case ParticipationAnswer.Zusage:
-                        color = Color.FromRgb(72, 212, 78);
-                        break;
-                    case ParticipationAnswer.Absage:
-                        color = Color.FromRgb(171, 0, 48);
-                        break;
-                }
-
-                return new SolidColorBrush(color);
+                return null;
            }

-            return null;
+            if(parameter != null && parameter.Equals("GibName"))
+            {
+                return employee2SchedulerAppointment.Employee.DetailDescription;
+            }
+
+            var color = Color.FromRgb(255, 255, 255);
+
+            switch(employee2SchedulerAppointment.ParticipationAnswer)
+            {
+                case ParticipationAnswer.Vorbehalt:
+                    color = Color.FromRgb(185, 39, 217);
+                    break;
+                case ParticipationAnswer.Zusage:
+                    color = Color.FromRgb(72, 212, 78);
+                    break;
+                case ParticipationAnswer.Absage:
+                    color = Color.FromRgb(171, 0, 48);
+                    break;
+            }
+
+            return new SolidColorBrush(color);
        }

        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
@@ -3248,19 +3236,13 @@ namespace BeWo.Scheduler.View
    {
        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
        {
-            if (BeWoApp.AppSettings.ShowInfoButtonInCalender == true)
-            {
-                return Visibility.Visible;
-            }
-            else
-                return Visibility.Collapsed;
+            return BeWoApp.AppSettings.ShowInfoButtonInCalender ? Visibility.Visible : Visibility.Collapsed;
        }
+
        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
        {
            throw new NotImplementedException();
        }
    }
-
-
    #endregion
 }
--- a/BeWo/Scheduler/View/RequestAnswerView.xaml.cs
+++ b/BeWo/Scheduler/View/RequestAnswerView.xaml.cs
@@ -9,6 +9,7 @@ using System.Windows.Controls;
 using System.Windows.Data;

 using BeWo.Annotations;
+using BeWo.Core.Service;
 using BeWo.Scheduler.ViewModel;
 using BeWo.ServiceProxy;

@@ -62,30 +63,38 @@ namespace BeWo.Scheduler.View

 		public RequestAnswerView(IEnumerable<IBeWoAppointment> appointments, IEnumerable<IBeWoAppointment> statusUpdates)
 		{
-			var statusUpdatesAsAppointments = new List<IBeWoAppointment>();
-
-		    foreach(var beWoAppointment in statusUpdates)
-		    {
-			    var item = (SchedulerAppointmentVM) beWoAppointment;
-			    foreach(var relation in item.EmployeeList.Where(emp => emp.IsPChanged && emp.ParticipationAnswer != ParticipationAnswer.Offen && emp.ParticipationAnswer != ParticipationAnswer.Verstrichen && !emp.Employee.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid)))
-		        {
-		            if(statusUpdatesAsAppointments.All(a => a.LabelKey != relation.Employee2SchedulerAppointmentOid))
-		            {
-		                if(relation.Employee2SchedulerAppointmentOid != null)
-		                {
-		                    statusUpdatesAsAppointments.Add(BuildNewVMFromOldVM(item, relation.Employee2SchedulerAppointmentOid.Value));
-		                }
-		            }
-		        }
-		    }
-
-			OffeneTermine = appointments.ToObservableCollection();
-			OffeneTermine.AddRange(new List<IBeWoAppointment>(statusUpdatesAsAppointments));
+            InitViewModel(appointments, statusUpdates);

 			DataContext = this;
 			InitializeComponent();
        }
-	    
+
+        private void InitViewModel(IEnumerable<IBeWoAppointment> appointments, IEnumerable<IBeWoAppointment> statusUpdates)
+        {
+            var statusUpdatesAsAppointments = new List<IBeWoAppointment>();
+
+            foreach(var beWoAppointment in statusUpdates)
+            {
+                var item = (SchedulerAppointmentVM) beWoAppointment;
+                foreach(var relation in item.EmployeeList.Where(emp => emp.IsPChanged && emp.ParticipationAnswer != ParticipationAnswer.Offen && emp.ParticipationAnswer != ParticipationAnswer.Verstrichen && !emp.Employee.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid)))
+                {
+                    if(statusUpdatesAsAppointments.Any(a => a.LabelKey == relation.Employee2SchedulerAppointmentOid))
+                    {
+                        continue;
+                    }
+
+                    if(relation.Employee2SchedulerAppointmentOid != null)
+                    {
+                        statusUpdatesAsAppointments.Add(BuildNewVMFromOldVM(item, relation.Employee2SchedulerAppointmentOid.Value));
+                    }
+                }
+            }
+
+            OffeneTermine = appointments.ToObservableCollection();
+            OffeneTermine.AddRange(new List<IBeWoAppointment>(statusUpdatesAsAppointments));
+            OnPropertyChanged(nameof(OffeneTermine));
+        }
+
 	    private static SchedulerAppointmentVM BuildNewVMFromOldVM(SchedulerAppointmentVM item, long emp2AppOid)
 	    {
 	        var customFieldStorage = (CustomFieldStorage) item.CustomFields[nameof(CustomFieldStorage)];
@@ -164,78 +173,45 @@ namespace BeWo.Scheduler.View

 		private void UpdateView(List<SchedulerAppointmentDC> aktualisierteTermine)
 		{
-			foreach (var dc in aktualisierteTermine)
-			{
-				foreach (var ivm in OffeneTermine)
-				{
-					var vm = ivm as SchedulerAppointmentVM;
-				    if (vm == null || !vm.DataContract.Equals(dc))
-				    {
-				        continue;
-				    }
+            if(BeWoApp.LoggedOnEmployeeOid is null)
+            {
+                return;
+            }

-					var found = vm;
-					found.DataContract = dc;
+            ServiceFacade.DoResourceServiceAsync(s => s.GetAllOpenAppointmentsForEmployee(BeWoApp.LoggedOnEmployeeOid.Value), offeneTermine =>
+            {
+                Cache.GetInstance().GetSchedulerObjects((customers, employees, categoriesToResources) =>
+                {
+                    this.Dispatch(() =>
+                    {
+                        var listVm = new SchedulerAppointmentListVM(offeneTermine, customers, employees, categoriesToResources);

-					UpdateViewModel(dc, (SchedulerAppointmentVM) ivm);
+                        var appointmentsToAnswer = NewSchedulerView.InitAppointmentsToAnswer(listVm);
+                        var appointmentStatusUpdates = NewSchedulerView.InitAppointmentStatusUpdates(listVm);

-					vm.UpdateCustomFields();
-                    
-				    if (vm.LabelKey is null)
-				    {
-				        this.Dispatch(() =>
-				        {
-				            OffeneTermine = OffeneTermine.Where(w => !w.Equals(vm)).ToObservableCollection();
+                        InitViewModel(appointmentsToAnswer, appointmentStatusUpdates);

-				            if (raiseChangeEvent)
-				            {
-				                OnPropertyChanged(nameof(OffeneTermine));
+                        RaiseParticipationChangedEventEvent();

-				                RaiseParticipationChangedEventEvent();
-				            }
-				        });
-				    }
-				    else
-				    {
-                        var test = (SchedulerAppointmentVM) OffeneTermine.FirstOrDefault(f => dc.EmployeeList.Any(a => a.Employee2SchedulerAppointmentOid.HasValue && a.Employee2SchedulerAppointmentOid.Value == f.LabelKey));
-                        this.Dispatch(() =>
+                        ToggleControls();
+
+                        if(!raiseChangeEvent)
                        {
-                            OffeneTermine = OffeneTermine.Where(w => !w.Equals(test)).ToObservableCollection();
-                            if (raiseChangeEvent)
-                            {
-                                OnPropertyChanged(nameof(OffeneTermine));
+                            return;
+                        }

-                                RaiseParticipationChangedEventEvent();
-                            }
-                        });
-                    }
-				}
-			}
-			
-			this.Dispatch(() =>
-			{
-				RaiseParticipationChangedEventEvent();
-
-			    ToggleControls();
-
-			    if (!raiseChangeEvent)
-			    {
-                    //Close();
-			    }
-			    else
-			    {
-			        if (OffeneTermine.Count == 0 && OTListView.Items.Count == 0)
-			        {
-			            Close();
-			        }
-			        else
-			        {
-			            OTListView.SelectedIndex = 0;
-			        }
-                }
-                
-			});
-		}
+                        if(OffeneTermine.Count == 0 && OTListView.Items.Count == 0)
+                        {
+                            Close();
+                        }
+                        else
+                        {
+                            OTListView.SelectedIndex = 0;
+                        }
+                    });
+                });
+            });
+        }

 		private void OK_OnClick(object sender, RoutedEventArgs e)
 		{
@@ -280,16 +256,11 @@ namespace BeWo.Scheduler.View
            ServiceFacade.DoResourceServiceAsync(s => s.UpdateSchedulerAppointments(new List<SchedulerAppointmentDC> {((SchedulerAppointmentVM) SelektierterTermin).DataContract}), UpdateView);
 		}

-		private static void UpdateViewModel(SchedulerAppointmentDC dc, SchedulerAppointmentVM vm)
-		{
-			vm.EmployeeList = new ObservableCollection<Employee2SchedulerAppointmentDC>(dc.EmployeeList);
-		}
-
 	    private void ToggleControls()
 	    {
-	        ZusagenStack.IsEnabled = !ZusagenStack.IsEnabled;
-	        OkButton.IsEnabled = !OkButton.IsEnabled;
-	        CloseBtn.IsEnabled = !CloseBtn.IsEnabled;
+	        ZusagenStack.IsEnabled    = !ZusagenStack.IsEnabled;
+	        OkButton.IsEnabled        = !OkButton.IsEnabled;
+	        CloseBtn.IsEnabled        = !CloseBtn.IsEnabled;
 	        AlleBestaetigen.IsEnabled = !AlleBestaetigen.IsEnabled;

 	    }
--- a/BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml.cs
+++ b/BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml.cs
@@ -359,9 +359,9 @@ namespace BeWo.Scheduler.View
 			e.Handled = true;
 		}

-		public string CountSelectedEmployees => $"{SelectedEmployees.Count} " + BS.Shared.Translation.Translator.Translate("MitarbeiterPlural") + " ausgewählt";
+		public string CountSelectedEmployees => $"{SelectedEmployees.Count} " + BS.SharedLauncher.Translation.Translator.Translate("MitarbeiterPlural") + " ausgewählt";
 		public string CountSelectedResources => $"{SelectedResources.Count} Ressourcen ausgewählt";
-		public string CountSelectedCustomers => $"{SelectedCustomers.Count} " + BS.Shared.Translation.Translator.Translate("Klienten") + " ausgewählt";
+		public string CountSelectedCustomers => $"{SelectedCustomers.Count} " + BS.SharedLauncher.Translation.Translator.Translate("Klienten") + " ausgewählt";
 		public string CountSelectedSupportConcepts => $"{SelectedSupportConcepts.Count} Hilfepläne ausgewählt";

 		public override AppointmentFormController CreateFormController(SchedulerControl schedulerControl, Appointment appointment)
@@ -499,11 +499,11 @@ namespace BeWo.Scheduler.View
                    var customFieldStorage = Appointment.GetCustomFieldStorage();
                    var serviceRecords = customFieldStorage?.ServiceRecordList ?? new List<ServiceRecordDC>();

-		            ViewModel.ApplyChangesToChangedOccurencyCustomFields(employees, customers, resources, originator, isPrivate, Appointment.RecurrenceIndex.ToString(), new Guid(Appointment.RecurrenceInfo.Id.ToString()), isTask, taskDescription, completedDate, dueDate, completedNotice, supportConceptList, Appointment.Subject, Appointment.AllDay, serviceRecords);
-
                    var oldRecurrenceInfo = Appointment.RecurrenceInfo.ToXml();
                    var newRecurrenceInfo = ViewModel.NewVM.RecurrenceInfo;

+					ViewModel.ApplyChangesToChangedOccurencyCustomFields(employees, customers, resources, originator, isPrivate, Appointment.RecurrenceIndex.ToString(), new Guid(Appointment.RecurrenceInfo.Id.ToString()), isTask, taskDescription, completedDate, dueDate, completedNotice, supportConceptList, Appointment.Subject, Appointment.AllDay, serviceRecords, start, end);
+
                    if(!Equals(oldRecurrenceInfo, newRecurrenceInfo))
                    {
                        // Damit wird verhindert, dass beim Ändern von Zeitangaben bei Serienterminen die Ausnahmen gelöscht werden.
@@ -542,7 +542,7 @@ namespace BeWo.Scheduler.View

 	        if(y.Count == 0)
 	        {
-	            MessageBox.Show("Bitte wählen Sie mindestens " + BS.Shared.Translation.Translator.Translate("einen Klienten") +  " aus!");
+	            MessageBox.Show("Bitte wählen Sie mindestens " + BS.SharedLauncher.Translation.Translator.Translate("einen Klienten") +  " aus!");
 	        }
 	        else
 	        {
--- a/BeWo/Scheduler/View/SchedulerView.xaml
+++ b/BeWo/Scheduler/View/SchedulerView.xaml
@@ -7,8 +7,8 @@
                    xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
                    xmlns:dxsch="http://schemas.devexpress.com/winfx/2008/xaml/scheduler"
                    xmlns:dxschint="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/internal"
-                    xmlns:dxschcore="clr-namespace:DevExpress.XtraScheduler;assembly=DevExpress.XtraScheduler.v17.1.Core"
-                    xmlns:dxschui="clr-namespace:DevExpress.Xpf.Scheduler.Drawing;assembly=DevExpress.Xpf.Scheduler.v17.1"
+                    xmlns:dxschcore="clr-namespace:DevExpress.XtraScheduler;assembly=DevExpress.XtraScheduler.v23.2.Core"
+                    xmlns:dxschui="clr-namespace:DevExpress.Xpf.Scheduler.Drawing;assembly=DevExpress.Xpf.Scheduler.v23.2"
 					xmlns:dxscht="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/themekeys"
                    xmlns:controls="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
                    xmlns:search="clr-namespace:BeWo.View.Search"
--- a/BeWo/Scheduler/View/ServiceRecordScheduler.xaml
+++ b/BeWo/Scheduler/View/ServiceRecordScheduler.xaml
@@ -6,7 +6,7 @@
             xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
             xmlns:dxsch="http://schemas.devexpress.com/winfx/2008/xaml/scheduler"
             xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
-             xmlns:dxschd="clr-namespace:DevExpress.Xpf.Scheduler.Drawing;assembly=DevExpress.Xpf.Scheduler.v17.1"
+             xmlns:dxschd="clr-namespace:DevExpress.Xpf.Scheduler.Drawing;assembly=DevExpress.Xpf.Scheduler.v23.2"
             mc:Ignorable="d" 
             d:DesignHeight="300" d:DesignWidth="600" dx:ThemeManager.ThemeName="Office2010Black">
    <UserControl.Resources>
--- a/BeWo/Scheduler/ViewModel/CustomFieldStorage.cs
+++ b/BeWo/Scheduler/ViewModel/CustomFieldStorage.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Windows;
 using System.Windows.Media;
-
 using BS.Shared.DataContracts;
 using BS.Shared.DataContracts.Compact;
 using BS.Shared.Extensions;
@@ -20,23 +19,38 @@ namespace BeWo.Scheduler.ViewModel

                if(IsTask)
                {
-                    result = result ?? "";
+                    result = result ?? string.Empty;
                    
                    if(CompletedDate.HasValue)
                    {
                        result += " erledigt am " + CompletedDate.Value.ToShortDateString();
-                    } else if(DueDate.HasValue)
+                    }
+                    else if(DueDate.HasValue)
                    {
                        result += $" bis {DueDate.Value:dd.MM.yyyy HH:mm}";
                    }
                }

-                if(IsAbsenceTime && _AbsenceTimeStart.HasValue)
+                if(!IsAbsenceTime || !_AbsenceTimeStart.HasValue)
                {
-                    result += _AbsenceTimeStart.Value.GetIntervalDescription(_AbsenceTimeEnd);
+                    return result;
                }

-                return result;
+                var absenceTimeEnd = _AbsenceTimeEnd;
+
+                if(!absenceTimeEnd.HasValue)
+                {
+                    return $"{result}{_AbsenceTimeStart.Value.GetIntervalDescription(absenceTimeEnd)}";
+                }
+
+                var absenceTimeStart = _AbsenceTimeStart.Value;
+
+                if(absenceTimeStart.IsTimeZero() && absenceTimeEnd.Value.IsTimeZero() && absenceTimeEnd.Value.AddDays(-1) > absenceTimeStart)
+                {
+                    absenceTimeEnd = absenceTimeEnd.Value.AddDays(-1);
+                }
+
+                return $"{result}{_AbsenceTimeStart.Value.GetIntervalDescription(absenceTimeEnd)}";
            }
        }

@@ -65,7 +79,7 @@ namespace BeWo.Scheduler.ViewModel

        public string RecurrenceId { get; set; }
        public int RecurrenceIndex { get; set; }
-        
+
        public CompactEmployeeDC Originator { get; set; }

        private DateTime? _AbsenceTimeStart;
@@ -107,8 +121,8 @@ namespace BeWo.Scheduler.ViewModel

            SchedulerAppointmentOid = pAppointment.DataContract?.SchedulerAppointmentOid;

-            RecurrenceId = pAppointment.DataContract?.RecurrenceId;
-            RecurrenceIndex = pAppointment.DataContract?.RecurrenceIndex ?? 0;
+            RecurrenceId = pAppointment.DataContract?.RecurrenceIdReference;
+            RecurrenceIndex = pAppointment.DataContract?.RecurrenceIndexReference ?? 0;

            _AbsenceTimeStart = pAppointment.AbsenceTimeStart;
            _AbsenceTimeEnd = pAppointment.AbsenceTimeEnd;
@@ -121,6 +135,10 @@ namespace BeWo.Scheduler.ViewModel
            ServiceRecordList = pAppointment.ServiceRecordList;
        }

+        /// <summary>
+        /// Erzeugt ein CustomFieldStorage-Objekt aus einem SchedulerAppointmentDC. Wird nur für veränderte Serientermine benutzt.
+        /// </summary>
+        /// <param name="pAppointment">Der veränderte Serientermin als SchedulerAppointmentDC</param>
        public CustomFieldStorage(SchedulerAppointmentDC pAppointment)
        {
            IsTask        = pAppointment.IsTask;
@@ -144,8 +162,8 @@ namespace BeWo.Scheduler.ViewModel

            SchedulerAppointmentOid = pAppointment.SchedulerAppointmentOid;

-            RecurrenceId = pAppointment.RecurrenceId;
-            RecurrenceIndex = pAppointment.RecurrenceIndex;
+            RecurrenceId = pAppointment.RecurrenceIdReference;
+            RecurrenceIndex = pAppointment.RecurrenceIndexReference ?? 0;

            HasServiceRecordEntry = pAppointment.HasServiceRecordEntry;

@@ -174,7 +192,7 @@ namespace BeWo.Scheduler.ViewModel
            Subject    = pSubject;
        }

-        public Visibility ToolTipTimeVisibility => IsTask || IsAbsenceTime || IsAllDay ? Visibility.Collapsed : Visibility.Visible;
+        public Visibility ToolTipTimeVisibility => IsTask || IsAbsenceTime ? Visibility.Collapsed : Visibility.Visible;

        public Visibility ToolTipResourcesVisibility => ResourceList?.Count > 0 ? Visibility.Visible : Visibility.Collapsed;

--- a/BeWo/Scheduler/ViewModel/NewSchedulerViewModel.cs
+++ b/BeWo/Scheduler/ViewModel/NewSchedulerViewModel.cs
@@ -24,14 +24,16 @@ namespace BeWo.Scheduler.ViewModel
 		    get => _ActiveAppointmentViewModel;

            set
-			{
-                if(value != null)
+            {
+                if(value is null)
                {
-                    _ActiveAppointmentViewModel = value;
-
-                    ViewModelChanged?.Invoke(this, new EventArgs<ISchedulerViewModel>(value));
+                    return;
                }
-			}
+
+                _ActiveAppointmentViewModel = value;
+
+                ViewModelChanged?.Invoke(this, new EventArgs<ISchedulerViewModel>(value));
+            }
 		}

        public AbstractAppointmentEditForm GetEditAppointmentForm(DevExpress.Xpf.Scheduler.SchedulerControl control, Appointment appointment)
@@ -53,7 +55,7 @@ namespace BeWo.Scheduler.ViewModel

 		public SchedulerSettings GetActiveSettings()
 		{
-			return ActiveAppointmentViewModel == null ? null : SchedulerSettings ?? ActiveAppointmentViewModel.GetDefaultSchedulerSettings();
+			return ActiveAppointmentViewModel is null ? null : SchedulerSettings ?? ActiveAppointmentViewModel.GetDefaultSchedulerSettings();
 		}

 		public IEnumerable<SchedulerAppointmentVM> ConvertAbsenceTimesToAppointments(IEnumerable<AbsenceTimeDC> pAbsenceTimes, DateTime pIntervalEnd, List<CompactEmployeeDC> allEmployees, List<CompactCustomerDC> allCustomers)
@@ -79,8 +81,36 @@ namespace BeWo.Scheduler.ViewModel
                    subject += $" ({dc.SimpleDescription})";
                }

-                var absenceTimeEnd = abwesenheit.End?.AddTicks(1);
-				
+                var absenceTimeEnd = abwesenheit.End;
+
+                // Ist nicht genau
+                if(abwesenheit.End.HasValue)
+                {
+                    var allDay = abwesenheit.Start.Value.Hour == 0 && abwesenheit.Start.Value.Minute == 0 && abwesenheit.Start.Value.Second == 0 &&
+                                 abwesenheit.End.Value.Hour == 0 && abwesenheit.End.Value.Minute == 0 && abwesenheit.End.Value.Second == 0;
+
+                    var end = abwesenheit.End.Value;
+                    var isMultipleDayAbsenceTime = abwesenheit.End is null || abwesenheit.Start.Value.Date != abwesenheit.End.Value.Date;
+
+                    if(isMultipleDayAbsenceTime && allDay)
+                    {
+                        absenceTimeEnd = end.AddDays(1);
+                    }
+
+                    // Wenn die Abwesenheit über mehrere Tage geht, muss ein Tag draufaddiert werden
+
+
+
+                    //if(end.Hour == 0 && end.Minute == 0 && end.Second == 0)
+                    //{
+                    //    absenceTimeEnd = end.AddSeconds(1);
+                    //}
+                    //else
+                    //{
+                    //    absenceTimeEnd = end.AddTicks(1);
+                    //}
+                }
+
                if(originator is null)
                {
                    originator = BeWoApp.CompactLoggedOnEmployee;
@@ -89,8 +119,8 @@ namespace BeWo.Scheduler.ViewModel
 				return new SchedulerAppointmentVM(
                    true, 
                    subject, 
-                    abwesenheit.Start.Value, 
-                    abwesenheit.End ?? pIntervalEnd, 
+                    abwesenheit.Start.Value,
+                    absenceTimeEnd ?? pIntervalEnd, 
                    originator, 
                    abwesenheit.Start, 
                    absenceTimeEnd, 
--- a/BeWo/Scheduler/ViewModel/SchedulerAppointmentListVM.cs
+++ b/BeWo/Scheduler/ViewModel/SchedulerAppointmentListVM.cs
@@ -435,7 +435,7 @@ namespace BeWo.Scheduler.ViewModel
 			return new SchedulerAppointmentEditForm(this, control, appointment, AllEmployees, AllCustomers, Categories2Resources, isTask);
 		}

-		public void ApplyChangesToChangedOccurencyCustomFields(ObservableCollection<Employee2SchedulerAppointmentDC> employees, List<CompactCustomerDC> customers, List<ResourceDC> resources, CompactEmployeeDC originator, bool isPrivate, string index, Guid id, bool isTask, string taskDescription, DateTime? completedDate, DateTime? dueDate, string completedNotice, List<CompactSupportConceptDC> supportConcepts, string subject, bool isAllDay, List<ServiceRecordDC> serviceRecords)
+		public void ApplyChangesToChangedOccurencyCustomFields(ObservableCollection<Employee2SchedulerAppointmentDC> employees, List<CompactCustomerDC> customers, List<ResourceDC> resources, CompactEmployeeDC originator, bool isPrivate, string index, Guid id, bool isTask, string taskDescription, DateTime? completedDate, DateTime? dueDate, string completedNotice, List<CompactSupportConceptDC> supportConcepts, string subject, bool isAllDay, List<ServiceRecordDC> serviceRecords, DateTime? start, DateTime? end)
 		{
 			if (!_ChangedOccurenceCustomFields.ContainsKey(id) || !_ChangedOccurenceCustomFields[id].ContainsKey(index))
 			{
--- a/BeWo/Scheduler/ViewModel/SchedulerAppointmentVM.cs
+++ b/BeWo/Scheduler/ViewModel/SchedulerAppointmentVM.cs
@@ -813,6 +813,9 @@ namespace BeWo.Scheduler.ViewModel
 	        set => base.IsNew = value;
 	    }

+		/// <summary>
+		/// Wird im RequestAnswerView benutzt, um ein VM-Objekt pro Zusage/Absage/Vorbehalt zu erzeugen
+		/// </summary>
        public long? LabelKey { get; set; }
 		
        public List<ServiceRecordDC> ServiceRecordList
--- a/BeWo/SchulbegleitenderDienst/SBDUtils/SBDUtils.cs
+++ b/BeWo/SchulbegleitenderDienst/SBDUtils/SBDUtils.cs
@@ -16,7 +16,12 @@ namespace BeWo.SchulbegleitenderDienst.SBDUtils
            
            foreach (var viewModel  in viewModels)
            {
-                if(viewModel.VertretungsStatus != VertretungsStatus.KlientKrank)
+                if (viewModel.Customer != null && viewModel.Customer.LastName == "Dau" || viewModel.Customer.LastName == "Sawan")
+                {
+                    int tet = 0;
+                }
+
+                if (viewModel.VertretungsStatus != VertretungsStatus.KlientKrank)
                {
                    var substitutionStartingDayCountCondition = SubstitutionStartingDayCountCondition(viewModel);

@@ -64,6 +69,10 @@ namespace BeWo.SchulbegleitenderDienst.SBDUtils

            foreach (var viewModel in viewModels)
            {
+                if (viewModel.Customer != null && viewModel.Customer.LastName == "Dau" || viewModel.Customer.LastName == "Sawan")
+                {
+                    int tet = 0;
+                }
                var isCustomerAbsenceWeekView = viewModel.WeekDayDictionary.Where(w => w.Value != null).All(a => a.Value.VertretungsStatus == VertretungsStatus.KlientKrank);

                var isSubstitutionUnwanted = viewModel.WeekDayDictionary.Where(w => w.Value != null).All(a => SubstitutionStartingDayCountCondition(a.Value) || a.Value.Vertretung?.VertretenderMitarbeiterOid != null || a.Value.Customer != null && a.Value.Customer.SubstitutionNeed == SubstitutionNeed.NoSubstitutionWanted);
@@ -83,7 +92,7 @@ namespace BeWo.SchulbegleitenderDienst.SBDUtils
                }
            }

-            return new WeeklySubstitutionListObject(employeeSubstitutionList, customerSubstitutionList, customerSubstitutionList);
+            return new WeeklySubstitutionListObject(employeeSubstitutionList, customerSubstitutionList, unwantedSubstitutionList);
        }
    }

--- a/BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstCustomerView.xaml
+++ b/BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstCustomerView.xaml
@@ -22,9 +22,12 @@
 		            <RowDefinition Height="Auto" />
 		            <RowDefinition Height="*" />
 		        </Grid.RowDefinitions>
-            <GroupBox Grid.ColumnSpan="1" Padding="5" Style="{StaticResource ObjectEditGroupBox}" Header="Schulbegleitender Dienst">
+            <GroupBox Grid.ColumnSpan="3" Padding="5" Style="{StaticResource ObjectEditGroupBox}" Header="Schulbegleitender Dienst">
                <Grid>
                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
                        <ColumnDefinition Width="Auto" />
                        <ColumnDefinition Width="*" />
                    </Grid.ColumnDefinitions>
@@ -34,18 +37,28 @@
                        <RowDefinition Height="Auto" />
                        <RowDefinition Height="Auto" />
                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
                        <RowDefinition Height="*" />
                    </Grid.RowDefinitions>
                    <Label Content="{markup:Translate CustomerPflege}" Margin="3" Grid.Row="0" Grid.Column="0" />
                    <CheckBox Margin="3" Grid.Row="0" Grid.Column="1"  HorizontalAlignment="Right" VerticalAlignment="Center" IsChecked="{Binding Path=Pflege, UpdateSourceTrigger=PropertyChanged}"/>
                    <Label Content="{markup:Translate CustomerToilettengang}" Margin="3" Grid.Row="1" Grid.Column="0" />
                    <CheckBox Margin="3" Grid.Row="1" Grid.Column="1"  HorizontalAlignment="Right" VerticalAlignment="Center" IsChecked="{Binding Path=Toilettengang, UpdateSourceTrigger=PropertyChanged}"/>
-                    <Label Content="{markup:Translate CustomerAggressivität}" Margin="3" Grid.Row="2" Grid.Column="0" />
-                    <CheckBox Margin="3" Grid.Row="2" Grid.Column="1"  HorizontalAlignment="Right" VerticalAlignment="Center" IsChecked="{Binding Path=Aggressiv, UpdateSourceTrigger=PropertyChanged}"/>
-                    <Label Content="{markup:Translate CustomerHygienebelehrung}" Margin="3" Grid.Row="3" Grid.Column="0" />
-                    <CheckBox Margin="3" Grid.Row="3" Grid.Column="1"  HorizontalAlignment="Right" VerticalAlignment="Center" IsChecked="{Binding Path=Hygienebelehrung, UpdateSourceTrigger=PropertyChanged}"/>
-                    <Label Content="{markup:Translate CustomerSchutzstufe}" Margin="3" Grid.Row="4" Grid.Column="0" />
-                    <TextBox Grid.Row="4" Grid.Column="1" Margin="3" Height="23" Text="{Binding Path=Schutzstufe, UpdateSourceTrigger=PropertyChanged}" />
+                    <Label Content="{markup:Translate CustomerAggressivität}" Margin="3" Grid.Row="0" Grid.Column="2" />
+                    <CheckBox Margin="3" Grid.Row="0" Grid.Column="3"  HorizontalAlignment="Right" VerticalAlignment="Center" IsChecked="{Binding Path=Aggressiv, UpdateSourceTrigger=PropertyChanged}"/>
+                    <Label Content="{markup:Translate CustomerHygienebelehrung}" Margin="3" Grid.Row="1" Grid.Column="2" />
+                    <CheckBox Margin="3" Grid.Row="1" Grid.Column="3"  HorizontalAlignment="Right" VerticalAlignment="Center" IsChecked="{Binding Path=Hygienebelehrung, UpdateSourceTrigger=PropertyChanged}"/>
+                    <Label Content="{markup:Translate CustomerSchutzstufe}" Margin="3" Grid.Row="2" Grid.Column="0" />
+                    <TextBox Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="4" Margin="3" Height="23" Text="{Binding Path=Schutzstufe, UpdateSourceTrigger=PropertyChanged}" />
+                    <Label Content="{markup:Translate CustomerUebernahmeort}" Margin="3" Grid.Row="3" Grid.Column="0" />
+                    <TextBox Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="4" Margin="3" Height="60" Text="{Binding Path=Uebernahmeort, UpdateSourceTrigger=PropertyChanged}" TextWrapping="Wrap" AcceptsReturn="True" VerticalScrollBarVisibility="Auto"/>
+                    <Label Content="{markup:Translate CustomerVerhalten}" Margin="3" Grid.Row="4" Grid.Column="0" />
+                    <TextBox Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="4" Margin="3" Height="60" Text="{Binding Path=Verhalten, UpdateSourceTrigger=PropertyChanged}" TextWrapping="Wrap" AcceptsReturn="True" VerticalScrollBarVisibility="Auto"/>
+                    <Label Content="{markup:Translate CustomerBetreuungsbedarf}" Margin="3" Grid.Row="5" Grid.Column="0" />
+                    <TextBox Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="4" Margin="3" Height="60" Text="{Binding Path=Betreuungsbedarf, UpdateSourceTrigger=PropertyChanged}" TextWrapping="Wrap" AcceptsReturn="True" VerticalScrollBarVisibility="Auto"/>
+                    <Label Content="{markup:Translate CustomerBemerkungenSbd}" Margin="3" Grid.Row="6" Grid.Column="0" />
+                    <TextBox Grid.Row="6" Grid.Column="1" Grid.ColumnSpan="4" Margin="3" Height="60" Text="{Binding Path=BemerkungenSbd, UpdateSourceTrigger=PropertyChanged}" TextWrapping="Wrap" AcceptsReturn="True" VerticalScrollBarVisibility="Auto"/>
                </Grid>
                </GroupBox>
            <GroupBox Header="Vertretungs-Einstellungen" Style="{StaticResource ObjectEditGroupBox}" Grid.Column="0" Grid.Row="1" Visibility="Visible" x:Name="VertretungsEinstellungen" Margin="0,10,0,0">
--- a/BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstEmployeeView.xaml
+++ b/BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstEmployeeView.xaml
@@ -27,11 +27,13 @@
 		        <RowDefinition Height="Auto" />
 		        <RowDefinition Height="*" />
 		    </Grid.RowDefinitions>
-    <GroupBox Grid.ColumnSpan="1" Padding="5" Style="{StaticResource ObjectEditGroupBox}" Header="Schulbegleitender Dienst">
+    <GroupBox Grid.ColumnSpan="3" Padding="5" Style="{StaticResource ObjectEditGroupBox}" Header="Schulbegleitender Dienst">
      <Grid>
        <Grid.ColumnDefinitions>
          <ColumnDefinition Width="Auto" />
-          <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
        </Grid.ColumnDefinitions>
        <Grid.RowDefinitions>
          <RowDefinition Height="Auto" />
@@ -42,21 +44,24 @@
          <RowDefinition Height="*" />
        </Grid.RowDefinitions>
        <Label Content="{markup:Translate EmployeePflege}" Margin="3" Grid.Row="0" Grid.Column="0" />
-        <CheckBox Margin="3" Grid.Row="0" Grid.Column="1"  HorizontalAlignment="Right" VerticalAlignment="Center" IsChecked="{Binding Path=Pflege, UpdateSourceTrigger=PropertyChanged}"/>
+        <CheckBox Margin="3" Grid.Row="0" Grid.Column="1"  HorizontalAlignment="Left" VerticalAlignment="Center" IsChecked="{Binding Path=Pflege, UpdateSourceTrigger=PropertyChanged}"/>

        <Label Content="{markup:Translate EmployeeToilettengang}" Margin="3" Grid.Row="1" Grid.Column="0" />
-          <CheckBox Margin="3" Grid.Row="1" Grid.Column="1"  HorizontalAlignment="Right" VerticalAlignment="Center" IsChecked="{Binding Path=Toilettengang, UpdateSourceTrigger=PropertyChanged}"/>
+                    <CheckBox Margin="3" Grid.Row="1" Grid.Column="1"  HorizontalAlignment="Left" VerticalAlignment="Center" IsChecked="{Binding Path=Toilettengang, UpdateSourceTrigger=PropertyChanged}"/>

        <Label Content="{markup:Translate EmployeeAggressivität}" Margin="3" Grid.Row="2" Grid.Column="0" />
-          <CheckBox Margin="3" Grid.Row="2" Grid.Column="1"  HorizontalAlignment="Right" VerticalAlignment="Center" IsChecked="{Binding Path=Aggressiv, UpdateSourceTrigger=PropertyChanged}"/>
+                    <CheckBox Margin="3" Grid.Row="2" Grid.Column="1"  HorizontalAlignment="Left" VerticalAlignment="Center" IsChecked="{Binding Path=Aggressiv, UpdateSourceTrigger=PropertyChanged}"/>

          <Label Content="{markup:Translate EmployeeHygienebelehrung}" Margin="3" Grid.Row="3" Grid.Column="0" />
-          <CheckBox Margin="3" Grid.Row="3" Grid.Column="1"  HorizontalAlignment="Right" VerticalAlignment="Center" IsChecked="{Binding Path=Hygienebelehrung, UpdateSourceTrigger=PropertyChanged}"/>
+                    <CheckBox Margin="3" Grid.Row="3" Grid.Column="1"  HorizontalAlignment="Left" VerticalAlignment="Center" IsChecked="{Binding Path=Hygienebelehrung, UpdateSourceTrigger=PropertyChanged}"/>

          <Label Content="{markup:Translate EmployeeSchutzstufe}" Margin="3" Grid.Row="4" Grid.Column="0" />
-          <TextBox Grid.Row="4" Grid.Column="1" Margin="3" Height="23" Text="{Binding Path=Schutzstufe, UpdateSourceTrigger=PropertyChanged}" />
+          <TextBox Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="3" Margin="3" Height="23" Text="{Binding Path=Schutzstufe, UpdateSourceTrigger=PropertyChanged}" />

-      </Grid>
+                    <Label Content="{markup:Translate CustomerBemerkungenSbd}" Margin="3" Grid.Row="5" Grid.Column="0" />
+                    <TextBox Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="3" Margin="3" Height="100" Text="{Binding Path=BemerkungenSbd, UpdateSourceTrigger=PropertyChanged}" TextWrapping="Wrap" AcceptsReturn="True" AutoWordSelection="True" VerticalScrollBarVisibility="Auto"/>
+          
+                </Grid>
      </GroupBox>

    
@@ -86,7 +91,7 @@

        </Grid>
      </GroupBox>
-      <GroupBox Header="Ausschlusskriterien" Grid.Column="1" Grid.ColumnSpan="1" Grid.Row="1" Style="{StaticResource ObjectEditGroupBox}" Margin="0,10,0,0">
+      <GroupBox Header="Ausschlusskriterien" Grid.Column="1" Grid.ColumnSpan="1" Grid.Row="1" Style="{StaticResource ObjectEditGroupBox}" HorizontalAlignment="Left" Margin="0,10,0,0">
        <Grid>
          <Grid.ColumnDefinitions>
            <ColumnDefinition Width="Auto" />
--- a/BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstEmployeeView.xaml.cs
+++ b/BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstEmployeeView.xaml.cs
@@ -23,7 +23,7 @@ using BS.Shared.Extensions;
 using BS.Shared;
 using BS.Shared.Core;
 using BS.Shared.DataContracts.Compact;
-using BS.Shared.Translation;
+using BS.SharedLauncher.Translation;
 using DevExpress.Xpf.Editors;
 using Microsoft.Win32;
 using CheckBox = System.Windows.Controls.CheckBox;
--- a/BeWo/SchulbegleitenderDienst/TagesVertretung.cs
+++ b/BeWo/SchulbegleitenderDienst/TagesVertretung.cs
@@ -56,9 +56,18 @@ namespace BeWo.SchulbegleitenderDienst
                VertretungsStatus          = vertretungsItem.VertretungsStatus,
                WochenansichtBemerkung     = vertretungsItem.WochenansichtBemerkung,
                VertreterInfoString        = vertretungsItem.VertreterInfoString,
+                CustomerToolTip = vertretungsItem.CustomerToolTip,
+                EmployeeToolTip = vertretungsItem.EmployeeToolTip,
+                VertreterToolTip = vertretungsItem.VertreterToolTip,
                EmployeeAddressString = vertretungsItem.EmployeeAddressString,
                Id = vertretungsItem.Id,
-                AssistanceTimeEntry = vertretungsItem.AssistanceTime
+                AssistanceTimeEntry = vertretungsItem.AssistanceTime,
+                AlleBetreuungszeiten = vertretungsItem.AlleBetreuungszeiten,
+                BetreuungszeitenAmDatum = vertretungsItem.BetreuungszeitenAmDatum,
+                MailCustomer = vertretungsItem.MailCustomer,
+                MailEmployee = vertretungsItem.MailEmployee,
+                MailVertretung = vertretungsItem.MailVertretung,
+                MailSchule = vertretungsItem.MailSchule
            };

            if (vertretungsItem.Arbeitszeiten != null && vertretungsItem.Arbeitszeiten.Any())
@@ -68,9 +77,14 @@ namespace BeWo.SchulbegleitenderDienst

            return tagesansichtVM;
        }
-        
-        public void AddeNeueTagesVertretung(TagesansichtVM viewModel, DateTime dateTime)
+
+
+        private bool _VertretungAusgewaehlt = false;
+
+        public bool AddeNeueTagesVertretung(TagesansichtVM viewModel, DateTime dateTime)
        {
+            _VertretungAusgewaehlt = false;
+
            if (viewModel.Employee != null)
            {
                _SearchView = new VertretungsSearchView(dateTime, viewModel.Customer, viewModel, null, viewModel.Employee);
@@ -78,10 +92,13 @@ namespace BeWo.SchulbegleitenderDienst
                _SearchView.RaiseCustomEvent += Tagesansicht_RaiseCustomEvent;
                _SearchView.ShowDialog(); 
            }
+
+            return _VertretungAusgewaehlt;
        }

        private void Tagesansicht_RaiseCustomEvent(object sender, VertretungSelectedEventArgs e)
        {
+            _VertretungAusgewaehlt = true;
            UpdateMitarbeiterToVertretung(e.Employee, e.VertretungVon, e.VertretungBis, e.TagesItem);

            _SearchView.Close();
--- a/BeWo/SchulbegleitenderDienst/TagesansichtVM.cs
+++ b/BeWo/SchulbegleitenderDienst/TagesansichtVM.cs
@@ -41,6 +41,14 @@ namespace BeWo.SchulbegleitenderDienst

        public DateTime? EndDate => Absencetime?.End;

+        public MailDC MailCustomer { get; set; }
+
+        public MailDC MailEmployee { get; set; }
+
+        public MailDC MailVertretung { get; set; }
+
+        public MailDC MailSchule { get; set; }
+
        public string ArbeitszeitenString
        {
            get
@@ -254,8 +262,18 @@ namespace BeWo.SchulbegleitenderDienst

        public new string VertreterInfoString { get; set; }

+        public string CustomerToolTip { get; set; }
+
+        public string EmployeeToolTip { get; set; }
+
+        public string VertreterToolTip { get; set; }
+
        public Guid Id { get; set; }

        public ArbeitszeitEintragDC AssistanceTimeEntry { get; set; }
+
+        public string AlleBetreuungszeiten { get; set; }
+
+        public string BetreuungszeitenAmDatum { get; set; }
    }
 }
--- a/BeWo/SchulbegleitenderDienst/VertretenderKlientSearchView.xaml.cs
+++ b/BeWo/SchulbegleitenderDienst/VertretenderKlientSearchView.xaml.cs
@@ -584,7 +584,7 @@ namespace BeWo.SchulbegleitenderDienst
 				}
 				else
 				{
-					MessageBox.Show("Bitte wählen sie zuerst " + BS.Shared.Translation.Translator.Translate("einen Klienten") + " aus.");
+					MessageBox.Show("Bitte wählen sie zuerst " + BS.SharedLauncher.Translation.Translator.Translate("einen Klienten") + " aus.");
 				}
 	    }
    }
--- a/BeWo/SchulbegleitenderDienst/VertretungsMainView.xaml.cs
+++ b/BeWo/SchulbegleitenderDienst/VertretungsMainView.xaml.cs
@@ -550,7 +550,7 @@ namespace BeWo.SchulbegleitenderDienst
            }
            else
            {           
-                MessageBox.Show(BS.Shared.Translation.Translator.Translate("Bitte wählen sie eine/n Mitarbeiter/in und eine Abwesenheitskategorie aus."));
+                MessageBox.Show(BS.SharedLauncher.Translation.Translator.Translate("Bitte wählen sie eine/n Mitarbeiter/in und eine Abwesenheitskategorie aus."));
            }


@@ -746,7 +746,7 @@ namespace BeWo.SchulbegleitenderDienst
            }
            else
            {
-                MessageBox.Show("Bitte wählen Sie " + BS.Shared.Translation.Translator.Translate("eine/n Klient/in") + " und eine Abwesenheitskategorie aus.");
+                MessageBox.Show("Bitte wählen Sie " + BS.SharedLauncher.Translation.Translator.Translate("eine/n Klient/in") + " und eine Abwesenheitskategorie aus.");
            }


@@ -868,21 +868,21 @@ namespace BeWo.SchulbegleitenderDienst

 	        if (e.MenuInfo.Column.FieldName == "Kunde")
 	        {
-	            BarButtonItem x = new BarButtonItem() {Content = BS.Shared.Translation.Translator.Translate("Klient/in öffnen") };
+	            BarButtonItem x = new BarButtonItem() {Content = BS.SharedLauncher.Translation.Translator.Translate("Klient/in öffnen") };
 	            x.ItemClick += Kundeninfo_OnClick;
 	            e.Customizations.Add(x);
 	        }

 	        if (e.MenuInfo.Column.FieldName == "KrankerMitarbeiter")
 	        {
-	            BarButtonItem x = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
+	            BarButtonItem x = new BarButtonItem() { Content = BS.SharedLauncher.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
 	            x.ItemClick += Mitarbeiterinfo_OnClick;
 	            e.Customizations.Add(x);
 	        }

 	        if (e.MenuInfo.Column.FieldName == "Vertretung")
 	        {
-	            BarButtonItem s = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
+	            BarButtonItem s = new BarButtonItem() { Content = BS.SharedLauncher.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
 	            s.ItemClick += MitarbeiterVertretunginfo_OnClick;
 	            e.Customizations.Add(s);
 	        }
@@ -905,21 +905,21 @@ namespace BeWo.SchulbegleitenderDienst

            if (e.MenuInfo.Column.FieldName == "Kunde")
            {
-                BarButtonItem x = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Klient/in öffnen") };
+                BarButtonItem x = new BarButtonItem() { Content = BS.SharedLauncher.Translation.Translator.Translate("Klient/in öffnen") };
                x.ItemClick += Kundeninfo_OnClick;
                e.Customizations.Add(x);
            }

            if (e.MenuInfo.Column.FieldName == "KrankerMitarbeiter")
            {
-                BarButtonItem x = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
+                BarButtonItem x = new BarButtonItem() { Content = BS.SharedLauncher.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
                x.ItemClick += Mitarbeiterinfo_OnClick;
                e.Customizations.Add(x);
            }

            if (e.MenuInfo.Column.FieldName == "Vertretung")
            {
-                BarButtonItem s = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
+                BarButtonItem s = new BarButtonItem() { Content = BS.SharedLauncher.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
                s.ItemClick += MitarbeiterVertretunginfo_OnClick;
                e.Customizations.Add(s);
            }
@@ -946,14 +946,14 @@ namespace BeWo.SchulbegleitenderDienst

            if (e.MenuInfo.Column.FieldName == "Kunde") // FieldNames umbennenen 
            {
-                BarButtonItem x = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Klient/in öffnen") };
+                BarButtonItem x = new BarButtonItem() { Content = BS.SharedLauncher.Translation.Translator.Translate("Klient/in öffnen") };
                x.ItemClick += Kundeninfo_OnClick; // bearbeiten
                e.Customizations.Add(x);
            }

            if (e.MenuInfo.Column.FieldName == "MaKrank")
            {
-                BarButtonItem x = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
+                BarButtonItem x = new BarButtonItem() { Content = BS.SharedLauncher.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
                x.ItemClick += Mitarbeiterinfo_OnClick; // eee
                e.Customizations.Add(x);
            }
@@ -963,7 +963,7 @@ namespace BeWo.SchulbegleitenderDienst
                e.MenuInfo.Column.FieldName == "VertretungFr" || e.MenuInfo.Column.FieldName == "VertretungSa" ||
                e.MenuInfo.Column.FieldName == "VertretungSo")
            {
-                BarButtonItem s = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
+                BarButtonItem s = new BarButtonItem() { Content = BS.SharedLauncher.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
                s.ItemClick += MitarbeiterVertretunginfoWochenanzeige_OnClick;
                e.Customizations.Add(s);
                _mitarbeiterVertretungWocheninfo = e.MenuInfo.Column.FieldName;
@@ -986,14 +986,14 @@ namespace BeWo.SchulbegleitenderDienst

            if (e.MenuInfo.Column.FieldName == "Kunde") // FieldNames umbennenen 
            {
-                BarButtonItem x = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Klient/in öffnen") };
+                BarButtonItem x = new BarButtonItem() { Content = BS.SharedLauncher.Translation.Translator.Translate("Klient/in öffnen") };
                x.ItemClick += Kundeninfo_OnClick; // bearbeiten
                e.Customizations.Add(x);
            }

            if (e.MenuInfo.Column.FieldName == "MaKrank")
            {
-                BarButtonItem x = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
+                BarButtonItem x = new BarButtonItem() { Content = BS.SharedLauncher.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
                x.ItemClick += Mitarbeiterinfo_OnClick; // eee
                e.Customizations.Add(x);
            }
@@ -1003,7 +1003,7 @@ namespace BeWo.SchulbegleitenderDienst
                e.MenuInfo.Column.FieldName == "VertretungFr" || e.MenuInfo.Column.FieldName == "VertretungSa" ||
                e.MenuInfo.Column.FieldName == "VertretungSo")
            {
-                BarButtonItem s = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
+                BarButtonItem s = new BarButtonItem() { Content = BS.SharedLauncher.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
                s.ItemClick += MitarbeiterVertretunginfoWochenanzeige_OnClick;
                e.Customizations.Add(s);
                _mitarbeiterVertretungWocheninfo = e.MenuInfo.Column.FieldName;
@@ -1026,14 +1026,14 @@ namespace BeWo.SchulbegleitenderDienst

            if (e.MenuInfo.Column.FieldName == "Kunde") // FieldNames umbennenen 
            {
-                BarButtonItem x = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Klient/in öffnen") };
+                BarButtonItem x = new BarButtonItem() { Content = BS.SharedLauncher.Translation.Translator.Translate("Klient/in öffnen") };
                x.ItemClick += Kundeninfo_OnClick; // bearbeiten
                e.Customizations.Add(x);
            }

            if (e.MenuInfo.Column.FieldName == "MaKrank")
            {
-                BarButtonItem x = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
+                BarButtonItem x = new BarButtonItem() { Content = BS.SharedLauncher.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
                x.ItemClick += Mitarbeiterinfo_OnClick; // eee
                e.Customizations.Add(x);
            }
@@ -1043,7 +1043,7 @@ namespace BeWo.SchulbegleitenderDienst
                e.MenuInfo.Column.FieldName == "VertretungFr" || e.MenuInfo.Column.FieldName == "VertretungSa" ||
                e.MenuInfo.Column.FieldName == "VertretungSo")
            {
-                BarButtonItem s = new BarButtonItem() { Content = BS.Shared.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
+                BarButtonItem s = new BarButtonItem() { Content = BS.SharedLauncher.Translation.Translator.Translate("Mitarbeiter/in öffnen") };
                s.ItemClick += MitarbeiterVertretunginfoWochenanzeige_OnClick;
                e.Customizations.Add(s);
                _mitarbeiterVertretungWocheninfo = e.MenuInfo.Column.FieldName;
@@ -1173,12 +1173,12 @@ namespace BeWo.SchulbegleitenderDienst
                    }
                }
                else
-                    MessageBox.Show(BS.Shared.Translation.Translator.Translate("Es wurde der Vertretung kein Mitarbeiter zugeteilt"));
+                    MessageBox.Show(BS.SharedLauncher.Translation.Translator.Translate("Es wurde der Vertretung kein Mitarbeiter zugeteilt"));

            }
            else
            {
-                MessageBox.Show(BS.Shared.Translation.Translator.Translate("Es wurde der Vertretung kein Mitarbeiter zugeteilt"));
+                MessageBox.Show(BS.SharedLauncher.Translation.Translator.Translate("Es wurde der Vertretung kein Mitarbeiter zugeteilt"));
            }
        }
        
@@ -1225,12 +1225,12 @@ namespace BeWo.SchulbegleitenderDienst
                                    ));
                            }
                            else
-                                MessageBox.Show(BS.Shared.Translation.Translator.Translate("Es wurde der Vertretung kein Mitarbeiter zugeteilt"));
+                                MessageBox.Show(BS.SharedLauncher.Translation.Translator.Translate("Es wurde der Vertretung kein Mitarbeiter zugeteilt"));

                        }
                        else
                        {
-                            MessageBox.Show(BS.Shared.Translation.Translator.Translate("Es wurde der Vertretung kein Mitarbeiter zugeteilt"));
+                            MessageBox.Show(BS.SharedLauncher.Translation.Translator.Translate("Es wurde der Vertretung kein Mitarbeiter zugeteilt"));
                        }
    
                    }
--- a/BeWo/SchulbegleitenderDienst/VertretungsMainViewV2.xaml
+++ b/BeWo/SchulbegleitenderDienst/VertretungsMainViewV2.xaml
--- a/BeWo/SchulbegleitenderDienst/VertretungsMainViewV2.xaml.cs
+++ b/BeWo/SchulbegleitenderDienst/VertretungsMainViewV2.xaml.cs
@@ -2,9 +2,12 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Globalization;
+using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
 using System.Windows.Documents;
+using System.Windows.Markup;
 using System.Windows.Navigation;
 using BeWo.Core;
 using BeWo.ServiceProxy;
@@ -13,6 +16,8 @@ using BS.Shared.Core;
 using BS.Shared.DataContracts;
 using BS.Shared.DataContracts.Compact;
 using BS.Shared.Extensions;
+using BS.SharedLauncher.Translation;
+using DevExpress.Utils;
 using DevExpress.Xpf.Bars;
 using DevExpress.Xpf.Editors;
 using DevExpress.Xpf.Grid;
@@ -53,7 +58,7 @@ namespace BeWo.SchulbegleitenderDienst
            this.Dispatch(() => {});

            ScrollViewerTagesansicht.Visibility = Visibility.Visible;
-            WochenansichtsContainerGrid.Visibility = Visibility.Collapsed;
+            ScrollViewerWochenansicht.Visibility = Visibility.Collapsed;

            SetDefaultDatePicker(DateTime.Now.Date);
 	        Datepicker.DateTime = DateTime.Now;
@@ -65,6 +70,10 @@ namespace BeWo.SchulbegleitenderDienst

            KlientVertretungsearchview.ItemSelected += KlientVertretungsearchview_KlientVertretungSelected;
            MitarbeiterVertretungsearchview.ItemSelected += MitarbeiterVertretungsearchview_MitarbeiterVertretungSelected;
+
+            UpdateReportUri();
+
+            //TableViewTagesansichtMitarbeiter.CellToolTipTemplate
        }
        
        private void LadeTagesansicht(DateTime date)
@@ -169,7 +178,7 @@ namespace BeWo.SchulbegleitenderDienst
 	    private CompactEmployeeDC _CurrentEmployee;

        private CompactCustomerDC _CurrentCustomer;
-
+        
        private void MitarbeiterVertretungsToggleButton_OnChecked(object sender, RoutedEventArgs e)
        {
            MvDatepickerUhrzeitVon.Text = string.Empty;
@@ -274,7 +283,7 @@ namespace BeWo.SchulbegleitenderDienst
            }
            else
            {           
-                MessageBox.Show(BS.Shared.Translation.Translator.Translate("Bitte wählen Sie eine/n Mitarbeiter/in und eine Abwesenheitskategorie aus."));
+                MessageBox.Show(BS.SharedLauncher.Translation.Translator.Translate("Bitte wählen Sie eine/n Mitarbeiter/in und eine Abwesenheitskategorie aus."));
            }


@@ -286,15 +295,15 @@ namespace BeWo.SchulbegleitenderDienst

                ClearAllMitarbeiterValues();
                
-                if (ScrollViewerTagesansicht.Visibility == Visibility.Visible)
-                {
-                    LadeTagesansicht(Datepicker.DateTime.Date);
-                }
-                else if (WochenansichtsContainerGrid.Visibility == Visibility.Visible)
-                {
-                    var x = Datepicker.DateTime.FirstDateOfWeek(Datepicker.DateTime.GetIso8601WeekOfYear());
-                    LadeWochenansicht(x, x.AddDays(5));
-                }                
+                //if (ScrollViewerTagesansicht.Visibility == Visibility.Visible)
+                //{
+                //    LadeTagesansicht(Datepicker.DateTime.Date);
+                //}
+                //else if (ScrollViewerWochenansicht.Visibility == Visibility.Visible)
+                //{
+                //    var x = Datepicker.DateTime.FirstDateOfWeek(Datepicker.DateTime.GetIso8601WeekOfYear());
+                //    LadeWochenansicht(x, x.AddDays(5));
+                //}                
            }
        }

@@ -481,7 +490,7 @@ namespace BeWo.SchulbegleitenderDienst
            }
            else
            {
-                MessageBox.Show("Bitte wählen Sie " + BS.Shared.Translation.Translator.Translate("eine/n Klient/in")  + " und eine Abwesenheitskategorie aus.");
+                MessageBox.Show("Bitte wählen Sie " + BS.SharedLauncher.Translation.Translator.Translate("eine/n Klient/in")  + " und eine Abwesenheitskategorie aus.");
            }

            if(isValid)
@@ -492,15 +501,15 @@ namespace BeWo.SchulbegleitenderDienst
                
                ClearAllKlientValues();
                
-                if(ScrollViewerTagesansicht.Visibility == Visibility.Visible)
-                {
-                    LadeTagesansicht(Datepicker.DateTime.Date);
-                }
-                else if(WochenansichtsContainerGrid.Visibility == Visibility.Visible)
-                {
-                    var x = Datepicker.DateTime.FirstDateOfWeek(Datepicker.DateTime.GetIso8601WeekOfYear());
-                    LadeWochenansicht(x, x.AddDays(5));
-                }
+                //if(ScrollViewerTagesansicht.Visibility == Visibility.Visible)
+                //{
+                //    LadeTagesansicht(Datepicker.DateTime.Date);
+                //}
+                //else if(ScrollViewerWochenansicht.Visibility == Visibility.Visible)
+                //{
+                //    var x = Datepicker.DateTime.FirstDateOfWeek(Datepicker.DateTime.GetIso8601WeekOfYear());
+                //    LadeWochenansicht(x, x.AddDays(5));
+                //}
            }
        }

@@ -563,7 +572,7 @@ namespace BeWo.SchulbegleitenderDienst
                {
                    if (isOverlapping)
                    {
-                        MessageBox.Show($"In dem angegebenen Zeitraum({absenceTime.Start.Value:dd.MM.yyyy} - {absenceTime.End.Value:dd.MM.yyyy}) existiert bereits eine Abwesenheit von " + BS.Shared.Translation.Translator.Translate("Klient") + " " + _CurrentCustomer.SimpleDescription + ". Die Abwesenheit konnte nicht angelegt werden.", "Fehler", MessageBoxButton.OK, MessageBoxImage.Warning);
+                        MessageBox.Show($"In dem angegebenen Zeitraum({absenceTime.Start.Value:dd.MM.yyyy} - {absenceTime.End.Value:dd.MM.yyyy}) existiert bereits eine Abwesenheit von " + BS.SharedLauncher.Translation.Translator.Translate("Klient") + " " + _CurrentCustomer.SimpleDescription + ". Die Abwesenheit konnte nicht angelegt werden.", "Fehler", MessageBoxButton.OK, MessageBoxImage.Warning);
                    }
                    else
                    {
@@ -597,96 +606,50 @@ namespace BeWo.SchulbegleitenderDienst

        private void ButtonVertretungWochenAnzeigeMitarbeiter_Click(object sender, RoutedEventArgs e)
 	    {
-            _Wochenvertretung.AddeNeueVertretungforWochenAnsicht((WochenansichtVM)GridDataControlWochenansichtMitarbeiter.SelectedItem, GridDataControlWochenansichtMitarbeiter.CurrentColumn.FieldName);
-	        
-            var selectedDate = Datepicker.DateTime.FirstDateOfWeek(Datepicker.DateTime.GetIso8601WeekOfYear());
-            LadeWochenansicht(selectedDate, selectedDate.AddDays(5));
+            if (_Wochenvertretung.AddeNeueVertretungforWochenAnsicht((WochenansichtVM)GridDataControlWochenansichtMitarbeiter.SelectedItem, GridDataControlWochenansichtMitarbeiter.CurrentColumn.FieldName))
+            {
+
+                var selectedDate = Datepicker.DateTime.FirstDateOfWeek(Datepicker.DateTime.GetIso8601WeekOfYear());
+                LadeWochenansicht(selectedDate, selectedDate.AddDays(5));
+            }
        }

        private void TagesansichtSettings_OnDefaultButtonClick(object sender, RoutedEventArgs e)
        {
            var button = (Button) sender;

-            _Tagesvertretung.AddeNeueTagesVertretung((TagesansichtVM) button.Tag, Datepicker.DateTime);
-
-            LadeTagesansicht(Datepicker.DateTime.Date);
-        }
-
-		private void GridDataControlTagesansichtMitarbeiter_OnShowGridMenu(object sender, GridMenuEventArgs e)
-        {
-            var barButtonItem = new BarButtonItem {Content = "Abwesenheit löschen"};
-	        barButtonItem.ItemClick += DeleteMitarbeiterKrankmeldung_OnClick;
-	        e.Customizations.Add(barButtonItem);
-
-            var barButtonItem2 = new BarButtonItem {Content = "Steckbrief anzeigen"};
-            barButtonItem2.ItemClick += ShowCharacteristics;
-            e.Customizations.Add(barButtonItem2);
-
-            var selectedViewModel = (TagesansichtVM)GridDataControlTagesansichtMitarbeiter.SelectedItem;
-            
-            if (selectedViewModel != null && selectedViewModel.Vertretung != null)
-            {    
-                var barButtonItem3 = new BarButtonItem {Content = "Vertretung löschen", Tag = e.Source.DataControl.SelectedItem };
-                barButtonItem3.ItemClick += DeleteVertretung_OnClick;
-                e.Customizations.Add(barButtonItem3);
-            }
-        }
-
-        private void ShowCharacteristics(object sender, RoutedEventArgs e)
-        {
-            var selectedItem = GridDataControlTagesansichtMitarbeiter.SelectedItem;
-
-            if(selectedItem != null)
+            if (_Tagesvertretung.AddeNeueTagesVertretung((TagesansichtVM)button.Tag, Datepicker.DateTime))
            {
-                var selectedTagesansichtVM = (TagesansichtVM) selectedItem;
-
-                var url = $"{BeWoApp.SiteOfOrigin}/ReportView.aspx?type={ReportTypes.SBDCharacteristics}&customerOid={selectedTagesansichtVM.Customer.CustomerOid}";
-
-                //var tempToken = string.Empty;
-
-                ServiceFacade.DoDownloadServiceAsync(s => s.CreateTemporaryToken(url, true), delegate(string tempToken)
-                {
-                    this.Dispatch(
-                        () =>
-                        {
-                            var addChar = url.Contains("?") ? "&" : "?";
-                            url = $"{url}{addChar}token={tempToken}";
-
-                            url = BeWoWpfUtils.GetHTMLEncodedURL(url);
-
-                            BeWoUtils.NavigateToReportUri(url, "Steckbrief");
-                        }
-                        );
-                });
-
-                //ServiceFacade.DoDownloadServiceSync(s => tempToken = s.CreateTemporaryToken(url, true));
-                //var addChar = url.Contains("?") ? "&" : "?";
-                //url = $"{url}{addChar}token={tempToken}";
-
-                //url = BeWoWpfUtils.GetHTMLEncodedURL(url);
-
-                //BeWoUtils.NavigateToReportUri(url, "Steckbrief");
-            }
-        }
-
-        private void GridDataControlTagesansichtKlient_OnShowGridMenu(object sender, GridMenuEventArgs e)
-        {
-            var barButtonItem = new BarButtonItem {Content = "Abwesenheit löschen"};
-            barButtonItem.ItemClick += DeleteKlientKrankmeldung_OnClick;
-            e.Customizations.Add(barButtonItem);
-        }
-
-        private void DeleteMitarbeiterKrankmeldung_OnClick(object sender, RoutedEventArgs e)
-	    {
-            if (MessageBox.Show("Möchten Sie die Abwesenheit wirklich löschen?", "Abwesenheit löschen", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.Yes)
-            {
-                var selectedViewModel = (TagesansichtVM)GridDataControlTagesansichtMitarbeiter.SelectedItem;
-
-                _Tagesvertretung.DeleteKrankmeldung(selectedViewModel, ShowDeletionMessageBox(selectedViewModel.Absencetime), Datepicker.DateTime.Date);

                LadeTagesansicht(Datepicker.DateTime.Date);
            }
-	    }
+        }
+
+		
+
+        private void ShowCharacteristics(object sender, RoutedEventArgs e)
+        {
+
+            var url = $"{BeWoApp.SiteOfOrigin}/ReportView.aspx";
+
+            var btn = sender as BarButtonItem;
+            if (btn.Tag is CompactCustomerDC)
+            {
+                var c = btn.Tag as CompactCustomerDC;
+                url += $"?type={ReportTypes.SBDCharacteristics}&customerOid={c.CustomerOid}";
+            }
+            else if (btn.Tag is CompactEmployeeDC)
+            {
+                var emp = btn.Tag as CompactEmployeeDC;
+                url += $"?type={ReportTypes.SBDEmployeeReport}&employeeOid={emp.EmployeeOid}";
+            }
+                
+                
+
+            BeWoUtils.NavigateToReportUri(url, "Steckbrief");
+
+        }
+

        //private void DeleteVertretung_OnClick(object sender, RoutedEventArgs e)
        //{
@@ -757,7 +720,7 @@ namespace BeWo.SchulbegleitenderDienst

        private void AbsentEmployeesDayViewGridControl_OnCellValueChanged(object sender, RowEventArgs e)
        {
-            _Tagesvertretung.UpdateRowData((TagesansichtVM) GridDataControlTagesansichtMitarbeiter.SelectedItem);
+            _Tagesvertretung.UpdateRowData((TagesansichtVM) GridControlTagesansichtMitarbeiter.SelectedItem);

            LadeTagesansicht(Datepicker.DateTime);
        }
@@ -767,7 +730,7 @@ namespace BeWo.SchulbegleitenderDienst
            if (ScrollViewerTagesansicht.Visibility == Visibility.Visible)
 	        {
 	            ScrollViewerTagesansicht.Visibility = Visibility.Collapsed;
-                WochenansichtsContainerGrid.Visibility = Visibility.Visible;
+                ScrollViewerWochenansicht.Visibility = Visibility.Visible;
 	            
                KwWochenAnzeigen();
            }
@@ -782,7 +745,7 @@ namespace BeWo.SchulbegleitenderDienst
 	        var startdt = dt.FirstDateOfWeek(dt.GetIso8601WeekOfYear());
 	        var enddt = startdt.AddDays(5);

-		    if (WochenansichtsContainerGrid.Visibility == Visibility.Visible)
+		    if (ScrollViewerWochenansicht.Visibility == Visibility.Visible)
 		    {
                LadeWochenansicht(startdt,enddt);    
 		    }
@@ -795,7 +758,7 @@ namespace BeWo.SchulbegleitenderDienst
 	        if (ScrollViewerTagesansicht.Visibility != Visibility.Visible)
 	        {
 	            ScrollViewerTagesansicht.Visibility = Visibility.Visible;
-                WochenansichtsContainerGrid.Visibility = Visibility.Collapsed;
+                ScrollViewerWochenansicht.Visibility = Visibility.Collapsed;
                
                TagesAnzeige();
 	        }
@@ -815,7 +778,7 @@ namespace BeWo.SchulbegleitenderDienst
 	        {
                LadeTagesansicht(Datepicker.DateTime);
 	        }
-            else if (WochenansichtsContainerGrid.Visibility == Visibility.Visible)
+            else if (ScrollViewerWochenansicht.Visibility == Visibility.Visible)
            {
                var x = Datepicker.DateTime.FirstDateOfWeek(Datepicker.DateTime.GetIso8601WeekOfYear());

@@ -924,7 +887,7 @@ namespace BeWo.SchulbegleitenderDienst
                {
                    
                }
-                else if (WochenansichtsContainerGrid.Visibility == Visibility.Visible)
+                else if (ScrollViewerWochenansicht.Visibility == Visibility.Visible)
                {
                    //GetAllVertretungsFreieMitarbeiter(startdt, enddt);
                }
@@ -941,8 +904,8 @@ namespace BeWo.SchulbegleitenderDienst
            {
                this.Dispatch(() =>
                {
-                    ComboBoxKlientVertretung.ItemsSource      = absenceReasons;
-                    ComboBoxMitarbeiterVertretung.ItemsSource = absenceReasons;
+                    ComboBoxKlientVertretung.ItemsSource      = absenceReasons.Where(a => !a.Sichtbarkeit.HasValue || a.Sichtbarkeit.Value != BS.Shared.AbsenceReasonVisibilityType.Employee);
+                    ComboBoxMitarbeiterVertretung.ItemsSource = absenceReasons.Where(a => !a.Sichtbarkeit.HasValue || a.Sichtbarkeit.Value != BS.Shared.AbsenceReasonVisibilityType.Customer); ;

                    AbwesenheitsKategorieComboBox.ItemsSource = absenceReasons;
                });
@@ -1030,11 +993,11 @@ namespace BeWo.SchulbegleitenderDienst
        
        private void CreateModalViewWindow(object obj) 
        {
-            if (obj is CompactEmployeeDC employee)
+            if (obj is CompactEmployeeDC employee && employee.EmployeeOid > 0)
            {
                VMFactory.CreateEmployeeVMAsync(employee.EmployeeOid, cb => this.Dispatch(() => BeWoUtils.OpenModalViewWindow<EmployeeVM, EmployeeDC, VertretungsMainView2>(cb, this, () => this.Dispatch(ReloadAfterEdit))));
            }
-            else if (obj is CompactCustomerDC customer)
+            else if (obj is CompactCustomerDC customer && customer.CustomerOid > 0)
            {
                VMFactory.CreateCustomerVMAsync(customer.CustomerOid, cb => this.Dispatch(() => BeWoUtils.OpenModalViewWindow<CustomerVM, CustomerDC, VertretungsMainView2>(cb, this, () => this.Dispatch(ReloadAfterEdit))));
            }
@@ -1053,22 +1016,142 @@ namespace BeWo.SchulbegleitenderDienst
            }
        }

+
+
+        private void GridDataControlTagesansichtMitarbeiter_OnShowGridMenu(object sender, GridMenuEventArgs e)
+        {
+            AddContextMenu(e);
+        }
+
+        private void GridDataControlTagesansichtKlient_OnShowGridMenu(object sender, GridMenuEventArgs e)
+        {
+            AddContextMenu(e);
+        }
+
        private void GridControlTagesansichtNoSubstitutionWanted_OnShowGridMenu(object sender, GridMenuEventArgs e)
        {
-            var barButtonItem = new BarButtonItem {Content = "Abwesenheit löschen", Tag = e.Source.DataControl.SelectedItem};
-            barButtonItem.ItemClick += DeleteCustomerAbsenceTime_OnClick;
-            e.Customizations.Add(barButtonItem);
+            AddContextMenu(e);
+        }

-            var selectedTagesansichtVM = (TagesansichtVM)barButtonItem.Tag;
-            if (selectedTagesansichtVM != null && selectedTagesansichtVM.Vertreter != null)
+        private void GridDataControlWochenansichtMitarbeiter_OnShowGridMenu(object sender, GridMenuEventArgs e)
+        {
+            AddContextMenu(e);
+        }
+
+
+        private void GridDataControlWochenansichtKlient_ShowGridMenu(object sender, GridMenuEventArgs e)
+        {
+            AddContextMenu(e);
+        }
+
+        private void SubstitutionUnwantedWeekViewGridControl_ShowGridMenu(object sender, GridMenuEventArgs e)
+        {
+            AddContextMenu(e);
+        }
+
+        private void AddContextMenu(GridMenuEventArgs e)
+        {
+            var item = e.Source.DataControl.SelectedItem;
+            TagesansichtVM tvm = null;
+            if (item != null && item is WochenansichtVM)
            {
-                var barButtonItem2 = new BarButtonItem { Content = "Vertretung löschen", Tag = e.Source.DataControl.SelectedItem };
-                barButtonItem2.ItemClick += DeleteVertretung_OnClick;
-                e.Customizations.Add(barButtonItem2);
+                var wvm = item as WochenansichtVM;
+                tvm = wvm.GetFirstTagesansichtVM();
+            }
+            else
+            {
+                tvm = item as TagesansichtVM;
            }
            
+            if (tvm != null)
+            {
+
+                var btn = new BarButtonItem { Content = Translator.Translate("Steckbrief anzeigen") };
+                btn.ItemClick += ShowCharacteristics;
+
+                if (!String.IsNullOrEmpty(e.MenuInfo.Column?.FieldName) && e.MenuInfo.Column.FieldName.Contains("Employee"))
+                {
+                    btn.Tag = tvm.Employee;
+                }
+                else if (!String.IsNullOrEmpty(e.MenuInfo.Column?.FieldName) && e.MenuInfo.Column.FieldName.Contains("Vertret"))
+                {
+                    btn.Tag = tvm.Vertreter;
+                }
+                if (btn.Tag == null)
+                {
+                    if (tvm.Customer != null)
+                    {
+                        btn.Tag = tvm.Customer;
+                    }
+                    else
+                    {
+                        btn.Tag = tvm.Employee;
+                    }
+                    
+                }
+                e.Customizations.Add(btn);
+
+                if (tvm.MailCustomer != null && !String.IsNullOrEmpty(tvm.MailCustomer.Receiver))
+                {
+                    btn = new BarButtonItem { Content = Translator.Translate("E-Mail an Klient/in senden"), Tag = tvm.MailCustomer };
+                    btn.ItemClick += SendMail_OnClick;
+                    e.Customizations.Add(btn);
+                }
+                if (tvm.MailEmployee != null && !String.IsNullOrEmpty(tvm.MailEmployee.Receiver))
+                {
+                    btn = new BarButtonItem { Content = Translator.Translate("E-Mail an Mitarbeiter/in senden"), Tag = tvm.MailEmployee };
+                    btn.ItemClick += SendMail_OnClick;
+                    e.Customizations.Add(btn);
+                }
+                if (tvm.MailVertretung != null && !String.IsNullOrEmpty(tvm.MailVertretung.Receiver))
+                {
+                    btn = new BarButtonItem { Content = Translator.Translate("E-Mail an Vertretung senden"), Tag = tvm.MailVertretung };
+                    btn.ItemClick += SendMail_OnClick;
+                    e.Customizations.Add(btn);
+                }
+                if (tvm.MailSchule != null && !String.IsNullOrEmpty(tvm.MailSchule.Receiver))
+                {
+                    btn = new BarButtonItem { Content = Translator.Translate("E-Mail an die Schule senden"), Tag = tvm.MailSchule };
+                    btn.ItemClick += SendMail_OnClick;
+                    e.Customizations.Add(btn);
+                }
+                
+                if (tvm.Absencetime != null)
+                {
+                    e.Customizations.Add(new DevExpress.Xpf.Bars.BarItemSeparator());
+
+                    btn = new BarButtonItem { Content = "Abwesenheit löschen", Tag = tvm };
+                    btn.ItemClick += DeleteAbsenceTime_OnClick;
+                    e.Customizations.Add(btn);
+                }
+                if (tvm.Vertreter != null)
+                {
+                    if (tvm.Absencetime == null)
+                    {
+                        e.Customizations.Add(new DevExpress.Xpf.Bars.BarItemSeparator());
+                    }
+
+                    btn = new BarButtonItem { Content = "Vertretung löschen", Tag = tvm };
+                    btn.ItemClick += DeleteVertretung_OnClick;
+                    e.Customizations.Add(btn);
+                }
+            }
        }

+        private void DeleteAbsenceTime_OnClick(object sender, RoutedEventArgs e)
+        {
+            var barButtonItem = (BarButtonItem)sender;
+            var selectedTagesansichtVM = (TagesansichtVM)barButtonItem.Tag;
+
+            if (MessageBox.Show("Möchten Sie die Abwesenheit wirklich löschen?", "Abwesenheit löschen", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.Yes)
+            {
+                _Tagesvertretung.DeleteKrankmeldung(selectedTagesansichtVM, ShowDeletionMessageBox(selectedTagesansichtVM.Absencetime), Datepicker.DateTime.Date);
+
+                LadeTagesansicht(Datepicker.DateTime);
+            }
+        }
+
+
        private void DeleteCustomerAbsenceTime_OnClick(object sender, RoutedEventArgs e)
        {
            var barButtonItem = (BarButtonItem) sender;
@@ -1082,6 +1165,18 @@ namespace BeWo.SchulbegleitenderDienst
            }
        }

+        private void DeleteMitarbeiterKrankmeldung_OnClick(object sender, RoutedEventArgs e)
+        {
+            if (MessageBox.Show("Möchten Sie die Abwesenheit wirklich löschen?", "Abwesenheit löschen", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.Yes)
+            {
+                var selectedViewModel = (TagesansichtVM)GridControlTagesansichtMitarbeiter.SelectedItem;
+
+                _Tagesvertretung.DeleteKrankmeldung(selectedViewModel, ShowDeletionMessageBox(selectedViewModel.Absencetime), Datepicker.DateTime.Date);
+
+                LadeTagesansicht(Datepicker.DateTime.Date);
+            }
+        }
+
        private void DeleteVertretung_OnClick(object sender, RoutedEventArgs e)
        {
            var barButtonItem = (BarButtonItem)sender;
@@ -1095,6 +1190,17 @@ namespace BeWo.SchulbegleitenderDienst
            }
        }

+        private void SendMail_OnClick(object sender, RoutedEventArgs e)
+        {
+            var barButtonItem = (BarButtonItem)sender;
+            var mail = (MailDC)barButtonItem.Tag;
+
+            if (mail != null)
+            {
+                BeWoUtils.OpenMailClient(mail.Receiver, mail.Subject, mail.Message);
+            }
+        }
+
        private void GridControlSubUnwanted_OnCellValueChanged(object sender, CellValueChangedEventArgs e)
        {
            _Tagesvertretung.UpdateRowData((TagesansichtVM) SubstitutionUnwantedDayViewGridControl.SelectedItem);
@@ -1111,5 +1217,209 @@ namespace BeWo.SchulbegleitenderDienst
            var x = Datepicker.DateTime.FirstDateOfWeek(Datepicker.DateTime.GetIso8601WeekOfYear());
            LadeWochenansicht(x, x.AddDays(5));
        }
+
+
+        private void TableView_MouseMove_Tagesansicht(object sender, System.Windows.Input.MouseEventArgs e)
+        {
+            var tv = sender as TableView;
+            var hitInfo = tv.CalcHitInfo(e.OriginalSource as DependencyObject);
+            var vm = tv.DataControl.GetRow(hitInfo.RowHandle) as TagesansichtVM;
+
+            //if (tooltipX > 0 && tooltipY > 0)
+            //{
+            //    //var p = e.GetPosition(this);
+
+            //    //if (Math.Abs(tooltipX - p.X) > 10 || Math.Abs(tooltipY - p.Y) > 10)
+            //    //{
+            //    //    PopupTooltip.IsOpen = false;
+            //    //    tooltipX = 0;
+            //    //    tooltipY = 0;
+            //    //}
+                
+            //}
+            //else 
+            if (vm != null && hitInfo.Column != null)
+            {
+                String tt = vm.CustomerToolTip;
+                String fn = hitInfo.Column.FieldName.ToLower();
+
+                if (fn.Contains("employee"))
+                {
+                    tt = vm.EmployeeToolTip;
+                }
+                else if (fn.Contains("vertret"))
+                {
+                    tt = vm.VertreterToolTip;
+                }
+                if (!String.IsNullOrEmpty(tt))
+                {
+                    Grid g = new Grid();
+
+                    SetTooltipXaml(tt, g);
+                    //ToolTip t = new ToolTip();
+                    //t.Content = g;
+                    //if (tv.DataControl.ToolTip != null)
+                    //{
+                    //    var told = (ToolTip)tv.DataControl.ToolTip;
+                        
+                    //    tv.DataControl.ToolTip = null;
+                        
+                    //}
+                    
+                    tv.DataControl.ToolTip = g;
+                    //t.UpdateLayout();
+                    //tv.DataControl.ToolTip = g;
+                    
+                }
+                else
+                {
+                    
+                }
+                //var p = e.GetPosition(this);
+                //tooltipX = p.X;
+                //tooltipY = p.Y;
+                //var column = hitInfo.Column;
+                ////SetTooltipXaml(vm.ToolTip);
+                //var test = e.GetPosition(tv.DataControl);
+                //PopupTooltip.PlacementTarget = tv.DataControl;
+                //PopupTooltip.Placement = PlacementMode.Left;
+                //PopupTooltip.HorizontalOffset = 3;
+                //PopupTooltip.VerticalOffset = 3;
+
+
+                //PopupTooltip.PopupAnimation = PopupAnimation.Fade;
+
+                ////PopupTooltip.IsOpen = true;
+
+            }
+
+        }
+
+        private void TableView_MouseMove_Wochenansicht(object sender, System.Windows.Input.MouseEventArgs e)
+        {
+            var tv = sender as TableView;
+            var hitInfo = tv.CalcHitInfo(e.OriginalSource as DependencyObject);
+            var vm = tv.DataControl.GetRow(hitInfo.RowHandle) as WochenansichtVM;
+
+            if (vm != null && hitInfo.Column != null)
+            {
+                String tt = "";
+
+                String fn = hitInfo.Column.FieldName.ToLower();
+                
+                if (fn.Contains("itemmo") && vm.ItemMo != null)
+                {
+                    tt = vm.ItemMo.VertreterToolTip;
+                }
+                else if (fn.Contains("itemdi") && vm.ItemDi != null)
+                {
+                    tt = vm.ItemDi.VertreterToolTip;
+                }
+                else if (fn.Contains("itemmi") && vm.ItemMi != null)
+                {
+                    tt = vm.ItemMi.VertreterToolTip;
+                }
+                else if (fn.Contains("itemdo") && vm.ItemDo != null)
+                {
+                    tt = vm.ItemDo.VertreterToolTip;
+                }
+                else if (fn.Contains("itemfr") && vm.ItemFr != null)
+                {
+                    tt = vm.ItemFr.VertreterToolTip;
+                }
+                else if (fn.Contains("itemsa") && vm.ItemSa != null)
+                {
+                    tt = vm.ItemSa.VertreterToolTip;
+                }
+                else
+                {
+                    TagesansichtVM tvm = vm.GetFirstTagesansichtVM();
+                    
+                    if (tvm != null)
+                    {
+                        tt = tvm.CustomerToolTip;
+                        if (fn.Contains("employee"))
+                        {
+                            tt = tvm.EmployeeToolTip;
+                        }
+                        else if (fn.Contains("vertret"))
+                        {
+                            tt = tvm.VertreterToolTip;
+                        }
+                    }
+                    
+                }
+                if (!String.IsNullOrEmpty(tt))
+                {
+                    Grid g = new Grid();
+
+                    SetTooltipXaml(tt, g);
+                    
+                    tv.DataControl.ToolTip = g;
+                }
+                
+            }
+
+        }
+        private void PopupTooltipGrid_MouseLeave(object sender, System.Windows.Input.MouseEventArgs e)
+        {
+            //PopupTooltip.IsOpen = false;
+        }
+
+        public void SetTooltipXaml(string xamlCode, Grid parent)
+        {
+            try
+            {
+                if (XamlReader.Parse(xamlCode) is UIElement element)
+                {
+                    parent.Children.Add(element);
+                }
+            }
+            catch (Exception e)
+            {
+                //ignore
+            }
+        }
+
+        private void LinkPdfExport_OnRequestNavigate(object sender, RequestNavigateEventArgs e)
+        {
+            UpdateReportUri();
+            BeWoUtils.NavigateToReportUri((sender as System.Windows.Documents.Hyperlink).NavigateUri.ToString(), Translator.Translate("Vertretungsplanung"));
+        }
+
+        private void UpdateReportUri()
+        {
+            int ansicht = 1;
+            if (ScrollViewerWochenansicht.Visibility == Visibility.Visible)
+            {
+                ansicht = 2;
+            }
+
+            var url = BeWoApp.SiteOfOrigin
+                        + "/ReportView.aspx"
+                        + "?type=" + Utils.EnumName(ReportTypes.VertretungsPlanung)
+                        + "&dt=" + Datepicker.DateTime.Date.ToString("dd.MM.yyyy")
+                        + "&ansicht=" + ansicht;
+
+
+            linkPdfExport.NavigateUri = new Uri(url);
+        }
+
+
+        
+
+
+        //private void TableView_SizeChanged(object sender, SizeChangedEventArgs e)
+        //{
+        //    var view = sender as TableView;
+
+        //    var height = view.ActualHeight;
+        //    if (height > 1000)
+        //    {
+        //        height = 1000;
+        //    }
+        //    var expander = view.DataControl.GetVisualParent<BeWo.Controls.ExpanderPanel>();
+        //    //expander.Height = height + 40;
+        //}
    }
 }
--- a/BeWo/SchulbegleitenderDienst/VertretungsSearchView.xaml
+++ b/BeWo/SchulbegleitenderDienst/VertretungsSearchView.xaml
@@ -100,34 +100,42 @@
            <Label Grid.Row="1" Grid.Column="0" Content="Vertretung bis" Margin="3" />
            <dxe:DateEdit x:Name="KVDatepickerVon" EditValue="{Binding Path=SubstitutionStart, UpdateSourceTrigger=PropertyChanged}" MaskType="DateTimeAdvancingCaret" AllowNullInput="False" Grid.Column="1" Grid.Row="0"  Margin="3" Height="23" Width="125" />
            <dxe:DateEdit x:Name="KVDatepickerBis" EditValue="{Binding Path=SubstitutionEnd, UpdateSourceTrigger=PropertyChanged}" MaskType="DateTimeAdvancingCaret" AllowNullInput="False" Grid.Column="1" Grid.Row="1"  Margin="3" Height="23" Width="125" />
-            <Label x:Name="lblZuletztVertreten" Grid.Row="0" Grid.Column="5" Margin="3" Content="Letzte Vertretung" />
-            <ListBox Grid.Row="0" Grid.Column="6" Width="200" Grid.RowSpan="2" Margin="3" x:Name="ListBoxLetzteVertreter" LostFocus="LetzteVertreter_OnLostFocus" SelectionChanged="LetzteVertreter_OnSelectionChanged" />
+                        <Label Grid.Column="2" Grid.Row="0" Content="Uhrzeit" Margin="3" />
+                        <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" x:Name="startTime" Height="23" Width="60" Margin="3"/>
+                        <Label Grid.Column="2" Grid.Row="1" Content="Uhrzeit" Margin="3" />
+                        <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" x:Name="endTime" Height="23" Width="60" Margin="3"/>
+
+                        <Label x:Name="lblZuletztVertreten" Grid.Row="0" Grid.Column="5" Margin="3" Content="Letzte Vertretung" />
+            <ListBox Grid.Row="0" Grid.Column="6" Width="200" Height="54" Grid.RowSpan="2" Margin="3" x:Name="ListBoxLetzteVertreter" LostFocus="LetzteVertreter_OnLostFocus" SelectionChanged="LetzteVertreter_OnSelectionChanged" />
          </Grid>
        </GroupBox>
-        <GroupBox Header="Filter" Grid.Row="2" Grid.Column="0" Style="{StaticResource ObjectEditGroupBox}" Margin="3,3,3,3" >
+        <GroupBox Header="" Grid.Row="2" Grid.Column="0" Style="{StaticResource ObjectEditGroupBox}" Margin="3,3,3,3" >
          <Grid >
            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="Auto" />
-              <ColumnDefinition Width="Auto"/>
-            </Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
            <Grid.RowDefinitions>
              <RowDefinition Height="Auto"/>
              <RowDefinition Height="Auto"/>
              <RowDefinition Height="*"/>
            </Grid.RowDefinitions>
-            <WrapPanel Orientation="Horizontal" Grid.ColumnSpan="3" Margin="0,3,0,3">
-              <CheckBox Content="männlich"  Margin="3,0,3,0" Click="RBMaennlich_OnClick"  x:Name="RBMaennlich" IsChecked="True" VerticalAlignment="Center"/>
-              <CheckBox Content="weiblich"  Margin="3,0,3,0" Click="RBWeiblich_OnClick"   x:Name="RBWeiblich" IsChecked="True" VerticalAlignment="Center"/>
-              <WrapPanel Orientation="Horizontal" HorizontalAlignment="Left" >
+            <WrapPanel Orientation="Horizontal" Margin="0,3,0,3">
+                            <CheckBox Content="{markup:Translate männlich}"  Margin="3,0,3,0" Click="RBMaennlich_OnClick"  x:Name="RBMaennlich" IsChecked="True" VerticalAlignment="Center"/>
+                            <CheckBox Content="{markup:Translate weiblich}"  Margin="3,0,3,0" Click="RBWeiblich_OnClick"   x:Name="RBWeiblich" IsChecked="True" VerticalAlignment="Center"/>
+              
                <Label Content="PLZ:" Margin="10,0,3,0"/>
                <dxe:TextEdit x:Name="PlzKlient" Margin="3,0,3,0" Height="23" Width="70" VerticalContentAlignment="Center" EditValueChanged="PlzKlient_OnTextChanged"  MaskType="RegEx" Mask="\d{1,5}"  ShowError="False"  />
-              </WrapPanel>
-              <WrapPanel Orientation="Horizontal" HorizontalAlignment="Right" >
+              
+              
                <Label Content="Ort:" Margin="3,0,3,0"/>
                <TextBox x:Name="OrtKlient" Margin="3,0,3,0" Height="23" Width="200" VerticalContentAlignment="Center" TextChanged="OrtKlient_OnTextChanged" />
-              </WrapPanel>
-            </WrapPanel>
-          </Grid>
+              
+                            <CheckBox Content="{markup:Translate Verwende Abstandsmessung}"  Margin="3,0,3,0" x:Name="chkEntfernungssuche" IsChecked="False" VerticalAlignment="Center" ToolTip="{markup:Translate Das Aktivieren der Option verwendet die Google Suche um den Abstand zwischen Adressen zu messen. Dieser Vorgang kann etwas mehr Zeit benötigen.}"/>
+                        </WrapPanel>
+                        <Button Grid.Row="1" Content="Suche starten" Width="90" Click="ButtonSuche_OnClick" Margin="3,3,3,3" HorizontalAlignment="Right" />
+                    </Grid>
        </GroupBox>
        <dxg:GridControl x:Name="GridControlPossibleVertreter" Grid.Row="3" Grid.Column="0" Margin="3,3,3,3" Visibility="Visible" Height="200">
          <dxg:GridControl.Columns>
@@ -140,7 +148,7 @@
            <dxg:GridColumn FieldName="Geschlecht" ReadOnly="True" Header="Geschlecht" />
          </dxg:GridControl.Columns>
          <dxg:GridControl.View>
-            <dxg:TableView AllowPerPixelScrolling="True" BestFitMode="AllRows" AllowBestFit="True" ShowTotalSummary="False" ShowGroupPanel="False" RowDoubleClick="TableView_OnRowDoubleClick" />
+            <dxg:TableView AllowPerPixelScrolling="True" BestFitMode="AllRows" AllowBestFit="True" ShowTotalSummary="False" ShowGroupPanel="False" RowDoubleClick="TableView_OnRowDoubleClick" ShowGridMenu="TableView_OnShowGridMenu"/>
          </dxg:GridControl.View>
        </dxg:GridControl>
        <StackPanel Grid.Row="4"  Grid.Column="0" Margin="3" >
--- a/BeWo/SchulbegleitenderDienst/VertretungsSearchView.xaml.cs
+++ b/BeWo/SchulbegleitenderDienst/VertretungsSearchView.xaml.cs
@@ -14,6 +14,10 @@ using BS.Shared.Core;
 using BS.Shared.DataContracts.Compact;
 using DevExpress.Xpf.Editors;
 using DevExpress.Xpf.Grid;
+using BS.Shared.DataContracts;
+using DevExpress.Xpf.Bars;
+using BeWo.Core;
+using BS.SharedLauncher.Translation;

 namespace BeWo.SchulbegleitenderDienst
 {
@@ -136,6 +140,12 @@ namespace BeWo.SchulbegleitenderDienst
            Loaded += VertretungsSearchView_Loaded;

            CommandBindings.Add(new CommandBinding(ApplicationCommands.Close, (s, e) => { Close(); }));
+
+            if (!BeWoApp.AppSettings.UseDistanceApi)
+            {
+                chkEntfernungssuche.Visibility = Visibility.Collapsed;
+            }
+
        }

        private void VertretungsSearchView_Loaded(object sender, EventArgs e)
@@ -159,25 +169,27 @@ namespace BeWo.SchulbegleitenderDienst
            var end = _Tagesansicht.Datum;
            
            var assistanceTime = _Tagesansicht.AssistanceTimeEntry;
-
-            var assistanceTimeDates = DateTimeUtils.GetAssistanceTimeComparisonDateTime(assistanceTime.UhrzeitVon, assistanceTime.UhrzeitBis, start);
-
-            start = assistanceTimeDates.Start;
-
-            end = assistanceTimeDates.End;
-
-            if (_Tagesansicht.Vertretung != null)
+            if (assistanceTime != null)
            {
-                start = _Tagesansicht.Vertretung.VertretungsZeitraumVon;
-                end = _Tagesansicht.Vertretung.VertretungsZeitraumBis;
+                var assistanceTimeDates = DateTimeUtils.GetAssistanceTimeComparisonDateTime(assistanceTime.UhrzeitVon, assistanceTime.UhrzeitBis, start);
+
+                start = assistanceTimeDates.Start;
+
+                end = assistanceTimeDates.End;
+
+                if (_Tagesansicht.Vertretung != null)
+                {
+                    start = _Tagesansicht.Vertretung.VertretungsZeitraumVon;
+                    end = _Tagesansicht.Vertretung.VertretungsZeitraumBis;
+                }
+
+
+                start = currentDate.Date;
+                end = currentDate.Date;
+
+                SubstitutionStart = start;
+                SubstitutionEnd = end;
            }
-
-
-            start = currentDate.Date;
-            end = currentDate.Date;
-
-            SubstitutionStart = start;
-            SubstitutionEnd = end;
        }

        private void RootGroupBox_OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
@@ -197,8 +209,7 @@ namespace BeWo.SchulbegleitenderDienst
 	    {
 	        lblCustomerName.Content = string.Empty;
 	        lblSchoolName.Content = string.Empty;
-	        lblBetreuungszeiten.Content = string.Empty;
-            
+	        
            if (_Tagesansicht.Customer != null)
            {
                lblCustomerName.Content = String.Format("{0}\n{1}\n{2} {3}", _Tagesansicht.Customer.Name,
@@ -210,15 +221,12 @@ namespace BeWo.SchulbegleitenderDienst
 	            var c2o = _Tagesansicht.Schools[0];
 	            var schule = c2o.Organisation;

-	            lblSchoolName.Content = String.Format("{0}\n{1}\n{2} {3}", schule.Name, schule.Street, schule.PostalCode, schule.Town);
+	            lblSchoolName.Content = String.Format("{0}\n{1}\n{2} {3} {4}", schule.Name, schule.Street, schule.PostalCode, schule.Town, c2o.Customer2OrganisationNotice);
 	            //    _Tagesansicht.Schule.Street, _Tagesansicht.Schule.PostalCode, _Tagesansicht.Schule.Town);
 	        }

-	        if (_Tagesansicht.AssistanceTimeEntry != null)
-	        {
-	            lblBetreuungszeiten.Content = _Tagesansicht.AssistanceTimeEntry.ToString();
-            }
-	        
+	        lblBetreuungszeiten.Content = _Tagesansicht.AlleBetreuungszeiten;
+            
 	            //"Montag 09:00 - 12:00\nDienstag 10:00 - 11:00\nMittwoch 08:00 - 12:00\nDonnerstag 08:00 - 12:00\nFreitag 08:00 - 12:00";
 	    }

@@ -236,6 +244,7 @@ namespace BeWo.SchulbegleitenderDienst
        private void SucheVertreter()
        {
            _dataListEmployee.Clear();
+            GridControlPossibleVertreter.ItemsSource = null;
            long? customerOid = null;
            var dateTime = DateTime.Now;

@@ -249,8 +258,43 @@ namespace BeWo.SchulbegleitenderDienst
                dateTime = _Tagesansicht.Datum;
            }

-            // TODO: GetAllActiveVertreterEmployeesCompact neuschreiben und AssistanceTimeEntry mitübergeben
-            ServiceFacade.DoEmployeeServiceAsync(s => s.GetAllActiveVertreterEmployeesCompact(customerOid, dateTime), r => this.Dispatch(delegate
+            var filter = new VertreterSucheFilterDC();
+            filter.CustomerOid = customerOid;
+            DateTime start = SubstitutionStart.Date;
+            DateTime ende = SubstitutionEnd.Date;
+
+            if (!String.IsNullOrEmpty(startTime.Text))
+            {
+                DateTime d = DateTime.Now;
+                var dateStr = String.Format("{0:dd.MM.yyyy} {1}", start, startTime.Text);
+                if (DateTime.TryParse(dateStr, out d))
+                {
+                    start = d;
+                }
+            }
+            if (!String.IsNullOrEmpty(endTime.Text))
+            {
+                DateTime d = DateTime.Now;
+                var dateStr = String.Format("{0:dd.MM.yyyy} {1}", ende, endTime.Text);
+                if (DateTime.TryParse(dateStr, out d))
+                {
+                    ende = d;
+                }
+            }
+            filter.StartDate = start;
+            filter.EndDate = ende;
+            filter.Weiblich = RBWeiblich.IsChecked.Value;
+            filter.Maennlich = RBMaennlich.IsChecked.Value;
+            filter.PLZ = PlzKlient.Text;
+            filter.Ort = OrtKlient.Text;
+            filter.Wunschkriterien = (List<String>)TokenBoxWunschAnzeige.EditValue;
+            filter.Ausschlusskriterien = (List<String>)TokenBoxAusschlussAnzeige.EditValue;
+
+            if (chkEntfernungssuche.Visibility == Visibility.Visible)
+            {
+                filter.VerwendeEntfernungssuche = chkEntfernungssuche.IsChecked.Value;
+            }
+            ServiceFacade.DoEmployeeServiceAsync(s => s.SucheVertreter(filter), r => this.Dispatch(delegate
            {
                GridControlPossibleVertreter.Visibility = Visibility.Hidden;
                ((TableView)GridControlPossibleVertreter.View).VerticalScrollbarVisibility = ScrollBarVisibility.Disabled;
@@ -299,6 +343,11 @@ namespace BeWo.SchulbegleitenderDienst
            return result;
        }

+        private void ButtonSuche_OnClick(object sender, RoutedEventArgs e)
+        {
+            SucheVertreter();
+        }
+
        private void ButtonBase_OnClick(object sender, RoutedEventArgs e)
        {
            if(!(GridControlPossibleVertreter.SelectedItem is SearchViewDaten item))
@@ -747,6 +796,38 @@ namespace BeWo.SchulbegleitenderDienst
            CloseSearchView(item);
        }

+        private void TableView_OnShowGridMenu(object sender, GridMenuEventArgs e)
+        {
+            AddContextMenu(e);
+        }
+
+        private void AddContextMenu(GridMenuEventArgs e)
+        {
+            var item = e.Source.DataControl.SelectedItem;
+
+
+            var btn = new BarButtonItem { Content = Translator.Translate("Steckbrief anzeigen") };
+            btn.ItemClick += ShowCharacteristics;
+            btn.Tag = item;
+                
+            e.Customizations.Add(btn);
+
+        }
+
+        private void ShowCharacteristics(object sender, RoutedEventArgs e)
+        {
+
+            var url = $"{BeWoApp.SiteOfOrigin}/ReportView.aspx";
+
+            var btn = sender as BarButtonItem;
+            var sd = btn.Tag as SearchViewDaten;
+            url += $"?type={ReportTypes.SBDEmployeeReport}&employeeOid={sd.EmployeeDC.EmployeeOid}";
+            
+
+            BeWoUtils.NavigateToReportUri(url, "Steckbrief");
+
+        }
+
        private void CloseSearchView(SearchViewDaten item)
        {
            var vertreter = item.EmployeeDC.CompactEmployee;
--- a/BeWo/SchulbegleitenderDienst/View/SbdOrganisationView.xaml
+++ b/BeWo/SchulbegleitenderDienst/View/SbdOrganisationView.xaml
@@ -0,0 +1,78 @@
+<localView:BeWoView x:Class="BeWo.SchulbegleitenderDienst.View.SbdOrganisationView"
+					xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+					xmlns:localView="clr-namespace:BeWo.View"
+					xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
+					xmlns:validation="clr-namespace:BeWo.Validation"
+					xmlns:shared="clr-namespace:BS.Shared;assembly=BS.Shared"
+					xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
+                    xmlns:t="clr-namespace:BeWo.MultiLanguage.Markup"
+					Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
+					VerticalAlignment="Stretch" Focusable="True">
+
+  <Grid Name="root" >
+    <Grid.RowDefinitions>
+      <RowDefinition Height="*" />
+    </Grid.RowDefinitions>
+
+        <WrapPanel Orientation="Horizontal">
+            <GroupBox Header="{t:Translate Freie Tage}" Style="{StaticResource ObjectEditGroupBox}" MaxWidth="400">
+        <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="Auto" />
+          </Grid.ColumnDefinitions>
+          <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+          </Grid.RowDefinitions>
+
+                    <Button Name="button_addFeiertag" Click="button_addFeiertag_Click" Grid.Row="2" Grid.Column="0"
+              Height="25" Margin="3,3,3,3" IsDefault="True" Padding="5,0,5,1" HorizontalAlignment="Left" Content="{t:Translate Neuen Tag hinzufügen}"></Button>
+
+          <dxg:GridControl x:Name="DatagridFeiertage" Margin="0,10,0,0" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="3" DataSource="{Binding VMList}">
+            <dxg:GridControl.Columns>
+              <dxg:GridColumn FieldName="IsDeleteable" Header="" FixedWidth="True" Width="24" ReadOnly="True">
+                <dxg:GridColumn.CellTemplate>
+                  <DataTemplate>
+                    <Button Content="r" Click="DeleteButton_Click" Visibility="{Binding Path=EditValue, Converter={StaticResource BoolVisibilityConverter}}" FontFamily="Webdings" Width="18" Height="18" VerticalAlignment="Center" />
+                  </DataTemplate>
+                </dxg:GridColumn.CellTemplate>
+              </dxg:GridColumn>
+              <dxg:GridColumn FieldName="Name" Header="Bezeichnung">
+                  <dxg:GridColumn.CellStyle>
+                      <Style TargetType="{x:Type dxg:LightweightCellEditor}" >
+                          <Style.Triggers>
+                              <DataTrigger Binding="{Binding RowData.Row.IsSystem}" Value="True">
+                                  <Setter Property="Background" Value="#FFCA7F" />
+                              </DataTrigger>
+                          </Style.Triggers>
+                      </Style>
+                  </dxg:GridColumn.CellStyle>
+              </dxg:GridColumn>
+              <dxg:GridColumn FieldName="Datum" Header="Datum" SortOrder="Ascending">
+                    <dxg:GridColumn.CellStyle>
+                        <Style TargetType="{x:Type dxg:LightweightCellEditor}" >
+                            <Style.Triggers>
+                                <DataTrigger Binding="{Binding RowData.Row.IsSystem}" Value="True">
+                                    <Setter Property="Background" Value="#FFCA7F" />
+                                </DataTrigger>
+                            </Style.Triggers>
+                        </Style>
+                    </dxg:GridColumn.CellStyle>
+              </dxg:GridColumn>
+            </dxg:GridControl.Columns>
+            <dxg:GridControl.View>
+              <dxg:TableView AutoWidth="true" ShowGroupPanel="False" ShowGroupedColumns="false" ShowTotalSummary="False" NavigationStyle="Cell" />
+            </dxg:GridControl.View>
+          </dxg:GridControl>
+        </Grid>
+      </GroupBox>
+    </WrapPanel>
+  </Grid>
+
+	
+</localView:BeWoView>
--- a/BeWo/SchulbegleitenderDienst/View/SbdOrganisationView.xaml.cs
+++ b/BeWo/SchulbegleitenderDienst/View/SbdOrganisationView.xaml.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows;
+
+using BeWo.Core;
+using BeWo.SchulbegleitenderDienst.ViewModel;
+using BeWo.ServiceProxy;
+using BeWo.Validation;
+using BeWo.ViewModel;
+using BeWo.ViewModel.ListViewModel;
+
+using BS.Shared.Extensions;
+
+namespace BeWo.SchulbegleitenderDienst.View
+{
+	public partial class SbdOrganisationView
+	{
+		private FeiertagListVM _ViewModel;
+		
+		public FeiertagListVM ViewModel
+		{
+			get { return _ViewModel; }
+			set
+			{
+				_ViewModel = value;
+				root.DataContext = value;
+			}
+		}
+        
+		public override bool IsDirty
+		{
+			get { return ViewModel != null && ViewModel.IsDirty; }
+		}
+
+		public SbdOrganisationView(FeiertagListVM pViewModel)
+		{
+			InitializeComponent();
+			ViewModel = pViewModel;
+		}
+
+        private void button_addFeiertag_Click(object sender, RoutedEventArgs e)
+		{
+		    if (ValidationTrigger.Validate(this))
+		        ViewModel.AddNewVMToList();
+        }
+
+		private void DeleteButton_Click(object sender, RoutedEventArgs e)
+		{
+		    var lVM = DatagridFeiertage.GetCurrentValue<FeiertagVM>();
+		    if (lVM == null) return;
+
+		    ViewModel.VMList.Remove(lVM);
+		    BeWoWpfUtils.RefreshDXGrid(DatagridFeiertage);
+        }
+
+	}
+}
--- a/BeWo/SchulbegleitenderDienst/WochenVertretung.cs
+++ b/BeWo/SchulbegleitenderDienst/WochenVertretung.cs
@@ -120,8 +120,11 @@ namespace BeWo.SchulbegleitenderDienst
            }
        }

-        public void AddeNeueVertretungforWochenAnsicht(WochenansichtVM wochenVm, string tag)
+        private bool _VertretungAusgewaehlt = false;
+
+        public bool AddeNeueVertretungforWochenAnsicht(WochenansichtVM wochenVm, string tag)
        {
+            _VertretungAusgewaehlt = false;
            TagesansichtVM tagesVm = null;

            if (tag.Contains("ItemMo"))
@@ -150,16 +153,21 @@ namespace BeWo.SchulbegleitenderDienst
            }
            
            if (tagesVm != null)
-            { 
+            {
+                
                var view = new VertretungsSearchView(tagesVm.Datum, tagesVm.Customer, tagesVm, wochenVm, wochenVm.Employee);

                view.RaiseCustomEvent += KlientenWochen_RaiseCustomEvent;
                view.ShowDialog();
+
+                
            }
+            return _VertretungAusgewaehlt;
        }

        public void KlientenWochen_RaiseCustomEvent(object sender, VertretungSelectedEventArgs e)
        {
+            _VertretungAusgewaehlt = true;
            UpdateMitarbeiterToVertretungKlientenWochenansicht(e.Employee, e.VertretungVon, e.VertretungBis, e.TagesItem, e.WochenItem);
        }

--- a/BeWo/SchulbegleitenderDienst/WochenansichtVM.cs
+++ b/BeWo/SchulbegleitenderDienst/WochenansichtVM.cs
@@ -20,5 +20,35 @@ namespace BeWo.SchulbegleitenderDienst
        public Dictionary<string, Dictionary<DateTime, TagesansichtVM>> VertretungsWoche { get; set; }

        public Dictionary<string, Dictionary<DateTime, TagesansichtVM>> KlientvertretungsWoche { get; set; }
+
+        public TagesansichtVM GetFirstTagesansichtVM()
+        {
+            if (ItemMo != null)
+            {
+                return ItemMo;
+            }
+            else if (ItemDi != null)
+            {
+                return ItemDi;
+            }
+            else if (ItemMi != null)
+            {
+                return ItemMi;
+            }
+            else if (ItemDo != null)
+            {
+                return ItemDo;
+            }
+            else if (ItemFr != null)
+            {
+                return ItemFr;
+            }
+            else if (ItemSa != null)
+            {
+                return ItemSa;
+            }
+
+            return null;
+        }
    }
 }
--- a/BeWo/ServiceProxy/Generated.cs
+++ b/BeWo/ServiceProxy/Generated.cs
--- a/BeWo/ServiceProxy/ServiceFacade.cs
+++ b/BeWo/ServiceProxy/ServiceFacade.cs
@@ -86,6 +86,20 @@ namespace BeWo.ServiceProxy
 			DoAsync<AccountingServiceClient, IAccountingService>(pAction, callback, true);
 		}

+		public static T DoAccountingServiceSync<T>(Func<IAccountingService, T> pFunc)
+		{
+			try
+			{
+				return pFunc.Invoke(GetInstance<AccountingServiceClient, IAccountingService>());
+			}
+			catch (Exception e)
+			{
+				ShowErrorMessage(e);
+			}
+
+			return default(T);
+		}
+
 		public static void DoAnalysisServiceAsync<T>(Func<IAnalysisService, T> pFunc, Action<T> pCallBack)
 		{
 			DoAsync<AnalysisServiceClient, IAnalysisService, T>(pFunc, pCallBack, true);
@@ -865,7 +879,7 @@ namespace BeWo.ServiceProxy
 			{
 				var lBeWoFault = (e as FaultException<BeWoFault>).Detail;

-				String rowUpdated = "Der Datensatz wurde in der Zwischenzeit von " + BS.Shared.Translation.Translator.Translate("einem anderen Benutzer") + " geändert. Ihre Änderungen konnten leider NICHT gespeichert werden. Das Problem tritt auf, wenn mehrere " + BS.Shared.Translation.Translator.Translate("BenutzerPlural") + " gleichzeitig den gleichen Datensatz bearbeiten.\n\nSie müssen den Datensatz schließen und erneut öffnen, um die Änderungen vornehmen zu können.";
+				String rowUpdated = "Der Datensatz wurde in der Zwischenzeit von " + BS.SharedLauncher.Translation.Translator.Translate("einem anderen Benutzer") + " geändert. Ihre Änderungen konnten leider NICHT gespeichert werden. Das Problem tritt auf, wenn mehrere " + BS.SharedLauncher.Translation.Translator.Translate("BenutzerPlural") + " gleichzeitig den gleichen Datensatz bearbeiten.\n\nSie müssen den Datensatz schließen und erneut öffnen, um die Änderungen vornehmen zu können.";
 				switch (lBeWoFault.FaultType)
 				{
 					case BeWoFaultType.Concurrency:
@@ -885,6 +899,10 @@ namespace BeWo.ServiceProxy
 						{
 							BeWoApp.ShowError(rowUpdated, e, false);
 						}
+						else if (!String.IsNullOrEmpty(lBeWoFault.Message) && lBeWoFault.Message.IndexOf("überschreitet") >= 0 && lBeWoFault.Message.IndexOf("erlaubte Größe") >= 0)
+						{
+							BeWoApp.ShowError(lBeWoFault.Message, e, false);
+						}
 						else
 						{
 							if (!String.IsNullOrEmpty(lBeWoFault.Message))
@@ -901,7 +919,22 @@ namespace BeWo.ServiceProxy
 			}
 			else
 			{
-				BeWoApp.ShowError(null, e, true);
+				String allMessage = String.Format("{0}", e);
+
+				if (!String.IsNullOrEmpty(allMessage) && allMessage.IndexOf("Es war kein an https://") >= 0 && allMessage.IndexOf("lauschender Endpunkt") >= 0)
+				{
+					String msg = "Es konnte leider keine Verbindung zum Server hergestellt werden. Bitte prüfen Sie Ihre Internetverbindung oder versuchen Sie es später erneut. Bei wiederholter Fehlermeldung schicken Sie bitte folgende Fehlermeldung an support@bewoplaner.de";
+
+					BeWoApp.ShowError(msg, e, true);
+				}
+				else if (!String.IsNullOrEmpty(e.Message) && e.Message.IndexOf("Der Prozess kann nicht auf die Datei") >= 0 && e.Message.IndexOf("von einem anderen Prozess verwendet") >= 0)
+                {
+					BeWoApp.ShowError(e.Message, e, false);
+				}
+				else
+				{
+					BeWoApp.ShowError(null, e, true);
+				}
 			}
 		}

--- a/BeWo/Styles/OrangeBlack.xaml
+++ b/BeWo/Styles/OrangeBlack.xaml
@@ -4882,8 +4882,89 @@
 		</Setter>
 	</Style>

+    <Style x:Key="ExpanderPanelStyle" TargetType="{x:Type uc:ExpanderPanel}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type uc:ExpanderPanel}">
+                    <Border x:Name="PART_Border" Background="{DynamicResource ObjectEditBackgroundBrush}" CornerRadius="0,0,0,0" Padding="0,0,0,0" BorderBrush="#FF474747" BorderThickness="1,1,1,1">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="*" />
+                            </Grid.RowDefinitions>
+                            <Grid Grid.Row="0" Grid.Column="0">
+                                <ToggleButton IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, UpdateSourceTrigger=PropertyChanged}" SnapsToDevicePixels="True" BorderThickness="0" Background="Transparent" BorderBrush="Transparent" >
+                                    <ToggleButton.Template>
+                                        <ControlTemplate TargetType="{x:Type ToggleButton}">
+                                            <Grid Background="Transparent">
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="*" />
+                                                    <ColumnDefinition Width="26" />
+                                                </Grid.ColumnDefinitions>
+                                                <Label Padding="0" Margin="0" VerticalAlignment="Center" Content="{Binding Path=Header, RelativeSource={RelativeSource AncestorType={x:Type Expander}, Mode=FindAncestor}}" Foreground="#FFFFFFFF" />
+                                                <Grid x:Name="grid_button" Grid.Column="1" Height="16" Width="16" Margin="1" VerticalAlignment="Center" RenderTransformOrigin="0.5,0.5">
+                                                    <Grid.RenderTransform>
+                                                        <RotateTransform Angle="0" />
+                                                    </Grid.RenderTransform>
+                                                    <Ellipse SnapsToDevicePixels="True" x:Name="ellipse" Stroke="#FFA0A0A0" StrokeThickness="2" />
+                                                    <Path SnapsToDevicePixels="True" HorizontalAlignment="Center" x:Name="Up_Arrow" VerticalAlignment="Center" Fill="#FFA0A0A0" Data="M0,0L4,7 8,0z" Margin="0,2,0,0" />

-	<Style x:Key="TransparentButtonStyle" TargetType="{x:Type Button}">
+                                                </Grid>
+                                            </Grid>
+                                            <ControlTemplate.Triggers>
+                                                <Trigger Property="IsChecked" Value="true">
+                                                    <Trigger.EnterActions>
+
+                                                        <BeginStoryboard>
+                                                            <Storyboard>
+                                                                <DoubleAnimation Storyboard.TargetName="grid_button" Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)" To="-180" Duration="0:0:0.3" />
+                                                            </Storyboard>
+                                                        </BeginStoryboard>
+                                                    </Trigger.EnterActions>
+                                                    <Trigger.ExitActions>
+                                                        <BeginStoryboard>
+                                                            <Storyboard>
+                                                                <DoubleAnimation Storyboard.TargetName="grid_button" Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)" Duration="0:0:0.3" />
+                                                            </Storyboard>
+                                                        </BeginStoryboard>
+                                                    </Trigger.ExitActions>
+                                                </Trigger>
+                                                <EventTrigger RoutedEvent="Mouse.MouseEnter">
+                                                    <BeginStoryboard>
+                                                        <Storyboard>
+                                                            <ColorAnimation Duration="0:0:0.2" Storyboard.TargetProperty="Stroke.Color" Storyboard.TargetName="ellipse" To="#FFFFFFFF" />
+                                                            <ColorAnimation Duration="0:0:0.2" Storyboard.TargetProperty="Fill.Color" Storyboard.TargetName="Up_Arrow" To="#FFFFFFFF" />
+                                                        </Storyboard>
+                                                    </BeginStoryboard>
+                                                </EventTrigger>
+                                                <EventTrigger RoutedEvent="Mouse.MouseLeave">
+                                                    <BeginStoryboard>
+                                                        <Storyboard>
+                                                            <ColorAnimation Duration="0:0:0.2" Storyboard.TargetProperty="Stroke.Color" Storyboard.TargetName="ellipse" />
+                                                            <ColorAnimation Duration="0:0:0.2" Storyboard.TargetProperty="Fill.Color" Storyboard.TargetName="Up_Arrow" />
+
+                                                        </Storyboard>
+                                                    </BeginStoryboard>
+                                                </EventTrigger>
+                                            </ControlTemplate.Triggers>
+                                        </ControlTemplate>
+                                    </ToggleButton.Template>
+                                </ToggleButton>
+                            </Grid>
+                            <Grid x:Name="PART_Header" Grid.Column="1"></Grid>
+                            <Grid Grid.Row="1" Grid.ColumnSpan="2" Grid.Column="0" x:Name="PART_Content"></Grid>
+                        </Grid>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="TransparentButtonStyle" TargetType="{x:Type Button}">
 		<Setter Property="VerticalContentAlignment" Value="Center" />
 		<Setter Property="Height" Value="25" />
 		<Setter Property="HorizontalAlignment" Value="Center" />
--- a/BeWo/View/BargeldkassenView.xaml
+++ b/BeWo/View/BargeldkassenView.xaml
@@ -52,6 +52,10 @@
    </view:BeWoView.Resources>
    <GroupBox Header="Bargeldkassen" Style="{StaticResource ObjectEditGroupBox}">
        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
            <Grid.RowDefinitions>
                <RowDefinition Height="Auto" />
                <RowDefinition Height="*" />
@@ -153,7 +157,11 @@
                    </Border>
                </controls:PopupNonTopmost>
            </StackPanel>
-            <TabControl Grid.Row="1" Margin="5" ItemsSource="{Binding VMList}" x:Name="tabcontrol_bargeldkassen" Visibility="{Binding VMList.Count, Converter={StaticResource CollectionCountToVisibilityConverter}}">
+            <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Stretch">
+                <Label Content="Sortierung" />
+                <ComboBox Height="23" x:Name="SortComboBox" Margin="3" VerticalAlignment="Top" MinWidth="180" SelectionChanged="SortComboBox_SelectionChanged"/>
+            </StackPanel>
+            <TabControl Grid.Row="1" Grid.ColumnSpan="2" Margin="5" ItemsSource="{Binding VMList}" x:Name="tabcontrol_bargeldkassen" Visibility="{Binding VMList.Count, Converter={StaticResource CollectionCountToVisibilityConverter}}">
                <TabControl.ItemTemplate>
                    <DataTemplate>
                        <StackPanel Orientation="Horizontal">
@@ -231,13 +239,10 @@
                          
                            <Button Grid.Row="0" Grid.Column="0" Content="Neue Zahlung hinzufügen" Margin="3" Tag="{Binding}" Click="ButtonOpenAddBargeldtransaktionClick" IsEnabled="{Binding Path=DarfBargeldTransaktionAnlegen, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}}" />

-                            <Label Grid.Row="0" Grid.Column="1" Content="Kassenbestand" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="3,-10,3,3"/>
-                            <dxe:TextEdit Grid.Row="0" Grid.Column="2" MaskType="Numeric" Mask="c" MaskUseAsDisplayFormat="True" Height="23" Margin="3,-10,3,3" EditMode="InplaceInactive"
-                            Width="80" EditValue="{Binding Path=Kassenbestand, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" HorizontalContentAlignment="Right" FontWeight="Bold" />
-
-                            <Label Grid.Row="0" Grid.Column="1" Content="Anfangsbestand" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="3,3,3,-10"/>
-                            <dxe:TextEdit Grid.Row="0" Grid.Column="2"  MaskType="Numeric" Mask="c" MaskUseAsDisplayFormat="True" Height="23" Margin="3,3,3,-10" EditMode="InplaceInactive"
-                            Width="80" EditValue="{Binding Path=Anfangsbestand, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" HorizontalContentAlignment="Right" FontWeight="Bold" />
+                            
+                            <Label Grid.Row="0" Grid.Column="1" Content="Anfangsbestand" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="3"/>
+                            <dxe:TextEdit Grid.Row="0" Grid.Column="2"  MaskType="Numeric" Mask="c" MaskUseAsDisplayFormat="True" Height="23" Margin="3" EditMode="InplaceInactive"
+                            EditValue="{Binding Path=Anfangsbestand, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" HorizontalContentAlignment="Left" FontWeight="Bold" />

                            <!--<Label VerticalAlignment="Center">Auszahlungsintervall</Label>
                                <dxe:ComboBoxEdit VerticalAlignment="Center" Height="23" HorizontalAlignment="Left" Width="100" IsTextEditable="False" Margin="3,0,3,3"
@@ -247,8 +252,9 @@
                                                        EditValueChanged="AuszahlungsIntervallCBEditValueChanged"/>-->


+                            <StackPanel Grid.Row="0" Grid.Column="7" Grid.ColumnSpan="2" Orientation="Horizontal" HorizontalAlignment="Left">
                            <Label Grid.Row="0" Grid.Column="3" Content="Startdatum" VerticalAlignment="Center"/>
-                            <dxe:DateEdit Grid.Row="0" Grid.Column="4" x:Name="KassenBuchStartCB" MaskType="DateTimeAdvancingCaret" Height="23" Margin="3" EditValue="{Binding Path=PreselectedStartDate, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}, Mode=OneWay}" AllowNullInput="False" />
+                            <dxe:DateEdit  Grid.Row="0" Grid.Column="4" x:Name="KassenBuchStartCB" MaskType="DateTimeAdvancingCaret" Height="23" Margin="3" EditValue="{Binding Path=PreselectedStartDate, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}, Mode=OneWay}" AllowNullInput="False" />

                            <Label Grid.Row="0" Grid.Column="5" Content="Enddatum" VerticalAlignment="Center"/>
                            <dxe:DateEdit Grid.Row="0" Grid.Column="6" x:Name="KassenBuchEndCB" MaskType="DateTimeAdvancingCaret" Height="23" Margin="3" EditValue="{Binding Path=PreselectedEndDate, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}, Mode=OneWay}" AllowNullInput="False"/>
@@ -260,16 +266,26 @@
                                <uc:NullItemComboBox x:Name="KassenbuchJahresCB" Margin="3" ItemsSource="{Binding Path=JahresComboBoxSource, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}}"
                                                SelectedItem="{Binding Path=PreselectedYear, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}, Mode=OneWay}"/>-->

-                            <TextBlock Grid.Row="0" Grid.Column="7" Margin="3" FontSize="14" VerticalAlignment="Center" PreviewMouseLeftButtonDown="KlassenbuchLinkOnPreviewMouseLeftButtonDown" Tag="{Binding}" IsEnabled="{Binding Path=Bargeldtransaktionen.VMList.Count, Converter={StaticResource CollectionCountToBoolConverter}, UpdateSourceTrigger=PropertyChanged}">
+                            <TextBlock Grid.Row="0" Margin="3"  FontSize="14" VerticalAlignment="Center" PreviewMouseLeftButtonDown="KlassenbuchLinkOnPreviewMouseLeftButtonDown" Tag="{Binding}" IsEnabled="{Binding Path=Bargeldtransaktionen.VMList.Count, Converter={StaticResource CollectionCountToBoolConverter}, UpdateSourceTrigger=PropertyChanged}">
                              <Hyperlink x:Name="LinkKassenbuchDrucken" TargetName="_NewWindow" Style="{StaticResource HyperlinkStyle}">
                                <Run Text="Kassenbuch drucken" />
                              </Hyperlink>
                            </TextBlock>
-                            
+                            </StackPanel>

                            

-                            <GroupBox Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="10" x:Name="BlubbTest" Style="{StaticResource ObjectEditGroupBox}" Header="Ein- und Auszahlungen">
+                            <GroupBox Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="10" x:Name="BlubbTest" Style="{StaticResource ObjectEditGroupBox}">
+                                <GroupBox.Header>
+                                    <StackPanel Orientation="Horizontal">
+                                        <TextBlock FontSize="16" Foreground="{StaticResource TabItemHotTextBrush}" FontFamily="Microsoft Sans Serif" Text="Ein- und Auszahlungen" Margin="3,5,3,3"/>
+                                        <Label Content="Saldo" VerticalAlignment="Center" Margin="3,3,3,3"/>
+                                    <dxe:TextEdit MaskType="Numeric" Mask="c" MaskUseAsDisplayFormat="True" Height="23" Margin="3,3,3,3" EditMode="InplaceInactive"
+                            EditValue="{Binding Path=Kassenbestand, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" FontWeight="Bold" />
+                                        <Label Content="Stichtag" VerticalAlignment="Center" Margin="3,3,3,3"/>
+                                        <dxe:DateEdit MaskType="DateTimeAdvancingCaret" Height="23" Width="100" Margin="3" EditValue="{Binding Path=Stichtag, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" AllowNullInput="True"/>
+                                    </StackPanel>
+                                </GroupBox.Header>
                                <dxg:GridControl Name="grid_bargeldtransaktionen" Tag="{Binding}" MaxWidth="{Binding ElementName=BlubbTest, Path=ActualWidth}" ItemsSource="{Binding Path=Bargeldtransaktionen.VMList}" CustomColumnSort="GridBargeldtransaktionenOnCustomColumnSort">
                                    <dxg:GridControl.Columns>
                                        <dxg:GridColumn Header="" FixedWidth="True" Width="24" ReadOnly="True" Visible="{Binding Path=DarfBargeldtransaktionenBearbeiten, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}}">
--- a/BeWo/View/BargeldkassenView.xaml.cs
+++ b/BeWo/View/BargeldkassenView.xaml.cs
@@ -17,7 +17,7 @@ using BeWo.ViewModel.ListViewModel;
 using BS.Shared;
 using BS.Shared.DataContracts;
 using BS.Shared.Extensions;
-
+using BS.SharedLauncher.Translation;
 using DevExpress.Utils;
 using DevExpress.Xpf.Editors;
 using DevExpress.Xpf.Grid;
@@ -103,6 +103,66 @@ namespace BeWo.View
            }
        }

+        private void SortiereKassen()
+        {
+            if (ViewModel != null && tabcontrol_bargeldkassen != null)
+            {
+                var alterIndex = tabcontrol_bargeldkassen.SelectedIndex;
+                tabcontrol_bargeldkassen.ItemsSource = null;
+                //var sorted = 
+                if (SortComboBox.SelectedIndex == 0)
+                {
+                    ViewModel.VMList.Sort((a, b) => Comparer<String>.Default.Compare(a.Kassenname, b.Kassenname));
+                    //sorted = r.OrderBy(k => k.Kassenname).ToList();
+                }
+                else if (SortComboBox.SelectedIndex == 1)
+                {
+                    ViewModel.VMList.Sort((a, b) => Comparer<long?>.Default.Compare(a.DataContract.BargeldkassenOid, b.DataContract.BargeldkassenOid));
+                    //sorted = r.OrderBy(k => k.BargeldkassenOid).ToList();
+                }
+                else
+                {
+                    ViewModel.VMList.Sort((a, b) => Comparer<long?>.Default.Compare(a.DataContract.BargeldkassenOid, b.DataContract.BargeldkassenOid) * -1);
+                    //sorted = r.OrderByDescending(k => k.BargeldkassenOid).ToList();
+                }
+                tabcontrol_bargeldkassen.ItemsSource = ViewModel.VMList;
+                if (alterIndex == -1)
+                {
+                    alterIndex = 0;
+                }
+                else
+                {
+                    while (alterIndex > ViewModel.VMList.Count)
+                    {
+                        alterIndex--;
+                    }
+                }
+                tabcontrol_bargeldkassen.SelectedIndex = alterIndex;
+                
+
+            }
+        }
+
+        private void SelektiereKasse(String kassenname)
+        {
+            if (!String.IsNullOrEmpty(kassenname))
+            {
+                var index = tabcontrol_bargeldkassen.SelectedIndex;
+                int idx = 0;
+                foreach (var item in tabcontrol_bargeldkassen.Items)
+                {
+                    var vm = item as BargeldkassenVM;
+                    if (vm?.Kassenname == kassenname)
+                    {
+                        index = idx;
+                    }
+                    idx++;
+                }
+                tabcontrol_bargeldkassen.SelectedIndex = index;
+                
+            }
+        }
+
        private readonly TableID currentObjectTid;
        private readonly long    currentObjectOid;

@@ -117,7 +177,8 @@ namespace BeWo.View
        public BargeldkassenView(TableID objectTid, long objectOid)
        {
            InitializeComponent();
-            
+            InitSortCombos();
+
            _JahresComboBoxSource = new List<int>();
            for (var i = 9; i >= 0; i--)
            {
@@ -133,7 +194,7 @@ namespace BeWo.View

            InitRights();  
            
-            ReloadViewModel();
+            ReloadViewModel(true, null);


            if (tabcontrol_bargeldkassen != null && tabcontrol_bargeldkassen.SelectedIndex == -1)
@@ -142,6 +203,26 @@ namespace BeWo.View
            }


+        }
+
+        private void InitSortCombos()
+        {
+            var list = new List<KassenSortOrderItem>();
+
+            list.Add(new KassenSortOrderItem(KassenSortOrderEnum.NachName));
+            list.Add(new KassenSortOrderItem(KassenSortOrderEnum.NachDatumAufsteigend));
+            list.Add(new KassenSortOrderItem(KassenSortOrderEnum.NachDatumAbsteigend));
+
+
+            SortComboBox.DisplayMemberPath = "Name";
+            SortComboBox.ItemsSource = list;
+            
+            if (BeWoApp.AppSettings.LastKassenSortOrder < list.Count)
+            {
+                SortComboBox.SelectedIndex = BeWoApp.AppSettings.LastKassenSortOrder;
+            }
+            
+
        }

        private void InitRights()
@@ -175,7 +256,17 @@ namespace BeWo.View
            
        }

-        private void ReloadViewModel()
+        private void ReloadViewModelMitSortierung()
+        {
+            ReloadViewModel(true, null);
+        }
+
+        private void ReloadViewModelOhneSortierung()
+        {
+            ReloadViewModel(false, null);
+        }
+
+        private void ReloadViewModel(bool sortiereKassen, String selectedKassenname)
        {
            var previouslySelectedTab = tabcontrol_bargeldkassen.SelectedIndex;

@@ -184,30 +275,15 @@ namespace BeWo.View
                    {
                        if (r.Any())
                        {
-                            int? alteAnzahl = null;
-
-                            if (ViewModel != null)
-                            {
-                                alteAnzahl = ViewModel.VMList.Count;
-                            }
-
+                            
                            ViewModel = new BargeldkassenListVM(r);

-                            var neueAnzahl = ViewModel.VMList.Count;
+                            //if (sortiereKassen)
+                            //{
+                                SortiereKassen();
+                            //}

-                            if (alteAnzahl != null && neueAnzahl > alteAnzahl)
-                            {
-                                tabcontrol_bargeldkassen.SelectedIndex = neueAnzahl - 1;
-                            }
-                            else if (previouslySelectedTab > -1)
-                            {
-                                tabcontrol_bargeldkassen.SelectedIndex = previouslySelectedTab;
-                            }
-                            else
-                            {
-                                tabcontrol_bargeldkassen.SelectedIndex = 0;
-                            }
-                            
+                            SelektiereKasse(selectedKassenname);

                            ViewModel.VMList.DoForEach(d => d.Bargeldtransaktionen.VMList.ListChanged += (sender, args) =>
                            {
@@ -231,7 +307,8 @@ namespace BeWo.View
                                    {
                                        bargeldkasse.RecalculateTransaktionsbestaende();

-                                        ServiceFacade.DoOperationsServiceAsync(s => s.UpdateBargeldkasse(bargeldkasse.CommitToDataContract()), r2 => this.Dispatch(ReloadViewModel));
+                                        ServiceFacade.DoOperationsServiceAsync(s => s.UpdateBargeldkasse(bargeldkasse.CommitToDataContract()), r2 => this.Dispatch(ReloadViewModelOhneSortierung));
+                                        
                                    }
                                }
                            });
@@ -254,11 +331,12 @@ namespace BeWo.View
            var textBlock = (TextBlock) sender;
            var kasse     = ((BargeldkassenVM) textBlock.Tag).CommitToDataContract();

-            var grid = (Grid)textBlock.Parent;
-            var kinder = grid.Children;

-            var startzeitraum = (DateEdit)kinder[6];
-            var endzeitraum = (DateEdit)kinder[8];
+            var stackPanel = (StackPanel)textBlock.Parent;
+            var kinder = stackPanel.Children;
+
+            var startzeitraum = (DateEdit)kinder[1];
+            var endzeitraum = (DateEdit)kinder[3];

            //var parentStackPanel = (StackPanel) textBlock.Parent;
            //var kinder           = parentStackPanel.Children;
@@ -298,7 +376,7 @@ namespace BeWo.View
            selectedBargeldkasse.RecalculateTransaktionsbestaende();
            var kb = selectedBargeldkasse.Kassenbestand;

-            ServiceFacade.DoOperationsServiceAsync(s => s.UpdateBargeldkasse(selectedBargeldkasse.CommitToDataContract()), r => this.Dispatch(ReloadViewModel));
+            ServiceFacade.DoOperationsServiceAsync(s => s.UpdateBargeldkasse(selectedBargeldkasse.CommitToDataContract()), r => this.Dispatch(ReloadViewModelOhneSortierung));
        }

        private void LinkZahlungsbelegDruckenClick(object sender, RoutedEventArgs e)
@@ -323,6 +401,7 @@ namespace BeWo.View
            var neu       = ViewModel.NewVM;
            neu.ObjectOid = currentObjectOid;
            neu.ObjectTid = currentObjectTid;
+            String name = neu.Kassenname;

            ServiceFacade.DoOperationsServiceAsync(s => s.InsertNewBargeldkasse(neu.CommitToDataContract()), r => this.Dispatch(delegate
            {
@@ -330,7 +409,7 @@ namespace BeWo.View

                ViewModel.NewVM = new BargeldkassenVM(new BargeldkassenDC());

-                ReloadViewModel();
+                ReloadViewModel(true, name);
            }));
        }
 		
@@ -350,7 +429,10 @@ namespace BeWo.View
            {
                return;
            }
-
+            if (!NewBargeldtransaktion.Betrag.HasValue || NewBargeldtransaktion.Zahlungstyp == null)
+            {
+                return;
+            }
            var transaktionsBetrag = NewBargeldtransaktion.Betrag * (NewBargeldtransaktion.Zahlungstyp.Enum == Zahlungstyp.Auszahlung ? -1 : 1);

            var latestTransactionDate = new DateTime(1, 1, 1);
@@ -397,7 +479,7 @@ namespace BeWo.View
                OnPropertyChanged("NewBargeldtransaktion");
                OnPropertyChanged("SelectedBargeldkasse");

-                ReloadViewModel();
+                ReloadViewModel(false, null);
            }));
        }

@@ -440,7 +522,7 @@ namespace BeWo.View

            ViewModel.VMList.Remove(selectedBargeldkasse);

-            ServiceFacade.DoOperationsServiceAsync(s => s.DeactivateBargeldkasse(selectedBargeldkasse.DataContract.BargeldkassenOid.Value, selectedBargeldkasse.DataContract.BargeldkassenVersion.Value), () => this.Dispatch(ReloadViewModel));
+            ServiceFacade.DoOperationsServiceAsync(s => s.DeactivateBargeldkasse(selectedBargeldkasse.DataContract.BargeldkassenOid.Value, selectedBargeldkasse.DataContract.BargeldkassenVersion.Value), () => this.Dispatch(ReloadViewModelOhneSortierung));
        }
        
        private void AuszahlungsIntervallCBEditValueChanged(object sender, EditValueChangedEventArgs e)
@@ -457,7 +539,7 @@ namespace BeWo.View
                return;
            }

-            ServiceFacade.DoOperationsServiceAsync(s => s.UpdateBargeldkasse(bargeldkasse.CommitToDataContract()), r => this.Dispatch(ReloadViewModel));
+            ServiceFacade.DoOperationsServiceAsync(s => s.UpdateBargeldkasse(bargeldkasse.CommitToDataContract()), r => this.Dispatch(ReloadViewModelOhneSortierung));
        }

        public event PropertyChangedEventHandler PropertyChanged;
@@ -502,8 +584,52 @@ namespace BeWo.View
            {
                popup.IsOpen = false;

-                ReloadViewModel();
+                ReloadViewModel(false, null);
            }));
        }
+
+        private void SortComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            BargeldkassenVM selectedVM = tabcontrol_bargeldkassen.SelectedItem as BargeldkassenVM;
+            String lastName = null;
+            if (selectedVM != null)
+            {
+                lastName = selectedVM.Kassenname;
+            }
+            SortiereKassen();
+            SelektiereKasse(lastName);
+
+            BeWoApp.AppSettings.LastKassenSortOrder = SortComboBox.SelectedIndex;
+            BeWoApp.SaveAppSettings();
+        }
+    }
+
+    public class KassenSortOrderItem
+    {
+        public KassenSortOrderItem(KassenSortOrderEnum e)
+        {
+            SortOrderEnum = e;
+        }
+
+        public KassenSortOrderEnum SortOrderEnum { get; set; }
+
+        public String Name
+        {
+            get
+            {
+                switch (SortOrderEnum)
+                {
+                    case KassenSortOrderEnum.NachName:
+                        return Translator.Translate("Nach Name");
+                    case KassenSortOrderEnum.NachDatumAufsteigend:
+                        return Translator.Translate("Nach Datum (aufsteigend)");
+                    case KassenSortOrderEnum.NachDatumAbsteigend:
+                        return Translator.Translate("Nach Datum (absteigend)");
+
+                }
+
+                return "";
+            }
+        }
    }
 }
--- a/BeWo/View/BeWoFileView.xaml.cs
+++ b/BeWo/View/BeWoFileView.xaml.cs
@@ -278,7 +278,7 @@ namespace BeWo.View
            n.IsSelected = true;

            new DispatcherTimer(
-                TimeSpan.FromMilliseconds(200),
+                TimeSpan.FromMilliseconds(100),
                DispatcherPriority.Background,
                (s1, e1) =>
                {
--- a/BeWo/View/BeWoWindow.xaml
+++ b/BeWo/View/BeWoWindow.xaml
@@ -6,7 +6,7 @@
        WindowStartupLocation="CenterOwner"
        AllowsTransparency="True"
        Background="Transparent"
-        ResizeMode="CanResizeWithGrip">
+        ResizeMode="CanResizeWithGrip" Closing="Window_Closing" Closed="Window_Closed">
    <Grid>
        <GroupBox x:Name="rootGroupBox" Style="{DynamicResource MainContentGroupBoxWithoutMaximizeBtnStyle}" MouseLeftButtonDown="RootGroupBox_OnMouseLeftButtonDown" MouseDoubleClick="RootGroupBox_OnMouseDoubleClick">
            
--- a/BeWo/View/BeWoWindow.xaml.cs
+++ b/BeWo/View/BeWoWindow.xaml.cs
@@ -8,7 +8,7 @@ namespace BeWo.View
    /// <summary>
    /// Interaktionslogik für BeWoWindow.xaml
    /// </summary>
-    public partial class BeWoWindow : Window
+    public partial class BeWoWindow : System.Windows.Window
    {
        private object _GroupBoxContent;
        public object GroupBoxContent
@@ -91,5 +91,15 @@ namespace BeWo.View
                WindowState = WindowState.Maximized;
            }
        }
+
+        public void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+
+        }
+
+        public void Window_Closed(object sender, EventArgs e)
+        {
+
+        }
    }
 }
--- a/BeWo/View/BeWoWindowBuilder.cs
+++ b/BeWo/View/BeWoWindowBuilder.cs
@@ -0,0 +1,72 @@
+using BeWo.View.Controls;
+using BeWo.ViewModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace BeWo.View
+{
+    public static class BeWoWindowBuilder
+    {
+        public static BeWoWindow GetTextViewer(string title, string text, bool fixed_size = false, double height = 600, double width = 400)
+        {
+            if (fixed_size)
+                return GetTextViewer(title, text, height, height, height, width, width, width);
+
+            var min_height = Math.Min(height, 300);
+            var max_height = Math.Max(height, 1000);
+
+            var min_width = Math.Min(width, 200);
+            var max_width = Math.Max(width, 1900);
+
+            return GetTextViewer(title, text, min_height, height, max_height, min_width, width, max_width);
+        }
+        public static BeWoWindow GetTextViewer(string title, string text, double min_height, double height, double max_height, double min_width, double width, double max_width)
+        {
+            var control = new TextViewer();
+            control.Text = text;
+
+            var beWoWindow = GetGenericBeWoWindow(title, min_height, height, max_height, min_width, width, max_width);
+            beWoWindow.GroupBoxContent = control;
+            
+            return beWoWindow;
+        }
+
+        public static BeWoWindow GetGkvAbrechnungDetailWindow(GkvAbrechnungVM vM, double height = 600, double width = 1200)
+        {
+            var detail = new GkvAbrechnungDetailControl(vM);
+
+            var beWoWindow = GetGenericBeWoWindow("Gkv Abrechnung Details", 100, height, 1000, 100, width, 1600);
+            beWoWindow.GroupBoxContent = detail;
+
+            return beWoWindow;
+        }
+
+        public static void ShowErrorMessageBox(string text)
+        {
+            MessageBox.Show(text, "Fehler", MessageBoxButton.OK, MessageBoxImage.Asterisk);
+        }
+
+        private static BeWoWindow GetGenericBeWoWindow(string title, double min_height, double height, double max_height, double min_width, double width, double max_width)
+        {
+            var beWoWindow = new BeWoWindow();
+
+            beWoWindow.Height = height;
+            beWoWindow.MinHeight = min_height;
+            beWoWindow.MaxHeight = max_height;
+            beWoWindow.Width = width;
+            beWoWindow.MinWidth = min_width;
+            beWoWindow.MaxHeight = max_width;
+
+            beWoWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner;
+            beWoWindow.Owner = BeWoApp.CurrentBeWo.MainWindow;
+            beWoWindow.rootGroupBox.Header = title;
+
+            return beWoWindow;
+        }
+    }
+}
--- a/BeWo/View/Controls/ComboBoxTreeViewControl.xaml
+++ b/BeWo/View/Controls/ComboBoxTreeViewControl.xaml
@@ -31,7 +31,7 @@
 							<ColumnDefinition Width="*" />
 						</Grid.ColumnDefinitions>
 						<Label x:Name="SearchFieldLabel" Grid.Column="0" Content="Suche" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Left" />
-						<TextBox x:Name="cbtv_search" Grid.Column="1" Margin="3" Height="23" Template="{StaticResource SearchTextBoxTemplate}" HorizontalAlignment="Stretch" />
+						<TextBox x:Name="cbtv_search" Grid.Column="1" Margin="3" Height="23" Template="{StaticResource SearchTextBoxTemplate}" HorizontalAlignment="Stretch" TextChanged="cbtv_search_TextChanged" />
 					</Grid>
 					<TreeView x:Name="Tree1" Margin="0" Grid.Row="1"
 					          ItemTemplate="{DynamicResource treeitemtemplate}"
@@ -39,14 +39,14 @@
 					          BorderThickness="0" Background="White"
 					          Loaded="Tree1_OnLoaded"
 					          dx:ThemeManager.ThemeName="None">
-						<TreeView.ItemsSource>
+						<!--<TreeView.ItemsSource>
 							<MultiBinding Converter="{StaticResource FilterDCConverter}">
 								<MultiBinding.Bindings>
 									<Binding Path="TreeViewSourceList" />
 									<Binding ElementName="cbtv_search" Path="Text" />
 								</MultiBinding.Bindings>
 							</MultiBinding>
-						</TreeView.ItemsSource>
+						</TreeView.ItemsSource>-->
 						<TreeView.Resources>
 							<Style x:Key="servicecat_treeitemstyle" TargetType="{x:Type TreeViewItem}">
 								<Setter Property="IsExpanded" Value="{Binding Path=IsExpanded, Mode=TwoWay}" />
@@ -91,6 +91,7 @@
 									<Grid.ColumnDefinitions>
 										<ColumnDefinition Width="Auto" />
 										<ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="Auto" />
 									</Grid.ColumnDefinitions>
                                    <Grid.RowDefinitions>
                                        <RowDefinition Height="Auto"></RowDefinition>
@@ -102,13 +103,17 @@
 									          Grid.Column="0" Margin="3 2"
 									          VerticalAlignment="Center"
 									          Click="Bd_OnClick" />
-									<TextBlock x:Name="BdText" Tag="{Binding}"
-									           Grid.Column="1" Margin="3 2"
+                                    <Image Grid.Column="1" Source="..\..\Ressources\Icons\ziel.png" Stretch="Uniform" Margin="3,1,1,1" Width="16" Height="16" Visibility="{Binding Path=IsZiel, Converter={StaticResource BoolVisibilityConverter}}"/>
+                                    <Image Grid.Column="1" Source="..\..\Ressources\Icons\massnahme.png" Stretch="Uniform" Margin="3,1,1,1" Width="16" Height="16" Visibility="{Binding Path=IsMassnahme, Converter={StaticResource BoolVisibilityConverter}}"/>
+                                    <Image Grid.Column="1" Source="..\..\Ressources\Icons\iziel.png" Stretch="Uniform" Margin="3,1,1,1" Width="16" Height="16" Visibility="{Binding Path=IsIndZiel, Converter={StaticResource BoolVisibilityConverter}}"/>
+                                    <Image Grid.Column="1" Source="..\..\Ressources\Icons\imassnahme.png" Stretch="Uniform" Margin="3,1,1,1" Width="16" Height="16" Visibility="{Binding Path=IsIndMassnahme, Converter={StaticResource BoolVisibilityConverter}}"/>
+                                    <TextBlock x:Name="BdText" Tag="{Binding}"
+									           Grid.Column="2" Margin="3 2"
 									           Text="{Binding Path=DetailDescription}"
 									           VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="Black"
 									           MouseDown="BdText_OnMouseDown" TextAlignment="Left" ToolTip="{Binding Path=GoalEntryDC.Notice}" />
 								    <TextBlock x:Name="RatingText" Tag="{Binding}"
-								               Grid.Column="1" Grid.Row="1" Margin="3 2"
+								               Grid.Column="2" Grid.Row="1" Margin="3 2"
 								               Text="{Binding Path=RatingName}" 
 								               VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="MediumBlue"
 								               MouseDown="BdText_OnMouseDown" TextAlignment="Left" Visibility="{Binding Path=HasRating, Converter={StaticResource BoolVisibilityConverter}}" />
--- a/BeWo/View/Controls/ComboBoxTreeViewControl.xaml.cs
+++ b/BeWo/View/Controls/ComboBoxTreeViewControl.xaml.cs
@@ -48,6 +48,7 @@ namespace BeWo.View.Controls
            {
                SetValue(ListProperty, value);
                ShowCheckedValues();
+                Tree1.ItemsSource = value;
            }
        }

@@ -360,5 +361,125 @@ namespace BeWo.View.Controls
            }
            RatingPopup.IsOpen = false;
        }
+
+        private void cbtv_search_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            FilterTreeItems();
+        }
+
+        private void FilterTreeItems()
+        {
+            String searchtext = cbtv_search.Text;
+            
+            foreach (var goal in Tree1.Items)
+            {
+                SetTreeItemVisibility(Tree1.ItemContainerGenerator, goal as SupportConceptGoalDC, searchtext);
+
+
+                //if (ig.Status != GeneratorStatus.ContainersGenerated)
+                //{
+                //    return;
+                //}
+
+                //var n = ig.ContainerFromIndex(this.treeview_individualServiceAccountings.Items.Count - 1) as TreeViewItem;
+                //if (n != null)
+                //{
+                //    n.IsSelected = true;
+
+                //    new DispatcherTimer(
+                //        TimeSpan.FromMilliseconds(200),
+                //        DispatcherPriority.Background,
+                //        (s1, e1) =>
+                //            {
+                //                ServiceCategoryTreeItem item = ig.ItemFromContainer(n) as ServiceCategoryTreeItem;
+                //                this.EditItem(this.treeview_individualServiceAccountings, null, item);
+                //                ((DispatcherTimer)s1).Stop();
+                //        },
+                //        this.Dispatcher).Start();
+                //}
+                //this.treeview_individualServiceAccountings.ItemContainerGenerator.StatusChanged -= this.ItemContainerGenerator_StatusChanged;
+            }
+        }
+
+        private void SetTreeItemVisibility(ItemContainerGenerator ig, SupportConceptGoalDC goal, string searchtext)
+        {
+
+            var item = ig.ContainerFromItem(goal) as TreeViewItem;
+
+            if (item == null)
+            {
+                Tree1.UpdateLayout();
+                item = ig.ContainerFromItem(goal) as TreeViewItem;
+            }
+
+            if (item == null)
+                return;
+            
+            if (goal.Children == null || goal.Children.Count == 0)
+            {
+                if (IsTreeItemVisible(goal, searchtext))
+                {
+                    item.Visibility = Visibility.Visible;
+                }
+                else
+                {
+                    item.Visibility = Visibility.Collapsed;
+                }
+
+            }
+            else
+            {
+                foreach (var child in goal.Children)
+                {
+                    SetTreeItemVisibility(item.ItemContainerGenerator, child, searchtext);
+                }
+
+
+                if (IsAtLeastOneChildVisible(goal.Children, searchtext))
+                {
+                    item.Visibility = Visibility.Visible;
+                }
+                else
+                {
+                    if (IsTreeItemVisible(goal, searchtext))
+                    {
+                        item.Visibility = Visibility.Visible;
+                    }
+                    else
+                    {
+                        item.Visibility = Visibility.Collapsed;
+                    }
+                }
+            }
+
+        }
+
+        private bool IsTreeItemVisible(SupportConceptGoalDC goal, string searchtext)
+        {
+
+            if (!String.IsNullOrEmpty(searchtext) && (String.IsNullOrEmpty(goal.DetailDescription) || !goal.DetailDescription.ToLower().Contains(searchtext.ToLower())))
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        private bool IsAtLeastOneChildVisible(List<SupportConceptGoalDC> children, string searchtext)
+        {
+
+            foreach (var child in children)
+            {
+                bool visible = IsTreeItemVisible(child, searchtext) || IsAtLeastOneChildVisible(child.Children, searchtext);
+                if (visible)
+                {
+                    return true;
+                }
+
+            }
+
+            return false;
+        }
+
    }
 }
--- a/BeWo/View/Controls/ComboBoxTreeViewControlV2.xaml
+++ b/BeWo/View/Controls/ComboBoxTreeViewControlV2.xaml
@@ -3,7 +3,7 @@
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:dx="clr-namespace:DevExpress.Xpf.Core;assembly=DevExpress.Xpf.Core.v17.1"
+             xmlns:dx="clr-namespace:DevExpress.Xpf.Core;assembly=DevExpress.Xpf.Core.v23.2"
             xmlns:shared="clr-namespace:BeWo.Core"
             mc:Ignorable="d" 
             d:DesignHeight="300" d:DesignWidth="300">
--- a/BeWo/View/Controls/DPCtrlDay.cs
+++ b/BeWo/View/Controls/DPCtrlDay.cs
@@ -84,7 +84,7 @@ namespace BeWo.View.Controls
                                c.Foreground = Brushes.Red;
                                c.Text = "ÜS";
                                c.ToolTip = (dc == null) ? string.Format("Überstunden:\t{0:0.00}\nAuszahlung:\t{1}\nBemerkung:\t{2}", 
-                                    info.OverTime.Betrag, info.OverTime.Auszahlungsart.Name, info.OverTime.Notice) : null;
+                                    info.OverTime.Betrag, info.OverTime.Auszahlungsart?.Name, info.OverTime.Notice) : null;

                                if (info.DayOfWeek == DayOfWeek.Saturday || info.DayOfWeek == DayOfWeek.Sunday)
                                    c.Background = new SolidColorBrush(ColorExtensions.FromHexString("EFEFEF"));
--- a/BeWo/View/Controls/DPCtrlEmployee.cs
+++ b/BeWo/View/Controls/DPCtrlEmployee.cs
@@ -1,14 +1,11 @@
 using BeWo.View.Detail.Report;
 using BS.Shared.DataContracts;
-using System;
+using BS.SharedLauncher.Translation;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Media;
-using BS.Shared.Translation;

 namespace BeWo.View.Controls
 {
--- a/BeWo/View/Controls/EnumComboBoxStyleSettings.cs
+++ b/BeWo/View/Controls/EnumComboBoxStyleSettings.cs
@@ -30,13 +30,18 @@ namespace BeWo.View.Controls
 			cb.DisplayTextConverter = (IValueConverter)Application.Current.FindResource("enumToDescriptionConverter");
 		}

-		protected override Style GetItemContainerStyle(LookUpEditBase cb)
+		protected override Style GetItemContainerStyle(LookUpEditBase control)
 		{
-			if (HasFlagsAttribute())
-				return (Style)cb.FindResource(new EditorListBoxThemeKeyExtension { ResourceKey = EditorListBoxThemeKeys.CheckBoxItemStyle, ThemeName = ThemeHelper.GetEditorThemeName(cb) });
-			return (Style)cb.FindResource(new EditorListBoxThemeKeyExtension { ResourceKey = EditorListBoxThemeKeys.DefaultItemStyle, ThemeName = ThemeHelper.GetEditorThemeName(cb) });
+			throw new NotImplementedException();
 		}

+		//protected override Style GetItemContainerStyle(LookUpEditBase cb)
+		//{
+		//	if (HasFlagsAttribute())
+		//		return (Style)cb.FindResource(new EditorListBoxThemeKeyExtension { ResourceKey = EditorListBoxThemeKeys.CheckBoxItemStyle, ThemeName = ThemeHelper.GetEditorThemeName(cb) });
+		//	return (Style)cb.FindResource(new EditorListBoxThemeKeyExtension { ResourceKey = EditorListBoxThemeKeys.DefaultItemStyle, ThemeName = ThemeHelper.GetEditorThemeName(cb) });
+		//}
+
        

 		//protected override SelectionMode SelectionMode
--- a/BeWo/View/Controls/GkvAbrechnungDetailControl.xaml
+++ b/BeWo/View/Controls/GkvAbrechnungDetailControl.xaml
@@ -0,0 +1,159 @@
+<UserControl x:Class="BeWo.View.Controls.GkvAbrechnungDetailControl"
+                    xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup" 
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:BeWo.View.Controls"
+             xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
+             xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
+             mc:Ignorable="d">
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*"/>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        <TabControl Background="#eeeeee" BorderThickness="0">
+            <TabItem Header="Allgemein">
+                <Grid Background="#eeeeee" Margin="0" HorizontalAlignment="Stretch" MaxWidth="700">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="auto"/>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="3*"/>
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="auto"/>
+                        <RowDefinition Height="auto"/>
+                        <RowDefinition Height="auto"/>
+                        <RowDefinition Height="auto"/>
+                        <RowDefinition Height="auto"/>
+                        <RowDefinition Height="auto"/>
+                        <RowDefinition Height="auto"/>
+                        <RowDefinition Height="auto"/>
+                        <RowDefinition Height="auto"/>
+                        <RowDefinition Height="auto"/>
+                        <RowDefinition Height="auto"/>
+                        <RowDefinition Height="auto"/>
+                        <RowDefinition Height="auto"/>
+                        <RowDefinition Height="auto"/>
+                        <RowDefinition Height="auto"/>
+                        <RowDefinition Height="auto"/>
+                        <RowDefinition Height="*"/>
+                    </Grid.RowDefinitions>
+                    <Label Grid.Row="0" Grid.Column="0" Margin="3" Content="Gkv Oid:"/>
+                    <TextBox Grid.Row="0" Grid.Column="2" Margin="3" IsReadOnly="True" Text="{Binding GkvAbrechnungOid}"/>
+                    <Label Grid.Row="1" Grid.Column="0" Margin="3" Content="IK Leistungserbringer:"/>
+                    <TextBox Grid.Row="1" Grid.Column="2" Margin="3" IsReadOnly="True" Text="{Binding IKLeistungserbringer}"/>
+                    <Label Grid.Row="2" Grid.Column="0" Margin="3" Content="IK Krankenkasse:"/>
+                    <TextBox Grid.Row="2" Grid.Column="2" Margin="3" IsReadOnly="True" Text="{Binding IKVersichertenKarte}"/>
+                    <Label Grid.Row="3" Grid.Column="0" Margin="3" Content="IK Kostenträger:"/>
+                    <TextBox Grid.Row="3" Grid.Column="2" Margin="3" IsReadOnly="True" Text="{Binding IKKostenträger}"/>
+                    <Label Grid.Row="4" Grid.Column="0" Margin="3" Content="IK Datenannahmestelle:"/>
+                    <TextBox Grid.Row="4" Grid.Column="2" Margin="3" IsReadOnly="True" Text="{Binding IKDatenannahmestelle}"/>
+                    <Label Grid.Row="5" Grid.Column="0" Margin="3" Content="Abrechnungsbeginn:"/>
+                    <TextBox Grid.Row="5" Grid.Column="2" Margin="3" IsReadOnly="True" Text="{Binding AbrechnungsZeitraumStart}"/>
+                    <Label Grid.Row="6" Grid.Column="0" Margin="3" Content="Abrechnungsende:"/>
+                    <TextBox Grid.Row="6" Grid.Column="2" Margin="3" IsReadOnly="True" Text="{Binding AbrechnungsZeitraumEnde}"/>
+                    <Label Grid.Row="7" Grid.Column="0" Margin="3" Content="Transfername:"/>
+                    <TextBox Grid.Row="7" Grid.Column="2" Margin="3" IsReadOnly="True" Text="{Binding Transfername}"/>
+                    <Label Grid.Row="8" Grid.Column="0" Margin="3" Content="Datenaustauschreferenz:"/>
+                    <TextBox Grid.Row="8" Grid.Column="2" Margin="3" IsReadOnly="True" Text="{Binding Datenaustauschreferenz}"/>
+                    <Label Grid.Row="9" Grid.Column="0" Margin="3" Content="Erstellt am:"/>
+                    <TextBox Grid.Row="9" Grid.Column="2" Margin="3" IsReadOnly="True" Text="{Binding ErstelltAm}"/>
+                    <Label Grid.Row="10" Grid.Column="0" Margin="3" Content="Dateigröße:"/>
+                    <TextBox Grid.Row="10" Grid.Column="2" Margin="3" IsReadOnly="True" Text="{Binding DateigrößeDisplayname}"/>
+                    <Label      Grid.Row="14" Grid.Column="0" Margin="3" Content="Betrag:"/>
+                    <TextBox    Grid.Row="14" Grid.Column="2" Margin="3" IsReadOnly="True" Text="{Binding Betrag, StringFormat={}{0:0.00 €}}"/>
+                    <Label      Grid.Row="15" Grid.Column="0" Margin="3" Content="Bezahlt:"/>
+                    <CheckBox Grid.Row="15" Grid.Column="2" Margin="3" HorizontalAlignment="Left" x:Name="Checkbox_Bezahlt" IsChecked="{Binding Bezahlt}"/>
+                    <!--<TextBox    Grid.Row="15" Grid.Column="2" Margin="3" IsReadOnly="True" Text="{Binding Bezahlt}"/>-->
+                    <Label      Grid.Row="16" Grid.Column="0" Margin="3" Content="Bemerkung:"/>
+                    <TextBox    Grid.Row="16" Grid.Column="2" Margin="3" Text="{Binding Notice}" x:Name="Textbox_Notice" />
+                </Grid>
+            </TabItem>
+            <TabItem Header="Protokoll">
+                <dxg:GridControl Margin="3" x:Name="datagrid_transfer" DataSource="{Binding TransferProtokolle}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+                    <dxg:GridControl.Columns>
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Dateiname" Header="Dateiname"></dxg:GridColumn>
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="PruftDatum" Header="Geprüft am">
+                            <dxg:GridColumn.EditSettings>
+                                <dxe:TextEditSettings DisplayFormat="g" Mask="c" MaskType="DateTime"></dxe:TextEditSettings>
+                            </dxg:GridColumn.EditSettings>
+                        </dxg:GridColumn>
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="PruftFehler" Header="Prüffehler"></dxg:GridColumn>
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="VerschlusseltDatum" Header="Verschlüsselt am">
+                            <dxg:GridColumn.EditSettings>
+                                <dxe:TextEditSettings DisplayFormat="g" Mask="c" MaskType="DateTime"></dxe:TextEditSettings>
+                            </dxg:GridColumn.EditSettings>
+                        </dxg:GridColumn>
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="VerschlusseltFehler" Header="Verschlüsselungsfehler"></dxg:GridColumn>
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="UbertragDatum" Header="Übertragen am">
+                            <dxg:GridColumn.EditSettings>
+                                <dxe:TextEditSettings DisplayFormat="g" Mask="c" MaskType="DateTime"></dxe:TextEditSettings>
+                            </dxg:GridColumn.EditSettings>
+                        </dxg:GridColumn>
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="UbertragFehler" Header="Übertragungsfehler"></dxg:GridColumn>
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="AbsenderBezeichnung" Header="Absender Bezeichnung"></dxg:GridColumn>
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="EmpfangerBezeichnung" Header="Empfänger Bezeichnung"></dxg:GridColumn>
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Dateityp" Header="Dateityp"></dxg:GridColumn>
+                    </dxg:GridControl.Columns>
+                    <dxg:GridControl.View>
+                        <dxg:TableView NavigationStyle="Cell" BestFitMode="Smart" 
+                                       AllowBestFit="True" ShowGroupPanel="False" ScrollingMode="Smart" SnapsToDevicePixels="True"
+                                       Margin="3,22,3,3"/>
+                    </dxg:GridControl.View>
+                </dxg:GridControl>
+            </TabItem>
+            <TabItem x:Name="tabitem_rechnungen" Header="Enthaltene Rechnungen">
+                <dxg:GridControl Margin="3" x:Name="datagrid_invoices" DataSource="{Binding InvoiceBases2}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+                    <dxg:GridControl.Columns>
+                        <dxg:GridColumn x:Name="ColumnChecked" FieldName="IsChecked" Header=" " MinWidth="30"></dxg:GridColumn>
+                        <dxg:GridColumn x:Name="ColumnButtons"  AllowEditing="False" FieldName="ReportLink" Header=" ">
+                            <dxg:GridColumn.DisplayTemplate>
+                                <ControlTemplate>
+                                    <StackPanel Orientation="Horizontal">
+                                        <Button Margin="1" ToolTip="Formular anzeigen" x:Name="btn_report" Height="20" Width="20" VerticalAlignment="Center">
+                                            <TextBlock Padding="0">
+												<Hyperlink TextDecorations="None" TargetName="_NewWindow" NavigateUri="{Binding DisplayText, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" RequestNavigate="Hyperlink_OnRequestNavigate">
+													<TextBlock Padding="0" Text="¥" Foreground="#FFFFFF" FontSize="15" FontFamily="Webdings" Height="17" Width="16" VerticalAlignment="Center" HorizontalAlignment="Left" />
+												</Hyperlink>
+											</TextBlock>
+                                        </Button>
+                                    </StackPanel>
+                                </ControlTemplate>
+                            </dxg:GridColumn.DisplayTemplate>
+                        </dxg:GridColumn>
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="TypeString" Header="Art der Rechnung" Width="150" />
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="CustomerName" Header="{markup:Translate Klient/in}" Width="100" />
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="AccountingPeriodString" SortFieldName="AccountingPeriodStart" Header="Zeitraum" Width="100" />
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="InvoiceNumber" Header="Nummer" />
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="InvoiceDate" Header="Datum" EditSettings="{dxe:DateSettings DisplayFormat=d}" MinWidth="70" />
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="RecipientString" Header="{markup:Translate EmpfängerSingular}" />
+                        <!--<dxg:GridColumn FieldName="AccountingPeriodString" Header="Abrechnungszeitraum" />-->
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="TotalAmount" Header="Betrag" MinWidth="70">
+                            <dxg:GridColumn.EditSettings>
+                                <dxe:TextEditSettings DisplayFormat="c" Mask="c" MaskType="Numeric"></dxe:TextEditSettings>
+                            </dxg:GridColumn.EditSettings>
+                        </dxg:GridColumn>
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Notice" Header="Bemerkung" MinWidth="200" />
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" x:Name="PaidColumn" FieldName="IsPaid" Header="Bezahlt"></dxg:GridColumn>
+                    </dxg:GridControl.Columns>
+                    <dxg:GridControl.View>
+                        <dxg:TableView NavigationStyle="Cell" x:Name="gridView" BestFitMode="Smart" 
+                                       AllowBestFit="True" ShowGroupPanel="False" ScrollingMode="Smart" SnapsToDevicePixels="True"
+                                       Loaded="gridView_Loaded"
+                                       Margin="3,22,3,3" />
+                    </dxg:GridControl.View>
+                </dxg:GridControl>
+            </TabItem>
+            <TabItem Header="Nutzdatendatei">
+                <local:TextViewer Text="{Binding Nutzdatendatei, Mode=OneWay}"/>
+            </TabItem>
+            <TabItem Header="Auftragsdatei">
+                <local:TextViewer Text="{Binding Auftragsdatei, Mode=OneWay}"/>
+            </TabItem>
+        </TabControl>
+    </Grid>
+</UserControl>
--- a/BeWo/View/Controls/GkvAbrechnungDetailControl.xaml.cs
+++ b/BeWo/View/Controls/GkvAbrechnungDetailControl.xaml.cs
@@ -0,0 +1,54 @@
+using BeWo.Core;
+using BeWo.ViewModel;
+using BeWo.ViewModel.ListViewModel;
+using DevExpress.Xpf.Grid;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BeWo.View.Controls
+{
+    /// <summary>
+    /// Interaktionslogik für GkvAbrechnungDetailControl.xaml
+    /// </summary>
+    public partial class GkvAbrechnungDetailControl : UserControl
+    {
+        public GkvAbrechnungVM GkvAbrechnungVM { get; set; }
+
+        public GkvAbrechnungDetailControl(GkvAbrechnungVM vm)
+        {
+            InitializeComponent();
+
+            GkvAbrechnungVM = vm;
+            DataContext = vm;
+        }
+
+        private void Hyperlink_OnRequestNavigate(object sender, RequestNavigateEventArgs e)
+        {
+            BeWoUtils.NavigateToReportUri(((Hyperlink)sender).NavigateUri.ToString(), "Druckvorschau");
+        }
+
+        private void gridView_Loaded(object sender, RoutedEventArgs e)
+        {
+            var tableView = sender as TableView;
+            if (tableView != null)
+            {
+                foreach (var item in tableView.VisibleColumns)
+                {
+                    tableView.BestFitColumn(item);
+                }
+            }
+        }
+    }
+}
--- a/BeWo/View/Controls/GoalRatingControl.xaml.cs
+++ b/BeWo/View/Controls/GoalRatingControl.xaml.cs
@@ -12,7 +12,7 @@ using System.Windows.Controls;
 using BeWo.Core.Service;
 using BS.Shared.DataContracts;
 using BS.Shared.DataContracts.ClientPartials;
-using BS.Shared.Translation;
+using BS.SharedLauncher.Translation;
 using DevExpress.Data.Helpers;
 using DevExpress.Xpf.Editors.Settings;

--- a/BeWo/View/Controls/MultiSupportConceptSelectionControl.xaml.cs
+++ b/BeWo/View/Controls/MultiSupportConceptSelectionControl.xaml.cs
@@ -62,6 +62,8 @@ namespace BeWo.View.Controls

        public event EventHandler<EventArgs<CompactSupportConceptDC>> ItemSelected;

+        public event EventHandler<EventArgs<IList<CompactSupportConceptDC>>> ListChanged;
+
        public CompactSupportConceptDC SelectedItem
        {
            get
@@ -94,6 +96,8 @@ namespace BeWo.View.Controls
                this.SelectedSupportConcepts.Add(e.Data);

                this.listBoxSupportConcepts.ScrollIntoView(e.Data);
+
+                FireListChangedEvent();
            }
        }

@@ -116,6 +120,7 @@ namespace BeWo.View.Controls
                                                           this.SelectedSupportConcepts.Add(sc);
                                                       }
                                                   }
+                                                   FireListChangedEvent();
                                               }

                                           }));
@@ -166,6 +171,15 @@ namespace BeWo.View.Controls
            if (dc != null)
            {
                this.SelectedSupportConcepts.Remove(dc);
+                FireListChangedEvent();
+            }
+        }
+
+        private void FireListChangedEvent()
+        {
+            if (ListChanged != null)
+            {
+                ListChanged(this, new EventArgs<IList<CompactSupportConceptDC>>(SelectedSupportConcepts)); 
            }
        }

--- a/BeWo/View/Controls/TextViewer.xaml
+++ b/BeWo/View/Controls/TextViewer.xaml
@@ -0,0 +1,26 @@
+<UserControl x:Class="BeWo.View.Controls.TextViewer"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:BeWo.View.Controls"
+             mc:Ignorable="d">
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*"/>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="auto"/>
+        </Grid.RowDefinitions>
+        <Grid Grid.Row="0">
+            <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto" Margin="3" Background="#eeeeee">
+                <TextBox x:Name="txt" IsReadOnly="True" Text="test" Foreground="Black" Background="#f1f1f1" BorderThickness="1">
+
+                </TextBox>
+            </ScrollViewer>
+        </Grid>
+
+        <Button Grid.Row="1" Content="Inhalt in Zwischenablage kopieren" Click="Button_Click" Margin="3"/>
+    </Grid>
+</UserControl>
--- a/BeWo/View/Controls/TextViewer.xaml.cs
+++ b/BeWo/View/Controls/TextViewer.xaml.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BeWo.View.Controls
+{
+    /// <summary>
+    /// Interaktionslogik für TextViewer.xaml
+    /// </summary>
+    public partial class TextViewer : UserControl
+    {
+        public static readonly DependencyProperty TextViewerTextProperty = DependencyProperty.Register(
+            "Text",
+            typeof(string),
+            typeof(TextViewer),
+            new UIPropertyMetadata(
+                (s, e) =>
+                {
+                    var info = (string)e.NewValue;
+                    var textViewer = (TextViewer)s;
+
+                    textViewer.txt.Text = info;
+                }));
+
+        public TextViewer()
+        {
+            InitializeComponent();
+        }
+
+        public string Text
+        {
+            get => (string)GetValue(TextViewerTextProperty);
+            set => SetValue(TextViewerTextProperty, value);
+        }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            Clipboard.SetText(Text);
+        }
+    }
+}
--- a/BeWo/View/Controls/ValueListEntryEditControl.xaml
+++ b/BeWo/View/Controls/ValueListEntryEditControl.xaml
@@ -31,7 +31,7 @@
        <Label        x:Name="LabelKatalog"  Grid.Row="1" Grid.Column="0" Content="Maßnahme:" Margin="3" Visibility="Collapsed"/>
        <ComboBox x:Name="CboCatalog" Grid.Row="1" Grid.Column="1" Margin="3" Grid.ColumnSpan="3" Visibility="Collapsed" SelectionChanged="CboCatalog_SelectionChanged"/>
        <Label        x:Name="LabelCode"  Grid.Row="2" Grid.Column="0" Content="Abkürzung:" Margin="3"/>
-        <TextBox      x:Name="TxtCode" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="3" Margin="3" Text="{Binding Abbreviation}"/>
+        <TextBox      x:Name="TxtCode" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="3" Margin="3" Text="{Binding Abbreviation}" Width="100" HorizontalAlignment="Left" MaxLength="200"/>
        <Label        x:Name="LabelBezeichnung"  Grid.Row="3" Grid.Column="0" Content="Bezeichnung:" Margin="3"/>
        <TextBox      x:Name="TxtBezeichnung" Grid.Row="3"  Grid.Column="1" Grid.ColumnSpan="3" Margin="3" Text="{Binding Description}" />
        <Label        x:Name="LabelNotice" Grid.Row="4" Grid.Column="0" Content="Beschreibung:" Margin="3"/>
--- a/BeWo/View/Controls/ValueListEntryEditControl.xaml.cs
+++ b/BeWo/View/Controls/ValueListEntryEditControl.xaml.cs
@@ -35,13 +35,21 @@ namespace BeWo.View.Controls
            {
                CboCatalog.SelectedItem = valueListEntry.CatalogEntry;
            }
-            bool zeigeKatalogAuswahl = massnahmenKatalog != null && (massnahmenKatalog.Count > 0);
+            bool zeigeKatalogAuswahl = massnahmenKatalog != null && (massnahmenKatalog.Count > 0) && valueListEntry.Type == BS.Shared.ValueListEntryType.SupportConceptIndividualGoalType;
            RadioStackPanel.Visibility = zeigeKatalogAuswahl ? Visibility.Visible : Visibility.Collapsed;
            if (zeigeKatalogAuswahl)
-            {   
+            {
                RBtnKatalog.IsChecked = true;
                RBtnIndMassnahme.IsChecked = false;

+
+                if (!valueListEntry.IsNew && valueListEntry.CatalogEntry == null)
+                {
+                    RBtnKatalog.IsChecked = false;
+                    RBtnIndMassnahme.IsChecked = true;
+
+                }
+
                UpdateControls();
            }

--- a/BeWo/View/Controls/YearMonthFilter.xaml
+++ b/BeWo/View/Controls/YearMonthFilter.xaml
@@ -1,25 +1,19 @@
 <UserControl x:Class="BeWo.View.YearMonthFilter" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 	<Grid>
-		<GroupBox>
-			<GroupBox.Header>
-
-				<Grid Margin="0 0 4 0">
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition Width="*" SharedSizeGroup="a" />
-						<ColumnDefinition Width="Auto" SharedSizeGroup="b" />
-					</Grid.ColumnDefinitions>
-					<CheckBox Name="checkbox_yearfilter" IsChecked="True" Content="Nach Jahr filtern" />
-					<CheckBox Name="checkbox_monthfilter" IsEnabled="{Binding Path=IsChecked, ElementName=checkbox_yearfilter}" Grid.Column="1" IsChecked="True" Content="Nach Monat filtern" Margin="5,0,0,0" />
-				</Grid>
-			</GroupBox.Header>
-			<Grid Margin="0 0 4 0">
-				<Grid.ColumnDefinitions>
-					<ColumnDefinition Width="*" SharedSizeGroup="a" />
-					<ColumnDefinition Width="Auto" SharedSizeGroup="b" />
-				</Grid.ColumnDefinitions>
-				<ComboBox x:Name="combobox_year" IsEnabled="{Binding Path=IsChecked, ElementName=checkbox_yearfilter}" Margin="3" Height="20" MinWidth="80" Padding="5 0" VerticalContentAlignment="Center" Background="White" />
-				<ComboBox x:Name="combobox_month" IsEnabled="{Binding Path=IsChecked, ElementName=checkbox_monthfilter}" Grid.Column="1" Margin="8,0,0,0" Height="20" MinWidth="120" Padding="5 0" VerticalContentAlignment="Center" Background="White" Grid.Row="1" />
-			</Grid>
-		</GroupBox>
+		
+		
+		<Grid.ColumnDefinitions>
+			<ColumnDefinition Width="*" SharedSizeGroup="a" />
+			<ColumnDefinition Width="Auto" SharedSizeGroup="b" />
+		</Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition  />
+            <RowDefinition  />
+        </Grid.RowDefinitions>
+        <CheckBox Name="checkbox_yearfilter" IsChecked="True" Content="Nach Jahr filtern" />
+        <CheckBox Name="checkbox_monthfilter" IsEnabled="{Binding Path=IsChecked, ElementName=checkbox_yearfilter}" Grid.Column="1" IsChecked="True" Content="Nach Monat filtern" Margin="8,0,0,0" />
+        <ComboBox x:Name="combobox_year" IsEnabled="{Binding Path=IsChecked, ElementName=checkbox_yearfilter}" Grid.Row="1" Margin="0,3,0,0" Height="20" MinWidth="80"  VerticalContentAlignment="Center" Background="White" />
+        <ComboBox x:Name="combobox_month" IsEnabled="{Binding Path=IsChecked, ElementName=checkbox_monthfilter}" Grid.Column="1" Grid.Row="1" Margin="8,3,0,0" Height="20" MinWidth="120" VerticalContentAlignment="Center" Background="White" />
+		
 	</Grid>
 </UserControl>
--- a/BeWo/View/CostRatePeriodControl.xaml
+++ b/BeWo/View/CostRatePeriodControl.xaml
@@ -22,7 +22,7 @@
 						<dxe:DateEdit MaskType="DateTimeAdvancingCaret" Grid.Column="1" x:Name="datepicker_validUntil" EditValue="{Binding Path=EndDate, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Height="23" />
 					</Grid>
                    <dxe:TextEdit Height="23" HorizontalAlignment="Stretch" MaskType="Numeric" MaskUseAsDisplayFormat="True" Grid.Column="1" Margin="3,0,0,0" EditValue="{Binding Path=CostRateValue, UpdateSourceTrigger=PropertyChanged}" 
-                                  Mask="########0.00"/>
+                                  Mask="########0.00##"/>
                    <!--<dxe:TextEdit Height="23" HorizontalAlignment="Stretch" MaskType="Numeric" MaskUseAsDisplayFormat="True" Grid.Column="1" Margin="3,0,0,0" EditValue="{Binding Path=CostRateValue, UpdateSourceTrigger=PropertyChanged}" >
                        <dxe:TextEdit.Mask>
                            <MultiBinding Converter="{StaticResource CostRatePeriodValueConverter}" UpdateSourceTrigger="PropertyChanged">
@@ -64,7 +64,7 @@
 					<TextBlock x:Name="lblValidUntil" Text="(gültig ab 01.01.2009)" Grid.Row="2" Margin="0,-3,0,0" />
 					<TextBox Height="23" x:Name="txtActualUnitName" Text="{Binding UnitName, UpdateSourceTrigger=PropertyChanged}" Visibility="Collapsed" Grid.Column="1" Grid.Row="1" Margin="3,3,0,0" HorizontalAlignment="Stretch" />
                    <dxe:TextEdit Height="23" HorizontalAlignment="Stretch" MaskType="Numeric" MaskUseAsDisplayFormat="True" Grid.Column="1" Margin="3,0,0,0" EditValue="{Binding Path=CostRateValue, UpdateSourceTrigger=PropertyChanged}" 
-                                  Mask="########0.00"/>
+                                  Mask="########0.00##"/>
                       
 					
 					<Button x:Name="button_addCostRatePeriod" HorizontalAlignment="Center" Grid.Column="2" Width="21" Height="21" Margin="3,0,0,0" VerticalAlignment="Center" Click="button_addCostRatePeriod_Click">
--- a/BeWo/View/Detail/AbsenceReasonView.xaml
+++ b/BeWo/View/Detail/AbsenceReasonView.xaml
@@ -5,7 +5,9 @@
        xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls" 
        xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
        xmlns:diagnostics="clr-namespace:System.Diagnostics;assembly=WindowsBase"
-        xmlns:s="clr-namespace:System;assembly=mscorlib" Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
+        xmlns:s="clr-namespace:System;assembly=mscorlib" 
+                    xmlns:core="clr-namespace:BS.Shared.Core;assembly=BS.Shared"
+                    Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
        VerticalAlignment="Stretch" Focusable="True">
    <GroupBox Name="root" Header="Aktuell definierte Abwesenheitskategorien" Style="{StaticResource ObjectEditGroupBox}">
        <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
@@ -43,8 +45,8 @@
                    Height="23" Width="50" MinValue="0"
                    MaxValue="59"
                    EditValue="{Binding Path=NewVM.Minutes, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}" />
-            <Button Name="button_addReason" Click="button_addReason_Click" Grid.Column="2" Grid.Row="1" Height="25"
-                    Margin="3" IsDefault="True" Grid.ColumnSpan="4" HorizontalAlignment="Right">Hinzufügen</Button>
+            <Button Name="button_addReason" Click="button_addReason_Click" Grid.Column="4" Grid.Row="1" Height="25"
+                    Margin="3" IsDefault="True" Grid.ColumnSpan="2" HorizontalAlignment="Right">Hinzufügen</Button>
            <Label Grid.Column="0" Grid.Row="1">
                Farbe im Belegungsplan
            </Label>
@@ -62,6 +64,17 @@
                    </Style>
                </ComboBox.ItemContainerStyle>
            </ComboBox>
+            <StackPanel Grid.Column="2" Grid.Row="1" Grid.ColumnSpan="2" Orientation="Horizontal">
+                <Label>Nur auswählbar für</Label>
+                <ComboBox x:Name="combo_visibilitytype"
+                               Grid.Column="3" Grid.Row="1" VerticalAlignment="Center" Margin="3,1,3,3" 
+                               HorizontalAlignment="Stretch"
+                               ItemsSource="{x:Static core:EnumTranslations.AbsenceReasonVisibility2Translations}"
+                               SelectedValue="{Binding NewVM.Sichtbarkeit, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                               SelectedValuePath="Key"
+                               DisplayMemberPath="Value"
+                               Height="23" Width="200"/>
+            </StackPanel>
            <dxg:GridControl x:Name="datagrid_absencereasons" Margin="0,10,0,0" Grid.Column="0" Grid.Row="2"
                    Grid.ColumnSpan="7" DataSource="{Binding VMList}">
                <dxg:GridControl.Columns>
@@ -78,6 +91,7 @@
                    <dxg:GridColumn FieldName="Description" Header="Bezeichnung" Width="180" />
                    <dxg:GridColumn FieldName="Hours" Header="max. abrechenbare Stunden" Width="180" />
                    <dxg:GridColumn FieldName="Minutes" Header="Minuten" Width="180" />
+                    <dxg:GridColumn x:Name="column_visibility" FieldName="Sichtbarkeit" Header="Nur auswählbar für" Width="150" />
                    <dxg:GridColumn x:Name="column_Color" FieldName="Brush" Header="Farbe" Width="70">
 						<dxg:GridColumn.DisplayTemplate>
 							<ControlTemplate>
--- a/BeWo/View/Detail/AbsenceReasonView.xaml.cs
+++ b/BeWo/View/Detail/AbsenceReasonView.xaml.cs
@@ -10,11 +10,13 @@ using BeWo.ServiceProxy;
 using BeWo.Validation;
 using BeWo.ViewModel;
 using BeWo.ViewModel.ListViewModel;
-
+using BS.Shared.Core;
 using BS.Shared.Extensions;

+using DevExpress.Xpf.Editors.Settings;
 using DevExpress.Xpf.Grid;

+
 namespace BeWo.View.Detail
 {
 	public partial class AbsenceReasonView
@@ -26,6 +28,8 @@ namespace BeWo.View.Detail
 			InitializeComponent();
 			combobox_brush.ItemTemplateSelector = new ComboBoxTemplateSelector(combobox_brush);
 			ViewModel = pViewModel;
+
+			column_visibility.EditSettings = new ComboBoxEditSettings { ItemsSource = EnumTranslations.AbsenceReasonVisibility2Translations, DisplayMember = "Value", ValueMember = "Key" };
 		}

 		public override bool IsDirty
--- a/BeWo/View/Detail/Accounting/DigitalInvoiceOverview.xaml
+++ b/BeWo/View/Detail/Accounting/DigitalInvoiceOverview.xaml
@@ -0,0 +1,94 @@
+<localView:BeWoView x:Class="BeWo.View.Detail.Accounting.DigitalInvoiceOverview" 
+                    xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup" 
+                    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+                    xmlns:localView="clr-namespace:BeWo.View" 
+                    xmlns:localViewModel="clr-namespace:BeWo.ViewModel" 
+                    xmlns:localViewDetail="clr-namespace:BeWo.View.Detail.Accounting" 
+                    xmlns:val="clr-namespace:BeWo.Validation" 
+                    xmlns:proxy="clr-namespace:BeWo.ServiceProxy" 
+                    xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls" 
+                    xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid" 
+                    xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core" 
+                    xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" 
+                    Height="Auto" Width="Auto" HorizontalAlignment="Stretch" 
+                    xmlns:s="clr-namespace:System;assembly=mscorlib" 
+                    xmlns:r="clr-namespace:BeWo.Security" 
+                    VerticalAlignment="Stretch" Focusable="True" 
+                    xmlns:Microsoft_Windows_Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Classic">
+
+	<Grid>
+		<GroupBox x:Name="groupbox_editArea" Grid.Row="0" Header="Rechnungsübersicht" Style="{DynamicResource ObjectEditGroupBox}">
+
+			<Grid Grid.IsSharedSizeScope="True">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition Width="Auto" />
+					<ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="*" />
+				</Grid.ColumnDefinitions>
+				<Grid.RowDefinitions>
+					<RowDefinition Height="Auto" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+
+				<localView:YearMonthFilter Margin="3 0 0 0" VerticalAlignment="Center" HorizontalAlignment="Left" Grid.Column="0" x:Name="yearMonthFilter" FilterSpanChanged="YearMonthFilter_FilterSpanChanged" />
+				<Button x:Name="button_reload" Grid.Column="1" Content="Aktualisieren" Margin="0,0,0,8" Click="ReloadButton_OnClick" Height="24" HorizontalAlignment="Left" VerticalAlignment="Bottom" Width="80" />
+				
+				<dxg:GridControl Margin="3" Grid.ColumnSpan="2" Grid.Row="1" DataSource="{Binding VMList}" x:Name="datagrid_invoices" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+					<dxg:GridControl.Columns>
+
+						<dxg:GridColumn x:Name="ColumnButtons"  AllowEditing="False" MinWidth="20" Width="22" FieldName="ReportLink" Header=" ">
+							<dxg:GridColumn.DisplayTemplate>
+								<ControlTemplate>
+									<StackPanel Orientation="Horizontal">
+                                        <Button Margin="1" ToolTip="Codierung erzeugen" x:Name="btn_report" Height="20" Width="20" VerticalAlignment="Center">
+                                            <TextBlock Padding="0">
+												<Hyperlink TextDecorations="None" TargetName="_NewWindow" NavigateUri="{Binding DisplayText, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" RequestNavigate="Hyperlink_OnRequestNavigate">
+													<TextBlock Padding="0" Text="¥" Foreground="#FFFFFF" FontSize="15" FontFamily="Webdings" Height="17" Width="16" VerticalAlignment="Center" HorizontalAlignment="Left" />
+												</Hyperlink>
+											</TextBlock>
+                                        </Button>
+                                    </StackPanel>
+								</ControlTemplate>
+							</dxg:GridColumn.DisplayTemplate>
+						</dxg:GridColumn>
+						<dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="TypeString" Header="Art der Rechnung" Width="150" />
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="CustomerName" Header="{markup:Translate Klient/in}" Width="100" />
+					    <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="AccountingPeriodString" Header="Zeitraum" Width="100" />
+						<dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="InvoiceNumber" Header="Nummer" />
+						<dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="InvoiceDate" Header="Datum" EditSettings="{dxe:DateSettings DisplayFormat=d}" MinWidth="70" />
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="RecipientString" Header="{markup:Translate EmpfängerSingular}" />
+						<!--<dxg:GridColumn FieldName="AccountingPeriodString" Header="Abrechnungszeitraum" />-->
+						<dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="TotalAmount" Header="Betrag" MinWidth="70">
+							<!--<dxg:GridColumn.CellStyle>
+                                <Style  TargetType="dxg:LightweightCellEditor">
+                                    <Setter Property="TextBlock.FontWeight" Value="Bold"/>
+                                </Style>
+                            </dxg:GridColumn.CellStyle>-->
+						</dxg:GridColumn>
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Notice" Header="Bemerkung" MinWidth="200" >
+                        </dxg:GridColumn>
+                    </dxg:GridControl.Columns>
+					<dxg:GridControl.View>
+						<dxg:TableView NavigationStyle="Cell" Loaded="gridView_Loaded" x:Name="gridView" BestFitMode="Smart" AllowBestFit="True" ShowGroupPanel="False" ScrollingMode="Smart" SnapsToDevicePixels="True" Margin="3,22,3,3" />
+					</dxg:GridControl.View>
+				</dxg:GridControl>
+
+				<Grid Grid.Row="1" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="5,2,5,0">
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition Width="*" />
+						<ColumnDefinition Width="Auto" />
+					</Grid.ColumnDefinitions>
+                    <WrapPanel>
+                        <Label FontSize="14" Foreground="{StaticResource GridPrintMenuLightBrush}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="10 0 0 0" Content="{Binding FilterResultAmountSum, Converter={StaticResource StringFormatConverter}, ConverterParameter='{}Summe aller Rechnungen: {0:c}'}" />
+                        <Label FontSize="14" Foreground="{StaticResource GridPrintMenuLightBrush}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0 0 0 0" Content=" | " />
+                        <Label FontSize="14" x:Name="lblAmoutNotPaid" Foreground="{StaticResource GridPrintMenuLightBrush}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0 0 0 0" Content="{Binding FilterResultAmountNotPaidSum, Converter={StaticResource StringFormatConverter}, ConverterParameter='{}Summe der noch offenen Rechnungen: {0:c}'}" />
+                    </WrapPanel>
+                </Grid>
+
+                <TextBox x:Name="Output" Grid.Row="1" Grid.Column="2" Text="Test123\nn" IsReadOnly="True" AcceptsReturn="True" />
+            </Grid>
+		</GroupBox>
+	</Grid>
+
+</localView:BeWoView>
--- a/BeWo/View/Detail/Accounting/DigitalInvoiceOverview.xaml.cs
+++ b/BeWo/View/Detail/Accounting/DigitalInvoiceOverview.xaml.cs
@@ -0,0 +1,144 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Web;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+using System.Windows.Media;
+using System.Windows.Navigation;
+using System.Windows.Threading;
+using BeWo.Core;
+using BeWo.ServiceProxy;
+using BeWo.ViewModel;
+using BeWo.ViewModel.ListViewModel;
+
+using BS.Shared;
+using BS.Shared.Core;
+using BS.Shared.DataContracts;
+using BS.Shared.Extensions;
+
+using DevExpress.Xpf.Editors;
+using DevExpress.Xpf.Grid;
+using Microsoft.Win32;
+
+namespace BeWo.View.Detail.Accounting
+{
+    public partial class DigitalInvoiceOverview : BeWoView
+    {
+        private readonly EquityInvoiceItemEditView _EquityInvoiceItemEditView;
+
+        private readonly GeneralInvoiceItemEditView _GeneralInvoiceItemEditView;
+
+        private readonly SettlementInvoiceItemEditView _SettlementInvoiceItemEditView;
+
+        private readonly SettlementInvoiceItemEditView2 _SettlementInvoiceItemEditView2;
+
+        private readonly ServiceInvoiceItemEditView _ServiceInvoiceItemEditView;
+
+        private InvoiceBaseListVM _Viewmodel;
+
+        public DigitalInvoiceOverview()
+        {
+            this.InitializeComponent();
+            this.ViewModel = new InvoiceBaseListVM(null);
+            
+            RefreshInvoiceList();
+        }
+
+        private void RefreshInvoiceList()
+		{
+			DateTime? start = null;
+			DateTime? end = null;
+			
+            if (ViewModel.DateTimeSpanFilter != null)
+			{
+				start = ViewModel.DateTimeSpanFilter.StartDate;
+				end = ViewModel.DateTimeSpanFilter.EndDate;
+			}
+            else
+            {
+                start = new DateTime(2023, 1, 1);
+                end = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1);
+            }
+
+            ServiceFacade.DoAccountingServiceAsync(s => s.GetInvoiceBases(start, end), UpdateInvoiceList);
+        }
+
+        private void UpdateInvoiceList(IList<InvoiceBaseDC> dcList)
+        {
+            this.Dispatcher.BeginInvoke(
+                DispatcherPriority.Normal,
+                (Action)delegate
+                {
+                    ViewModel.UpdateList(dcList.Where(x => true).ToList());
+                    this.gridView.BestFitColumns();
+                });
+        }
+
+        private InvoiceBaseListVM ViewModel
+        {
+            get
+            {
+                return this._Viewmodel;
+            }
+
+            set
+            {
+                this.DataContext = value;
+                this._Viewmodel = value;
+            }
+        }
+
+        private void RefreshItemInList(InvoiceBaseDC cb)
+        {
+            this.Dispatch(
+                delegate
+                    {
+                        var old = this.ViewModel.VMList.Single(i => i.DataContract.InvoiceBaseOid.Equals(cb.InvoiceBaseOid));
+                        var lNew = new InvoiceBaseVM(cb);
+
+                        this.ViewModel.VMList.Remove(old);
+                        this.ViewModel.VMList.Add(lNew);
+                        this.datagrid_invoices.RefreshData();
+                        this.gridView.FocusedRow = lNew;
+                    });
+        }
+        
+        private void gridView_Loaded(object sender, RoutedEventArgs e)
+        {
+            this.gridView.BestFitColumns();
+        }
+
+        private void gridView_ShownEditor(object sender, EditorEventArgs e)
+        {
+            if (e.Editor is CheckEdit)
+            {
+                var ed = (CheckEdit)e.Editor;
+                ed.Tag = e.Row;
+            }
+        }
+
+        private void Hyperlink_OnRequestNavigate(object sender, RequestNavigateEventArgs e)
+        {
+            var uri = ((Hyperlink)sender).NavigateUri;
+            string dcid = HttpUtility.ParseQueryString(uri.Query).Get("ibid");
+
+            var schaarf = ServiceFacade.DoOperationsServiceSync(x => x.GetDakotaFileFormat(dcid));
+
+            Output.Text = schaarf;
+        }
+
+		private void ReloadButton_OnClick(object sender, RoutedEventArgs e)
+		{
+			RefreshInvoiceList();
+        }
+
+        private void YearMonthFilter_FilterSpanChanged(object sender, EventArgs<DateTimeSpan> e)
+        {
+            this.ViewModel.DateTimeSpanFilter = e.Data;
+            RefreshInvoiceList();
+        }
+    }
+}
--- a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml
+++ b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml
@@ -0,0 +1,113 @@
+<localView:BeWoView x:Class="BeWo.View.Detail.Accounting.GkvAbrechnungOverview" 
+                    xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup" 
+                    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:localView="clr-namespace:BeWo.View" 
+                    xmlns:localViewModel="clr-namespace:BeWo.ViewModel" 
+                    xmlns:localViewDetail="clr-namespace:BeWo.View.Detail.Accounting" 
+                    xmlns:val="clr-namespace:BeWo.Validation" 
+                    xmlns:proxy="clr-namespace:BeWo.ServiceProxy" 
+                    xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls" xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid" xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core" xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" Height="Auto" Width="Auto" HorizontalAlignment="Stretch" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:r="clr-namespace:BeWo.Security" VerticalAlignment="Stretch" Focusable="True" xmlns:Microsoft_Windows_Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Classic">
+
+	<Grid>
+		<GroupBox x:Name="groupbox_editArea" Grid.Row="0" Header="GKV-Abrechnungen" Style="{DynamicResource ObjectEditGroupBox}">
+
+			<Grid Grid.IsSharedSizeScope="True" Margin="0,3,0,0">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+				</Grid.ColumnDefinitions>
+				<Grid.RowDefinitions>
+					<RowDefinition Height="Auto" />
+					<RowDefinition Height="*" />
+                    <RowDefinition Height="Auto" />
+				</Grid.RowDefinitions>
+
+				<localView:YearMonthFilter Margin="3 0 0 3" VerticalAlignment="Bottom" HorizontalAlignment="Left" Grid.Column="0" x:Name="yearMonthFilter" FilterSpanChanged="YearMonthFilter_FilterSpanChanged" />
+                <StackPanel Orientation="Vertical" Grid.Column="1" Margin="12,5,0,0" VerticalAlignment="Center" HorizontalAlignment="Left">
+                    <RadioButton x:Name="radioFilterByInvoiceDate" Content="Nach Erstelldatum filtern" IsChecked="True" Click="radioFilterByInvoiceDate_Click"/>
+                    <RadioButton x:Name="radioFilterByAccountingDate" Content="Nach Abrechnungszeitraum filtern" Click="radioFilterByInvoiceDate_Click"/>
+                </StackPanel>
+                <Grid Grid.Column="2">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="auto"/>
+                        <ColumnDefinition Width="auto"/>
+                    </Grid.ColumnDefinitions>
+                    <Button x:Name="button_new" Grid.Column="2" Content="Neue Abrechnung" Margin="3" Click="NewButton_OnClick" Height="24" VerticalAlignment="Bottom"  />
+                    <Button x:Name="button_reload" Grid.Column="1" Content="Aktualisieren" Margin="3" Click="ReloadButton_OnClick" Height="24" VerticalAlignment="Bottom" Width="80" />
+                </Grid>
+
+                <dxg:GridControl Margin="3" Grid.ColumnSpan="3" Grid.Row="1" DataSource="{Binding VMList}" x:Name="datagrid_gkvAbrechnungen" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+                    <dxg:GridControl.Columns>
+                        <dxg:GridColumn x:Name="ColumnChecked" FieldName="IsChecked" Header=" " MinWidth="30" Width="120" Visible="False"></dxg:GridColumn>
+                        <dxg:GridColumn x:Name="ColumnButtons"  AllowEditing="False" Width="70"  FieldName="ReportLink" Header=" ">
+                            <dxg:GridColumn.DisplayTemplate>
+                                <ControlTemplate>
+                                    <StackPanel Orientation="Horizontal" Margin="1">
+                                        <Button Click="btn_details_Click" Content="¥" Padding="0" Margin="1" ToolTip="Details anzeigen" Foreground="#FFFFFF" FontSize="11" FontFamily="Webdings" x:Name="btn_details" Height="18" Width="20" VerticalAlignment="Center" />
+                                        <!--<Button Click="btn_nutz_Click" Content="¥" Padding="0" Margin="1" ToolTip="Nutzdatendatei" Foreground="#BBBBBB" FontSize="10" FontFamily="Webdings" x:Name="btn_nutz" Height="17" Width="20" VerticalAlignment="Center" />
+                                        <Button Click="btn_auf_Click" Content="¥" Padding="0" Margin="1" ToolTip="Auftragsdatei" Foreground="#BBBBBB" FontSize="10" FontFamily="Webdings" x:Name="btn_auf" Height="17" Width="20" VerticalAlignment="Center" />-->
+                                        <Button Click="btn_send_Click" Content="*" Padding="0" Margin="1" ToolTip="Senden" Foreground="#FFFF00" FontSize="11" FontFamily="Wingdings" x:Name="btn_send" Height="18" Width="20" VerticalAlignment="Center" />
+                                        <Button Click="btn_delete_Click" Content="r" Padding="0" Margin="1" ToolTip="Löschen" Foreground="#FF0000" FontSize="11" FontFamily="Webdings" x:Name="btn_delete" Height="18" Width="20" VerticalAlignment="Center" />
+                                    </StackPanel>
+                                </ControlTemplate>
+                            </dxg:GridColumn.DisplayTemplate>
+                        </dxg:GridColumn>
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="RecipientString" Width="177" Header="{markup:Translate EmpfängerSingular}" />
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="AbrechnungsZeitraumStart" Header="Abrechnungsbeginn" Width="116">
+                            <dxg:GridColumn.EditSettings>
+                                <dxe:DateEditSettings DisplayFormat="d" HorizontalContentAlignment="Right"/>
+                            </dxg:GridColumn.EditSettings>
+                        </dxg:GridColumn>
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="AbrechnungsZeitraumEnde" Header="Abrechnungsende" Width="107" >
+                            <dxg:GridColumn.EditSettings>
+                                <dxe:DateEditSettings DisplayFormat="d" HorizontalContentAlignment="Right"/>
+                            </dxg:GridColumn.EditSettings>
+                        </dxg:GridColumn>
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Transfername" Header="Transfername" Width="84" >
+                            <dxg:GridColumn.EditSettings>
+                                <dxe:TextEditSettings HorizontalContentAlignment="Right"/>
+                            </dxg:GridColumn.EditSettings>
+                        </dxg:GridColumn>
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Datenaustauschreferenz" Header="Referenz" Width="58" >
+                            <dxg:GridColumn.EditSettings>
+                                <dxe:TextEditSettings HorizontalContentAlignment="Right"/>
+                            </dxg:GridColumn.EditSettings>
+                        </dxg:GridColumn>
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="DateigrößeDisplayname" Header="Dateigröße" Width="100" >
+                            <dxg:GridColumn.EditSettings>
+                                <dxe:TextEditSettings HorizontalContentAlignment="Right"/>
+                            </dxg:GridColumn.EditSettings>
+                        </dxg:GridColumn>
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="ErstelltAm" Header="Erstelldatum" Width="120">
+                            <dxg:GridColumn.EditSettings>
+                                <dxe:TextEditSettings HorizontalContentAlignment="Right"/>
+                            </dxg:GridColumn.EditSettings>
+                        </dxg:GridColumn>
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Betrag" Header="Betrag" MinWidth="74">
+                            <dxg:GridColumn.EditSettings>
+                                <dxe:TextEditSettings DisplayFormat="c" Mask="c" MaskType="Numeric" HorizontalContentAlignment="Right"></dxe:TextEditSettings>
+                            </dxg:GridColumn.EditSettings>
+                        </dxg:GridColumn>
+                        <dxg:GridColumn FieldName="Notice" Header="Bemerkung" MinWidth="200" >
+                            <dxg:GridColumn.EditSettings>
+                                <dxe:TextEditSettings TextWrapping="Wrap" />
+                            </dxg:GridColumn.EditSettings>
+                        </dxg:GridColumn>
+                        <dxg:GridColumn x:Name="PaidColumn" FieldName="Bezahlt" Header="Bezahlt" Width="50"></dxg:GridColumn>
+                    </dxg:GridControl.Columns>
+                    <dxg:GridControl.View>
+                        <dxg:TableView NavigationStyle="Cell" Loaded="gridView_Loaded" x:Name="gridView" BestFitMode="Smart" 
+                                       AllowBestFit="True" ShowGroupPanel="False" ScrollingMode="Smart" SnapsToDevicePixels="True"  ShownEditor="gridView_ShownEditor"
+                                       CellValueChanging="gridView_CellValueChanged" 
+                                       CustomRowAppearance="TableView_OnCustomRowAppearance"
+                                       Margin="3,22,3,3" CellValueChanged="gridView_CellValueChanged_1" RowMinHeight="24"/>
+                    </dxg:GridControl.View>
+                </dxg:GridControl>
+            </Grid>
+		</GroupBox>
+	</Grid>
+
+</localView:BeWoView>
--- a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs
+++ b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs
@@ -0,0 +1,350 @@
+using System;
+using System.Activities.Statements;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+using System.Windows.Media;
+using System.Windows.Navigation;
+using System.Windows.Threading;
+using BeWo.Core;
+using BeWo.ServiceProxy;
+using BeWo.View.Controls;
+using BeWo.ViewModel;
+using BeWo.ViewModel.ListViewModel;
+
+using BS.Shared;
+using BS.Shared.Core;
+using BS.Shared.DataContracts;
+using BS.Shared.DataContracts.GkvAbrechnung;
+using BS.Shared.Extensions;
+using DevExpress.Data.Filtering;
+using DevExpress.Mvvm;
+using DevExpress.Xpf.Editors;
+using DevExpress.Xpf.Grid;
+using Microsoft.Win32;
+
+namespace BeWo.View.Detail.Accounting
+{
+    public partial class GkvAbrechnungOverview : BeWoView
+    {
+        private readonly NewGkvAbrechnungPopUpView _NewGkvAbrechnungPopUpView;
+        private readonly GkvAbrechnungListVM _Viewmodel;
+
+        public GkvAbrechnungOverview(GkvAbrechnungListVM vm)
+        {
+            UpdateDataGridFilterCommand = new DelegateCommand(UpdateDataGridFilter);
+
+            InitializeComponent();
+
+            DownloadLinkEngine = new DownloadLinkEngine();
+
+            _Viewmodel = vm;
+
+            DataContext = vm;
+
+            //datagrid_gkvAbrechnungen.FixedFilter = new BinaryOperator("Datenaustauschreferenz", 1);
+
+            _NewGkvAbrechnungPopUpView = new NewGkvAbrechnungPopUpView();
+            _NewGkvAbrechnungPopUpView.CancelButtonClicked += NewGkvAbrechnungPopUpViewCancelButtonClicked;
+            _NewGkvAbrechnungPopUpView.CreateButtonClicked += NewGkvAbrechnungPopUpViewCreateButtonClicked;
+
+            _Viewmodel.DateTimeSpanFilter = yearMonthFilter.FilterSpan;
+
+            CheckRights();
+
+            RefreshGkvAbrechnungenList();
+
+            UpdateDataGridFilter();
+        }
+
+        public DownloadLinkEngine DownloadLinkEngine { get; set; }
+        public DelegateCommand UpdateDataGridFilterCommand { get; set; }
+
+        private bool ShowAllInvoices => _Viewmodel.DateTimeSpanFilter is null;
+
+        private void CheckRights()
+        {
+            //if (!BeWoApp.AppSettings.AllowStorno)
+            //{
+            //    ColumnButtons.MinWidth = 67;
+            //}
+        }
+        private void RefreshGkvAbrechnungenList()
+        {
+            var test = datagrid_gkvAbrechnungen;
+
+            ServiceFacade.DoAccountingServiceAsync(s => s.GetFilteredGkvAbrechnungen(null), UpdateGkvAbrechnungList);
+        }
+        private void UpdateDataGridFilter()
+        {
+            datagrid_gkvAbrechnungen.FixedFilter = null;
+            gridView.BestFitColumns();
+
+            if (ShowAllInvoices)
+            {
+                datagrid_gkvAbrechnungen.FixedFilter = null;
+            }
+            else
+            {
+                var filterByInvoiceDate = radioFilterByInvoiceDate.IsChecked.Value;
+
+                var filter_start = _Viewmodel.DateTimeSpanFilter.StartDate;
+                var filter_ende = _Viewmodel.DateTimeSpanFilter.EndDate.AddDays(1).AddMilliseconds(-1);
+
+                if (filterByInvoiceDate)
+                {
+                    datagrid_gkvAbrechnungen.FixedFilter = CriteriaOperator.And(
+                    CriteriaOperator.FromLambda<GkvAbrechnungDC>(gkv => gkv.ErstelltAm >= filter_start),
+                    CriteriaOperator.FromLambda<GkvAbrechnungDC>(gkv => gkv.ErstelltAm <= filter_ende));
+                }
+                else
+                {
+                    datagrid_gkvAbrechnungen.FixedFilter = CriteriaOperator.Or(
+                   CriteriaOperator.FromLambda<GkvAbrechnungDC>(gkv => filter_start <= gkv.AbrechnungsZeitraumStart && gkv.AbrechnungsZeitraumStart <= filter_ende),
+                   CriteriaOperator.FromLambda<GkvAbrechnungDC>(gkv => filter_start <= gkv.AbrechnungsZeitraumEnde && gkv.AbrechnungsZeitraumEnde <= filter_ende),
+                   CriteriaOperator.FromLambda<GkvAbrechnungDC>(gkv => gkv.AbrechnungsZeitraumStart <= filter_start && filter_ende <= gkv.AbrechnungsZeitraumEnde));
+                }
+            }
+        }
+
+        private void UpdateGkvAbrechnungList(IList<GkvAbrechnungDC> dcList)
+        {
+            this.Dispatcher.BeginInvoke(
+                DispatcherPriority.Normal,
+                (Action)delegate
+                {
+                    _Viewmodel.UpdateList(dcList);
+                    UpdateDataGridFilter();
+                });
+        }
+
+        private void NewGkvAbrechnungPopUpViewCancelButtonClicked(object sender, EventArgs e)
+        {
+            MainControl.CloseCurrentPopUp();
+        }
+        private void NewGkvAbrechnungPopUpViewCreateButtonClicked(object sender, EventArgs<GkvAbrechnungDC> e)
+        {
+            var checked_invoice_bases = _NewGkvAbrechnungPopUpView.ViewModel.InvoiceBases.Where(x => x.IsChecked).Select(x => x.DataContract.InvoiceBaseOid.Value).ToList();
+
+            if (checked_invoice_bases.Count == 0)
+            {
+                if (MessageBox.Show("Sie haben keine Rechnung hinzugefügt. Wollen Sie fortfahren?", "GKV-Abrechnung erstellen", MessageBoxButton.YesNo, MessageBoxImage.Warning) != MessageBoxResult.Yes)
+                {
+                    return;
+                }
+            }
+
+            MainControl.CloseCurrentPopUp();
+
+            var gkv_abrechnung = e.Data;
+            var gkv_filter = new GkvAbrechnungRequestDC(gkv_abrechnung);
+
+            gkv_filter.SelectedInvoiceBases = checked_invoice_bases;
+
+            ServiceFacade.DoAccountingServiceAsync(x => x.CreateNewGkvAbrechnung(gkv_filter),
+                cb => Dispatcher.BeginInvoke(DispatcherPriority.Normal,
+                (Action)delegate
+                {
+                    if (cb.Success)
+                    {
+                        RefreshGkvAbrechnungenList();
+                    }
+                    else
+                    {
+                        BeWoWindowBuilder.ShowErrorMessageBox(cb.Error);
+                    }
+                }));
+        }
+
+        private void YearMonthFilter_FilterSpanChanged(object sender, EventArgs<DateTimeSpan> e)
+        {
+            _Viewmodel.DateTimeSpanFilter = e.Data;
+            UpdateDataGridFilter();
+        }
+
+        private void btn_details_Click(object sender, RoutedEventArgs e)
+        {
+            var vm = this.datagrid_gkvAbrechnungen.GetCurrentValue<GkvAbrechnungVM>();
+
+            var window = BeWoWindowBuilder.GetGkvAbrechnungDetailWindow(vm);
+
+            window.Closing += Detail_Window_Closing;
+
+            window.ShowDialog();
+        }
+
+        private void Detail_Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            var bewo_window = sender as BeWoWindow;
+            var detail_control = bewo_window.GroupBoxContent as GkvAbrechnungDetailControl;
+
+            var vm = detail_control.DataContext as GkvAbrechnungVM;
+
+            var checkbox_checked = detail_control.Checkbox_Bezahlt.IsChecked;
+            var textbox_text = detail_control.Textbox_Notice.Text;
+
+            vm.Notice = textbox_text;
+
+            if (vm.IsDirty)
+            {
+                var dc = ServiceFacade.DoAccountingServiceSync(x => x.UpdateGkvAbrechnung(vm.CommitToDataContract()));
+                vm.GkvAbrechnungVersion = dc.GkvAbrechnungVersion;
+            }
+        }
+
+        private void btn_send_Click(object sender, RoutedEventArgs e)
+        {
+            var vm = datagrid_gkvAbrechnungen.GetCurrentValue<GkvAbrechnungVM>();
+
+            string text = "Sind Sie sicher, dass Sie die gewählte GKV-Abrechnung senden möchten?";
+
+
+
+            if (vm.TransferProtokolle != null && vm.TransferProtokolle.Any())
+            {
+                var last = vm.TransferProtokolle.Last();
+
+                var state = last.GetState();
+
+                if(state == 6)
+                {
+                    text = "Die gewählte GKV-Abrechnung wurde bereits erfolgreich gesendet. Möchten Sie sie erneut senden?";
+                }
+                else
+                {
+                    text = "Die gewählte GKV-Abrechnung wurde nicht erfolgreich gesendet. Möchten Sie sie erneut senden?";
+                }
+            }
+
+            if (MessageBox.Show(text, "GKV-Abrechnung senden", MessageBoxButton.YesNo, MessageBoxImage.Warning) == MessageBoxResult.Yes)
+            {
+                var req = new GkvAbrechnungSendRequestDC();
+
+                req.GkvAbrechnungDC = vm.CommitToDataContract();
+
+                ServiceFacade.DoAccountingServiceAsync(s => s.SendNewGkvAbrechnung(req),
+                    cb =>
+                    {
+                        Dispatcher.BeginInvoke(DispatcherPriority.Normal, (Action)(() =>
+                        {
+                            if (cb.Successful)
+                            {
+                                var dc = cb.GkvAbrechnungDC;
+
+                                vm.GkvAbrechnungVersion = dc.GkvAbrechnungVersion;
+                                vm.UpdateGkvTransferProtokoll(dc.TransferProtokolle.ToList());
+                            }
+                            else
+                            {
+                                MessageBox.Show(cb.Message);
+                            }
+                        }));
+                    }, false);
+            }
+        }
+        private void btn_delete_Click(object sender, RoutedEventArgs e)
+        {
+            var vm = datagrid_gkvAbrechnungen.GetCurrentValue<GkvAbrechnungVM>();
+
+            if (MessageBox.Show("Sind Sie sicher, dass Sie die gewählte GKV-Abrechnung löschen möchten?", "GKV-Abrechnung löschen", MessageBoxButton.YesNo, MessageBoxImage.Warning) == MessageBoxResult.Yes)
+            {
+                _Viewmodel.VMList.Remove(vm);
+
+                ServiceFacade.DoAccountingServiceAsync(s => s.DeleteGkvAbrechnung(vm.CommitToDataContract()));
+            }
+        }
+        private void NewButton_OnClick(object sender, RoutedEventArgs e)
+        {
+            GkvAbrechnungDC gkvAbrechnungDC = new GkvAbrechnungDC();
+            int year = DateTime.Now.Year;
+            int month = DateTime.Now.Month - 1;
+            gkvAbrechnungDC.AbrechnungsZeitraumStart = new DateTime(year, month, 1);
+            gkvAbrechnungDC.AbrechnungsZeitraumEnde = new DateTime(year, month, DateTime.DaysInMonth(year, month));
+            GkvAbrechnungVM gkvAbrechnungVM = new GkvAbrechnungVM(gkvAbrechnungDC);
+            _NewGkvAbrechnungPopUpView.Clear();
+            _NewGkvAbrechnungPopUpView.ViewModel = gkvAbrechnungVM;
+            this.MainControl.ShowControlAsModalPopup(this._NewGkvAbrechnungPopUpView);
+        }
+        private void ReloadButton_OnClick(object sender, RoutedEventArgs e)
+        {
+            RefreshGkvAbrechnungenList();
+        }
+
+        private void gridView_Loaded(object sender, RoutedEventArgs e)
+        {
+            //this.gridView.BestFitColumns();
+        }
+        private void gridView_ShownEditor(object sender, EditorEventArgs e)
+        {
+            if (e.Editor is CheckEdit)
+            {
+                var ed = (CheckEdit)e.Editor;
+                ed.Tag = e.Row;
+            }
+        }
+        private void gridView_CellValueChanged(object sender, CellValueChangedEventArgs e)
+        {
+            if (e.Column != null && e.Column.FieldName == "Bezahlt")
+            {
+                if (e.Value is bool b && e.Row is GkvAbrechnungVM vm)
+                {
+                    SaveBezahltChange(vm, b);
+                }
+            }
+        }
+        private void TableView_OnCustomRowAppearance(object sender, CustomRowAppearanceEventArgs e)
+        {
+            if (e.Property != null && e.Property.Name == "Background")
+            {
+                var gkvAbrechnungVM = datagrid_gkvAbrechnungen.GetRow(e.RowHandle) as GkvAbrechnungVM;
+                /*
+                if (gkvAbrechnungVM != null && !String.IsNullOrEmpty(gkvAbrechnungVM.BackgroundColor))
+                {
+                    e.Result = new SolidColorBrush((Color)ColorConverter.ConvertFromString(gkvAbrechnungVM.BackgroundColor));
+                    e.Handled = true;
+                }
+                */
+            }
+        }
+
+        private void radioFilterByInvoiceDate_Click(object sender, RoutedEventArgs e)
+        {
+            UpdateDataGridFilter();
+        }
+
+        private void SaveBezahltChange(GkvAbrechnungVM vm, bool b)
+        {
+            var dc_in = vm.CommitToDataContract();
+
+            dc_in.Bezahlt = b;
+
+            var dc = ServiceFacade.DoAccountingServiceSync(x => x.UpdateGkvAbrechnung(dc_in));
+
+            vm.GkvAbrechnungVersion = dc.GkvAbrechnungVersion;
+            vm.Bezahlt = dc.Bezahlt;
+        }
+
+        private void SaveNoticeChange(GkvAbrechnungVM vm, string notice)
+        {
+            var dc = ServiceFacade.DoAccountingServiceSync(x => x.UpdateGkvAbrechnung(vm.CommitToDataContract()));
+
+            vm.GkvAbrechnungVersion = dc.GkvAbrechnungVersion;
+            vm.Notice = dc.Notice;
+        }
+
+        private void gridView_CellValueChanged_1(object sender, CellValueChangedEventArgs e)
+        {
+            if (e.Column != null && e.Column.FieldName == "Notice")
+            {
+                if (e.Value is string s && e.Row is GkvAbrechnungVM vm)
+                {
+                    SaveNoticeChange(vm, s);
+                }
+            }
+        }
+    }
+}
--- a/BeWo/View/Detail/Accounting/InvoiceOverview.xaml
+++ b/BeWo/View/Detail/Accounting/InvoiceOverview.xaml
@@ -1,25 +1,48 @@
-<localView:BeWoView x:Class="BeWo.View.Detail.Accounting.InvoiceOverview" xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:localView="clr-namespace:BeWo.View" xmlns:localViewModel="clr-namespace:BeWo.ViewModel" xmlns:localViewDetail="clr-namespace:BeWo.View.Detail.Accounting" xmlns:val="clr-namespace:BeWo.Validation" xmlns:proxy="clr-namespace:BeWo.ServiceProxy" xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls" xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid" xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core" xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" Height="Auto" Width="Auto" HorizontalAlignment="Stretch" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:r="clr-namespace:BeWo.Security" VerticalAlignment="Stretch" Focusable="True" xmlns:Microsoft_Windows_Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Classic">
+<localView:BeWoView x:Class="BeWo.View.Detail.Accounting.InvoiceOverview" 
+                    xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup" 
+                    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+                    xmlns:localView="clr-namespace:BeWo.View" 
+                    xmlns:localViewModel="clr-namespace:BeWo.ViewModel" 
+                    xmlns:localViewDetail="clr-namespace:BeWo.View.Detail.Accounting" 
+                    xmlns:val="clr-namespace:BeWo.Validation" 
+                    xmlns:proxy="clr-namespace:BeWo.ServiceProxy" 
+                    xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls" 
+                    xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid" 
+                    xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core" 
+                    xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" Height="Auto" Width="Auto" HorizontalAlignment="Stretch" 
+                    xmlns:s="clr-namespace:System;assembly=mscorlib" 
+                    xmlns:r="clr-namespace:BeWo.Security" VerticalAlignment="Stretch" Focusable="True" 
+                    xmlns:Microsoft_Windows_Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Classic">

 	<Grid>
 		<GroupBox x:Name="groupbox_editArea" Grid.Row="0" Header="Rechnungsübersicht" Style="{DynamicResource ObjectEditGroupBox}">

-			<Grid Grid.IsSharedSizeScope="True">
+			<Grid Grid.IsSharedSizeScope="True" Margin="0,3,0,0">
 				<Grid.ColumnDefinitions>
 					<ColumnDefinition Width="Auto" />
-					<ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
 				</Grid.ColumnDefinitions>
 				<Grid.RowDefinitions>
 					<RowDefinition Height="Auto" />
 					<RowDefinition Height="*" />
+                    <RowDefinition Height="Auto" />
 				</Grid.RowDefinitions>

-				<localView:YearMonthFilter Margin="3 0 0 0" VerticalAlignment="Center" HorizontalAlignment="Left" Grid.Column="0" x:Name="yearMonthFilter" FilterSpanChanged="YearMonthFilter_FilterSpanChanged" />
-				<Button x:Name="button_reload" Grid.Column="1" Content="Aktualisieren" Margin="0,0,0,8" Click="ReloadButton_OnClick" Height="24" HorizontalAlignment="Left" VerticalAlignment="Bottom" Width="80" />
+				<localView:YearMonthFilter Margin="3 0 0 3" VerticalAlignment="Bottom" HorizontalAlignment="Left" Grid.Column="0" x:Name="yearMonthFilter" FilterSpanChanged="YearMonthFilter_FilterSpanChanged" />
+                <StackPanel Orientation="Vertical" Grid.Column="1" Margin="12,5,0,0" VerticalAlignment="Center" HorizontalAlignment="Left">
+                    <RadioButton x:Name="radioFilterByInvoiceDate" Content="Nach Rechnungsdatum filtern" IsChecked="True"/>
+                    <RadioButton x:Name="radioFilterByAccountingDate" Content="Nach Abrechnungszeitraum filtern" />
+                </StackPanel>
+                
+				<Button x:Name="button_reload" Grid.Column="2" Content="Aktualisieren" Margin="12,0,0,0" Click="ReloadButton_OnClick" Height="24" HorizontalAlignment="Left" VerticalAlignment="Bottom" Width="80" />
+                
 				
-				<dxg:GridControl Margin="3" Grid.ColumnSpan="2" Grid.Row="1" DataSource="{Binding VMList}" x:Name="datagrid_invoices" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+				<dxg:GridControl Margin="3" Grid.ColumnSpan="3" Grid.Row="1" DataSource="{Binding VMList}" x:Name="datagrid_invoices" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
 					<dxg:GridControl.Columns>
-
-						<dxg:GridColumn x:Name="ColumnButtons"  AllowEditing="False" MinWidth="90" FieldName="ReportLink" Header=" ">
+                        <dxg:GridColumn x:Name="ColumnChecked" FieldName="IsChecked" Header=" " MinWidth="30"></dxg:GridColumn>
+                        <dxg:GridColumn x:Name="ColumnButtons"  AllowEditing="False" MinWidth="90" FieldName="ReportLink" Header=" ">
 							<dxg:GridColumn.DisplayTemplate>
 								<ControlTemplate>
 									<StackPanel Orientation="Horizontal">
@@ -39,8 +62,8 @@
 						</dxg:GridColumn>
 						<dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="TypeString" Header="Art der Rechnung" Width="150" />
                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="CustomerName" Header="{markup:Translate Klient/in}" Width="100" />
-					    <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="AccountingPeriodString" Header="Zeitraum" Width="100" />
-						<dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="InvoiceNumber" Header="Nummer" />
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="AccountingPeriodString" SortFieldName="AccountingPeriodStart" Header="Zeitraum" Width="100" />
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="InvoiceNumber" Header="Nummer" />
 						<dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="InvoiceDate" Header="Datum" EditSettings="{dxe:DateSettings DisplayFormat=d}" MinWidth="70" />
                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="RecipientString" Header="{markup:Translate EmpfängerSingular}" />
 						<!--<dxg:GridColumn FieldName="AccountingPeriodString" Header="Abrechnungszeitraum" />-->
@@ -63,11 +86,15 @@
                        <dxg:GridColumn x:Name="PaidColumn" FieldName="IsPaid" Header="Bezahlt"></dxg:GridColumn>
 					</dxg:GridControl.Columns>
 					<dxg:GridControl.View>
-						<dxg:TableView NavigationStyle="Cell" Loaded="gridView_Loaded" x:Name="gridView" BestFitMode="Smart" AllowBestFit="True" ShowGroupPanel="False" ScrollingMode="Smart" SnapsToDevicePixels="True" CellValueChanging="gridView_CellValueChanged"  Margin="3,22,3,3" />
+						<dxg:TableView NavigationStyle="Cell" Loaded="gridView_Loaded" x:Name="gridView" BestFitMode="Smart" 
+                                       AllowBestFit="True" ShowGroupPanel="False" ScrollingMode="Smart" SnapsToDevicePixels="True" 
+                                       CellValueChanging="gridView_CellValueChanged" 
+                                       CustomRowAppearance="TableView_OnCustomRowAppearance"
+                                       Margin="3,22,3,3" />
 					</dxg:GridControl.View>
 				</dxg:GridControl>

-				<Grid Grid.Row="1" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="5,2,5,0">
+				<Grid Grid.Row="1" Grid.ColumnSpan="3" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="5,2,5,0">
 					<Grid.ColumnDefinitions>
 						<ColumnDefinition Width="*" />
 						<ColumnDefinition Width="Auto" />
@@ -85,7 +112,19 @@


 				</Grid>
-			</Grid>
+                <StackPanel Grid.Row="2" Orientation="Horizontal">
+                    <Button Margin="10 3 0 0"
+                                              Name="button_checkAllLeistungen" Click="button_checkAll_Click"
+                                              HorizontalAlignment="Left">Alle auswählen</Button>
+                    <Button Margin="10 3 0 0"
+                                              Name="button_uncheckAllLeistungen" Click="button_uncheckAll_Click"
+                                              HorizontalAlignment="Left">Alle abwählen</Button>
+                    <Button Margin="10 3 0 0"
+                                              Name="button_aufklappenAllLeistungen" Click="button_printInvoices_Click"
+                                              HorizontalAlignment="Left">Ausgewählte Rechnungen drucken</Button>
+                    
+                </StackPanel>
+            </Grid>
 		</GroupBox>
 	</Grid>

--- a/BeWo/View/Detail/Accounting/InvoiceOverview.xaml.cs
+++ b/BeWo/View/Detail/Accounting/InvoiceOverview.xaml.cs
@@ -109,7 +109,9 @@ namespace BeWo.View.Detail.Accounting
 				start = ViewModel.DateTimeSpanFilter.StartDate;
 				end = ViewModel.DateTimeSpanFilter.EndDate;
 			}
-			ServiceFacade.DoAccountingServiceAsync(s => s.GetInvoiceBases(start, end), UpdateInvoiceList);
+            bool filterByInvoiceDate = radioFilterByInvoiceDate.IsChecked.Value;
+            
+			ServiceFacade.DoAccountingServiceAsync(s => s.GetInvoiceBases2(start, end, filterByInvoiceDate), UpdateInvoiceList);
        }

        private void UpdateInvoiceList(IList<InvoiceBaseDC> dcList)
@@ -200,7 +202,12 @@ namespace BeWo.View.Detail.Accounting

            if (MessageBox.Show("Sind Sie sicher, dass Sie die gewählte Rechnung stornieren möchten?", "Rechnung stornieren", MessageBoxButton.YesNo, MessageBoxImage.Warning) == MessageBoxResult.Yes)
            {
-                ServiceFacade.DoAccountingServiceAsync(s => s.StorniereInvoiceBases(new[] { vm.DataContract }.ToList()), RefreshInvoiceList);
+                ServiceFacade.DoAccountingServiceAsync(s => s.StorniereInvoiceBases(new[] { vm.DataContract }.ToList()),
+                    () => this.Dispatch(
+                            delegate
+                            {
+                                RefreshInvoiceList();
+                            }));
            }

            mIgnoreCheckChanges = false;
@@ -298,7 +305,7 @@ namespace BeWo.View.Detail.Accounting
            lHeaderCaptions.Add("Zeitraum");
            lHeaderCaptions.Add("Nummer");
            lHeaderCaptions.Add("Datum");
-            lHeaderCaptions.Add(BS.Shared.Translation.Translator.Translate("EmpfängerSingular"));
+            lHeaderCaptions.Add(BS.SharedLauncher.Translation.Translator.Translate("EmpfängerSingular"));
            lHeaderCaptions.Add("Betrag");
            lHeaderCaptions.Add("Bemerkung");
            lHeaderCaptions.Add("Bezahlt");
@@ -320,7 +327,7 @@ namespace BeWo.View.Detail.Accounting

        private void Hyperlink_OnRequestNavigate(object sender, RequestNavigateEventArgs e)
        {
-			BeWoUtils.NavigateToReportUri(((Hyperlink)sender).NavigateUri.ToString(), "Druckvorschau");
+            BeWoUtils.NavigateToReportUri(((Hyperlink)sender).NavigateUri.ToString(), "Druckvorschau");
        }

 		private void ReloadButton_OnClick(object sender, RoutedEventArgs e)
@@ -347,6 +354,92 @@ namespace BeWo.View.Detail.Accounting
                }
            }
        }
+
+        private void TableView_OnCustomRowAppearance(object sender, CustomRowAppearanceEventArgs e)
+        {
+            if (e.Property != null && e.Property.Name == "Background")
+            {
+                var ib = datagrid_invoices.GetRow(e.RowHandle) as InvoiceBaseVM;
+                if (ib != null && !String.IsNullOrEmpty(ib.BackgroundColor))
+                {
+                    e.Result = new SolidColorBrush((Color)ColorConverter.ConvertFromString(ib.BackgroundColor));
+                    e.Handled = true;
+                }
+            }
+
+            //var data = srGridControl.rowhan
+        }
+
+        private void button_checkAll_Click(object sender, RoutedEventArgs e)
+        {
+            var visible = GetVisibleVMs();
+            foreach (var item in visible)
+            {
+                item.IsChecked = true;
+            }
+        }
+
+        private void button_uncheckAll_Click(object sender, RoutedEventArgs e)
+        {
+            var visible = GetVisibleVMs();
+            foreach (var item in visible)
+            {
+                item.IsChecked = false;
+            }
+        }
+
+        private void button_printInvoices_Click(object sender, RoutedEventArgs e)
+        {
+            var list = new List<InvoiceBaseVM>();
+
+            var items = datagrid_invoices.ItemsSource as IList<InvoiceBaseVM>;
+
+            if (items != null)
+            {
+                for (int i = 0; i < items.Count; i++)
+                {
+                    var vm = datagrid_invoices.GetRow(i) as InvoiceBaseVM;
+                    if (vm != null && vm.IsChecked)
+                    {
+                        list.Add(vm);
+                    }
+                }
+            }
+
+            PrintInvoices(list);
+        }
+
+        private void PrintInvoices(List<InvoiceBaseVM> list)
+        {
+            var oidList = list.Select(i => i.DataContract.InvoiceBaseOid.Value).ToList();
+            
+            ServiceFacade.DoReportServiceAsync(s => s.CreateInvoiceListReport(oidList), ms => BeWoApp.MainControl.Dispatch(() => BeWoUtils.ShowReportWindow(ms, "Rechnungen")));
+
+        }
+
+        private IList<InvoiceBaseVM> GetVisibleVMs()
+        {
+            var list = new List<InvoiceBaseVM>();
+
+            var items = datagrid_invoices.ItemsSource as IList<InvoiceBaseVM>;
+
+            if (items != null)
+            {
+                for (int i = 0; i < items.Count; i++)
+                {
+                    if (datagrid_invoices.IsRowVisible(i))
+                    {
+                        var vm = datagrid_invoices.GetRow(i) as InvoiceBaseVM;
+                        if (vm != null)
+                        {
+                            list.Add(vm);
+                        }
+                    }
+                }
+            }
+
+            return list;
+        }
    }

 }
--- a/BeWo/View/Detail/Accounting/NewGkvAbrechnungPopUpView.xaml
+++ b/BeWo/View/Detail/Accounting/NewGkvAbrechnungPopUpView.xaml
@@ -0,0 +1,120 @@
+<localView:BeWoView x:Class="BeWo.View.Detail.Accounting.NewGkvAbrechnungPopUpView"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:localView="clr-namespace:BeWo.View"
+        xmlns:localViewModel="clr-namespace:BeWo.ViewModel" xmlns:localViewDetail="clr-namespace:BeWo.View.Detail.Accounting"
+        xmlns:val="clr-namespace:BeWo.Validation" xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
+        xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
+        xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
+        xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
+        xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" Height="Auto" Width="Auto"
+        HorizontalAlignment="Stretch" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:r="clr-namespace:BeWo.Security"
+        VerticalAlignment="Stretch" Focusable="True"
+        xmlns:Microsoft_Windows_Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Classic" xmlns:localSearchView="clr-namespace:BeWo.View.Search">
+    <GroupBox Width="1100" Style="{StaticResource PopUpWindowStyle}">
+        <GroupBox.Header>
+            <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="0,0,0,0">
+                <Image Source="..\..\..\Ressources\Icons\CoinsDisabled.png" Height="28" />
+                <TextBox 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 Background="{StaticResource ObjectEditBackgroundBrush}">
+            <GroupBox Margin="10" Header="GKV-Abrechnung erstellen" Style="{StaticResource ObjectEditGroupBox}">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <Label>
+                        <StackPanel Orientation="Vertical">
+                            <AccessText Margin="2">Es wird eine GKV-Abrechnung für die in der Tabelle selektierten Rechnungen erstellt.</AccessText>
+                            <AccessText Margin="2">Rechnungen, die nicht enthalten sein sollen bitte ggf. deselektieren.</AccessText>
+                            <AccessText Margin="2">Anschließend bitte auf "Erstellen" klicken.</AccessText>
+                        </StackPanel>
+                    </Label>
+
+                    <Grid Grid.Column="1">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="90" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="120" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <Label Content="Rechnungszeitraum von" Grid.Row="0" Grid.Column="0" />
+                        <dxe:DateEdit MaskType="DateTimeAdvancingCaret" BorderThickness="1" Height="23" Margin="3" Grid.Row="0" Grid.Column="1" EditValue="{val:ValidationBinding Path=AbrechnungsZeitraumStart}" EditValueChanged="DateEdit_EditValueChanged"/>
+                        <Label Content="Rechnungszeitraum bis" Grid.Row="1" Grid.Column="0" />
+                        <dxe:DateEdit MaskType="DateTimeAdvancingCaret" BorderThickness="1" Height="23" Margin="3" Grid.Row="1" Grid.Column="1" EditValue="{val:ValidationBinding Path=AbrechnungsZeitraumEnde}" EditValueChanged="DateEdit2_EditValueChanged"/>
+                        <!--<Label Content="Annahmestelle" Grid.Row="0" Grid.Column="2" />
+                        <uc:PopUpEdit IsReadOnly="True"
+                                      x:Name="popupedit_DatenannahmestelleSearch"
+                                      Grid.Column="3" Margin="3" Height="23" Grid.Row="0"
+                                      DeleteButtonVisibility="Collapsed"
+                                      PopUpClick="popupedit_DatenannahmestelleSearch_PopUpClick" />-->
+                        <Label Content="Organisation" Grid.Row="0" Grid.Column="2" />
+                        <uc:PopUpEdit IsReadOnly="True"
+                                      x:Name="popupedit_GkvSearch"
+                                      Grid.Column="3" Margin="3" Height="23" Grid.Row="0"
+                                      DeleteButtonVisibility="Collapsed"
+                                      PopUpClick="popupedit_GkvSearch_PopUpClick" />
+                        <Label Content="Bemerkung" Grid.Row="0" Grid.Column="4" />
+                        <TextBox Grid.Row="0" Grid.Column="5" Grid.RowSpan="2" Margin="3" AcceptsReturn="True" TextWrapping="Wrap" Height="50" Text="{Binding Notice}" />
+                    </Grid>
+
+                    <dxg:GridControl x:Name="grid_newInvoices" DataSource="{Binding InvoiceBases}" Margin="3" Grid.Row="1" Grid.ColumnSpan="2" MinHeight="200">
+                        <dxg:GridControl.Columns>
+                            <dxg:GridColumn x:Name="ColumnChecked" FieldName="IsChecked" Header=" " MinWidth="30"></dxg:GridColumn>
+                            <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="TypeString" Header="Art der Rechnung" Width="150" />
+                            <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="InvoiceNumber" Header="Nummer" />
+                            <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="InvoiceDate" Header="Datum" EditSettings="{dxe:DateSettings DisplayFormat=d}" MinWidth="70" />
+                            <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="CustomerName" Header="{markup:Translate Klient/in}" Width="100" />
+                            <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="AccountingPeriodString" SortFieldName="AccountingPeriodStart" Header="Zeitraum" Width="100" />
+                            <!--<dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="RecipientString" Header="{markup:Translate EmpfängerSingular}" />-->
+                            <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="TotalAmount" Header="Betrag" MinWidth="70">
+                                <dxg:GridColumn.EditSettings>
+                                    <dxe:TextEditSettings DisplayFormat="c" Mask="c" MaskType="Numeric"></dxe:TextEditSettings>
+                                </dxg:GridColumn.EditSettings>
+                            </dxg:GridColumn>
+                            <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Notice" Header="Bemerkung" MinWidth="200" >
+                                <dxg:GridColumn.EditSettings>
+                                    <dxe:TextEditSettings TextWrapping="Wrap" />
+                                </dxg:GridColumn.EditSettings>
+                            </dxg:GridColumn>
+                            <dxg:GridColumn x:Name="PaidColumn" FieldName="IsPaid" Header="Bezahlt" ReadOnly="True"></dxg:GridColumn>
+                        </dxg:GridControl.Columns>
+                        <dxg:GridControl.View >
+                            <dxg:TableView x:Name="gridView" ShowGroupPanel="False" CellValueChanging="TableView_CellValueChanging"/>
+                        </dxg:GridControl.View>
+                    </dxg:GridControl>
+                    <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Grid.Row="2" Grid.ColumnSpan="2">
+                        <Button Margin="10 3 0 0"
+                                              Name="button_checkAllLeistungen" Click="button_checkAll_Click"
+                                              HorizontalAlignment="Left">Alle auswählen</Button>
+                        <Button Margin="10 3 0 0"
+                                              Name="button_uncheckAllLeistungen" Click="button_uncheckAll_Click"
+                                              HorizontalAlignment="Left">Alle abwählen</Button>
+                    </StackPanel>
+                    
+                    <StackPanel HorizontalAlignment="Right" Orientation="Horizontal" Grid.Row="2" Grid.ColumnSpan="2">
+                        <Button Content="Erstellen" x:Name="btn_create" Click="btn_create_Click" Padding="5 0" Margin="3" />
+                        <Button Content="Abbrechen" x:Name="btn_cancel" Click="btn_cancel_Click" Margin="3" Padding="5 0" />
+                    </StackPanel>
+                </Grid>
+            </GroupBox>
+            <Popup Margin="10" x:Name="popup_organisation" StaysOpen="False" Placement="MousePoint" Width="370" Height="250" Closed="popup_Closed" Opened="popup_Opened">
+                <localSearchView:OrganisationSearchView SearchMode="All" x:Name="gkvsearchview" />
+            </Popup>
+        </Grid>
+    </GroupBox>
+</localView:BeWoView>
--- a/BeWo/View/Detail/Accounting/NewGkvAbrechnungPopUpView.xaml.cs
+++ b/BeWo/View/Detail/Accounting/NewGkvAbrechnungPopUpView.xaml.cs
@@ -0,0 +1,238 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Windows;
+using System.Windows.Input;
+using System.Windows.Threading;
+using BeWo.ServiceProxy;
+using BeWo.ViewModel;
+using BS.Shared.Core;
+using BS.Shared.DataContracts;
+using BS.Shared.DataContracts.Compact;
+using BS.Shared.DataContracts.GkvAbrechnung;
+using BS.Shared.Extensions;
+using DevExpress.Xpf.Grid;
+
+namespace BeWo.View.Detail.Accounting
+{
+    public partial class NewGkvAbrechnungPopUpView : BeWoView
+    {
+        private long? _LoadedInvoiceBaseOid;
+
+        private List<InvoiceBaseDC> _InvoiceBaseDCs;
+
+        private List<string> _InvoiceNumbers;
+
+        private GkvAbrechnungVM _Viewmodel;
+
+        public event EventHandler<EventArgs<GkvAbrechnungDC>> CreateButtonClicked;
+
+        public event EventHandler CancelButtonClicked;
+
+        public NewGkvAbrechnungPopUpView()
+        {
+            this.InitializeComponent();
+
+            this.CommandBindings.Add(new CommandBinding(ApplicationCommands.Close,
+                                                        (s, e) =>
+                                                        {
+                                                            this._InvoiceBaseDCs?.Clear();
+                                                            if (CancelButtonClicked != null)
+                                                                CancelButtonClicked.Invoke(s, e);
+                                                        }));
+
+            this.grid_newInvoices.View.Loaded += (s, e) => ((TableView)this.grid_newInvoices.View).BestFitColumns();
+        }
+
+
+        public GkvAbrechnungVM ViewModel
+        {
+            get
+            {
+                return this._Viewmodel;
+            }
+
+            set
+            {
+                this.DataContext = value;
+                this._Viewmodel = value;
+            }
+        }
+
+        public List<InvoiceBaseDC> InvoiceBaseDcs
+        {
+            set
+            {
+                this._InvoiceNumbers = value.Select(i => i.InvoiceNumber).ToList();
+                this._InvoiceBaseDCs = new List<InvoiceBaseDC>(value);
+                this.grid_newInvoices.ItemsSource = this._InvoiceBaseDCs;
+            }
+        }
+
+        private void Fire()
+        {
+            if (this.CreateButtonClicked != null)
+            {
+                if (_InvoiceBaseDCs == null)
+                    _InvoiceBaseDCs = new List<InvoiceBaseDC>();
+
+                for (int i = 0; i < _InvoiceBaseDCs.Count; i++)
+                {
+                    _InvoiceBaseDCs[i].InvoiceNumber = this._InvoiceNumbers[i];
+                }
+
+                var gkvAbrechnung = ViewModel.CommitToDataContract();
+
+                this.CreateButtonClicked(this, new EventArgs<GkvAbrechnungDC>(gkvAbrechnung));
+            }
+        }
+        public void Clear()
+        {
+            _LoadedInvoiceBaseOid = null;
+            popupedit_GkvSearch.Text = string.Empty;
+            popupedit_GkvSearch.Focus();
+        }
+
+        private void btn_cancel_Click(object sender, RoutedEventArgs e)
+        {
+            if (ViewModel.InvoiceBases != null)
+                ViewModel.InvoiceBases.Clear();
+            this.CancelButtonClicked(this, e);
+        }
+        private void btn_create_Click(object sender, RoutedEventArgs e)
+        {
+            this.Fire();
+        }
+
+        private void TableView_CellValueChanging(object sender, CellValueChangedEventArgs e)
+        {
+            var si = e.Row as InvoiceBaseDC;
+            if (e.Column.FieldName.Contains("NeuErstellen") && ((bool)e.Value))
+            {
+                if (si.DiffErstellen)
+                {
+                    si.DiffErstellen = false;
+                    grid_newInvoices.RefreshData();
+                }
+            }
+            else if (e.Column.FieldName.Contains("DiffErstellen") && ((bool)e.Value))
+            {
+                if (si.NeuErstellen)
+                {
+                    si.NeuErstellen = false;
+                    grid_newInvoices.RefreshData();
+                }
+            }
+        }
+ 
+        private void popupedit_GkvSearch_PopUpClick(object sender, RoutedEventArgs e)
+        {
+            gkvsearchview.ItemSelected += gkvsearchview_OrganisationSelected;
+            popup_organisation.IsOpen = true;
+        }
+        private void gkvsearchview_OrganisationSelected(object sender, EventArgs<CompactOrganisationDC> e)
+        {
+            popup_organisation.IsOpen = false;
+            gkvsearchview.ItemSelected -= gkvsearchview_OrganisationSelected;
+
+            ViewModel.IKKostenträger = e.Data.IKKostentrager;
+            ViewModel.IKVersichertenKarte = e.Data.IKKrankenkasse;
+            ViewModel.IKDatenannahmestelle = e.Data.IKDatenannahmestelle;
+
+            popupedit_GkvSearch.Text = e.Data.ToString();
+            popupedit_GkvSearch.Focus();
+
+            RefreshInvoiceBases(e.Data.OrganisationOid);
+        }
+
+        private void RefreshInvoiceBases() => RefreshInvoiceBases(_LoadedInvoiceBaseOid);
+        private void RefreshInvoiceBases(DateTime? start, DateTime? ende) => RefreshInvoiceBases(_LoadedInvoiceBaseOid, start ?? ViewModel?.AbrechnungsZeitraumStart, ende ?? ViewModel?.AbrechnungsZeitraumEnde);
+        private void RefreshInvoiceBases(long? costOid) => RefreshInvoiceBases(costOid, ViewModel?.AbrechnungsZeitraumStart, ViewModel?.AbrechnungsZeitraumEnde);
+        private void RefreshInvoiceBases(long? costOid, DateTime? start, DateTime? ende)
+        {
+            if (costOid != null && start != null && ende != null && ende >= start)
+            {
+                _LoadedInvoiceBaseOid = costOid;
+
+                ServiceFacade.DoAccountingServiceAsync(s => s.GetInvoiceBasesForCostBearerAndId(start, ende, (long)costOid, "RechnungSoziotherapie"), UpdateInvoiceList);
+            }
+        }
+
+        private void UpdateInvoiceList(IList<InvoiceBaseDC> dcList)
+        {
+            this.Dispatcher.BeginInvoke(
+                DispatcherPriority.Normal,
+                (Action)delegate
+                {
+                    BindingList <InvoiceBaseVM> invoiceBaseVMs = new BindingList<InvoiceBaseVM>();
+                    foreach (var invoiceBaseDC in dcList)
+                    {
+                        InvoiceBaseVM invoiceBaseVM = new InvoiceBaseVM(invoiceBaseDC);
+                        invoiceBaseVM.IsChecked = false;
+                        invoiceBaseVMs.Add(invoiceBaseVM);
+                    }
+                    ViewModel.InvoiceBases = invoiceBaseVMs;
+                    grid_newInvoices.ItemsSource = ViewModel.InvoiceBases;
+                    this.gridView.BestFitColumns();
+                });
+        }
+
+        private void popupedit_DatenannahmestelleSearch_PopUpClick(object sender, RoutedEventArgs e)
+        {
+            // tbd
+        }
+
+        private void button_checkAll_Click(object sender, RoutedEventArgs e)
+        {
+            var visible = GetVisibleVMs();
+            foreach (var item in visible)
+            {
+                item.IsChecked = true;
+            }
+        }
+        private void button_uncheckAll_Click(object sender, RoutedEventArgs e)
+        {
+            var visible = GetVisibleVMs();
+            foreach (var item in visible)
+            {
+                item.IsChecked = false;
+            }
+        }
+
+
+        private IList<InvoiceBaseVM> GetVisibleVMs()
+        {
+            var list = new List<InvoiceBaseVM>();
+
+            var items = grid_newInvoices.ItemsSource as IList<InvoiceBaseVM>;
+
+            if (items != null)
+            {
+                for (int i = 0; i < items.Count; i++)
+                {
+                    if (grid_newInvoices.IsRowVisible(i))
+                    {
+                        var vm = grid_newInvoices.GetRow(i) as InvoiceBaseVM;
+                        if (vm != null)
+                        {
+                            list.Add(vm);
+                        }
+                    }
+                }
+            }
+
+            return list;
+        }
+
+        private void DateEdit_EditValueChanged(object sender, DevExpress.Xpf.Editors.EditValueChangedEventArgs e)
+        {
+            RefreshInvoiceBases((DateTime)e.NewValue, null);
+        }
+
+        private void DateEdit2_EditValueChanged(object sender, DevExpress.Xpf.Editors.EditValueChangedEventArgs e)
+        {
+            RefreshInvoiceBases(null, (DateTime)e.NewValue);
+        }
+    }
+}
--- a/BeWo/View/Detail/Accounting/ServiceInvoiceCreatePopUpView.xaml
+++ b/BeWo/View/Detail/Accounting/ServiceInvoiceCreatePopUpView.xaml
@@ -10,7 +10,7 @@
        HorizontalAlignment="Stretch" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:r="clr-namespace:BeWo.Security"
        VerticalAlignment="Stretch" Focusable="True"
        xmlns:Microsoft_Windows_Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Classic">
-    <GroupBox Width="850" Style="{StaticResource PopUpWindowStyle}">
+    <GroupBox Width="1100" Style="{StaticResource PopUpWindowStyle}">
        <GroupBox.Header>
            <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="0,0,0,0">
                <Image Source="..\..\Ressources\Icons\CoinsDisabled.png" Height="28" />
@@ -22,6 +22,10 @@
        <Grid Background="{StaticResource ObjectEditBackgroundBrush}">
            <GroupBox Margin="10" Header="Rechnung(en) erstellen" Style="{StaticResource ObjectEditGroupBox}">
                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition />
+                        <ColumnDefinition />
+                    </Grid.ColumnDefinitions>
                    <Grid.RowDefinitions>
                        <RowDefinition Height="Auto" />
                        <RowDefinition Height="*" />
@@ -34,7 +38,9 @@
                            <AccessText Margin="2">Klicken Sie anschließend auf "Erstellen".</AccessText>
                        </StackPanel>
                    </Label>
-                    <dxg:GridControl x:Name="grid_newInvoices" Margin="3" Grid.Row="1" MinHeight="200">
+                    <TextBlock x:Name="txtWarnhinweis" Foreground="Red" Grid.Column="1" ></TextBlock>
+
+                        <dxg:GridControl x:Name="grid_newInvoices" Margin="3" Grid.Row="1" Grid.ColumnSpan="2" MinHeight="200">
                        <dxg:GridControl.Columns>
                            <dxg:GridColumn FieldName="Notice" Header="" FixedWidth="True" Width="24" ReadOnly="True">
                                <dxg:GridColumn.CellTemplate>
@@ -52,12 +58,16 @@
                                    <dxe:TextEditSettings DisplayFormat="c" Mask="c" MaskType="Numeric"></dxe:TextEditSettings>
                                </dxg:GridColumn.EditSettings>
                            </dxg:GridColumn>
+                            <dxg:GridColumn FieldName="InvoiceBase.Details" Header="Details"></dxg:GridColumn>
+                            <dxg:GridColumn FieldName="InvoiceBase.NeuErstellen" Header="Neu erstellen" ></dxg:GridColumn>
+                            <dxg:GridColumn FieldName="InvoiceBase.DiffErstellen" Header="{markup:Translate Diff.-Rg erstellen}"></dxg:GridColumn>
+                            <dxg:GridColumn FieldName="InvoiceBase.Hinweise" Header="Hinweise"></dxg:GridColumn>
                        </dxg:GridControl.Columns>
                        <dxg:GridControl.View>
-                            <dxg:TableView ShowGroupPanel="False" />
+                            <dxg:TableView ShowGroupPanel="False" CellValueChanging="TableView_CellValueChanging"/>
                        </dxg:GridControl.View>
                    </dxg:GridControl>
-                    <StackPanel HorizontalAlignment="Right" Orientation="Horizontal" Grid.Row="2">
+                    <StackPanel HorizontalAlignment="Right" Orientation="Horizontal" Grid.Row="2" Grid.ColumnSpan="2">
                        <Button Content="Erstellen" x:Name="btn_create" Click="btn_create_Click" Padding="5 0" Margin="3" />
                        <Button Content="Abbrechen" x:Name="btn_cancel" Click="btn_cancel_Click" Margin="3" Padding="5 0" />
                    </StackPanel>
--- a/BeWo/View/Detail/Accounting/ServiceInvoiceCreatePopUpView.xaml.cs
+++ b/BeWo/View/Detail/Accounting/ServiceInvoiceCreatePopUpView.xaml.cs
@@ -8,7 +8,7 @@ using System.Windows.Input;
 using BS.Shared.Core;
 using BS.Shared.DataContracts;
 using BS.Shared.Extensions;
-
+using BS.SharedLauncher.Translation;
 using DevExpress.Xpf.Grid;

 namespace BeWo.View.Detail.Accounting
@@ -42,6 +42,16 @@ namespace BeWo.View.Detail.Accounting
                this._InvoiceNumbers = value.Select(i => i.InvoiceBase.InvoiceNumber).ToList();
                this._Dcs = new BindingList<ServiceInvoiceDC>(value);
                this.grid_newInvoices.ItemsSource = this._Dcs;
+
+                SetzeWarnhinweis();
+            }
+        }
+
+        private void SetzeWarnhinweis()
+        {
+            if (_Dcs.Any(s => s.InvoiceBase.DiffErstellen))
+            {
+                txtWarnhinweis.Text = Translator.Translate("Es wurden bereits Rechnungen im gewählten Zeitraum erstellt.\nWenn Sie keine Differenzrechnungen erstellen möchten,\nentfernen Sie bitte die entsprechenden Häkchen.");
            }
        }

@@ -73,5 +83,26 @@ namespace BeWo.View.Detail.Accounting
        {
            this._Dcs.Remove(this.grid_newInvoices.GetCurrentValue<ServiceInvoiceDC>());
        }
+
+        private void TableView_CellValueChanging(object sender, CellValueChangedEventArgs e)
+        {
+            var si = e.Row as ServiceInvoiceDC;
+            if (e.Column.FieldName.Contains("NeuErstellen") && ((bool)e.Value))
+            {
+                if (si.InvoiceBase.DiffErstellen)
+                {
+                    si.InvoiceBase.DiffErstellen = false;
+                    grid_newInvoices.RefreshData();
+                }
+            }
+            else if (e.Column.FieldName.Contains("DiffErstellen") && ((bool)e.Value))
+            {
+                if (si.InvoiceBase.NeuErstellen)
+                {
+                    si.InvoiceBase.NeuErstellen = false;
+                    grid_newInvoices.RefreshData();
+                }
+            }
+        }
    }
 }
--- a/BeWo/View/Detail/Accounting/SettlementInvoiceItemEditView2.xaml
+++ b/BeWo/View/Detail/Accounting/SettlementInvoiceItemEditView2.xaml
@@ -185,7 +185,7 @@
                                        <RowDefinition Height="Auto" />
                                        <RowDefinition Height="Auto" />
                                    </Grid.RowDefinitions>
-                                    <dxg:GridControl Background="Transparent" HorizontalAlignment="Left"
+                                    <dxg:GridControl HorizontalAlignment="Left"
                                            DataSource="{Binding InvoiceItems.VMList}">
                                        <!--<dxg:GridControl.Resources>
                                                <ControlTemplate x:Key="{dxg:TableViewThemeKey ResourceKey=ControlTemplate}">
@@ -220,7 +220,7 @@
                                        <dxg:GridControl.View>
                                            <dxg:TableView NavigationStyle="None" ShowIndicator="False"
                                                    AllowSorting="False" AllowColumnFiltering="False"
-                                                    ShowHorizontalLines="False" ShowVerticalLines="False" AllowResizing="False"
+                                                    AllowResizing="False"
                                                    ShowGroupPanel="False"
                                                        />
                                        </dxg:GridControl.View>
--- a/BeWo/View/Detail/Accounting/SettlementInvoiceView.xaml.cs
+++ b/BeWo/View/Detail/Accounting/SettlementInvoiceView.xaml.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Navigation;
 using BS.Shared;
@@ -13,6 +14,9 @@ using BeWo.ViewModel.ListViewModel;
 using BS.Shared.Core;
 using BS.Shared.DataContracts.Compact;
 using BS.Shared.Extensions;
+using BS.SharedLauncher.Translation;
+using System.Windows.Media;
+using System;

 namespace BeWo.View.Detail.Accounting
 {
@@ -128,28 +132,126 @@ namespace BeWo.View.Detail.Accounting
        }

        private void button_addCostBearer_Click(object sender, RoutedEventArgs e)
+        {
+            if (ViewModel.VMList.Count > 0)
+            {
+                FrageNachRechnungsart();
+            }
+            else
+            {
+                ErstelleNeueSpitzabrechnung();
+            }
+            
+        }
+
+        private void ErstelleNeueSpitzabrechnung()
        {
            ServiceFacade.DoOperationsServiceAsync(
-                s => s.GenerateInitialSettlementDC(this._SelectedSupportConcept.CostBearerRelOids[0]), 
+                s => s.GenerateInitialSettlementDC(this._SelectedSupportConcept.CostBearerRelOids[0]),
                dc =>
-                    {
-                        dc.SupportConceptOid = this._SelectedSupportConcept.SupportConceptOid;
-                        this.Dispatch(
-                            delegate
-                                {
-                                    var vm = new SettlementVM(dc);
-                                    if (ShowOldEditView(vm))
-                                    {
-                                        this._EditView.ViewModel = new SettlementVM(dc);
-                                        this.MainControl.ShowControlAsModalPopup(this._EditView);
-                                    } 
-                                    else
-                                    {
-                                        this._EditView2.ViewModel = new SettlementVM(dc);
-                                        this.MainControl.ShowControlAsModalPopup(this._EditView2);
-                                    }
-                                });
-                    });
+                {
+                    dc.SupportConceptOid = this._SelectedSupportConcept.SupportConceptOid;
+                    this.Dispatch(
+                        delegate
+                        {
+                            var vm = new SettlementVM(dc);
+                            if (ShowOldEditView(vm))
+                            {
+                                this._EditView.ViewModel = new SettlementVM(dc);
+                                this.MainControl.ShowControlAsModalPopup(this._EditView);
+                            }
+                            else
+                            {
+                                this._EditView2.ViewModel = new SettlementVM(dc);
+                                this.MainControl.ShowControlAsModalPopup(this._EditView2);
+                            }
+                        });
+                });
+        }
+
+        private void ErstelleDifferenzrechnung()
+        {
+            ServiceFacade.DoOperationsServiceAsync(
+                s => s.GenerateDifferenzSettlementDC(this._SelectedSupportConcept.CostBearerRelOids[0]),
+                dc =>
+                {
+                    dc.SupportConceptOid = this._SelectedSupportConcept.SupportConceptOid;
+                    this.Dispatch(
+                        delegate
+                        {
+                            var vm = new SettlementVM(dc);
+                            this._EditView2.ViewModel = new SettlementVM(dc);
+                            this.MainControl.ShowControlAsModalPopup(this._EditView2);
+                        });
+                });
+        }
+
+        private void FrageNachRechnungsart()
+        {
+            //return 0 = Cancel, 1 = Neue Rechnung, 2 = DiffRechnung
+
+            var cancelButton = new Button { Content = " Abbrechen " };
+            cancelButton.Margin = new Thickness(5);
+            
+            
+            var btnNeueRechnung = new Button { Content = Translator.Translate(" Neue Rechnung erstellen ") };
+            btnNeueRechnung.Margin = new Thickness(5);
+
+            var btnDiffRechnung = new Button { Content = Translator.Translate(" Differenzrechnung erstellen ") };
+            btnDiffRechnung.Margin = new Thickness(5);
+
+            var textBlock = new TextBlock
+            {
+                Foreground = Brushes.Black,
+                Margin = new Thickness(10, 20, 10, 20),
+                Text = Translator.Translate("Es wurde bereits eine Spitzabrechnung für den ausgewählten Hilfeplan erstellt.\n" +
+                       "Möchten Sie eine neue Rechnung oder eine Differenzrechnung zur letzten\nSpitzabrechnung erstellen?")
+            };
+            textBlock.FontSize = 12;
+            
+            BeWoWindow bewoWindow = BeWoWpfUtils.CreateBeWoPopupWindow(100, 800, true);
+
+            cancelButton.Click += delegate { bewoWindow.Close(); };
+
+
+            btnNeueRechnung.Click += delegate
+            {
+                bewoWindow.Close();
+                ErstelleNeueSpitzabrechnung();
+            };
+
+            btnDiffRechnung.Click += delegate
+            {
+                bewoWindow.Close();
+                ErstelleDifferenzrechnung();
+            };
+
+            var centeredStackPanel = new StackPanel { Orientation = Orientation.Vertical, VerticalAlignment = VerticalAlignment.Center, HorizontalAlignment = HorizontalAlignment.Center };
+            var buttonStackPanel = new StackPanel { Orientation = Orientation.Horizontal };
+            buttonStackPanel.HorizontalAlignment = HorizontalAlignment.Right;
+
+            buttonStackPanel.Children.Add(btnNeueRechnung);
+            buttonStackPanel.Children.Add(btnDiffRechnung);
+            buttonStackPanel.Children.Add(cancelButton);
+
+
+            centeredStackPanel.Children.Add(textBlock);
+            centeredStackPanel.Children.Add(buttonStackPanel);
+            
+            
+
+
+            var grid = new Grid
+            {
+                Background = (LinearGradientBrush)FindResource("ObjectEditBackgroundBrush")
+            };
+
+            grid.Children.Add(centeredStackPanel);
+
+            bewoWindow.GroupBoxContent = grid;
+            bewoWindow.rootGroupBox.Header = "Spitzabrechnung erstellen";
+            bewoWindow.Owner = BeWoApp.CurrentBeWo.MainWindow;
+            bewoWindow.Show();
        }

        private bool ShowOldEditView(SettlementVM vm)
--- a/BeWo/View/Detail/AccountingTransactionBookingView.xaml
+++ b/BeWo/View/Detail/AccountingTransactionBookingView.xaml
@@ -57,6 +57,11 @@
    </localView:BeWoView.Resources>
    <Grid>
        <Grid x:Name="rootGrid">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
            <Grid.RowDefinitions>
                <RowDefinition Height="Auto" />
                <RowDefinition Height="Auto" />
@@ -64,7 +69,9 @@
            </Grid.RowDefinitions>
            <CheckBox Content="Buchungen für ausgewählten Hilfeplan" Grid.Row="0" IsChecked="True" Margin="0,3,0,0"
                    x:Name="chkWithClient" Checked="chkWithClient_Checked" Unchecked="chkWithClient_Unchecked" />
-            <Grid x:Name="customerInfoGrid" Grid.Row="1" Margin="0,3,0,0">
+            <uc:PopUpEdit IsReadOnly="True" Name="popupedit_file" Grid.Column="1" Margin="30,0,0,0" Height="23" Width="250" Grid.Row="0" HorizontalAlignment="Left" DeleteButtonVisibility="Collapsed" PopUpClick="popupedit_file_PopUpClick" />
+            <Button x:Name="ButtonImport" Grid.Column="2" Margin="5,0,0,0" Height="22" Content="Abschlagszahlungen importieren" Click="ButtonImport_Click" HorizontalAlignment="Left" VerticalAlignment="Center" Visibility="Visible" ></Button>
+            <Grid x:Name="customerInfoGrid" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" Margin="0,3,0,0">
                <Grid.ColumnDefinitions>
                    <ColumnDefinition Width="250" />
                    <ColumnDefinition />
@@ -88,7 +95,7 @@
                    <TextBlock Text="{Binding Path=InformationString}" Foreground="#FF2B508B" FontSize="14" />
                </Grid>
            </Grid>
-            <Grid Grid.Row="2" x:Name="customerDetailGrid" Margin="0,5,0,0">
+            <Grid Grid.Row="2" x:Name="customerDetailGrid" Grid.Column="0" Grid.ColumnSpan="3"  Margin="0,5,0,0">
                <Grid.ColumnDefinitions>
                    <ColumnDefinition Width="Auto" />
                    <ColumnDefinition />
--- a/BeWo/View/Detail/AccountingTransactionBookingView.xaml.cs
+++ b/BeWo/View/Detail/AccountingTransactionBookingView.xaml.cs
@@ -21,14 +21,17 @@ using BS.Shared.DataContracts;
 using BS.Shared.DataContracts.Compact;
 using BS.Shared.Services;
 using BS.Shared.Core;
-using BS.Shared.Translation;
 using Microsoft.Win32;
+using BS.Shared.Extensions;
+using BS.SharedLauncher.Translation;

 namespace BeWo.View.Detail
 {
    public partial class AccountingTransactionBookingView
    {
        private bool saveInProgress = false;
+
+        private String _UploadFileName;
        public static Visibility InsertedOnAndByVisibility
        {
            get
@@ -56,6 +59,16 @@ namespace BeWo.View.Detail
            DownloadLinkEngine = new DownloadLinkEngine();
            linkExcelExport.NavigateUri = DownloadLinkEngine.GenerateNewExcelLink();

+            if (!BeWoApp.AppSettings.ShowImportAbschlagszahlungen)
+            {
+                popupedit_file.Visibility = Visibility.Collapsed;
+                ButtonImport.Visibility = Visibility.Collapsed;
+            }
+#if DEBUG
+            popupedit_file.Visibility = Visibility.Visible;
+            ButtonImport.Visibility = Visibility.Visible;
+#endif
+
            Loaded += AccountingTransactionBookingView_Loaded;
        }

@@ -650,5 +663,92 @@ namespace BeWo.View.Detail
            }
        }

+        private void popupedit_file_PopUpClick(object sender, RoutedEventArgs ev)
+        {
+            var dlg = new OpenFileDialog();
+
+            if (dlg.ShowDialog() == true)
+            {
+                try
+                {
+
+                    _UploadFileName = dlg.FileName;
+
+                    popupedit_file.Text = dlg.SafeFileName;
+                    ButtonImport.IsEnabled = true;
+
+
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show(ex.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Exclamation);
+                }
+            }
+        }
+        private void ButtonImport_Click(object sender, RoutedEventArgs pe)
+        {
+            if (!String.IsNullOrEmpty(popupedit_file.Text))
+            {
+
+                try
+                {
+                    var upload = new ProgressStream(File.OpenRead(_UploadFileName));
+                    //upload.ProgressChanged += (s, e) => Dispatcher.BeginInvoke(
+                    //    DispatcherPriority.Normal,
+                    //    (Action)(() =>
+                    //    {
+                    //        progressbar_upload.Value = e.Data;
+                    //        text_progress.Content = string.Format("Bitte warten... {0:00}%", e.Data * 100);
+                    //    }));
+                    long oid = 0;
+
+                    var lUlPackage = new UploadPackage(null, 0, _UploadFileName, null, 0, 0, upload);
+
+                    ServiceFacade.DoStreamingServiceAsync(
+                        s => s.UploadImportFile(lUlPackage),
+                        r => this.Dispatch(
+                            delegate
+                            {
+
+
+                                //_UploadFileName = null;
+                                //button_uploadDocument.IsEnabled = false;
+                                //popupedit_file.Text = string.Empty;
+
+                                upload.Dispose();
+                                if (r != null && !String.IsNullOrEmpty(r.ResultMessage))
+                                {
+                                    if (r.Success)
+                                    {
+                                        MessageBox.Show(r.ResultMessage, "Import", MessageBoxButton.OK,
+                                            MessageBoxImage.Information);
+
+                                        ViewModel.RefreshAccountingTransactionsForSelectedTreeNode();
+                                    }
+                                    else
+                                    {
+                                        MessageBox.Show(r.ResultMessage, "Import", MessageBoxButton.OK,
+                                            MessageBoxImage.Exclamation);
+                                    }
+
+                                }
+
+                            }),
+                                () => this.Dispatch(
+                                    delegate
+                                    {
+
+                                        upload.Dispose();
+                                    }));
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show(ex.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Exclamation);
+                }
+
+
+            }
+        }
+
    }
 }
--- a/BeWo/View/Detail/AccountingTransactionView.xaml
+++ b/BeWo/View/Detail/AccountingTransactionView.xaml
@@ -27,34 +27,33 @@
 					<RowDefinition Height="Auto" />
 				</Grid.RowDefinitions>

-				<GroupBox Margin="0 0 10 0">
-					<GroupBox.Header>
-
-						<Grid Margin="0 0 4 0">
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition Width="*" SharedSizeGroup="a" />
-								<ColumnDefinition Width="Auto" SharedSizeGroup="b" />
-							</Grid.ColumnDefinitions>
-							<CheckBox Name="checkbox_yearfilter" IsChecked="True" Content="Nach Jahr filtern" />
-							<CheckBox Name="checkbox_monthfilter" IsEnabled="{Binding Path=IsChecked, ElementName=checkbox_yearfilter}" Grid.Column="1" IsChecked="True" Content="Nach Monat filtern" Margin="5,0,0,0" />
-						</Grid>
-					</GroupBox.Header>
-					<Grid Margin="0 0 4 0">
+				
+					<Grid Margin="0 3 0 0">
 						<Grid.ColumnDefinitions>
 							<ColumnDefinition Width="*" SharedSizeGroup="a" />
 							<ColumnDefinition Width="Auto" SharedSizeGroup="b" />
 						</Grid.ColumnDefinitions>
-            <ComboBox x:Name="combobox_year" IsEnabled="{Binding Path=IsChecked, ElementName=checkbox_yearfilter}" Margin="3" Height="20" MinWidth="80" Padding="5 0" VerticalContentAlignment="Center" Background="White" />
-            <ComboBox x:Name="combobox_month" IsEnabled="{Binding Path=IsChecked, ElementName=checkbox_monthfilter}" Grid.Column="1" Margin="8,0,0,0" Height="20" MinWidth="120" Padding="5 0" VerticalContentAlignment="Center" Background="White" Grid.Row="1" />
-					</Grid>
-				</GroupBox>
-
-				<GroupBox Grid.Row="1" Grid.RowSpan="2" Grid.Column="0" Margin="0 0 10 0">
-					<GroupBox.Header>
-						<CheckBox Name="checkbox_supportconceptfilter" Unchecked="checkbox_supportconceptfilter_CheckedChanged" IsChecked="False" Checked="checkbox_supportconceptfilter_CheckedChanged" Content="Nach Hilfeplan filtern" />
-					</GroupBox.Header>
-					<localSearchView:SupportConceptTreeSearchView ResultListBackground="{StaticResource AccountingContentBrush}" x:Name="treesearchview_filter" IsEnabled="{Binding Path=IsChecked, ElementName=checkbox_supportconceptfilter}" Grid.Row="2" />
-				</GroupBox>
+                        <Grid.RowDefinitions>
+                            <RowDefinition  />
+                            <RowDefinition  />
+                        </Grid.RowDefinitions>
+                        <CheckBox Name="checkbox_yearfilter" IsChecked="True" Content="Nach Jahr filtern" />
+                        <CheckBox Name="checkbox_monthfilter" IsEnabled="{Binding Path=IsChecked, ElementName=checkbox_yearfilter}" Grid.Column="1" IsChecked="True" Content="Nach Monat filtern" Margin="8,0,0,0" />
+                        <ComboBox x:Name="combobox_year" IsEnabled="{Binding Path=IsChecked, ElementName=checkbox_yearfilter}" Grid.Row="1" Margin="0,3,0,0" Height="20" MinWidth="80" Padding="0,0,0,0" VerticalContentAlignment="Center" Background="White" />
+                        <ComboBox x:Name="combobox_month" IsEnabled="{Binding Path=IsChecked, ElementName=checkbox_monthfilter}" Grid.Column="1" Grid.Row="1" Margin="8,3,0,0" Height="20" MinWidth="120"  VerticalContentAlignment="Center" Background="White" />
+                        
+                    </Grid>
+				
+				<Grid Grid.Row="1" Grid.RowSpan="2" Grid.Column="0" Margin="0 8 8 0">
+                    <Grid.RowDefinitions>
+                        <RowDefinition  Height="Auto"/>
+                        <RowDefinition  Height="*"/>
+                    </Grid.RowDefinitions>
+                    
+						<CheckBox Name="checkbox_supportconceptfilter" Unchecked="checkbox_supportconceptfilter_CheckedChanged" IsChecked="False" Checked="checkbox_supportconceptfilter_CheckedChanged" Content="Nach Hilfeplan filtern" Grid.Row="0" />
+					
+					<localSearchView:SupportConceptTreeSearchView ResultListBackground="{StaticResource AccountingContentBrush}" x:Name="treesearchview_filter" IsEnabled="{Binding Path=IsChecked, ElementName=checkbox_supportconceptfilter}" Grid.Row="1" Margin="0,3,0,0" />
+				</Grid>

 				<GridSplitter Grid.Column="0" HorizontalAlignment="Right" Grid.Row="0" Grid.RowSpan="3" Width="4" />

--- a/Show More
+++ b/Show More