Bug + cleaner

+ OrganisationView.xaml ScrollViewer wenn zu klein

BeWo/BeWo.csproj

@@ -962,12 +962,14 @@
       <DependentUpon>BSLogoControl.xaml</DependentUpon>
     </Compile>
     <Compile Include="Converter\AnonymizationRight2VisibilityConverter.cs" />
+    <Compile Include="Converter\AppSettingsConverter.cs" />
     <Compile Include="Converter\BooleanOrVisibilityMultiConverter.cs" />
     <Compile Include="Converter\BooleanAndVisibilityMultiConverter.cs" />
     <Compile Include="Converter\BoolNullCheckConverter.cs" />
     <Compile Include="Converter\BoolReverseConverter.cs" />
     <Compile Include="Converter\BoolEnabledToTabitemBackgroundConverter.cs" />
     <Compile Include="Converter\BoolToParameterReturnConverter.cs" />
+    <Compile Include="Converter\BoolVisibilityCollapsedConverter.cs" />
     <Compile Include="Converter\CellColorConverter.cs" />
     <Compile Include="Converter\CollectionContainsTag2BoolConverter.cs" />
     <Compile Include="Converter\CollectionCountToBoolConverter.cs" />
@@ -984,6 +986,7 @@
     <Compile Include="Converter\BoolVisibilityMultiConverter.cs" />
     <Compile Include="Converter\NullableBoolToBoolConverter.cs" />
     <Compile Include="Converter\Object2ToStringConverter.cs" />
+    <Compile Include="Converter\RadioBoolToIntConverter.cs" />
     <Compile Include="Converter\TestDebugConverter.cs" />
     <Compile Include="Converter\ParticipationBrushConverter.cs" />
     <Compile Include="Converter\ArchiveRight2VisibilityConverter.cs" />

BeWo/BeWo.csproj.user

@@ -9,7 +9,7 @@
     <ErrorReportUrlHistory />
     <FallbackCulture>de-DE</FallbackCulture>
     <VerifyUploadedFiles>false</VerifyUploadedFiles>
-    <ProjectView>ShowAllFiles</ProjectView>
+    <ProjectView>ProjectFiles</ProjectView>
   </PropertyGroup>
   <PropertyGroup>
     <EnableSecurityDebugging>false</EnableSecurityDebugging>

BeWo/BeWoApp.xaml

@@ -88,7 +88,13 @@
             <conv:DeleteForGoodRight2VisibilityConverter x:Key="DeleteForGoodRight2VisibilityConverter" />
             <conv:AnonymizationRight2VisibilityConverter x:Key="AnonymizationRight2VisibilityConverter" />
             <conv:GkvState2StringConverter x:Key="GkvState2StringConverter" />
+            <conv:RadioBoolToIntConverter x:Key="RadioBoolToIntConverter" />
             <conv:EnumTranslationConverter x:Key="EnumTranslationConverter" />
+            <conv:AppSettingsConverter x:Key="AppSettingsConverter" />
+            <conv:ValueConverterGroup x:Key="AppSettings2Visible">
+                <conv:AppSettingsConverter />
+                <conv:BoolVisibilityCollapsedConverter />
+            </conv:ValueConverterGroup>
 
             <Style x:Key="SupportConceptDetailStyle" TargetType="{x:Type ListBoxItem}">
                 <Setter Property="HorizontalContentAlignment" Value="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorLevel=1, AncestorType={x:Type ItemsControl}, Mode=FindAncestor}}" />

BeWo/Converter/AppSettingsConverter.cs

@@ -0,0 +1,36 @@
+using BeWo.Core.Config;
+using BS.Shared.Core;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace BeWo.Converter
+{
+	public class AppSettingsConverter : IValueConverter
+	{
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			if (parameter == null)
+				return false;
+
+			if(parameter is string setting)
+			{
+				// Kann gerne erweitert werden
+				// Achtung! Verwende bei Parameter SettingsKeys
+				if (setting == SettingsKeys.AllowGkvAbrechnung)
+					return BeWoApp.AppSettings.AllowGkvAbrechnung;
+			}
+
+			return false;
+		}
+
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			throw new NotImplementedException();
+		}
+	}
+}

BeWo/Converter/BoolVisibilityCollapsedConverter.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace BeWo.Converter
+{
+    public class BoolVisibilityCollapsedConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value == null)
+            {
+                return Visibility.Visible;
+            }
+
+            if(value is bool b)
+            {
+                return (bool)value ? Visibility.Visible : Visibility.Collapsed;
+            }
+
+            return Visibility.Visible;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

BeWo/Converter/EnumTranslationConverter.cs

@@ -19,12 +19,18 @@ namespace BeWo.Converter
                 {
                     return v;
                 }
+                // RE:
+                // EnumTranslationConverter, aber betrachtet nicht alle?
+                // Brauche hier eig nur EnumTranslations.Gkv2Translation
+                if (EnumTranslations.AllTranslations.TryGetValue(e, out string vv))
+                {
+                    return vv;
+                }
 
                 return e;
             }
 
             return null;
-            throw new NotImplementedException();
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)

BeWo/Converter/GkvState2StringConverter.cs

@@ -22,6 +22,7 @@ namespace BeWo.Converter
             {
                 case GkvState.NoSend: return "Erstellt";
                 case GkvState.Waiting: return "Gesendet";
+                case GkvState.Waiting4Urbelege: return "Urbelege per Post";
                 case GkvState.Error: return "Fehler";
                 case GkvState.ErrorFatal: return "Fataler Fehler";
                 case GkvState.Paid: return "Bezahlt";

BeWo/Converter/RadioBoolToIntConverter.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace BeWo.Converter
+{
+    public class RadioBoolToIntConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return value?.Equals(int.Parse(parameter.ToString()));
+        }
+
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return value?.Equals(true) == true ? int.Parse(parameter.ToString()) : Binding.DoNothing;
+        }
+	}
+}

BeWo/DebugConfig.cs

@@ -12,7 +12,8 @@ namespace BeWo
         FeatureCustomerWohnhilfe,
         FeatureWohnheimWohneinheit,
         FeatureAuswertungenQuittierungsbelege,
-        FeatureDokumentenVorlage
+        FeatureDokumentenVorlage,
+        FeatureDakota
     }
 
     public class DebugConfig
@@ -79,6 +80,14 @@ namespace BeWo
             SelectView = UIContext.Report
         };
 
+        public static DebugConfig Feature_Dakota => new DebugConfig()
+        {
+            DebugConfigMode = DebugConfigMode.FeatureDakota,
+            AutoLogin = true,
+            SelectView = UIContext.Finance,
+            SelectIndex = 8
+        };
+
         public static DebugConfig Feature_Dokumenten_Vorlage => new DebugConfig()
         {
             DebugConfigMode = DebugConfigMode.FeatureDokumentenVorlage,

BeWo/LoginControl.xaml.cs

@@ -61,7 +61,7 @@ namespace BeWo
         //proxy anmeldedaten
         public string proxyname;
         public string proxyUsername;
-        public string proxypasswd; 
+        public string proxypasswd;
 
         private List<BeWoProfile> _ProfileList;
         public List<BeWoProfile> ProfileList
@@ -69,7 +69,7 @@ namespace BeWo
             get { return _ProfileList; }
             set { _ProfileList = value; }
         }
-        
+
         public LoginControl()
         {
             InitializeComponent();
@@ -77,24 +77,24 @@ namespace BeWo
             DateTime dt = new DateTime(2017, 1, 1);
             if (DateTime.Now > dt)
                 dt = DateTime.Now;
-            
+
             txtCopyright.Text = String.Format("Copyright {0:yyyy} | ownSoft GmbH", dt);
-            
+
             var checkPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\profiles.txt";
-			if (File.Exists(checkPath))
-			{
-				//Nimm lokalen Profilpfad wenn er existiert. Wird z.B. bei Kunden mit Citrix Server genutzt, die keine Clickonce Installation vornehmen
-				_ProfilesFilePath = checkPath;
-			}
-			else
-			{
-				_ProfilesFilePath = Path.Combine(BeWoApp.GetAndCreateUserAppDataPath(), "profiles.txt");
-			}
+            if (File.Exists(checkPath))
+            {
+                //Nimm lokalen Profilpfad wenn er existiert. Wird z.B. bei Kunden mit Citrix Server genutzt, die keine Clickonce Installation vornehmen
+                _ProfilesFilePath = checkPath;
+            }
+            else
+            {
+                _ProfilesFilePath = Path.Combine(BeWoApp.GetAndCreateUserAppDataPath(), "profiles.txt");
+            }
 
             _ConfigFilePath = Path.Combine(BeWoApp.GetAndCreateUserAppDataPath(), "bwp.config");
 
             ProfileList = new List<BeWoProfile>();
-	        BeWoProfile selectedProfile = null;
+            BeWoProfile selectedProfile = null;
             HeightFrom = gridLogin.Height;
             HeightTo = gridLogin.Height + 64;
             LineYCoordFrom = linkLine.Y1;
@@ -102,31 +102,31 @@ namespace BeWo
 
             DataContext = this;
 
-            
+
             ReadProxyName();
 
             try
             {
-	            ReadProfileList();
-               
+                ReadProfileList();
+
 #if DEBUG
 
 
                 var uri = new Uri("https://localhost/Host/?k=demo&s=localhost/service");
 
-				var paramDic = BeWoUtils.ParseQuery(uri.Query);
-				string v1, v2;
-				paramDic.TryGetValue("k", out v1);
-				paramDic.TryGetValue("s", out v2);
-				BeWoApp.Tenant = v1;
-				BeWoApp.ServerName = v2;
-				if (ProfileList.Count > 0)
-					ProfileList.Insert(0, new BeWoProfile(v1, v2, BeWoApp.Tenant));
-				else
-					ProfileList.Add(new BeWoProfile(v1, v2, BeWoApp.Tenant));
-				SaveProfileListToFile();
+                var paramDic = BeWoUtils.ParseQuery(uri.Query);
+                string v1, v2;
+                paramDic.TryGetValue("k", out v1);
+                paramDic.TryGetValue("s", out v2);
+                BeWoApp.Tenant = v1;
+                BeWoApp.ServerName = v2;
+                if (ProfileList.Count > 0)
+                    ProfileList.Insert(0, new BeWoProfile(v1, v2, BeWoApp.Tenant));
+                else
+                    ProfileList.Add(new BeWoProfile(v1, v2, BeWoApp.Tenant));
+                SaveProfileListToFile();
+
 
-			
 
 
 #else
@@ -171,29 +171,29 @@ namespace BeWo
                    
                 }
 #endif
-			}
+            }
             catch (Exception ex)
             {
-                
-            }
-            
-			
-	        //string ipaddress = "";
 
-			// --------------
+            }
+
+
+            //string ipaddress = "";
+
+            // --------------
 
             if (ProfileList.Count == 0 || String.IsNullOrEmpty(ProfileList[0].Tenant))
-				ShowEnterTenantDialog();
+                ShowEnterTenantDialog();
 
             //if (ProfileList.Count == 0)
-                //ProfileList.Add(new BeWoProfile("Ungültiges Profil", "Bitte geben Sie hier einen gültigen Server an. Z.B. app1", "Kundennummer"));
-	        BeWoProfile firstProfile = null;
-			if (ProfileList.Count > 0)
-				firstProfile = ProfileList[0];
-			ProfileList.Sort((a, b) => a.Name.CompareTo(b.Name));
-	        profileSelectionComboBox.ItemsSource = ProfileList;
+            //ProfileList.Add(new BeWoProfile("Ungültiges Profil", "Bitte geben Sie hier einen gültigen Server an. Z.B. app1", "Kundennummer"));
+            BeWoProfile firstProfile = null;
+            if (ProfileList.Count > 0)
+                firstProfile = ProfileList[0];
+            ProfileList.Sort((a, b) => a.Name.CompareTo(b.Name));
+            profileSelectionComboBox.ItemsSource = ProfileList;
+
 
-			
             if (ProfileList.Count > 0)
             {
 #if DEBUG
@@ -207,10 +207,10 @@ namespace BeWo
                     selectedProfile = firstProfile;
                 }
             }
-				
-            
+
+
             //if (profileSelectionComboBox.SelectedItem == null)
-                profileSelectionComboBox.SelectedItem = selectedProfile;
+            profileSelectionComboBox.SelectedItem = selectedProfile;
 
             TextBox_Username.Focus();
 
@@ -218,9 +218,9 @@ namespace BeWo
             {
                 TextBox_Username.Text = "demo";
                 PasswordBox_Password.Password = "demo";
-                
+
             }
-            
+
             //this.lblTenant.Content = BeWoApp.Tenant;
             lblVersion.Content = BeWoApp.Version;
 
@@ -233,9 +233,9 @@ namespace BeWo
 
             //linkLine.Margin = new Thickness(linkLine.Margin.Left, linkLine.Margin.Top + 25, linkLine.Margin.Right, linkLine.Margin.Bottom);
             //gridLogin.Height += 25;
-            
+
         }
-        
+
 
         private void PinCertificate()
         {
@@ -265,7 +265,7 @@ namespace BeWo
             {
                 if (certificate == null || chain == null)
                     return false;
-                
+
                 bool chainContainsPk = false;
 
                 foreach (var element in chain.ChainElements)
@@ -458,7 +458,7 @@ namespace BeWo
                         while (!myFile.EndOfStream)
                         {
                             var data = myFile.ReadLine();
-                            
+
                             if (!String.IsNullOrEmpty(data))
                             {
                                 if (data.Contains("selected"))
@@ -484,65 +484,65 @@ namespace BeWo
             }
             catch (Exception e)
             {
-                
+
             }
-            
+
 
             return null;
         }
 
         private void ReadProfileList()
-		{
-		    try
-		    {
-		        if (File.Exists(_ProfilesFilePath))
-		        {
-		            var myFile = new StreamReader(_ProfilesFilePath, Encoding.Default);
+        {
+            try
+            {
+                if (File.Exists(_ProfilesFilePath))
+                {
+                    var myFile = new StreamReader(_ProfilesFilePath, Encoding.Default);
 
-		            while (!myFile.EndOfStream)
-		            {
-		                var data = myFile.ReadLine()?.Split('|');
+                    while (!myFile.EndOfStream)
+                    {
+                        var data = myFile.ReadLine()?.Split('|');
 
-		                if (data?.Length >= 3)
-		                {
-		                    if (!String.IsNullOrEmpty(data[1]) && !String.IsNullOrEmpty(data[2]))
-		                        ProfileList.Add(new BeWoProfile(data[0], data[1], data[2]));
-		                }
-		            }
-		            myFile.Close();
-		        }
+                        if (data?.Length >= 3)
+                        {
+                            if (!String.IsNullOrEmpty(data[1]) && !String.IsNullOrEmpty(data[2]))
+                                ProfileList.Add(new BeWoProfile(data[0], data[1], data[2]));
+                        }
+                    }
+                    myFile.Close();
+                }
             }
-		    catch (Exception e)
-		    {
-		    }
-		}
+            catch (Exception e)
+            {
+            }
+        }
 
-		private string GetNumericServerName(string serverName)
-		{
-			if (!String.IsNullOrEmpty(serverName))
-			{
-				int snOut = 0;
-				if (!Int32.TryParse(serverName, out snOut))
-				{
-					String nname = serverName.Replace("app", "");
-					if (nname.IndexOf('.') > 0)
-					{
-						return nname.Substring(0, nname.IndexOf('.'));
-					}
-				}
-			}
-			return serverName;
-		}
+        private string GetNumericServerName(string serverName)
+        {
+            if (!String.IsNullOrEmpty(serverName))
+            {
+                int snOut = 0;
+                if (!Int32.TryParse(serverName, out snOut))
+                {
+                    String nname = serverName.Replace("app", "");
+                    if (nname.IndexOf('.') > 0)
+                    {
+                        return nname.Substring(0, nname.IndexOf('.'));
+                    }
+                }
+            }
+            return serverName;
+        }
 
         private void ShowEnterTenantDialog()
         {
             BeWoProfile p = null;
-            
+
             var cancel = false;
             var tenant = String.Empty;
             while (p == null && !cancel)
             {
-                var dlg = new EnterTenantDialog {Tenant = tenant};
+                var dlg = new EnterTenantDialog { Tenant = tenant };
                 var result = dlg.ShowDialog();
                 if (result.HasValue && result.Value)
                 {
@@ -551,14 +551,14 @@ namespace BeWo
                     {
                         tenant = tenant.Trim();
                     }
-					var server = GetServerFromTenant(tenant);
+                    var server = GetServerFromTenant(tenant);
                     if (!String.IsNullOrEmpty(server))
                     {
                         p = new BeWoProfile(tenant, server, tenant);
-						if (ProfileList.Count > 0)
-							ProfileList.Insert(0, p);
-						else
-							ProfileList.Add(p);
+                        if (ProfileList.Count > 0)
+                            ProfileList.Insert(0, p);
+                        else
+                            ProfileList.Add(p);
                         SaveProfileListToFile();
                     }
                     else
@@ -574,14 +574,14 @@ namespace BeWo
         }
 
 
-		private string GetServerFromTenant(string tenant)
-		{
-			try
-			{
-				if (tenant == "demo")
-				{
-					return "app1.bewoplaner.de";
-				}
+        private string GetServerFromTenant(string tenant)
+        {
+            try
+            {
+                if (tenant == "demo")
+                {
+                    return "app1.bewoplaner.de";
+                }
                 //Server URL über Kundennummer:
                 //https://bewoplaner.beyondsoft.de/getserver.php?CustomerID=1234567890
 
@@ -590,28 +590,28 @@ namespace BeWo
                 //https://bewoplaner.beyondsoft.de/getcontractstate.php?CustomerID=1234567890
 
 
-			                                
+
                 String url = String.Format(GETSERVER_URL, tenant);
-				using (WebClient client = new WebClient())
-				{
-					//MessageBox.Show(hostAddress);
-					byte[] response = client.UploadValues(url, "POST", new NameValueCollection());
+                using (WebClient client = new WebClient())
+                {
+                    //MessageBox.Show(hostAddress);
+                    byte[] response = client.UploadValues(url, "POST", new NameValueCollection());
 
-					String server = System.Text.Encoding.ASCII.GetString(response);
+                    String server = System.Text.Encoding.ASCII.GetString(response);
 
-					return server;
-				}
-			}
-			catch (Exception ex)
-			{
-				//MessageBox.Show(String.Format("Fehler beim Prüfen der Kundennummer: {0}\n\n{1}", ex.Message, ex.StackTrace));
-				return null;
-			}
+                    return server;
+                }
+            }
+            catch (Exception ex)
+            {
+                //MessageBox.Show(String.Format("Fehler beim Prüfen der Kundennummer: {0}\n\n{1}", ex.Message, ex.StackTrace));
+                return null;
+            }
+
+            return null;
+        }
 
-			return null;
-		}
 
-		
         private BeWoProfile GenerateProfileFromUri(Uri uri)
         {
 
@@ -711,10 +711,12 @@ namespace BeWo
                 TextBox_Username.Focus();
             }
 
-            if(DebugConfig.CurrentConfig is object && DebugConfig.CurrentConfig.AutoLogin)
+#if DEBUG
+            if (DebugConfig.CurrentConfig is object && DebugConfig.CurrentConfig.AutoLogin)
             {
                 button_login_Click(this, new RoutedEventArgs());
             }
+#endif
         }
 
         private void ShowModalBackground()
@@ -732,43 +734,43 @@ namespace BeWo
         private void button_login_Click(object sender, RoutedEventArgs e)
         {
 
-			if (!String.IsNullOrEmpty(proxyname))
-			{
-				var webProxy = WebProxy.GetDefaultProxy();
-				webProxy.UseDefaultCredentials = true;
-				System.Net.WebRequest.DefaultWebProxy = new WebProxy(proxyname, true);
+            if (!String.IsNullOrEmpty(proxyname))
+            {
+                var webProxy = WebProxy.GetDefaultProxy();
+                webProxy.UseDefaultCredentials = true;
+                System.Net.WebRequest.DefaultWebProxy = new WebProxy(proxyname, true);
 
-				if (String.IsNullOrEmpty(proxyUsername))
-				{
-					WebRequest.DefaultWebProxy.Credentials = CredentialCache.DefaultNetworkCredentials;
-				}
-				else
-				{
-					WebRequest.DefaultWebProxy.Credentials = new NetworkCredential(proxyUsername, proxypasswd);
-				}
-			}
+                if (String.IsNullOrEmpty(proxyUsername))
+                {
+                    WebRequest.DefaultWebProxy.Credentials = CredentialCache.DefaultNetworkCredentials;
+                }
+                else
+                {
+                    WebRequest.DefaultWebProxy.Credentials = new NetworkCredential(proxyUsername, proxypasswd);
+                }
+            }
 
 
 
-			if (ProfileList.Count == 0 || profileSelectionComboBox.SelectedItem == null)
-			{
-				MessageBox.Show(
-					"Es wurde kein gültiges Profil gefunden. Bitte erstellen Sie zunächst ein Profil. Klicken Sie dazu auf 'Erweitert' und anschließend auf den Button 'Profile bearbeiten'",
-					"Ungültiges Profil", MessageBoxButton.OK, MessageBoxImage.Warning);
-			}
-			else
-			{
-			    var profile = profileSelectionComboBox.SelectedItem as BeWoProfile;
+            if (ProfileList.Count == 0 || profileSelectionComboBox.SelectedItem == null)
+            {
+                MessageBox.Show(
+                    "Es wurde kein gültiges Profil gefunden. Bitte erstellen Sie zunächst ein Profil. Klicken Sie dazu auf 'Erweitert' und anschließend auf den Button 'Profile bearbeiten'",
+                    "Ungültiges Profil", MessageBoxButton.OK, MessageBoxImage.Warning);
+            }
+            else
+            {
+                var profile = profileSelectionComboBox.SelectedItem as BeWoProfile;
 
-			    isNet45OrNewer = IsNet45OrNewer();
+                isNet45OrNewer = IsNet45OrNewer();
 
-			    if (!isNet45OrNewer)
-			    {
-			        if (!CheckStatusMessage(String.Format(GETNETMESSAGE_URL, profile.Tenant, BeWoApp.ShortVersion)))
-			        {
-			            return;
-			        }
-			    }
+                if (!isNet45OrNewer)
+                {
+                    if (!CheckStatusMessage(String.Format(GETNETMESSAGE_URL, profile.Tenant, BeWoApp.ShortVersion)))
+                    {
+                        return;
+                    }
+                }
 
 #if DEBUG
                 if (!CheckStatusMessage(String.Format(GETSTATUSMESSAGE_URL + "&pre", profile.Tenant, BeWoApp.ShortVersion)))
@@ -784,30 +786,30 @@ namespace BeWo
 
 
                 ChangeServerAndTenant(profile);
-				var lWaitLayer = new WaitLayer2();
-				grid_root.Children.Add(lWaitLayer);
+                var lWaitLayer = new WaitLayer2();
+                grid_root.Children.Add(lWaitLayer);
 
-				string lUserName = TextBox_Username.Text;
-				string lPassword = PasswordBox_Password.Password;
-			    string lPIN = PINTextBox.Text;
-				string lTenant = BeWoApp.Tenant;
-                
-				
-				if (!String.IsNullOrEmpty(lPIN))
-				{
-					lPIN += "_" + System.Environment.MachineName;
-				}
-				Action<WaitLayer2, String, String, String, String> action = Login;
-				action.BeginInvoke(lWaitLayer, lUserName, lPassword, lTenant, lPIN, cb => {}, null);
-			}
+                string lUserName = TextBox_Username.Text;
+                string lPassword = PasswordBox_Password.Password;
+                string lPIN = PINTextBox.Text;
+                string lTenant = BeWoApp.Tenant;
+
+
+                if (!String.IsNullOrEmpty(lPIN))
+                {
+                    lPIN += "_" + System.Environment.MachineName;
+                }
+                Action<WaitLayer2, String, String, String, String> action = Login;
+                action.BeginInvoke(lWaitLayer, lUserName, lPassword, lTenant, lPIN, cb => { }, null);
+            }
         }
-		
+
         private void Login(WaitLayer2 lWaitLayer, String lUserName, String lPassword, String lTenant, String lPIN)
-        { 
+        {
             try
             {
                 //1. Versuch
-                UserValidationResult result = TryLogin(lWaitLayer, lUserName, lPassword, lTenant, lPIN );
+                UserValidationResult result = TryLogin(lWaitLayer, lUserName, lPassword, lTenant, lPIN);
 
                 //2. Versuch
                 if (result == UserValidationResult.UnkownError)
@@ -815,7 +817,7 @@ namespace BeWo
                     ServiceFacade.DoOperationsServiceAsync(op => op.ResetTenant(lTenant),
                                     delegate
                                     {
-                                        result = TryLogin(lWaitLayer ,lUserName, lPassword, lTenant, lPIN);
+                                        result = TryLogin(lWaitLayer, lUserName, lPassword, lTenant, lPIN);
 
                                         if (result == UserValidationResult.UnkownError)
                                         {
@@ -823,7 +825,7 @@ namespace BeWo
                                             ServiceFacade.DoOperationsServiceAsync(op => op.ResetAllTenants(),
                                                     delegate
                                                     {
-                                                        result = TryLogin(lWaitLayer,lUserName, lPassword, lTenant, lPIN);
+                                                        result = TryLogin(lWaitLayer, lUserName, lPassword, lTenant, lPIN);
 
                                                         if (result == UserValidationResult.UnkownError)
                                                         {
@@ -862,37 +864,37 @@ namespace BeWo
                         MessageBox.Show("Die Kundennummer '" + lTenant + "' ist ungültig.", "Fehler bei der Anmeldung", MessageBoxButton.OK, MessageBoxImage.Exclamation);
                     });
                 }
-	            String pin = lPIN;
-				
-				if (!String.IsNullOrEmpty(lPIN) && lPIN.IndexOf('_') >= 0)
-				{
-					pin = lPIN.Substring(0, lPIN.IndexOf('_'));
-				}
+                String pin = lPIN;
 
-				if (result == UserValidationResult.IncorrectPin)
-				{
-					this.Dispatch(delegate
-					{
-						grid_root.Children.Remove(lWaitLayer);
-						MessageBox.Show("Die Pin '" + pin + "' ist unbekannt!", "Fehler bei der Anmeldung", MessageBoxButton.OK, MessageBoxImage.Exclamation);
-					});
-				}
-				if (result == UserValidationResult.PinAlreadyUsed)
-				{
-					this.Dispatch(delegate
-					{
-						grid_root.Children.Remove(lWaitLayer);
-						MessageBox.Show("Die Pin '" + pin + "' wurde bereits verwendet!", "Fehler bei der Anmeldung", MessageBoxButton.OK, MessageBoxImage.Exclamation);
-					});
-				}
-				if (result == UserValidationResult.PinExpired)
-				{
-					this.Dispatch(delegate
-					{
-						grid_root.Children.Remove(lWaitLayer);
-						MessageBox.Show("Die Pin '" + pin + "' ist bereits abgelaufen!", "Fehler bei der Anmeldung", MessageBoxButton.OK, MessageBoxImage.Exclamation);
-					});
-				}
+                if (!String.IsNullOrEmpty(lPIN) && lPIN.IndexOf('_') >= 0)
+                {
+                    pin = lPIN.Substring(0, lPIN.IndexOf('_'));
+                }
+
+                if (result == UserValidationResult.IncorrectPin)
+                {
+                    this.Dispatch(delegate
+                    {
+                        grid_root.Children.Remove(lWaitLayer);
+                        MessageBox.Show("Die Pin '" + pin + "' ist unbekannt!", "Fehler bei der Anmeldung", MessageBoxButton.OK, MessageBoxImage.Exclamation);
+                    });
+                }
+                if (result == UserValidationResult.PinAlreadyUsed)
+                {
+                    this.Dispatch(delegate
+                    {
+                        grid_root.Children.Remove(lWaitLayer);
+                        MessageBox.Show("Die Pin '" + pin + "' wurde bereits verwendet!", "Fehler bei der Anmeldung", MessageBoxButton.OK, MessageBoxImage.Exclamation);
+                    });
+                }
+                if (result == UserValidationResult.PinExpired)
+                {
+                    this.Dispatch(delegate
+                    {
+                        grid_root.Children.Remove(lWaitLayer);
+                        MessageBox.Show("Die Pin '" + pin + "' ist bereits abgelaufen!", "Fehler bei der Anmeldung", MessageBoxButton.OK, MessageBoxImage.Exclamation);
+                    });
+                }
                 if (result == UserValidationResult.PasswordExpired)
                 {
                     //this.Dispatch(delegate
@@ -919,7 +921,7 @@ namespace BeWo
         private UserValidationResult TryLogin(WaitLayer2 lWaitLayer, string lUserName, string lPassword, string tenant, string lPin)
         {
             UserValidationResult? result = null;
-	        
+
             if (!string.IsNullOrEmpty(lUserName) && !string.IsNullOrEmpty(lPassword))
             {
                 String tempUsername = lUserName;
@@ -945,7 +947,7 @@ namespace BeWo
                     clr = e.Message;
                 }
 
-                
+
                 tempUsername = String.Format("{0}//Version={1};CLRVersion={2};BeWoVersion={3};IsNet45OrNewer={4}", lUserName, version, clr, bewoVersion, isNet45OrNewer);
                 try
                 {
@@ -953,7 +955,7 @@ namespace BeWo
                     {
                         try
                         {
-							return s.IsUserValid(tempUsername, lPassword, lPin);
+                            return s.IsUserValid(tempUsername, lPassword, lPin);
                         }
                         catch (Exception)
                         {
@@ -969,7 +971,7 @@ namespace BeWo
                             LoginResult(lWaitLayer, r, lUserName, lPassword, tenant, lPin);
                         });
 
-                        
+
                     }, true);
                 }
                 catch (FaultException<BeWoFault>)
@@ -979,7 +981,7 @@ namespace BeWo
             }
             else
             {
-                if(result == null)
+                if (result == null)
                     result = UserValidationResult.UserUnknown;
             }
 
@@ -991,9 +993,9 @@ namespace BeWo
             return result.Value;
         }
 
-        private void LoginResult( WaitLayer2 lWaitLayer, UserValidationResult result, String lUserName, String lPassword, String tenant, String lPIN)
+        private void LoginResult(WaitLayer2 lWaitLayer, UserValidationResult result, String lUserName, String lPassword, String tenant, String lPIN)
         {
-            
+
             if (result == UserValidationResult.UserValid || result == UserValidationResult.UserValidTwoFactorAuthenticationNeeded || result == UserValidationResult.TwoFactorAuthenticationFailedNoChatCodeAllowLogin)
             {
                 if (result == UserValidationResult.UserValidTwoFactorAuthenticationNeeded || result == UserValidationResult.TwoFactorAuthenticationFailedNoChatCodeAllowLogin)
@@ -1010,7 +1012,7 @@ namespace BeWo
                         message = Translator.Translate("Kein Chat Code für die Zwei Faktor Authentifizierung gefunden");
                         dlg.ShowCodeField = false;
                     }
-                
+
                     if (message.Contains("<") && message.Contains(">"))
                     {
                         dlg.SetXaml(message);
@@ -1036,14 +1038,14 @@ namespace BeWo
 
                 BeWoApp.UserName = lUserName;
                 BeWoApp.UserPassword = lPassword;
-                             
+
                 BeWoApp.PasswortStrength = BeWoUtils.CheckPasswordSecurity(lPassword);
 
                 ServiceFacade.DoUserServiceAsync(s2 => s2.LoadUserByNameAndPassword(lUserName, lPassword),
                     r2 =>
                     {
                         BeWoApp.LoggedOnUser = r2;
-						
+
                         ServiceFacade.DoOperationsServiceAsync(s => s.GetMandator(),
                             m =>
                             {
@@ -1078,7 +1080,7 @@ namespace BeWo
                                     }
                                     grid_root.Children.Remove(lWaitLayer);
                                     MessageBox.Show(msg, "Fehler bei der Anmeldung", MessageBoxButton.OK, MessageBoxImage.Exclamation);
-                                        
+
                                     var pav = new PasswortAenderungsView();
                                     pav.ShowDialog();
 
@@ -1086,7 +1088,8 @@ namespace BeWo
                                     {
 
                                     }
-                                    else {
+                                    else
+                                    {
                                         LoginSuccessful?.Invoke(this, new EventArgs());
                                     }
                                 });
@@ -1153,14 +1156,14 @@ namespace BeWo
 
         }
 
-		private void button_configureProxy_Click(object sender, RoutedEventArgs rea)
-	    {
+        private void button_configureProxy_Click(object sender, RoutedEventArgs rea)
+        {
             ProxyLoginView proxyLogin = new ProxyLoginView();
-			proxyLogin.WindowStartupLocation = WindowStartupLocation.CenterScreen;
-			
-			proxyLogin.ShowDialog();
-			ReadProxyName();
-	    }
+            proxyLogin.WindowStartupLocation = WindowStartupLocation.CenterScreen;
+
+            proxyLogin.ShowDialog();
+            ReadProxyName();
+        }
 
         // TODO: Verschlüsselung einbauen!
         private void ReadProxyName()
@@ -1171,15 +1174,15 @@ namespace BeWo
 
             try
             {
-				var filePath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\proxy.dat";
-				if (!File.Exists(filePath))
-				{
-					filePath = Path.Combine(BeWoApp.GetAndCreateUserAppDataPath(), "proxy.dat");
-				}
+                var filePath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\proxy.dat";
+                if (!File.Exists(filePath))
+                {
+                    filePath = Path.Combine(BeWoApp.GetAndCreateUserAppDataPath(), "proxy.dat");
+                }
 
                 var allLines = File.ReadAllLines(filePath);
 
-                foreach(var linex in allLines)
+                foreach (var linex in allLines)
                 {
                     var decryptedLine = EncryptionUtils.DecryptString(linex);
                     datai[counter] = decryptedLine;
@@ -1195,20 +1198,22 @@ namespace BeWo
                 //}
 
                 //file.Close();
-                
+
                 proxyname = datai[0];
                 proxyUsername = datai[1];
                 proxypasswd = datai[2];
 
                 proxyTextBox.Text = proxyname;
 
-            }catch(IOException i){
+            }
+            catch (IOException i)
+            {
                 //Fehlermeldung
             }
-            
+
         }
 
-        
+
         private void SaveSelectedProfile(BeWoProfile profile)
         {
             try
@@ -1217,7 +1222,7 @@ namespace BeWo
                 {
 #if DEBUG
                     sw.WriteLine("selected={0}|{1}|{2}", profile.Name, profile.Server, profile.Tenant);
-                    
+
 #else
                     if (profile.Tenant != "demo")
                     {
@@ -1297,26 +1302,26 @@ namespace BeWo
                     }
 
                     profile.Tenant = profile.Tenant.Trim();
-                    
-					//if (BeWoApp.Tenant == "7635986435")
-					//{
-					//	if (profile.Server != "3")
-					//	{
-					//		profile.Server = "3";
-					//		SaveProfileListToFile();
-					//	}
 
-					//}
+                    //if (BeWoApp.Tenant == "7635986435")
+                    //{
+                    //	if (profile.Server != "3")
+                    //	{
+                    //		profile.Server = "3";
+                    //		SaveProfileListToFile();
+                    //	}
 
-	                var server = GetServerFromTenant(profile.Tenant);
-	                if (!String.IsNullOrEmpty(server) && server != profile.Server)
-	                {
-		                profile.Server = server;
-						SaveProfileListToFile();
-	                }
+                    //}
 
-	                BeWoApp.Tenant = profile.Tenant;
-					BeWoApp.ServerName = GetNumericServerName(profile.Server);
+                    var server = GetServerFromTenant(profile.Tenant);
+                    if (!String.IsNullOrEmpty(server) && server != profile.Server)
+                    {
+                        profile.Server = server;
+                        SaveProfileListToFile();
+                    }
+
+                    BeWoApp.Tenant = profile.Tenant;
+                    BeWoApp.ServerName = GetNumericServerName(profile.Server);
                     BeWoApp.ServerAddress = profile.Server;
 
 #if DEBUG
@@ -1337,15 +1342,15 @@ namespace BeWo
                     "Ungültiges Profil", MessageBoxButton.OK, MessageBoxImage.Warning);
             }
         }
-        
+
         private void ShowProfileStackPanel(object sender, RoutedEventArgs e)
         {
             if (profileLabel.Visibility == Visibility.Visible)
             {
                 profileLabel.Visibility = Visibility.Collapsed;
                 profileStackPanel.Visibility = Visibility.Collapsed;
-	            proxyLabel.Visibility = Visibility.Collapsed;
-				proxyStackPanel.Visibility = Visibility.Collapsed;
+                proxyLabel.Visibility = Visibility.Collapsed;
+                proxyStackPanel.Visibility = Visibility.Collapsed;
             }
         }
 
@@ -1401,8 +1406,8 @@ namespace BeWo
                 showProfileSelectionBtn.Content = "Ausblenden";
                 profileLabel.Visibility = Visibility.Visible;
                 profileStackPanel.Visibility = Visibility.Visible;
-				proxyLabel.Visibility = Visibility.Visible;
-				proxyStackPanel.Visibility = Visibility.Visible;
+                proxyLabel.Visibility = Visibility.Visible;
+                proxyStackPanel.Visibility = Visibility.Visible;
             }
             else
             {
@@ -1425,17 +1430,17 @@ namespace BeWo
             if (handler != null) handler(this, new PropertyChangedEventArgs(propertyName));
         }
 
-	    private bool pwvViewOffen;
-	    private void PasswortVergessenLinkOnRequestNavigate(object sender, RequestNavigateEventArgs e)
-	    {
-		    if (pwvViewOffen) return;
+        private bool pwvViewOffen;
+        private void PasswortVergessenLinkOnRequestNavigate(object sender, RequestNavigateEventArgs e)
+        {
+            if (pwvViewOffen) return;
 
-		    var p = new PwVergessenView();
-		    p.Closed += (s, ex) => { pwvViewOffen = false; };
-			p.Show();
+            var p = new PwVergessenView();
+            p.Closed += (s, ex) => { pwvViewOffen = false; };
+            p.Show();
 
-		    pwvViewOffen = true;
-	    }
+            pwvViewOffen = true;
+        }
 
         private void UIElement_OnKeyDown(object sender, KeyEventArgs e)
         {
@@ -1445,7 +1450,7 @@ namespace BeWo
                 {
                     PinEinblenden();
                 }
-                
+
             }
         }
 
@@ -1476,8 +1481,8 @@ namespace BeWo
             Name = pname;
             Server = pserver;
             Tenant = ptenant;
-			if (Name == null)
-				Name = String.Empty;
+            if (Name == null)
+                Name = String.Empty;
             if (!String.IsNullOrEmpty(Tenant))
             {
                 Tenant = Tenant.Trim();

BeWo/MainControl.xaml.cs

@@ -50,7 +50,8 @@ namespace BeWo
         Wohnheim,
         Vertretungen,
         CustomerTeam,
-        Scheduling
+        Scheduling,
+		Finance
 	}
 
 	public partial class MainControl
@@ -295,6 +296,9 @@ namespace BeWo
 					case UIContext.Scheduling:
                         view = new SchedulingMasterView();
                         break;
+					case UIContext.Finance:
+						view = new FinanceView();
+						break;
 				}
 				_Views[uiContext] = view;
 			}
@@ -901,7 +905,7 @@ namespace BeWo
 		{
 			if (DoSaveCheck())
 			{
-				NavigateTo(new FinanceView());
+				NavigateTo(GetViewForUIContext(UIContext.Finance));
 			}
 		}
 

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" SizeChanged="Window_SizeChanged">
     <Grid x:Name="rootGrid">
         <ComboBox Width="100"></ComboBox>
     </Grid>

BeWo/MainWindow.xaml.cs

@@ -105,5 +105,13 @@ namespace BeWo
 
             Application.Current.Shutdown();
         }
-    }
+
+		private void Window_SizeChanged(object sender, SizeChangedEventArgs e)
+		{
+#if DEBUG
+            // Setze den Titel auf die aktuelle Breite und Höhe
+            this.Title = $"BeWoPlaner ({e.NewSize.Width}x{e.NewSize.Height})";
+#endif
+        }
+	}
 }

BeWo/Styles/ControlStyles/TextBoxStyles.xaml

@@ -2,6 +2,7 @@
     <Style x:Key="TextBoxBase" TargetType="{x:Type TextBox}">
         <Setter Property="Margin" Value="3" />
         <Setter Property="Padding" Value="3" />
+        <Setter Property="Height" Value="23" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
     </Style>

BeWo/View/BeWoWindowBuilder.cs

@@ -36,11 +36,11 @@ namespace BeWo.View
             return beWoWindow;
         }
 
-        public static BeWoWindow GetGkvAbrechnungDetailWindow(GkvAbrechnungVM vM, double height = 600, double width = 1200)
+        public static BeWoWindow GetGkvAbrechnungDetailWindow(GkvAbrechnungVM vM, double height = 800, double width = 600)
         {
             var detail = new GkvAbrechnungDetailControl(vM);
 
-            var beWoWindow = GetGenericBeWoWindow("GKV-Abrechnung Nr. " + vM.GkvAbrechnungOid + ": Details", 100, height, 1000, 100, width, 1600);
+            var beWoWindow = GetGenericBeWoWindow("GKV-Abrechnung Nr. " + vM.GkvAbrechnungOid + ": Details", 100, height, 1000, 400, width, 1600);
             beWoWindow.GroupBoxContent = detail;
 
             return beWoWindow;

BeWo/View/Controls/GkvAbrechnungDetailControl.xaml

@@ -1,143 +1,452 @@
-<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">
+<UserControl
+    x:Class="BeWo.View.Controls.GkvAbrechnungDetailControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
+    xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
+    xmlns:local="clr-namespace:BeWo.View.Controls"
+    xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:viewmodel="clr-namespace:BeWo.ViewModel"
+    d:DataContext="{d:DesignInstance Type=viewmodel:GkvAbrechnungVM}"
+    mc:Ignorable="d">
     <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
-            <RowDefinition Height="*"/>
+            <RowDefinition Height="*" />
         </Grid.RowDefinitions>
         <TabControl Background="#eeeeee" BorderThickness="0">
             <TabItem Header="Allgemein">
-                <Grid Background="#eeeeee" Margin="0" HorizontalAlignment="Stretch" MaxWidth="700">
+                <Grid
+                    MaxWidth="700"
+                    Margin="0"
+                    HorizontalAlignment="Stretch"
+                    Background="#eeeeee">
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="auto"/>
-                        <ColumnDefinition Width="*"/>
-                        <ColumnDefinition Width="3*"/>
+                        <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="*"/>
+                        <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-Abrechnung Nr.:"/>
-                    <TextBox Grid.Row="0" Grid.Column="2" Margin="3" IsReadOnly="True" Text="{Binding GkvAbrechnungOid}"/>
-                    <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="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="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}"/>
+                    <Label
+                        Grid.Row="0"
+                        Grid.Column="0"
+                        Margin="3"
+                        Content="GKV-Abrechnung Nr.:" />
+                    <TextBox
+                        Grid.Row="0"
+                        Grid.Column="2"
+                        Margin="3"
+                        IsReadOnly="True"
+                        Text="{Binding GkvAbrechnungOid}" />
+                    <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="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="Verfahrensstufe:" />
+
+                    <StackPanel
+                        Grid.Row="10"
+                        Grid.Column="2"
+                        Margin="3"
+                        Orientation="Horizontal">
+                        <RadioButton
+                            Margin="3"
+                            GroupName="a"
+                            IsChecked="{Binding Path=VerfahrensstufeInt, Converter={StaticResource RadioBoolToIntConverter}, ConverterParameter=0}">
+                            Test
+                        </RadioButton>
+                        <RadioButton
+                            Margin="3"
+                            GroupName="a"
+                            IsChecked="{Binding Path=VerfahrensstufeInt, Converter={StaticResource RadioBoolToIntConverter}, ConverterParameter=1}">
+                            Erprobung
+                        </RadioButton>
+                        <RadioButton
+                            Margin="3"
+                            GroupName="a"
+                            IsChecked="{Binding Path=VerfahrensstufeInt, Converter={StaticResource RadioBoolToIntConverter}, ConverterParameter=2}">
+                            Echt
+                        </RadioButton>
+                    </StackPanel>
+
+                    <Label
+                        Grid.Row="13"
+                        Grid.Column="0"
+                        Margin="3"
+                        Content="Urbelege Gesendet:" />
+                    <CheckBox
+                        x:Name="Checkbox_Urbelege"
+                        Grid.Row="13"
+                        Grid.Column="2"
+                        Margin="3"
+                        HorizontalAlignment="Left"
+                        IsChecked="{Binding UrbelegeGesendet}" />
+                    <Label
+                        Grid.Row="14"
+                        Grid.Column="0"
+                        Margin="3"
+                        Content="Bezahlt:" />
+                    <CheckBox
+                        x:Name="Checkbox_Bezahlt"
+                        Grid.Row="14"
+                        Grid.Column="2"
+                        Margin="3"
+                        HorizontalAlignment="Left"
+                        IsChecked="{Binding Bezahlt}" />
+                    <Label
+                        Grid.Row="15"
+                        Grid.Column="0"
+                        Margin="3"
+                        Content="Betrag:" />
+                    <TextBox
+                        Grid.Row="15"
+                        Grid.Column="2"
+                        Margin="3"
+                        IsReadOnly="True"
+                        Text="{Binding Betrag, StringFormat={}{0:0.00 €}}" />
                     <!--<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" MaxLength="1024" TextWrapping="Wrap" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto" AcceptsReturn="True"/>
+                    <Label
+                        Grid.Row="16"
+                        Grid.Column="0"
+                        Margin="3"
+                        Content="Bemerkung:" />
+                    <TextBox
+                        x:Name="Textbox_Notice"
+                        Grid.Row="16"
+                        Grid.Column="2"
+                        Margin="3"
+                        AcceptsReturn="True"
+                        HorizontalScrollBarVisibility="Disabled"
+                        MaxLength="1024"
+                        Text="{Binding Notice}"
+                        TextWrapping="Wrap"
+                        VerticalScrollBarVisibility="Auto" />
                 </Grid>
             </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
+                    x:Name="datagrid_invoices"
+                    Margin="3"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch"
+                    DataSource="{Binding InvoiceBases2}">
                     <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
+                            x:Name="ColumnChecked"
+                            MinWidth="30"
+                            FieldName="IsChecked"
+                            Header=" " />
+                        <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">
+                                        <Button
+                                            x:Name="btn_report"
+                                            Width="20"
+                                            Height="20"
+                                            Margin="1"
+                                            VerticalAlignment="Center"
+                                            ToolTip="Formular anzeigen">
                                             <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>
+                                                <Hyperlink
+                                                    NavigateUri="{Binding DisplayText, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                                    RequestNavigate="Hyperlink_OnRequestNavigate"
+                                                    TextDecorations="None"
+                                                    TargetName="_NewWindow">
+                                                    <TextBlock
+                                                        Width="16"
+                                                        Height="17"
+                                                        Padding="0"
+                                                        HorizontalAlignment="Left"
+                                                        VerticalAlignment="Center"
+                                                        FontFamily="Webdings"
+                                                        FontSize="15"
+                                                        Foreground="#FFFFFF"
+                                                        Text="¥" />
+                                                </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
+                            Width="150"
+                            AllowEditing="False"
+                            FieldName="TypeString"
+                            Header="Art der Rechnung"
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            Width="100"
+                            AllowEditing="False"
+                            FieldName="CustomerName"
+                            Header="{markup:Translate Klient/in}"
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            Width="100"
+                            AllowEditing="False"
+                            FieldName="AccountingPeriodString"
+                            Header="Zeitraum"
+                            ReadOnly="True"
+                            SortFieldName="AccountingPeriodStart" />
+                        <dxg:GridColumn
+                            AllowEditing="False"
+                            FieldName="InvoiceNumber"
+                            Header="Nummer"
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            MinWidth="70"
+                            AllowEditing="False"
+                            EditSettings="{dxe:DateSettings DisplayFormat=d}"
+                            FieldName="InvoiceDate"
+                            Header="Datum"
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            AllowEditing="False"
+                            FieldName="RecipientString"
+                            Header="{markup:Translate EmpfängerSingular}"
+                            ReadOnly="True" />
                         <!--<dxg:GridColumn FieldName="AccountingPeriodString" Header="Abrechnungszeitraum" />-->
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="TotalAmount" Header="Betrag" MinWidth="70">
+                        <dxg:GridColumn
+                            MinWidth="70"
+                            AllowEditing="False"
+                            FieldName="TotalAmount"
+                            Header="Betrag"
+                            ReadOnly="True">
                             <dxg:GridColumn.EditSettings>
-                                <dxe:TextEditSettings DisplayFormat="c" Mask="c" MaskType="Numeric"></dxe:TextEditSettings>
+                                <dxe:TextEditSettings
+                                    DisplayFormat="c"
+                                    Mask="c"
+                                    MaskType="Numeric" />
                             </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:GridColumn
+                            MinWidth="200"
+                            AllowEditing="False"
+                            FieldName="Notice"
+                            Header="Bemerkung"
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            x:Name="PaidColumn"
+                            AllowEditing="False"
+                            FieldName="IsPaid"
+                            Header="Bezahlt"
+                            ReadOnly="True" />
                     </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:TableView
+                            x:Name="gridView"
+                            Margin="3,22,3,3"
+                            AllowBestFit="True"
+                            BestFitMode="Smart"
+                            Loaded="gridView_Loaded"
+                            NavigationStyle="Cell"
+                            ScrollingMode="Smart"
+                            ShowGroupPanel="False"
+                            SnapsToDevicePixels="True" />
                     </dxg:GridControl.View>
                 </dxg:GridControl>
             </TabItem>
             <TabItem Header="Protokoll">
-                <dxg:GridControl Margin="3" x:Name="datagrid_transfer" DataSource="{Binding TransferProtokolle}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+                <dxg:GridControl
+                    x:Name="datagrid_transfer"
+                    Margin="3"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch"
+                    DataSource="{Binding TransferProtokolle}">
                     <dxg:GridControl.Columns>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="GkvTransferProtokollOid" Header="Oid" Tag="Debug"></dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="GkvTransferProtokollVersion" Header="Version" Tag="Debug"></dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="AbsenderBezeichnung" Header="Absender"></dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="EmpfangerBezeichnung" Header="Empfänger"></dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="IKLeistungserbringer" Header="Leistungserbringer"></dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="IKKrankenkasse" Header="Krankenkasse"></dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="IKKostentrager" Header="Kostentrager"></dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Rechnungsnummer" Header="Rec.Nr."></dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Datenaustauschreferenz" Header="Dat. ref."></dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Transfernummer" Header="TNr."></dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Transfername" Header="TName"></dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="ErstelltAm" Header="Erstellt">
+                        <dxg:GridColumn
+                            AllowEditing="False"
+                            FieldName="GkvTransferProtokollOid"
+                            Header="Oid"
+                            ReadOnly="True"
+                            Tag="Debug" />
+                        <dxg:GridColumn
+                            AllowEditing="False"
+                            FieldName="GkvTransferProtokollVersion"
+                            Header="Version"
+                            ReadOnly="True"
+                            Tag="Debug" />
+                        <dxg:GridColumn
+                            AllowEditing="False"
+                            FieldName="AbsenderBezeichnung"
+                            Header="Absender"
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            AllowEditing="False"
+                            FieldName="EmpfangerBezeichnung"
+                            Header="Empfänger"
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            AllowEditing="False"
+                            FieldName="IKLeistungserbringer"
+                            Header="Leistungserbringer"
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            AllowEditing="False"
+                            FieldName="IKKrankenkasse"
+                            Header="Krankenkasse"
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            AllowEditing="False"
+                            FieldName="IKKostentrager"
+                            Header="Kostentrager"
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            AllowEditing="False"
+                            FieldName="Rechnungsnummer"
+                            Header="Rec.Nr."
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            AllowEditing="False"
+                            FieldName="Datenaustauschreferenz"
+                            Header="Dat. ref."
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            AllowEditing="False"
+                            FieldName="Transfernummer"
+                            Header="TNr."
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            AllowEditing="False"
+                            FieldName="Transfername"
+                            Header="TName"
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            AllowEditing="False"
+                            FieldName="ErstelltAm"
+                            Header="Erstellt"
+                            ReadOnly="True">
                             <dxg:GridColumn.EditSettings>
-                                <dxe:TextEditSettings DisplayFormat="g" Mask="c" MaskType="DateTime"></dxe:TextEditSettings>
+                                <dxe:TextEditSettings
+                                    DisplayFormat="g"
+                                    Mask="c"
+                                    MaskType="DateTime" />
                             </dxg:GridColumn.EditSettings>
                         </dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Dateityp" Header="Typ" Width="100"></dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Dateiname" Header="Dateiname" Width="80"></dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Dateigrosse" Header="Größe"  Width="70"></dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="SentSuccess" Header="Dakota Übertragen"></dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Fehlertitel" Header="Fehlertitel"></dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Fehlerdatum" Header="Fehlerdatum" Width="100">
+                        <dxg:GridColumn
+                            Width="100"
+                            AllowEditing="False"
+                            FieldName="Dateityp"
+                            Header="Typ"
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            Width="80"
+                            AllowEditing="False"
+                            FieldName="Dateiname"
+                            Header="Dateiname"
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            Width="70"
+                            AllowEditing="False"
+                            FieldName="Dateigrosse"
+                            Header="Größe"
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            AllowEditing="False"
+                            FieldName="SentSuccess"
+                            Header="Dakota Übertragen"
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            AllowEditing="False"
+                            FieldName="Fehlertitel"
+                            Header="Fehlertitel"
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            Width="100"
+                            AllowEditing="False"
+                            FieldName="Fehlerdatum"
+                            Header="Fehlerdatum"
+                            ReadOnly="True">
                             <dxg:GridColumn.EditSettings>
-                                <dxe:TextEditSettings DisplayFormat="g" Mask="c" MaskType="DateTime"></dxe:TextEditSettings>
+                                <dxe:TextEditSettings
+                                    DisplayFormat="g"
+                                    Mask="c"
+                                    MaskType="DateTime" />
                             </dxg:GridColumn.EditSettings>
                         </dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Fehlernachricht" Header="Fehlernachricht" MinWidth="200"></dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Fehlerlevel" Header="Fehlerlevel"></dxg:GridColumn>
+                        <dxg:GridColumn
+                            MinWidth="200"
+                            AllowEditing="False"
+                            FieldName="Fehlernachricht"
+                            Header="Fehlernachricht"
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            AllowEditing="False"
+                            FieldName="Fehlerlevel"
+                            Header="Fehlerlevel"
+                            ReadOnly="True" />
                     </dxg:GridControl.Columns>
                     <dxg:GridControl.View>
-                        <dxg:TableView NavigationStyle="Cell" BestFitMode="Smart" x:Name="gridView2"
-                                       AllowBestFit="True" ShowGroupPanel="False" ScrollingMode="Smart" SnapsToDevicePixels="True"
-                                       Loaded="gridView_Loaded"
-                                       Margin="3,22,3,3"/>
+                        <dxg:TableView
+                            x:Name="gridView2"
+                            Margin="3,22,3,3"
+                            AllowBestFit="True"
+                            BestFitMode="Smart"
+                            Loaded="gridView_Loaded"
+                            NavigationStyle="Cell"
+                            ScrollingMode="Smart"
+                            ShowGroupPanel="False"
+                            SnapsToDevicePixels="True" />
                     </dxg:GridControl.View>
                 </dxg:GridControl>
             </TabItem>

BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml.cs

@@ -90,7 +90,7 @@ namespace BeWo.View.Controls.Wohnhilfe
                 }
                 else
                 {
-                    IsLarge = false;
+                    //IsLarge = false;
                 }
             }
         }

BeWo/View/Controls/YearMonthFilter.xaml

@@ -1,19 +1,49 @@
-<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>
-		
-		
-		<Grid.ColumnDefinitions>
-			<ColumnDefinition Width="*" SharedSizeGroup="a" />
-			<ColumnDefinition Width="Auto" SharedSizeGroup="b" />
-		</Grid.ColumnDefinitions>
+<UserControl
+    x:Class="BeWo.View.YearMonthFilter"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    x:Name="root">
+    <Grid>
+
+
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" SharedSizeGroup="a" />
+            <ColumnDefinition Width="Auto" SharedSizeGroup="b" />
+        </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
-            <RowDefinition  />
-            <RowDefinition  />
+            <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>
+        <CheckBox
+            Name="checkbox_yearfilter"
+            Content="Nach Jahr filtern"
+            IsChecked="True" />
+        <CheckBox
+            Name="checkbox_monthfilter"
+            Grid.Column="1"
+            Margin="8,0,0,0"
+            Content="Nach Monat filtern"
+            IsChecked="{Binding Path=FilterMonth, ElementName=root}"
+            IsEnabled="{Binding Path=IsChecked, ElementName=checkbox_yearfilter}" />
+        <ComboBox
+            x:Name="combobox_year"
+            Grid.Row="1"
+            Height="20"
+            MinWidth="80"
+            Margin="0,3,0,0"
+            VerticalContentAlignment="Center"
+            Background="White"
+            IsEnabled="{Binding Path=IsChecked, ElementName=checkbox_yearfilter}" />
+        <ComboBox
+            x:Name="combobox_month"
+            Grid.Row="1"
+            Grid.Column="1"
+            Height="20"
+            MinWidth="120"
+            Margin="8,3,0,0"
+            VerticalContentAlignment="Center"
+            Background="White"
+            IsEnabled="{Binding Path=IsChecked, ElementName=checkbox_monthfilter}" />
+
+    </Grid>
 </UserControl>

BeWo/View/Controls/YearMonthFilter.xaml.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using System.Windows;
 using System.Windows.Controls;
 
 using BS.Shared.Core;
@@ -14,7 +15,16 @@ namespace BeWo.View
     /// </summary>
     public partial class YearMonthFilter : UserControl
     {
-        public YearMonthFilter()
+		public bool FilterMonth
+		{
+			get { return (bool)GetValue(FilterMonthProperty); }
+			set { SetValue(FilterMonthProperty, value); }
+		}
+
+		public static readonly DependencyProperty FilterMonthProperty =
+			DependencyProperty.Register("FilterMonth", typeof(bool), typeof(YearMonthFilter), new PropertyMetadata(true));
+
+		public YearMonthFilter()
         {
             this.InitializeComponent();
             this.InitDateCombos();
@@ -55,7 +65,7 @@ namespace BeWo.View
 
         private void FireFilterSpanChanged()
         {
-            if (this.FilterSpanChanged != null)
+            if (this.FilterSpanChanged != null && IsLoaded)
             {
                 this.FilterSpanChanged(this, new EventArgs<DateTimeSpan>(this.FilterSpan));
             }

BeWo/View/CostRatePeriodControl.xaml

@@ -1,28 +1,52 @@
-<UserControl xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
-             xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"  x:Class="BeWo.View.CostRatePeriodControl" VerticalAlignment="Top" x:Name="UserControl" Background="{x:Null}">
-	<UserControl.Resources>
-		<DataTemplate x:Key="CostRateItemTemplate">
-			<Border BorderThickness="0 1 0 0" BorderBrush="Gray" Margin="0 2 0 0">
-				<Grid Grid.Row="2" Grid.ColumnSpan="2" Margin="0 2 0 0">
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition Width="Auto" SharedSizeGroup="c1" />
-						<ColumnDefinition Width="Auto" SharedSizeGroup="c2" />
-						<ColumnDefinition Width="*" />
-					</Grid.ColumnDefinitions>
-					<Grid.RowDefinitions>
-						<RowDefinition Height="Auto" />
-						<RowDefinition Height="Auto" />
-					</Grid.RowDefinitions>
-					<Grid>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="*" />
-							<ColumnDefinition Width="Auto" />
-						</Grid.ColumnDefinitions>
-						<TextBlock Text="Gültig bis" Margin="0,4,3,0" />
-						<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##"/>
+<UserControl
+    x:Class="BeWo.View.CostRatePeriodControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
+    x:Name="UserControl"
+    VerticalAlignment="Top"
+    Background="{x:Null}">
+    <UserControl.Resources>
+        <DataTemplate x:Key="CostRateItemTemplate">
+            <Border
+                Margin="0,2,0,0"
+                BorderBrush="Gray"
+                BorderThickness="0,1,0,0">
+                <Grid
+                    Grid.Row="2"
+                    Grid.ColumnSpan="2"
+                    Margin="0,2,0,0">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" SharedSizeGroup="c1" />
+                        <ColumnDefinition Width="Auto" SharedSizeGroup="c2" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <TextBlock Margin="0,4,3,0" Text="Gültig bis" />
+                        <dxe:DateEdit
+                            x:Name="datepicker_validUntil"
+                            Grid.Column="1"
+                            Height="23"
+                            EditValue="{Binding Path=EndDate, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                            MaskType="DateTimeAdvancingCaret" />
+                    </Grid>
+                    <dxe:TextEdit
+                        Grid.Column="1"
+                        Height="23"
+                        Margin="3,0,0,0"
+                        HorizontalAlignment="Stretch"
+                        EditValue="{Binding Path=CostRateValue, UpdateSourceTrigger=PropertyChanged}"
+                        Mask="########0.00##"
+                        MaskType="Numeric"
+                        MaskUseAsDisplayFormat="True" />
                     <!--<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">
@@ -33,59 +57,168 @@
                             </MultiBinding>
                         </dxe:TextEdit.Mask>
                     </dxe:TextEdit>-->
-					
-					<TextBlock Padding="0 4 0 0" Height="23" x:Name="lblOldUnitName" Text="{Binding Text, ElementName=lblActualUnitName}" Grid.Row="1" Visibility="{Binding Visibility, ElementName=lblActualUnitName}" />
-					<TextBox Height="23" x:Name="txtOldUnitName" Grid.Row="1" Text="{Binding UnitName, UpdateSourceTrigger=PropertyChanged}" Visibility="{Binding Visibility, ElementName=lblActualUnitName}" Grid.Column="1" Margin="3,3,0,0" HorizontalAlignment="Stretch" />
-					<Button x:Name="button_deleteCostRatePeriod" Grid.RowSpan="2" VerticalAlignment="Bottom" Grid.Column="2" Width="20" Height="20" HorizontalAlignment="Right" Style="{DynamicResource CloseButtonStyle}" Click="button_deleteCostRatePeriod_Click" Margin="3,0,0,3" />
-				</Grid>
-			</Border>
-		</DataTemplate>
-	</UserControl.Resources>
-	<Grid x:Name="LayoutRoot" Grid.IsSharedSizeScope="True">
-		<Border x:Name="border" BorderBrush="#FF6A6A6A" BorderThickness="0" Padding="0">
-			<Grid>
-				<Grid.RowDefinitions>
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-				</Grid.RowDefinitions>
-				<Grid Margin="3 0">
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition Width="Auto" MinWidth="160" SharedSizeGroup="c1" />
-						<ColumnDefinition Width="Auto" MinWidth="70" SharedSizeGroup="c2" />
-						<ColumnDefinition Width="*" />
-					</Grid.ColumnDefinitions>
-					<Grid.RowDefinitions>
-						<RowDefinition Height="Auto" />
-						<RowDefinition Height="Auto" />
-						<RowDefinition Height="Auto" />
-					</Grid.RowDefinitions>
-					<TextBlock Height="23" x:Name="lblActualValue" Text="Aktueller Stundensatz (€)" Padding="0,4,0,0" />
-					<TextBlock Height="23" Padding="0 4 0 0" x:Name="lblActualUnitName" Text="UnitName" Grid.Row="1" Visibility="Collapsed" />
-					<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##"/>
-                       
-					
-					<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">
-						<Grid Width="18" HorizontalAlignment="Center" VerticalAlignment="Center">
-							<Line X1="4" X2="12" Y1="8" Y2="8" Fill="{x:Null}" Stroke="#FFFFFFFF" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeThickness="2" HorizontalAlignment="Center" VerticalAlignment="Center" Width="16" Height="16" />
-							<Line X1="8" X2="8" Y1="4" Y2="12" Fill="{x:Null}" Stroke="#FFFFFFFF" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeThickness="2" HorizontalAlignment="Center" VerticalAlignment="Center" Width="16" Height="16" />
-						</Grid>
-					</Button>
-				</Grid>
-				<ListBox x:Name="listBoxOldValues" IsSynchronizedWithCurrentItem="True" Grid.Row="3" Grid.ColumnSpan="3" Margin="0,3,0,0" BorderBrush="Transparent" BorderThickness="0" ItemTemplate="{DynamicResource CostRateItemTemplate}" Background="{x:Null}">
-					<ListBox.ItemContainerStyle>
-						<Style TargetType="{x:Type ListBoxItem}">
-							<Setter Property="Focusable" Value="false" />
-						</Style>
-					</ListBox.ItemContainerStyle>
-					<ListBox.Resources>
-						<SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="Transparent" />
-						<SolidColorBrush x:Key="{x:Static SystemColors.ControlBrushKey}" Color="Transparent" />
-					</ListBox.Resources>
-				</ListBox>
-			</Grid>
-		</Border>
-	</Grid>
+
+                    <TextBlock
+                        x:Name="lblOldUnitName"
+                        Grid.Row="1"
+                        Height="23"
+                        Padding="0,4,0,0"
+                        Text="{Binding Text, ElementName=lblActualUnitName}"
+                        Visibility="{Binding Visibility, ElementName=lblActualUnitName}" />
+                    <TextBox
+                        x:Name="txtOldUnitName"
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Height="23"
+                        Margin="3,3,0,0"
+                        HorizontalAlignment="Stretch"
+                        Text="{Binding UnitName, UpdateSourceTrigger=PropertyChanged}"
+                        Visibility="{Binding Visibility, ElementName=lblActualUnitName}" />
+                    <Button
+                        x:Name="button_deleteCostRatePeriod"
+                        Grid.RowSpan="2"
+                        Grid.Column="2"
+                        Width="20"
+                        Height="20"
+                        Margin="3,0,0,3"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Bottom"
+                        Click="button_deleteCostRatePeriod_Click"
+                        Style="{DynamicResource CloseButtonStyle}" />
+                </Grid>
+            </Border>
+        </DataTemplate>
+    </UserControl.Resources>
+    <Grid x:Name="LayoutRoot" Grid.IsSharedSizeScope="True">
+        <Border
+            x:Name="border"
+            Padding="0"
+            BorderBrush="#FF6A6A6A"
+            BorderThickness="0">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <Grid Margin="3,0">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition
+                            Width="Auto"
+                            MinWidth="160"
+                            SharedSizeGroup="c1" />
+                        <ColumnDefinition
+                            Width="Auto"
+                            MinWidth="70"
+                            SharedSizeGroup="c2" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <TextBlock
+                        x:Name="lblActualValue"
+                        Height="23"
+                        Padding="0,4,0,0"
+                        Text="Aktueller Stundensatz (€)" />
+                    <TextBlock
+                        x:Name="lblActualUnitName"
+                        Grid.Row="1"
+                        Height="23"
+                        Padding="0,4,0,0"
+                        Text="UnitName"
+                        Visibility="Collapsed" />
+                    <TextBlock
+                        x:Name="lblValidUntil"
+                        Grid.Row="2"
+                        Margin="0,-3,0,0"
+                        Text="(gültig ab 01.01.2009)" />
+                    <TextBox
+                        x:Name="txtActualUnitName"
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Height="23"
+                        Margin="3,3,0,0"
+                        HorizontalAlignment="Stretch"
+                        Text="{Binding UnitName, UpdateSourceTrigger=PropertyChanged}"
+                        Visibility="Collapsed" />
+                    <dxe:TextEdit
+                        Grid.Column="1"
+                        Height="23"
+                        Margin="3,0,0,0"
+                        HorizontalAlignment="Stretch"
+                        EditValue="{Binding Path=CostRateValue, UpdateSourceTrigger=PropertyChanged}"
+                        Mask="########0.00##"
+                        MaskType="Numeric"
+                        MaskUseAsDisplayFormat="True" />
+
+
+                    <Button
+                        x:Name="button_addCostRatePeriod"
+                        Grid.Column="2"
+                        Width="21"
+                        Height="21"
+                        Margin="3,0,0,0"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Click="button_addCostRatePeriod_Click">
+                        <Grid
+                            Width="18"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center">
+                            <Line
+                                Width="16"
+                                Height="16"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                Fill="{x:Null}"
+                                Stroke="#FFFFFFFF"
+                                StrokeEndLineCap="Round"
+                                StrokeStartLineCap="Round"
+                                StrokeThickness="2"
+                                X1="4"
+                                X2="12"
+                                Y1="8"
+                                Y2="8" />
+                            <Line
+                                Width="16"
+                                Height="16"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                Fill="{x:Null}"
+                                Stroke="#FFFFFFFF"
+                                StrokeEndLineCap="Round"
+                                StrokeStartLineCap="Round"
+                                StrokeThickness="2"
+                                X1="8"
+                                X2="8"
+                                Y1="4"
+                                Y2="12" />
+                        </Grid>
+                    </Button>
+                </Grid>
+                <ListBox
+                    x:Name="listBoxOldValues"
+                    Grid.Row="3"
+                    Grid.ColumnSpan="3"
+                    Margin="0,3,0,0"
+                    Background="{x:Null}"
+                    BorderBrush="Transparent"
+                    BorderThickness="0"
+                    IsSynchronizedWithCurrentItem="True"
+                    ItemTemplate="{DynamicResource CostRateItemTemplate}">
+                    <ListBox.ItemContainerStyle>
+                        <Style TargetType="{x:Type ListBoxItem}">
+                            <Setter Property="Focusable" Value="false" />
+                        </Style>
+                    </ListBox.ItemContainerStyle>
+                    <ListBox.Resources>
+                        <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="Transparent" />
+                        <SolidColorBrush x:Key="{x:Static SystemColors.ControlBrushKey}" Color="Transparent" />
+                    </ListBox.Resources>
+                </ListBox>
+            </Grid>
+        </Border>
+    </Grid>
 </UserControl>

BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml

@@ -1,102 +1,298 @@
-<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">
+<localView:BeWoView
+    x:Class="BeWo.View.Detail.Accounting.GkvAbrechnungOverview"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:Microsoft_Windows_Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Classic"
+    xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
+    xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
+    xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
+    xmlns:localView="clr-namespace:BeWo.View"
+    xmlns:localViewDetail="clr-namespace:BeWo.View.Detail.Accounting"
+    xmlns:localViewModel="clr-namespace:BeWo.ViewModel"
+    xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
+    xmlns:proxy="clr-namespace:BeWo.ServiceProxy"
+    xmlns:r="clr-namespace:BeWo.Security"
+    xmlns:s="clr-namespace:System;assembly=mscorlib"
+    xmlns:shared="clr-namespace:BS.Shared;assembly=BS.Shared"
+    xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
+    xmlns:val="clr-namespace:BeWo.Validation"
+    Width="Auto"
+    Height="Auto"
+    HorizontalAlignment="Stretch"
+    VerticalAlignment="Stretch"
+    Focusable="True">
 
-	<Grid>
-		<GroupBox x:Name="groupbox_editArea" Grid.Row="0" Header="GKV-Abrechnungen" Style="{DynamicResource ObjectEditGroupBox}">
+    <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" />
+            <Grid Margin="0,3,0,0" Grid.IsSharedSizeScope="True">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
                     <ColumnDefinition Width="Auto" />
                     <ColumnDefinition Width="*" />
-				</Grid.ColumnDefinitions>
-				<Grid.RowDefinitions>
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="*" />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
                     <RowDefinition Height="Auto" />
-				</Grid.RowDefinitions>
+                    <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" ToolTip="Filtert die angezeigten GKV-Abrechnungen nach ihrem Erstelldatum"/>
-                    <RadioButton x:Name="radioFilterByAccountingDate" Content="Nach Abrechnungszeitraum filtern" Click="radioFilterByInvoiceDate_Click" ToolTip="Filtert die angezeigten GKV-Abrechnungen nach ihrem Abrechnungszeitraum. Es werden alle Abrechnungen angezeigt, die den ausgewählten Monat bzw. Jahr beinhalten."/>
+                <localView:YearMonthFilter
+                    x:Name="yearMonthFilter"
+                    Grid.Column="0"
+                    Margin="3,0,0,3"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Bottom"
+                    FilterMonth="False"
+                    FilterSpanChanged="YearMonthFilter_FilterSpanChanged" />
+                <StackPanel
+                    Grid.Column="1"
+                    Margin="12,5,0,0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    Orientation="Vertical">
+                    <RadioButton
+                        x:Name="radioFilterByInvoiceDate"
+                        Click="radioFilterByInvoiceDate_Click"
+                        Content="Nach Erstelldatum filtern"
+                        IsChecked="True"
+                        ToolTip="Filtert die angezeigten GKV-Abrechnungen nach ihrem Erstelldatum" />
+                    <RadioButton
+                        x:Name="radioFilterByAccountingDate"
+                        Click="radioFilterByInvoiceDate_Click"
+                        Content="Nach Abrechnungszeitraum filtern"
+                        ToolTip="Filtert die angezeigten GKV-Abrechnungen nach ihrem Abrechnungszeitraum. Es werden alle Abrechnungen angezeigt, die den ausgewählten Monat bzw. Jahr beinhalten." />
                 </StackPanel>
                 <Grid Grid.Column="2">
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*"/>
-                        <ColumnDefinition Width="auto"/>
-                        <ColumnDefinition Width="auto"/>
+                        <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" ToolTip="Neue GKV-Abrechnung erstellen" />
-                    <Button x:Name="button_reload" Grid.Column="1" Content="Aktualisieren" Margin="3" Click="ReloadButton_OnClick" Height="24" VerticalAlignment="Bottom" Width="80" ToolTip="Aktualisiere die Liste aller GKV-Abrechnungen"/>
+                    <Button
+                        x:Name="button_new"
+                        Grid.Column="2"
+                        Height="24"
+                        Margin="3"
+                        VerticalAlignment="Bottom"
+                        Click="NewButton_OnClick"
+                        Content="Neue Abrechnung"
+                        ToolTip="Neue GKV-Abrechnung erstellen"
+                        Visibility="{Binding Converter={StaticResource UserRightType2Visible}, ConverterParameter={x:Static shared:UserRightType.Finance_Gkv_Create}}" />
+                    <Button
+                        x:Name="button_reload"
+                        Grid.Column="1"
+                        Width="80"
+                        Height="24"
+                        Margin="3"
+                        VerticalAlignment="Bottom"
+                        Click="ReloadButton_OnClick"
+                        Content="Aktualisieren"
+                        ToolTip="Aktualisiere die Liste aller GKV-Abrechnungen" />
                 </Grid>
 
-                <dxg:GridControl Margin="3" Grid.ColumnSpan="3" Grid.Row="1" DataSource="{Binding VMList}" x:Name="datagrid_gkvAbrechnungen" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Visibility="Collapsed">
+                <dxg:GridControl
+                    x:Name="datagrid_gkvAbrechnungen"
+                    Grid.Row="1"
+                    Grid.ColumnSpan="3"
+                    Margin="3"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch"
+                    DataSource="{Binding VMList}"
+                    Visibility="Collapsed">
+                    <dxg:GridControl.Effect>
+                        <DropShadowEffect Color="#FFC7D9E2" />
+                    </dxg:GridControl.Effect>
                     <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="Auto"  FieldName="ReportLink" Header=" ">
+                        <dxg:GridColumn
+                            x:Name="ColumnChecked"
+                            Width="120"
+                            MinWidth="30"
+                            FieldName="IsChecked"
+                            Header=" "
+                            Visible="False" />
+                        <dxg:GridColumn
+                            x:Name="ColumnButtons"
+                            Width="Auto"
+                            AllowEditing="False"
+                            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" />
+                                    <StackPanel Margin="1" Orientation="Horizontal">
+                                        <Button
+                                            x:Name="btn_details"
+                                            Width="20"
+                                            Height="18"
+                                            Margin="1"
+                                            Padding="0"
+                                            VerticalAlignment="Center"
+                                            Click="btn_details_Click"
+                                            Content="¥"
+                                            FontFamily="Webdings"
+                                            FontSize="11"
+                                            Foreground="#FFFFFF"
+                                            ToolTip="Details anzeigen" />
                                         <!--<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="#ffffff" FontSize="11" FontFamily="Wingdings" x:Name="btn_send" Height="18" Width="20" VerticalAlignment="Center"/>
-                                        <Button Click="btn_force_send_Click" Content="r" Padding="0" Margin="1" ToolTip="DEBUG: Protokolle Löschen" Foreground="#FFFF00" FontSize="11" FontFamily="Wingdings" x:Name="btn_force_send" Height="18" Width="20" VerticalAlignment="Center" Visibility="Collapsed"/>
-                                        <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" />
+                                        <Button
+                                            x:Name="btn_send"
+                                            Width="20"
+                                            Height="18"
+                                            Margin="1"
+                                            Padding="0"
+                                            VerticalAlignment="Center"
+                                            Click="btn_send_Click"
+                                            Visibility="{Binding Converter={StaticResource UserRightType2Visible}, ConverterParameter={x:Static shared:UserRightType.Finance_Gkv_Send}}"
+                                            Content="*"
+                                            FontFamily="Wingdings"
+                                            FontSize="11"
+                                            Foreground="#ffffff"
+                                            ToolTip="Senden" />
+                                        <Button
+                                            x:Name="btn_delete"
+                                            Width="20"
+                                            Height="18"
+                                            Margin="1"
+                                            Padding="0"
+                                            VerticalAlignment="Center"
+                                            Click="btn_delete_Click"
+                                            Visibility="{Binding Converter={StaticResource UserRightType2Visible}, ConverterParameter={x:Static shared:UserRightType.Finance_Gkv_Delete}}"
+                                            Content="r"
+                                            FontFamily="Webdings"
+                                            FontSize="11"
+                                            Foreground="#FF0000"
+                                            ToolTip="Löschen" />
                                     </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="AbrechnungsZeitraum" Header="Abrechnungszeitraum" Width="Auto"/>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="ErstelltAm" Header="Erstelldatum" Width="Auto">
+                        <dxg:GridColumn
+                            Width="177"
+                            AllowEditing="False"
+                            FieldName="RecipientString"
+                            Header="{markup:Translate EmpfängerSingular}"
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            Width="Auto"
+                            AllowEditing="False"
+                            FieldName="AbrechnungsZeitraum"
+                            Header="Abrechnungszeitraum"
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            Width="Auto"
+                            AllowEditing="False"
+                            FieldName="ErstelltAm"
+                            Header="Erstelldatum"
+                            ReadOnly="True">
                             <dxg:GridColumn.EditSettings>
-                                <dxe:DateEditSettings DisplayFormat="d" HorizontalContentAlignment="Right"/>
+                                <dxe:DateEditSettings HorizontalContentAlignment="Right" DisplayFormat="d" />
                             </dxg:GridColumn.EditSettings>
                         </dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="GkvState" Header="Status" Width="Auto">
+                        <dxg:GridColumn
+                            Width="Auto"
+                            AllowEditing="False"
+                            FieldName="Verfahrensstufe"
+                            Header="Verfahrensstufe"
+                            ReadOnly="True">
                             <dxg:GridColumn.EditSettings>
-                                <dxe:DateEditSettings DisplayTextConverter="{StaticResource GkvState2StringConverter}"/>
+                                <dxe:DateEditSettings DisplayTextConverter="{StaticResource EnumTranslationConverter}" />
                             </dxg:GridColumn.EditSettings>
                         </dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="LastTransferDateTime" Header="Gesendet Am" Width="Auto">
+                        <dxg:GridColumn
+                            Width="Auto"
+                            AllowEditing="False"
+                            FieldName="GkvState"
+                            Header="Status"
+                            ReadOnly="True">
                             <dxg:GridColumn.EditSettings>
-                                <dxe:DateEditSettings DisplayFormat="d" HorizontalContentAlignment="Right"/>
+                                <dxe:DateEditSettings DisplayTextConverter="{StaticResource GkvState2StringConverter}" />
                             </dxg:GridColumn.EditSettings>
                         </dxg:GridColumn>
-                        <dxg:GridColumn x:Name="FehlermeldungColumn" FieldName="Fehlermeldung" Header="Fehlermeldung" Width="*"></dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Betrag" Header="Betrag">
+                        <dxg:GridColumn
+                            Width="Auto"
+                            AllowEditing="False"
+                            FieldName="LastTransferDateTime"
+                            Header="Gesendet Am"
+                            ReadOnly="True">
                             <dxg:GridColumn.EditSettings>
-                                <dxe:TextEditSettings DisplayFormat="c" Mask="c" MaskType="Numeric" HorizontalContentAlignment="Right"></dxe:TextEditSettings>
+                                <dxe:DateEditSettings HorizontalContentAlignment="Right" DisplayFormat="d" />
                             </dxg:GridColumn.EditSettings>
                         </dxg:GridColumn>
-                        <dxg:GridColumn x:Name="PaidColumn" FieldName="Bezahlt" Header="Bezahlt" Width="Auto"></dxg:GridColumn>
-                        <dxg:GridColumn FieldName="Notice" Header="Bemerkung" MinWidth="200" Width="3*" Tag="1024">
+                        <dxg:GridColumn
+                            x:Name="FehlermeldungColumn"
+                            Width="*"
+                            FieldName="Fehlermeldung"
+                            Header="Fehlermeldung" />
+                        <dxg:GridColumn
+                            x:Name="UrbelegeColumn"
+                            Width="Auto"
+                            FieldName="UrbelegeGesendet"
+                            Header="Urbelege gesendet">
+                            <dxg:GridColumn.CellTemplate>
+                                <DataTemplate>
+                                    <dxe:CheckEdit Name="PART_Editor" />
+                                </DataTemplate>
+                            </dxg:GridColumn.CellTemplate>
+                        </dxg:GridColumn>
+                        <dxg:GridColumn
+                            x:Name="PaidColumn"
+                            Width="Auto"
+                            FieldName="Bezahlt"
+                            Header="Bezahlt">
+                            <dxg:GridColumn.CellTemplate>
+                                <DataTemplate>
+                                    <dxe:CheckEdit Name="PART_Editor" />
+                                </DataTemplate>
+                            </dxg:GridColumn.CellTemplate>
+                        </dxg:GridColumn>
+                        <dxg:GridColumn
+                            AllowEditing="False"
+                            FieldName="Betrag"
+                            Header="Betrag"
+                            ReadOnly="True">
+                            <dxg:GridColumn.EditSettings>
+                                <dxe:TextEditSettings
+                                    HorizontalContentAlignment="Right"
+                                    DisplayFormat="c"
+                                    Mask="c"
+                                    MaskType="Numeric" />
+                            </dxg:GridColumn.EditSettings>
+                        </dxg:GridColumn>
+                        <dxg:GridColumn
+                            Width="3*"
+                            MinWidth="200"
+                            FieldName="Notice"
+                            Header="Bemerkung"
+                            Tag="1024">
                             <dxg:GridColumn.EditSettings>
                                 <dxe:TextEditSettings TextWrapping="Wrap" />
                             </dxg:GridColumn.EditSettings>
                         </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:TableView
+                            x:Name="gridView"
+                            Margin="3,22,3,3"
+                            AllowBestFit="True"
+                            BestFitMode="Smart"
+                            CellValueChanged="gridView_CellValueChanged_1"
+                            CellValueChanging="gridView_CellValueChanging"
+                            CustomRowAppearance="TableView_OnCustomRowAppearance"
+                            Loaded="gridView_Loaded"
+                            NavigationStyle="Cell"
+                            RowMinHeight="24"
+                            ScrollingMode="Smart"
+                            ShownEditor="gridView_ShownEditor"
+                            SnapsToDevicePixels="True" />
                     </dxg:GridControl.View>
                 </dxg:GridControl>
             </Grid>
-		</GroupBox>
-	</Grid>
+        </GroupBox>
+    </Grid>
 
 </localView:BeWoView>

BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs

@@ -34,7 +34,7 @@ namespace BeWo.View.Detail.Accounting
         private readonly NewGkvAbrechnungPopUpView _NewGkvAbrechnungPopUpView;
         private readonly GkvAbrechnungListVM _Viewmodel;
 
-        public GkvAbrechnungOverview(GkvAbrechnungListVM vm)
+        public GkvAbrechnungOverview()
         {
             UpdateDataGridFilterCommand = new DelegateCommand(UpdateDataGridFilter);
 
@@ -42,9 +42,9 @@ namespace BeWo.View.Detail.Accounting
 
             DownloadLinkEngine = new DownloadLinkEngine();
 
-            _Viewmodel = vm;
+            _Viewmodel = new GkvAbrechnungListVM();
 
-            DataContext = vm;
+            DataContext = _Viewmodel;
 
             //datagrid_gkvAbrechnungen.FixedFilter = new BinaryOperator("Datenaustauschreferenz", 1);
 
@@ -66,10 +66,7 @@ namespace BeWo.View.Detail.Accounting
 
         private void CheckRights()
         {
-            //if (!BeWoApp.AppSettings.AllowStorno)
-            //{
-            //    ColumnButtons.MinWidth = 67;
-            //}
+            
         }
         private void RefreshGkvAbrechnungenList()
         {
@@ -204,27 +201,6 @@ namespace BeWo.View.Detail.Accounting
             }
         }
 
-        private void btn_force_send_Click(object sender, RoutedEventArgs e)
-        {
-#if DEBUG
-
-#else
-            return;
-#endif
-
-            var vm = datagrid_gkvAbrechnungen.GetCurrentValue<GkvAbrechnungVM>();
-
-            if(vm.TransferProtokolle is object && vm.TransferProtokolle.Any())
-            {
-                vm.TransferProtokolle.Clear();
-
-                var result_dc = ServiceFacade.DoAccountingServiceSync(x => x.UpdateGkvAbrechnung(vm.CommitToDataContract()));
-
-                vm.TransferProtokolle = result_dc.TransferProtokolle?.ToList();
-                vm.GkvAbrechnungVersion = result_dc.GkvAbrechnungVersion;
-            }
-        }
-
         private void btn_send_Click(object sender, RoutedEventArgs e)
         {
             var vm = datagrid_gkvAbrechnungen.GetCurrentValue<GkvAbrechnungVM>();
@@ -313,14 +289,24 @@ namespace BeWo.View.Detail.Accounting
                 ((TextEdit)gridView.ActiveEditor).SetPropertyValue("MaxLength", tag);
             }
         }
-        private void gridView_CellValueChanged(object sender, CellValueChangedEventArgs e)
+        private void gridView_CellValueChanging(object sender, CellValueChangedEventArgs e)
         {
-            if (e.Column != null && e.Column.FieldName == "Bezahlt")
+            if (e.Column is null)
+                return;
+
+            if (e.Column.FieldName == nameof(GkvAbrechnungVM.Bezahlt))
             {
                 if (e.Value is bool b && e.Row is GkvAbrechnungVM vm)
                 {
                     SaveBezahltChange(vm, b);
                 }
+            } 
+            else if (e.Column.FieldName == nameof(GkvAbrechnungVM.UrbelegeGesendet))
+            {
+                if (e.Value is bool b && e.Row is GkvAbrechnungVM vm)
+                {
+                    SaveUrbelegeGesendetChange(vm, b);
+                }
             }
         }
         private void TableView_OnCustomRowAppearance(object sender, CustomRowAppearanceEventArgs e)
@@ -337,6 +323,11 @@ namespace BeWo.View.Detail.Accounting
                     e.Result = Brushes.Orange;
                     e.Handled = true;
                 }
+                else if (GkvAbrechnungVM.GetState(gkvAbrechnungVM) == GkvState.Waiting4Urbelege)
+                {
+                    e.Result = Brushes.Green;
+                    e.Handled = true;
+                }
             }
         }
 
@@ -351,10 +342,33 @@ namespace BeWo.View.Detail.Accounting
 
             dc_in.Bezahlt = b;
 
-            var dc = ServiceFacade.DoAccountingServiceSync(x => x.UpdateGkvAbrechnung(dc_in));
+            ServiceFacade.DoAccountingServiceAsync(x => x.UpdateGkvAbrechnung(dc_in), cb =>
+            {
+                Dispatcher.Invoke(() => {
+                    vm.GkvAbrechnungVersion = cb.GkvAbrechnungVersion;
+                    vm.Bezahlt = cb.Bezahlt;
+                });
+            }, false);
+        }
 
-            vm.GkvAbrechnungVersion = dc.GkvAbrechnungVersion;
-            vm.Bezahlt = dc.Bezahlt;
+        private void SaveUrbelegeGesendetChange(GkvAbrechnungVM vm, bool b)
+        {
+            var dc_in = vm.CommitToDataContract();
+
+            dc_in.UrbelegeGesendet = b;
+
+            ServiceFacade.DoAccountingServiceAsync(x => x.UpdateGkvAbrechnung(dc_in), cb =>
+            {
+                Dispatcher.Invoke(() => {
+                    vm.GkvAbrechnungVersion = cb.GkvAbrechnungVersion;
+                    vm.UrbelegeGesendet = cb.UrbelegeGesendet;
+                });
+            }, false);
+
+            //var dc = ServiceFacade.DoAccountingServiceSync(x => x.UpdateGkvAbrechnung(dc_in));
+
+            //vm.GkvAbrechnungVersion = dc.GkvAbrechnungVersion;
+            //vm.UrbelegeGesendet = dc.UrbelegeGesendet;
         }
 
         private void SaveNoticeChange(GkvAbrechnungVM vm, string notice)
@@ -375,5 +389,5 @@ namespace BeWo.View.Detail.Accounting
                 }
             }
         }
-    }
+	}
 }

BeWo/View/Detail/CustomerWohnhilfeView.xaml

@@ -56,7 +56,7 @@
                 </Button>
             </StackPanel>
             <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
-                <CheckBox x:Name="checkbox_size" IsChecked="{Binding Path=IsLarge, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">Groß</CheckBox>
+                <CheckBox x:Name="checkbox_size" IsChecked="{Binding Path=IsLarge, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Visibility="Hidden">Groß</CheckBox>
             </StackPanel>
             <TabControl
                 x:Name="tabcontrol_NotizenKategorien"

BeWo/View/Detail/EmployeeView.xaml

@@ -34,6 +34,8 @@
                     </dxg:GridColumn>-->
                     <dxg:GridColumn FieldName="Customer.LastNameFirstName" AllowEditing="False" Header="{markup:Translate Klient(in)}" Width="180" AllowSorting="True" SortOrder="Ascending" />
                     <dxg:GridColumn FieldName="Role" x:Name="column_role" Header="Rolle" Width="180" AllowSorting="True"/>
+                    <dxg:GridColumn FieldName="StartDate" Width="100" Header="{markup:Translate Startdatum}" />
+                    <dxg:GridColumn FieldName="EndDate" Width="100" Header="{markup:Translate Enddatum}" />
                     <dxg:GridColumn FieldName="Notice" Header="Erläuterung" Width="180" AllowSorting="True"/>
                 </dxg:GridControl.Columns>
                 <dxg:GridControl.View>

BeWo/View/Detail/SupportConceptView.xaml.cs

@@ -157,7 +157,7 @@ namespace BeWo.View.Detail
 
         private void OnLoaded(object sender, RoutedEventArgs routedEventArgs)
         {
-            if (taskToEdit != null && ViewModel != null)
+            if (taskToEdit != null && ViewModel != null && ViewModel.Tasks != null)
             {
                 tabitem_tasks.IsSelected = true;
 

BeWo/View/Detail/Wohneinheit/WohneinheitBelegungSchedulerView.xaml

@@ -240,10 +240,10 @@
 
                             <dxsch:DataSource.AppointmentMappings>
                                 <dxsch:AppointmentMappings
+                                    AllDay="AllDay"
                                     End="EndDateDisplay"
                                     LabelId="Customer.CustomerOid"
                                     ResourceId="Wohneinheit.Oid"
-                                    AllDay="AllDay"
                                     Start="StartDate"
                                     Subject="Customer.VollerName" />
                             </dxsch:DataSource.AppointmentMappings>

BeWo/View/Detail/Wohneinheit/WohneinheitBelegungTableView.xaml

@@ -136,6 +136,6 @@
                 </dxg:GridControl>
             </Grid>
         </GroupBox>
-        <local:WohneinheitBelegungEditPopup x:Name="popup_newBelegung"/>
+        <local:WohneinheitBelegungEditPopup x:Name="popup_newBelegung" />
     </Grid>
 </UserControl>

BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissControl.xaml

@@ -22,11 +22,11 @@
             Style="{StaticResource ObjectEditGroupBox}">
             <ListBox
                 Name="PhotosListBox"
+                ContextMenuOpening="PhotosListBox_ContextMenuOpening"
                 ItemsSource="{Binding VMList}"
                 ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                 ScrollViewer.VerticalScrollBarVisibility="Auto"
                 SelectedIndex="0"
-                ContextMenuOpening="PhotosListBox_ContextMenuOpening"
                 Style="{StaticResource PhotoListBox}">
                 <ListBox.ContextMenu>
                     <ContextMenu>

BeWo/View/Detail/Wohneinheit/WohneinheitVerwaltungViewV2.xaml

@@ -86,9 +86,9 @@
                 <ScrollViewer
                     Grid.Column="2"
                     Margin="5"
+                    Padding="5"
                     DataContext="{Binding SelectedVM}"
                     VerticalScrollBarVisibility="Visible"
-                    Padding="5"
                     Visibility="{Binding Path=., Converter={StaticResource ObjectVisibilityConverter}}">
                     <StackPanel Orientation="Vertical">
                         <GroupBox
@@ -255,7 +255,7 @@
                                     Text="{Binding Path=Zusatznotiz, UpdateSourceTrigger=PropertyChanged}" />
                             </Grid>
                         </GroupBox>
-                        <local:WohneinheitGrundrissControl Visibility="{Binding Path=DataContext.PermissionWohneinheitGalleryView, ElementName=root_grid,Converter={StaticResource BoolVisibilityConverter}}" DataContext="{Binding ImageListVM}" />
+                        <local:WohneinheitGrundrissControl DataContext="{Binding ImageListVM}" Visibility="{Binding Path=DataContext.PermissionWohneinheitGalleryView, ElementName=root_grid, Converter={StaticResource BoolVisibilityConverter}}" />
                     </StackPanel>
                 </ScrollViewer>
 

BeWo/View/HilfeplanImportView.xaml

@@ -59,7 +59,7 @@
             <Button x:Name="ButtonImport" Grid.Column="2" Margin="5,0,0,0" Height="22" Content="Datei auslesen" Click="ButtonImport_Click" HorizontalAlignment="Left" VerticalAlignment="Center" Visibility="Visible" ></Button>
         </Grid>
         <GroupBox x:Name="GroupBoxMain" Grid.Row="1" Margin="5"  Header="{t:Translate Inhalt des Dokuments}" Style="{StaticResource ObjectEditGroupBox}" Visibility="Hidden">
-            <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Hidden">
+            <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
                 <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto"></RowDefinition>
@@ -77,10 +77,10 @@
                             <Label HorizontalAlignment="Left" VerticalAlignment="Center" Content="{t:Translate Zielplanung}" FontSize="14" Margin="0" />
                         </Grid>
                     </Expander.Header>
-                        <TreeView x:Name="treeview_Goals" Margin="3 3 7 3" Padding="5 5 10 5"
+                        <TreeView x:Name="treeview_Goals" Margin="3 3 7 3" Padding="5 5 10 5" BorderBrush="Black" BorderThickness="1"
                       ItemContainerStyle="{DynamicResource goal_treeitemstyle}"
                                               ItemTemplate="{DynamicResource goal_treeitemtemplate}" Grid.RowSpan="1" MinHeight="100"
-                          VirtualizingStackPanel.IsVirtualizing="False">
+                          VirtualizingStackPanel.IsVirtualizing="False" >
                             <TreeView.Resources>
                                 <Style x:Key="goal_treeitemstyle" TargetType="TreeViewItem">
                                     <Setter Property="IsExpanded" Value="{Binding Path=IsExpanded, Mode=TwoWay}" />

BeWo/View/Master/AdministrationView.xaml

@@ -57,7 +57,7 @@
                                     <dxa:AccordionItem Header="{markup:Translate Medikamentenarten}" Name="TabitemMedikamentenarten" Selected="Tabitem_Selected" Foreground="Black"/>
                                     <dxa:AccordionItem Header="{markup:Translate Rollen des Umfeldes}" Name="TabitemEnvironmentRoles" Selected="Tabitem_Selected" Foreground="Black"/>
                                     <dxa:AccordionItem Header="{markup:Translate Vermittlung}" Name="TabitemPlacementObjectives" Selected="Tabitem_Selected" Foreground="Black"/>
-                                    <dxa:AccordionItem Header="{t:Translate Falldaten}" Foreground="{StaticResource TabItemTextBrush}">
+                                    <dxa:AccordionItem Header="{t:Translate Falldaten}" Foreground="Black" >
                                         <dxa:AccordionItem Header="{markup:Translate Auftragsherkunft}" Name="TabitemAuftragsherkunft" Selected="Tabitem_Selected" Foreground="Black"/>
                                         <dxa:AccordionItem Header="{markup:Translate Vermittlungsgrundlage}" Name="TabitemVermittlungsgrundlage" Selected="Tabitem_Selected" Foreground="Black"/>
                                     </dxa:AccordionItem>

BeWo/View/Master/DokumenteView.xaml

@@ -1,17 +1,22 @@
-<localView:BeWoView x:Class="BeWo.View.Master.DokumenteView" 
-                    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
-                    xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
-                    xmlns:localView="clr-namespace:BeWo.View"
-                    xmlns:master="clr-namespace:BeWo.View.Master"
-                    xmlns:dxa="http://schemas.devexpress.com/winfx/2008/xaml/accordion"
-                    xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
-                    xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
-                    xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
-                    xmlns:dxgt="http://schemas.devexpress.com/winfx/2008/xaml/grid/themekeys"
-                    xmlns:dxlc="http://schemas.devexpress.com/winfx/2008/xaml/layoutcontrol" 
-                    xmlns:controls="clr-namespace:BeWo.View.Controls"
-                    Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True">
+<localView:BeWoView
+    x:Class="BeWo.View.Master.DokumenteView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:BeWo.View.Controls"
+    xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
+    xmlns:dxa="http://schemas.devexpress.com/winfx/2008/xaml/accordion"
+    xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
+    xmlns:dxgt="http://schemas.devexpress.com/winfx/2008/xaml/grid/themekeys"
+    xmlns:dxlc="http://schemas.devexpress.com/winfx/2008/xaml/layoutcontrol"
+    xmlns:localView="clr-namespace:BeWo.View"
+    xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
+    xmlns:master="clr-namespace:BeWo.View.Master"
+    xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
+    Width="Auto"
+    Height="Auto"
+    HorizontalAlignment="Stretch"
+    VerticalAlignment="Stretch"
+    Focusable="True">
 
     <localView:BeWoView.Resources>
         <Style TargetType="dxg:RowControl">
@@ -22,64 +27,78 @@
                 </Trigger>
             </Style.Triggers>
         </Style>
-        <ContextMenu x:Name="contextMenu" x:Key="cm" MenuItem.Click="ContextMenu_Click" Opened="ContextMenu_Opened">
-            <MenuItem Header="Neuer Ordner" >
+        <ContextMenu
+            x:Key="cm"
+            x:Name="contextMenu"
+            MenuItem.Click="ContextMenu_Click"
+            Opened="ContextMenu_Opened">
+            <MenuItem Header="Neuer Ordner">
                 <MenuItem.Icon>
-                    <Image Source="..\Ressources\Icons\new.png"/>
+                    <Image Source="..\Ressources\Icons\new.png" />
                 </MenuItem.Icon>
             </MenuItem>
             <MenuItem Header="Umbenennen">
                 <MenuItem.Icon>
-                    <Image Source="..\Ressources\Icons\Rename24.png"/>
+                    <Image Source="..\Ressources\Icons\Rename24.png" />
                 </MenuItem.Icon>
             </MenuItem>
             <Separator />
-            <MenuItem Header="Löschen" >
+            <MenuItem Header="Löschen">
                 <MenuItem.Icon>
-                    <Image Source="..\Ressources\Icons\Delete24.png"/>
+                    <Image Source="..\Ressources\Icons\Delete24.png" />
                 </MenuItem.Icon>
             </MenuItem>
         </ContextMenu>
-        
-        
-        <ContextMenu x:Name="TemplateContextMenu" x:Key="templatecm" MenuItem.Click="TemplateContextMenu_Click"  Opened="TemplateContextMenu_Opened">
-            <MenuItem Header="Neuer Ordner" >
+
+
+        <ContextMenu
+            x:Key="templatecm"
+            x:Name="TemplateContextMenu"
+            MenuItem.Click="TemplateContextMenu_Click"
+            Opened="TemplateContextMenu_Opened">
+            <MenuItem Header="Neuer Ordner">
                 <MenuItem.Icon>
-                    <Image Source="..\Ressources\Icons\Add24.png"/>
+                    <Image Source="..\Ressources\Icons\Add24.png" />
                 </MenuItem.Icon>
             </MenuItem>
             <MenuItem Header="Umbenennen">
                 <MenuItem.Icon>
-                    <Image Source="..\Ressources\Icons\Rename24.png"/>
+                    <Image Source="..\Ressources\Icons\Rename24.png" />
                 </MenuItem.Icon>
             </MenuItem>
             <Separator />
-            <MenuItem Header="Neue Vorlage" >
+            <MenuItem Header="Neue Vorlage">
                 <MenuItem.Icon>
-                    <Image Source="..\Ressources\Icons\DocumentWithAdd.png"/>
+                    <Image Source="..\Ressources\Icons\DocumentWithAdd.png" />
                 </MenuItem.Icon>
             </MenuItem>
             <Separator />
-            <MenuItem Header="Löschen" >
+            <MenuItem Header="Löschen">
                 <MenuItem.Icon>
-                    <Image Source="..\Ressources\Icons\Delete24.png"/>
+                    <Image Source="..\Ressources\Icons\Delete24.png" />
                 </MenuItem.Icon>
             </MenuItem>
         </ContextMenu>
         <master:DeleteButtonVisibilityConverter x:Key="DeleteButtonVisibilityConverter" />
         <master:EditButtonVisibilityConverter x:Key="EditButtonVisibilityConverter" />
-        
+
     </localView:BeWoView.Resources>
 
-    
 
 
-     <Grid>
+
+    <Grid>
         <uc:ShadowChrome>
             <GroupBox Style="{StaticResource MainContentGroupBoxStyle}">
                 <GroupBox.Header>
-                    <StackPanel Orientation="Horizontal" VerticalAlignment="Bottom" Margin="0,11,0,0">
-                        <Image Source="..\..\Ressources\Icons\Folder.png" RenderTransformOrigin="0.5,0.5" Width="32">
+                    <StackPanel
+                        Margin="0,11,0,0"
+                        VerticalAlignment="Bottom"
+                        Orientation="Horizontal">
+                        <Image
+                            Width="32"
+                            RenderTransformOrigin="0.5,0.5"
+                            Source="..\..\Ressources\Icons\Folder.png">
                             <Image.RenderTransform>
                                 <TransformGroup>
                                     <ScaleTransform ScaleX="1.3" ScaleY="1.3" />
@@ -89,34 +108,66 @@
                                 </TransformGroup>
                             </Image.RenderTransform>
                         </Image>
-                        <TextBox Text="Dokumente" Margin="10,0,0,0" Background="{x:Null}" Foreground="{DynamicResource MainGroupBoxForegroundBrush}" FontSize="22" BorderBrush="{x:Null}" VerticalAlignment="Stretch" Padding="0,0,0,0" BorderThickness="0,0,0,0" />
+                        <TextBox
+                            Margin="10,0,0,0"
+                            Padding="0,0,0,0"
+                            VerticalAlignment="Stretch"
+                            Background="{x:Null}"
+                            BorderBrush="{x:Null}"
+                            BorderThickness="0,0,0,0"
+                            FontSize="22"
+                            Foreground="{DynamicResource MainGroupBoxForegroundBrush}"
+                            Text="Dokumente" />
                     </StackPanel>
                 </GroupBox.Header>
                 <Grid Background="{StaticResource ObjectEditBackgroundBrush}">
-                    <TabControl Visibility="Visible">
+                    <TabControl Margin="1" Visibility="Visible">
                         <TabItem Visibility="Visible">
                             <TabItem.Header>
-                                <TextBlock Text="{markup:Translate Alle Dokumente}" TextElement.FontSize="16" TextElement.Foreground="{StaticResource TabItemHotTextBrush}" TextElement.FontFamily="Microsoft Sans Serif" Padding="3"></TextBlock>
+                                <TextBlock
+                                    Padding="3"
+                                    Text="{markup:Translate Alle Dokumente}"
+                                    TextElement.FontFamily="Microsoft Sans Serif"
+                                    TextElement.FontSize="16"
+                                    TextElement.Foreground="{StaticResource TabItemHotTextBrush}" />
                             </TabItem.Header>
 
                             <dxlc:LayoutControl Orientation="Horizontal">
-                                <dxlc:LayoutGroup dxlc:LayoutControl.AllowHorizontalSizing="True" Width="300">
+                                <dxlc:LayoutGroup Width="300" dxlc:LayoutControl.AllowHorizontalSizing="True">
                                     <Grid Margin="0,0,0,0">
                                         <Grid.RowDefinitions>
                                             <RowDefinition Height="auto" />
                                             <RowDefinition Height="*" />
                                         </Grid.RowDefinitions>
                                         <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="Auto"></ColumnDefinition>
-                                            <ColumnDefinition Width="*"></ColumnDefinition>
+                                            <ColumnDefinition Width="Auto" />
+                                            <ColumnDefinition Width="*" />
                                         </Grid.ColumnDefinitions>
 
-                                        <Label Content="Suche" Margin="0,0,0,0" />
-                                        <TextBox Height="20" Grid.Column="1" x:Name="textbox_searchForFileName" Margin="3,2,0,5" HorizontalContentAlignment="Stretch" TabIndex="0" Template="{DynamicResource SearchTextBoxTemplate}" BorderThickness="0,0,0,0" KeyDown="TextBox_KeyDown"/>
+                                        <Label Margin="0,0,0,0" Content="Suche" />
+                                        <TextBox
+                                            x:Name="textbox_searchForFileName"
+                                            Grid.Column="1"
+                                            Height="20"
+                                            Margin="3,2,0,5"
+                                            HorizontalContentAlignment="Stretch"
+                                            BorderThickness="0,0,0,0"
+                                            KeyDown="TextBox_KeyDown"
+                                            TabIndex="0"
+                                            Template="{DynamicResource SearchTextBoxTemplate}" />
 
-                                        <dxg:TreeListControl Grid.Row="1" Grid.ColumnSpan="2" x:Name="documents_treeview_control" Margin="0 0 2 4" VerticalAlignment="Stretch" dx:ThemeManager.ThemeName="Office2010Black">
+                                        <dxg:TreeListControl
+                                            x:Name="documents_treeview_control"
+                                            Grid.Row="1"
+                                            Grid.ColumnSpan="2"
+                                            Margin="0,0,2,4"
+                                            VerticalAlignment="Stretch"
+                                            dx:ThemeManager.ThemeName="Office2010Black">
                                             <dxg:TreeListControl.Columns>
-                                                <dxg:TreeListColumn FieldName="Name" AllowSorting="False" Width="300">
+                                                <dxg:TreeListColumn
+                                                    Width="300"
+                                                    AllowSorting="False"
+                                                    FieldName="Name">
                                                     <!--<dxg:TreeListColumn.CellStyle>
                                                     <Style TargetType="dxg:LightweightCellEditor" BasedOn="{StaticResource {dxgt:GridRowThemeKey ResourceKey=LightweightCellStyle}}">
                                                         <Style.Triggers>
@@ -130,10 +181,25 @@
                                                 </dxg:TreeListColumn>
                                             </dxg:TreeListControl.Columns>
                                             <dxg:TreeListControl.View>
-                                                <dxg:TreeListView x:Name="DocumentsTreeView" PreviewMouseLeftButtonDown="DocumentsTreeView_PreviewMouseLeftButtonDown" ShowColumnHeaders="False" ShowIndicator="False" ShowHorizontalLines="False" ShowVerticalLines="False"    
-                                                  FocusedRowChanged="DocumentsTreeView_FocusedRowChanged" LostFocus="DocumentsTreeView_LostFocus"
-                                                  NodeExpanding="DocumentsTreeView_NodeExpanding" AllowEditing="False" ShowNodeImages="True" PrintNodeImages="True" AutoWidth="True"
-                                                  KeyFieldName="{Binding DocumentTreeItemVM.DocTreeItemOid}" ParentFieldName="Binding DocumentTreeItemVM.ParentOid" ContextMenu="{StaticResource cm}" VerticalScrollbarVisibility="Auto" HorizontalScrollbarVisibility="Auto">
+                                                <dxg:TreeListView
+                                                    x:Name="DocumentsTreeView"
+                                                    AllowEditing="False"
+                                                    AutoWidth="True"
+                                                    ContextMenu="{StaticResource cm}"
+                                                    FocusedRowChanged="DocumentsTreeView_FocusedRowChanged"
+                                                    HorizontalScrollbarVisibility="Auto"
+                                                    KeyFieldName="{Binding DocumentTreeItemVM.DocTreeItemOid}"
+                                                    LostFocus="DocumentsTreeView_LostFocus"
+                                                    NodeExpanding="DocumentsTreeView_NodeExpanding"
+                                                    ParentFieldName="Binding DocumentTreeItemVM.ParentOid"
+                                                    PreviewMouseLeftButtonDown="DocumentsTreeView_PreviewMouseLeftButtonDown"
+                                                    PrintNodeImages="True"
+                                                    ShowColumnHeaders="False"
+                                                    ShowHorizontalLines="False"
+                                                    ShowIndicator="False"
+                                                    ShowNodeImages="True"
+                                                    ShowVerticalLines="False"
+                                                    VerticalScrollbarVisibility="Auto">
                                                     <!--<dxg:TreeListView.RowStyle>
                                                     <Style BasedOn="{StaticResource {dxgt:GridRowThemeKey ResourceKey=RowStyle}}" TargetType="dxg:rows">
                                                         <Style.Triggers>
@@ -151,7 +217,10 @@
                                     </Grid>
                                 </dxlc:LayoutGroup>
                                 <dxlc:LayoutGroup dxlc:LayoutControl.AllowHorizontalSizing="True">
-                                    <Grid Grid.Column="1" Grid.Row="0" Grid.RowSpan="2">
+                                    <Grid
+                                        Grid.Row="0"
+                                        Grid.RowSpan="2"
+                                        Grid.Column="1">
                                         <Grid.RowDefinitions>
                                             <RowDefinition Height="Auto" />
                                             <RowDefinition Height="*" />
@@ -160,7 +229,12 @@
                                             <ColumnDefinition Width="Auto" />
                                             <ColumnDefinition Width="*" />
                                         </Grid.ColumnDefinitions>
-                                        <GroupBox x:Name="GroupBoxDokumentenListe" Grid.ColumnSpan="2" Padding="5" Style="{StaticResource ObjectEditGroupBox}" Header="">
+                                        <GroupBox
+                                            x:Name="GroupBoxDokumentenListe"
+                                            Grid.ColumnSpan="2"
+                                            Padding="5"
+                                            Header=""
+                                            Style="{StaticResource ObjectEditGroupBox}">
 
                                             <Grid>
                                                 <Grid.ColumnDefinitions>
@@ -176,10 +250,29 @@
                                                     <RowDefinition Height="Auto" />
                                                 </Grid.RowDefinitions>
 
-                                                <Button Name="button_uploadDocument" Click="button_OpenUploadDocument_Click"  Grid.Column="0" Grid.Row="0">Datei hochladen</Button>
-                                                <controls:PopupNonTopmost Grid.Row="0" Topmost="False" x:Name="popup_UploadFiles" Width="350" StaysOpen="True" Placement="MousePoint">
-                                                    <Border Background="White" Padding="3" BorderThickness="1" BorderBrush="Gray">
-                                                        <GroupBox x:Name="groupbox_uploadDocument" Header="Dokument hochladen" Style="{StaticResource ObjectEditGroupBox}">
+                                                <Button
+                                                    Name="button_uploadDocument"
+                                                    Grid.Row="0"
+                                                    Grid.Column="0"
+                                                    Click="button_OpenUploadDocument_Click">
+                                                    Datei hochladen
+                                                </Button>
+                                                <controls:PopupNonTopmost
+                                                    x:Name="popup_UploadFiles"
+                                                    Grid.Row="0"
+                                                    Width="350"
+                                                    Placement="MousePoint"
+                                                    StaysOpen="True"
+                                                    Topmost="False">
+                                                    <Border
+                                                        Padding="3"
+                                                        Background="White"
+                                                        BorderBrush="Gray"
+                                                        BorderThickness="1">
+                                                        <GroupBox
+                                                            x:Name="groupbox_uploadDocument"
+                                                            Header="Dokument hochladen"
+                                                            Style="{StaticResource ObjectEditGroupBox}">
                                                             <Grid>
                                                                 <Grid.RowDefinitions>
                                                                     <RowDefinition Height="Auto" />
@@ -195,15 +288,49 @@
 
                                                                 </Grid.ColumnDefinitions>
                                                                 <Label VerticalAlignment="Center" Content="{markup:Translate Datei}" />
-                                                                <uc:PopUpEdit IsReadOnly="True" DeleteButtonVisibility="Collapsed"
-                                                                    Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="2" Margin="3" Height="23" x:Name="popupedit_file"
-                                                                    PopUpClick="popupedit_file_PopUpClick_1" Cursor="Arrow" />
-                                                                <Label Content="Beschreibung" Grid.Row="2" Grid.Column="0" VerticalAlignment="Top" />
-                                                                <TextBox x:Name="textbox_beschreibung" Grid.Row="2" Grid.Column="1" Height="50" Margin="3" Grid.ColumnSpan="2" />
-                                                                <Button Grid.Row="4" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Bottom" Height="25"
-                                                                  Margin="3" Content="Hochladen" x:Name="button_uploadFile" Click="button_uploadDocument_Click" />
-                                                                <Button Grid.Row="4" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="25"
-                                                                    Margin="3" Content="Abbrechen" x:Name="button_cancelFileUpload" Click="button_cancelFileUpload_Click" />
+                                                                <uc:PopUpEdit
+                                                                    x:Name="popupedit_file"
+                                                                    Grid.Row="0"
+                                                                    Grid.Column="1"
+                                                                    Grid.ColumnSpan="2"
+                                                                    Height="23"
+                                                                    Margin="3"
+                                                                    Cursor="Arrow"
+                                                                    DeleteButtonVisibility="Collapsed"
+                                                                    IsReadOnly="True"
+                                                                    PopUpClick="popupedit_file_PopUpClick_1" />
+                                                                <Label
+                                                                    Grid.Row="2"
+                                                                    Grid.Column="0"
+                                                                    VerticalAlignment="Top"
+                                                                    Content="Beschreibung" />
+                                                                <TextBox
+                                                                    x:Name="textbox_beschreibung"
+                                                                    Grid.Row="2"
+                                                                    Grid.Column="1"
+                                                                    Grid.ColumnSpan="2"
+                                                                    Height="50"
+                                                                    Margin="3" />
+                                                                <Button
+                                                                    x:Name="button_uploadFile"
+                                                                    Grid.Row="4"
+                                                                    Grid.Column="1"
+                                                                    Height="25"
+                                                                    Margin="3"
+                                                                    HorizontalAlignment="Right"
+                                                                    VerticalAlignment="Bottom"
+                                                                    Click="button_uploadDocument_Click"
+                                                                    Content="Hochladen" />
+                                                                <Button
+                                                                    x:Name="button_cancelFileUpload"
+                                                                    Grid.Row="4"
+                                                                    Grid.Column="2"
+                                                                    Height="25"
+                                                                    Margin="3"
+                                                                    HorizontalAlignment="Stretch"
+                                                                    VerticalAlignment="Bottom"
+                                                                    Click="button_cancelFileUpload_Click"
+                                                                    Content="Abbrechen" />
                                                             </Grid>
                                                         </GroupBox>
                                                     </Border>
@@ -211,8 +338,20 @@
                                                 <!--<Label Grid.Column="1" Margin="25 1 0 0" FontSize="13">Beschreibung</Label>
                                             <TextBox Name="textbox_fileNotice" Margin="3" Height="23" Grid.Column="2" Grid.Row="0" />-->
 
-                                                <ProgressBar Height="20" Margin="2" Name="progressbar_upload" Grid.Row="1" Grid.ColumnSpan="3" Minimum="0" Maximum="1" />
-                                                <Label HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Row="2" Grid.ColumnSpan="3" Name="text_progress" />
+                                                <ProgressBar
+                                                    Name="progressbar_upload"
+                                                    Grid.Row="1"
+                                                    Grid.ColumnSpan="3"
+                                                    Height="20"
+                                                    Margin="2"
+                                                    Maximum="1"
+                                                    Minimum="0" />
+                                                <Label
+                                                    Name="text_progress"
+                                                    Grid.Row="2"
+                                                    Grid.ColumnSpan="3"
+                                                    HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center" />
                                             </Grid>
 
 
@@ -242,46 +381,106 @@
                                     </Grid>-->
 
                                         </GroupBox>
-                                        <dxg:GridControl Grid.Row="1" Margin="2,3,5,5" DataSource="{Binding SelectedItem.Files, ElementName=treeview}" x:Name="datagrid_documents" Grid.Column="1">
+                                        <dxg:GridControl
+                                            x:Name="datagrid_documents"
+                                            Grid.Row="1"
+                                            Grid.Column="1"
+                                            Margin="2,3,5,5"
+                                            DataSource="{Binding SelectedItem.Files, ElementName=treeview}">
                                             <dxg:GridControl.Columns>
-                                                <dxg:GridColumn FieldName="FileName" Header="" FixedWidth="True" Width="24" ReadOnly="True" Visible="{Binding Converter={StaticResource DeleteButtonVisibilityConverter}}">
+                                                <dxg:GridColumn
+                                                    Width="24"
+                                                    FieldName="FileName"
+                                                    FixedWidth="True"
+                                                    Header=""
+                                                    ReadOnly="True"
+                                                    Visible="{Binding Converter={StaticResource DeleteButtonVisibilityConverter}}">
                                                     <dxg:GridColumn.CellTemplate>
                                                         <DataTemplate>
-                                                            <Button Content="r" FontFamily="Webdings" Click="DeleteButton_Click" Width="20" Height="20" VerticalAlignment="Center" ToolTip="Löschen" />
+                                                            <Button
+                                                                Width="20"
+                                                                Height="20"
+                                                                VerticalAlignment="Center"
+                                                                Click="DeleteButton_Click"
+                                                                Content="r"
+                                                                FontFamily="Webdings"
+                                                                ToolTip="Löschen" />
                                                         </DataTemplate>
                                                     </dxg:GridColumn.CellTemplate>
                                                 </dxg:GridColumn>
-                                                <dxg:GridColumn Header="" FixedWidth="True" Width="24" ReadOnly="True" Visible="{Binding Converter={StaticResource EditButtonVisibilityConverter}}">
+                                                <dxg:GridColumn
+                                                    Width="24"
+                                                    FixedWidth="True"
+                                                    Header=""
+                                                    ReadOnly="True"
+                                                    Visible="{Binding Converter={StaticResource EditButtonVisibilityConverter}}">
                                                     <dxg:GridColumn.CellTemplate>
                                                         <DataTemplate>
-                                                            <Button Content="!" FontFamily="Wingdings" Click="EditButton_Click" Width="20" Height="20" VerticalAlignment="Center" ToolTip="Bearbeiten"/>
+                                                            <Button
+                                                                Width="20"
+                                                                Height="20"
+                                                                VerticalAlignment="Center"
+                                                                Click="EditButton_Click"
+                                                                Content="!"
+                                                                FontFamily="Wingdings"
+                                                                ToolTip="Bearbeiten" />
                                                         </DataTemplate>
                                                     </dxg:GridColumn.CellTemplate>
                                                 </dxg:GridColumn>
-                                                <dxg:GridColumn FieldName="InsertedOn" AllowEditing="False" Header="hinterlegt am" Width="*" />
-                                                <dxg:GridColumn FieldName="InsertedBy" AllowEditing="False" Header="hinterlegt von" Width="*" />
-                                                <dxg:GridColumn FieldName="FileName" AllowEditing="False" Header="Dateiname" Width="*" />
-                                                <dxg:GridColumn FieldName="Description" AllowEditing="False" Header="Beschreibung" Width="*" />
-                                                <dxg:GridColumn FieldName="URL" Header="Herunterladen" Width="100" MinWidth="90" x:Name="ColumnDownload">
+                                                <dxg:GridColumn
+                                                    Width="*"
+                                                    AllowEditing="False"
+                                                    FieldName="InsertedOn"
+                                                    Header="hinterlegt am" />
+                                                <dxg:GridColumn
+                                                    Width="*"
+                                                    AllowEditing="False"
+                                                    FieldName="InsertedBy"
+                                                    Header="hinterlegt von" />
+                                                <dxg:GridColumn
+                                                    Width="*"
+                                                    AllowEditing="False"
+                                                    FieldName="FileName"
+                                                    Header="Dateiname" />
+                                                <dxg:GridColumn
+                                                    Width="*"
+                                                    AllowEditing="False"
+                                                    FieldName="Description"
+                                                    Header="Beschreibung" />
+                                                <dxg:GridColumn
+                                                    x:Name="ColumnDownload"
+                                                    Width="100"
+                                                    MinWidth="90"
+                                                    FieldName="URL"
+                                                    Header="Herunterladen">
                                                     <dxg:GridColumn.CellTemplate>
                                                         <DataTemplate>
                                                             <TextBlock>
-									            <Hyperlink TargetName="inexistent" NavigateUri="{Binding Path=Value, Converter={StaticResource DownloadURLConverter}}" RequestNavigate="Hyperlink_OnRequestNavigate">
-										            <TextBlock Text="herunterladen" />
-									            </Hyperlink>    
-								            </TextBlock>
+                                                                <Hyperlink
+                                                                    NavigateUri="{Binding Path=Value, Converter={StaticResource DownloadURLConverter}}"
+                                                                    RequestNavigate="Hyperlink_OnRequestNavigate"
+                                                                    TargetName="inexistent">
+                                                                    <TextBlock Text="herunterladen" />
+                                                                </Hyperlink>
+                                                            </TextBlock>
                                                         </DataTemplate>
                                                     </dxg:GridColumn.CellTemplate>
                                                 </dxg:GridColumn>
                                             </dxg:GridControl.Columns>
                                             <dxg:GridControl.View>
-                                                <dxg:TableView AutoWidth="false" ShowGroupPanel="False" ShowGroupedColumns="false" ShowTotalSummary="False" NavigationStyle="Cell" x:Name="DocumentTableView"/>
+                                                <dxg:TableView
+                                                    x:Name="DocumentTableView"
+                                                    AutoWidth="false"
+                                                    NavigationStyle="Cell"
+                                                    ShowGroupPanel="False"
+                                                    ShowGroupedColumns="false"
+                                                    ShowTotalSummary="False" />
                                             </dxg:GridControl.View>
                                         </dxg:GridControl>
                                     </Grid>
                                 </dxlc:LayoutGroup>
                             </dxlc:LayoutControl>
-                            <!-- Hier kommt das Dokumentenzeug hin wenn Templates wieder angeschaltet werden/-->
+                            <!--  Hier kommt das Dokumentenzeug hin wenn Templates wieder angeschaltet werden/  -->
 
                         </TabItem>
 
@@ -289,33 +488,57 @@
 
                         <TabItem Selector.IsSelected="True">
                             <TabItem.Header>
-                                <TextBlock Text="{markup:Translate Vorlagen}" TextElement.FontSize="16" TextElement.Foreground="{StaticResource TabItemHotTextBrush}" TextElement.FontFamily="Microsoft Sans Serif" Padding="3"></TextBlock>
+                                <TextBlock
+                                    Padding="3"
+                                    Text="{markup:Translate Vorlagen}"
+                                    TextElement.FontFamily="Microsoft Sans Serif"
+                                    TextElement.FontSize="16"
+                                    TextElement.Foreground="{StaticResource TabItemHotTextBrush}" />
                             </TabItem.Header>
                             <dxlc:LayoutControl Orientation="Horizontal">
-                                <dxlc:LayoutGroup dxlc:LayoutControl.AllowHorizontalSizing="True" Width="300">
-                                    <Grid Margin="0,0,0,0" >
-                                <Grid.RowDefinitions>
+                                <dxlc:LayoutGroup Width="300" dxlc:LayoutControl.AllowHorizontalSizing="True">
+                                    <Grid Margin="0,0,0,0">
+                                        <Grid.RowDefinitions>
                                             <RowDefinition Height="*" />
                                         </Grid.RowDefinitions>
                                         <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="*"></ColumnDefinition>
-                                </Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="*" />
+                                        </Grid.ColumnDefinitions>
 
 
-                                <dxg:TreeListControl x:Name="template_treeview_control" Grid.Column="0" DefaultSorting="Name" Margin="2,3,2,5" VerticalAlignment="Stretch" dx:ThemeManager.ThemeName="Office2010Black">
-                                    <dxg:TreeListControl.Columns>
-                                        <dxg:TreeListColumn FieldName="Name" AllowSorting="True"/>
-                                    </dxg:TreeListControl.Columns>
-                                    <dxg:TreeListControl.View>
-                                                <dxg:TreeListView x:Name="TemplateTreeView" PreviewMouseLeftButtonDown="TemplateTreeView_PreviewMouseLeftButtonDown"  ShowColumnHeaders="False" AutoWidth="True"
-                                                  ShowIndicator="False" ShowHorizontalLines="False" ShowVerticalLines="False" FocusedRowChanged="TemplateTreeView_FocusedRowChanged" 
-                                                  LostFocus="TemplateTreeView_LostFocus" NodeExpanding="templateTreeListView_NodeExpanding" AllowEditing="False" ShowNodeImages="True" PrintNodeImages="True"
-                                                  KeyFieldName="{Binding DocumentTreeItemVM.DocTreeItemOid}" ParentFieldName="Binding DocumentTreeItemVM.ParentOid" ContextMenu="{StaticResource templatecm}"
-                                                          VerticalScrollbarVisibility="Auto" HorizontalScrollbarVisibility="Auto">
-                                        </dxg:TreeListView>
-                                    </dxg:TreeListControl.View>
-                                </dxg:TreeListControl>
-                                <!--
+                                        <dxg:TreeListControl
+                                            x:Name="template_treeview_control"
+                                            Grid.Column="0"
+                                            Margin="2,3,2,5"
+                                            VerticalAlignment="Stretch"
+                                            dx:ThemeManager.ThemeName="Office2010Black"
+                                            DefaultSorting="Name">
+                                            <dxg:TreeListControl.Columns>
+                                                <dxg:TreeListColumn AllowSorting="True" FieldName="Name" />
+                                            </dxg:TreeListControl.Columns>
+                                            <dxg:TreeListControl.View>
+                                                <dxg:TreeListView
+                                                    x:Name="TemplateTreeView"
+                                                    AllowEditing="False"
+                                                    AutoWidth="True"
+                                                    ContextMenu="{StaticResource templatecm}"
+                                                    FocusedRowChanged="TemplateTreeView_FocusedRowChanged"
+                                                    HorizontalScrollbarVisibility="Auto"
+                                                    KeyFieldName="{Binding DocumentTreeItemVM.DocTreeItemOid}"
+                                                    LostFocus="TemplateTreeView_LostFocus"
+                                                    NodeExpanding="templateTreeListView_NodeExpanding"
+                                                    ParentFieldName="Binding DocumentTreeItemVM.ParentOid"
+                                                    PreviewMouseLeftButtonDown="TemplateTreeView_PreviewMouseLeftButtonDown"
+                                                    PrintNodeImages="True"
+                                                    ShowColumnHeaders="False"
+                                                    ShowHorizontalLines="False"
+                                                    ShowIndicator="False"
+                                                    ShowNodeImages="True"
+                                                    ShowVerticalLines="False"
+                                                    VerticalScrollbarVisibility="Auto" />
+                                            </dxg:TreeListControl.View>
+                                        </dxg:TreeListControl>
+                                        <!--
                                 <Grid Grid.Column="2" Grid.Row="0">
                                     <Grid.RowDefinitions>
                                         <RowDefinition Height="Auto" />
@@ -348,9 +571,9 @@
                                             <ProgressBar Height="20" Margin="2" Name="progressbar_upload" Grid.Row="1" Grid.ColumnSpan="3" Minimum="0" Maximum="1" />
                                             <Label HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Row="2" Grid.ColumnSpan="3" Name="text_progress" />
                                         </Grid>
-                                    -->
+                                        -->
 
-                                <!--
+                                        <!--
                                         <Grid>
                                             <Grid.ColumnDefinitions>
                                                 <ColumnDefinition Width="Auto" />
@@ -374,42 +597,93 @@
                                             <ProgressBar Height="20" Margin="3" Name="progressbar_upload" Grid.Row="2" Grid.ColumnSpan="5" Minimum="0" Maximum="1" />
                                             <Label VerticalAlignment="Center" Grid.Row="2" Grid.ColumnSpan="5" HorizontalAlignment="Center" Name="text_progress" />
                                         </Grid>
-                                
-                            
+
+
                                     </GroupBox>
-                                    -->
-                                
-                            </Grid>
+                                        -->
+
+                                    </Grid>
                                 </dxlc:LayoutGroup>
                                 <dxlc:LayoutGroup dxlc:LayoutControl.AllowHorizontalSizing="True">
-                                    <dxg:GridControl Grid.Row="0" Margin="2,3,5,5" DataSource="{Binding SelectedItem.Files, ElementName=treeview}" x:Name="datagrid_templates" Grid.Column="1">
+                                    <dxg:GridControl
+                                        x:Name="datagrid_templates"
+                                        Grid.Row="0"
+                                        Grid.Column="1"
+                                        Margin="2,3,5,5"
+                                        DataSource="{Binding SelectedItem.Files, ElementName=treeview}">
                                         <dxg:GridControl.Columns>
-                                            <dxg:GridColumn FieldName="FileName" Header="" FixedWidth="True" Width="24" ReadOnly="True">
+                                            <dxg:GridColumn
+                                                Width="24"
+                                                FieldName="FileName"
+                                                FixedWidth="True"
+                                                Header=""
+                                                ReadOnly="True">
                                                 <dxg:GridColumn.CellTemplate>
                                                     <DataTemplate>
-                                                        <Button Content="r" FontFamily="Webdings" Click="TemplateDeleteButton_Click" Width="20" Height="20" VerticalAlignment="Center" Margin="1"/>
+                                                        <Button
+                                                            Width="20"
+                                                            Height="20"
+                                                            Margin="1"
+                                                            VerticalAlignment="Center"
+                                                            Click="TemplateDeleteButton_Click"
+                                                            Content="r"
+                                                            FontFamily="Webdings" />
                                                     </DataTemplate>
                                                 </dxg:GridColumn.CellTemplate>
                                             </dxg:GridColumn>
-                                            <dxg:GridColumn FieldName="Name" AllowEditing="False" Header="Dateiname" Width="*" />
-                                            <dxg:GridColumn FieldName="Beschreibung" AllowEditing="False" Header="Beschreibung" Width="*" />
-                                            <dxg:GridColumn FieldName="FileEdit" Header="" FixedWidth="True" Width="80" ReadOnly="True">
+                                            <dxg:GridColumn
+                                                Width="*"
+                                                AllowEditing="False"
+                                                FieldName="Name"
+                                                Header="Dateiname" />
+                                            <dxg:GridColumn
+                                                Width="*"
+                                                AllowEditing="False"
+                                                FieldName="Beschreibung"
+                                                Header="Beschreibung" />
+                                            <dxg:GridColumn
+                                                Width="80"
+                                                FieldName="FileEdit"
+                                                FixedWidth="True"
+                                                Header=""
+                                                ReadOnly="True">
                                                 <dxg:GridColumn.CellTemplate>
                                                     <DataTemplate>
-                                                        <Button Content="Bearbeiten" Click="EditTemplate_Click"  Width="75" Height="20" VerticalAlignment="Center" />
+                                                        <Button
+                                                            Width="75"
+                                                            Height="20"
+                                                            VerticalAlignment="Center"
+                                                            Click="EditTemplate_Click"
+                                                            Content="Bearbeiten" />
                                                     </DataTemplate>
                                                 </dxg:GridColumn.CellTemplate>
                                             </dxg:GridColumn>
-                                            <dxg:GridColumn FieldName="PrintFile" Header="" FixedWidth="True" Width="80" ReadOnly="True">
+                                            <dxg:GridColumn
+                                                Width="80"
+                                                FieldName="PrintFile"
+                                                FixedWidth="True"
+                                                Header=""
+                                                ReadOnly="True">
                                                 <dxg:GridColumn.CellTemplate>
                                                     <DataTemplate>
-                                                        <Button Content="Drucken" Click="PrintTemplate_Click"  Width="75" Height="20" VerticalAlignment="Center" />
+                                                        <Button
+                                                            Width="75"
+                                                            Height="20"
+                                                            VerticalAlignment="Center"
+                                                            Click="PrintTemplate_Click"
+                                                            Content="Drucken" />
                                                     </DataTemplate>
                                                 </dxg:GridColumn.CellTemplate>
                                             </dxg:GridColumn>
                                         </dxg:GridControl.Columns>
                                         <dxg:GridControl.View>
-                                            <dxg:TableView AutoWidth="false" ShowGroupPanel="False" ShowGroupedColumns="false" ShowTotalSummary="False" NavigationStyle="Cell" x:Name="TemplateTableView"/>
+                                            <dxg:TableView
+                                                x:Name="TemplateTableView"
+                                                AutoWidth="false"
+                                                NavigationStyle="Cell"
+                                                ShowGroupPanel="False"
+                                                ShowGroupedColumns="false"
+                                                ShowTotalSummary="False" />
                                         </dxg:GridControl.View>
                                     </dxg:GridControl>
                                 </dxlc:LayoutGroup>
@@ -418,9 +692,9 @@
                     </TabControl>
                 </Grid>
             </GroupBox>
-              
+
         </uc:ShadowChrome>
 
     </Grid>
-       
+
 </localView:BeWoView>

BeWo/View/Master/DokumenteView.xaml.cs

@@ -1282,6 +1282,7 @@ namespace BeWo.View.Master
                     Name = table.Tabellenname,
                     Table = TableID.Vorlagentabelle,
                     ObjectOid = table.VorlagentabelleOid,
+                    Node = node,
                     BeWoFolderDC = new BeWoFolderDC { Name = "RootFolder", SubFolders = new List<BeWoFolderDC>() }
                 };
                 DocumentTreeItemVM vm = new DocumentTreeItemVM(dc);
@@ -1430,6 +1431,7 @@ namespace BeWo.View.Master
                     DocumentTreeItemVM vm = new DocumentTreeItemVM(dc);
                     dc.Node.Content = vm;
                     row.DataContract.Node.Nodes.Add(dc.Node);
+                    row.DataContract.Node.IsExpanded = true;
                 }
                 else if (twi.Header.Equals("Umbenennen"))
                 {
@@ -1452,8 +1454,8 @@ namespace BeWo.View.Master
                     {
                         if(savedTemplate.IsDirty)
                         {
-                            SaveInDatabase(savedTemplate);
-
+                            var savedDC = SaveInDatabase(savedTemplate);
+                            savedTemplate = new DokumentvorlageVM(savedDC);
                             var tableitems = datagrid_templates.ItemsSource as List<DokumentvorlageVM>;
                             datagrid_templates.ItemsSource = new List<DokumentvorlageVM>();
 
@@ -1511,8 +1513,11 @@ namespace BeWo.View.Master
         private DokumentvorlageDC SaveInDatabase(DokumentvorlageVM savedTemplate)
         {
             var dc = savedTemplate.CommitToDataContract();
-            var textasbytes = Encoding.ASCII.GetBytes(dc.RTFText);
-            dc.Data = textasbytes;
+            if (!String.IsNullOrEmpty(dc.RTFText))
+            {
+                var textasbytes = Encoding.ASCII.GetBytes(dc.RTFText);
+                dc.Data = textasbytes;
+            }
             var updatedDC = ServiceFacade.DoOperationsServiceSync(s => s.InsertTemplate(dc));
 
             return updatedDC;

BeWo/View/Master/FinanceView.xaml

@@ -1,64 +1,154 @@
-<localView:BeWoView x:Class="BeWo.View.Master.FinanceView" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls" xmlns:val="clr-namespace:BeWo.Validation" xmlns:localView="clr-namespace:BeWo.View" Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True">
+<localView:BeWoView
+    x:Class="BeWo.View.Master.FinanceView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:accounting="clr-namespace:BeWo.View.Detail.Accounting"
+    xmlns:core="clr-namespace:BS.Shared.Core;assembly=BS.Shared"
+    xmlns:shared="clr-namespace:BS.Shared;assembly=BS.Shared"
+    xmlns:localView="clr-namespace:BeWo.View"
+    xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
+    xmlns:val="clr-namespace:BeWo.Validation"
+    Width="Auto"
+    Height="Auto"
+    HorizontalAlignment="Stretch"
+    VerticalAlignment="Stretch"
+    Focusable="True">
 
-	<Grid>
-		<uc:ShadowChrome>
-			<GroupBox Style="{StaticResource MainContentGroupBoxStyle}">
-				<GroupBox.Header>
-					<StackPanel Orientation="Horizontal" VerticalAlignment="Bottom" Margin="0,11,0,0">
-						<Image Source="..\..\Ressources\Icons\CoinsDisabled.png" RenderTransformOrigin="0.5,0.5" Width="32">
-							<Image.RenderTransform>
-								<TransformGroup>
-									<ScaleTransform ScaleX="1.3" ScaleY="1.3" />
-									<SkewTransform AngleX="0" AngleY="0" />
-									<RotateTransform Angle="0" />
-									<TranslateTransform X="0" Y="-2" />
-								</TransformGroup>
-							</Image.RenderTransform>
-						</Image>
-						<TextBox Text="Finanzen" Margin="10,0,0,0" Background="{x:Null}" Foreground="{DynamicResource MainGroupBoxForegroundBrush}" FontSize="22" BorderBrush="{x:Null}" VerticalAlignment="Stretch" Padding="0,0,0,0" BorderThickness="0,0,0,0" />
-					</StackPanel>
-				</GroupBox.Header>
-				<Grid Margin="0,3,0,0" Background="{StaticResource ObjectEditBackgroundBrush}">
-					<Grid.RowDefinitions>
-						<RowDefinition Height="Auto" />
-						<RowDefinition Height="*" />
-						<RowDefinition Height="Auto" />
-					</Grid.RowDefinitions>
-					<Rectangle Fill="{DynamicResource AccountingContentBrush}" Height="6" />
-					<TabControl x:Name="root" Grid.Row="1" Style="{StaticResource ObjectEditTabControl}" BorderThickness="0,0,0,0">
-						<TabItem Header="Abschlagszahlungen" IsSelected="True" Name="tabitem_financeBooking" Selector.Selected="tabitem_financeBooking_Selected" />
-            <!--<TabItem Header="Abschlagszahlungen2" Name="tabitem_financeBooking2" Selector.Selected="tabitem_financeBooking_Selected2" />-->
-						<TabItem Header="Buchungsübersicht" Name="tabitem_financeOverview" Selector.Selected="tabitem_financeOverview_Selected" />
-						<TabItem Header="Finanzauswertung" Name="tabitem_openClaims" Selector.Selected="tabitem_openClaims_Selected" />
-						<!--
+    <Grid>
+        <uc:ShadowChrome>
+            <GroupBox Style="{StaticResource MainContentGroupBoxStyle}">
+                <GroupBox.Header>
+                    <StackPanel
+                        Margin="0,11,0,0"
+                        VerticalAlignment="Bottom"
+                        Orientation="Horizontal">
+                        <Image
+                            Width="32"
+                            RenderTransformOrigin="0.5,0.5"
+                            Source="..\..\Ressources\Icons\CoinsDisabled.png">
+                            <Image.RenderTransform>
+                                <TransformGroup>
+                                    <ScaleTransform ScaleX="1.3" ScaleY="1.3" />
+                                    <SkewTransform AngleX="0" AngleY="0" />
+                                    <RotateTransform Angle="0" />
+                                    <TranslateTransform X="0" Y="-2" />
+                                </TransformGroup>
+                            </Image.RenderTransform>
+                        </Image>
+                        <TextBox
+                            Margin="10,0,0,0"
+                            Padding="0,0,0,0"
+                            VerticalAlignment="Stretch"
+                            Background="{x:Null}"
+                            BorderBrush="{x:Null}"
+                            BorderThickness="0,0,0,0"
+                            FontSize="22"
+                            Foreground="{DynamicResource MainGroupBoxForegroundBrush}"
+                            Text="Finanzen" />
+                    </StackPanel>
+                </GroupBox.Header>
+                <Grid Margin="0,3,0,0" Background="{StaticResource ObjectEditBackgroundBrush}">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <Rectangle Height="6" Fill="{DynamicResource AccountingContentBrush}" />
+                    <TabControl
+                        x:Name="root"
+                        Grid.Row="1"
+                        BorderThickness="0,0,0,0"
+                        Style="{StaticResource ObjectEditTabControl}">
+                        <TabItem
+                            Name="tabitem_financeBooking"
+                            Header="Abschlagszahlungen"
+                            IsSelected="True"
+                            Selector.Selected="tabitem_financeBooking_Selected" />
+                        <!--<TabItem Header="Abschlagszahlungen2" Name="tabitem_financeBooking2" Selector.Selected="tabitem_financeBooking_Selected2" />-->
+                        <TabItem
+                            Name="tabitem_financeOverview"
+                            Header="Buchungsübersicht"
+                            Selector.Selected="tabitem_financeOverview_Selected" />
+                        <TabItem
+                            Name="tabitem_openClaims"
+                            Header="Finanzauswertung"
+                            Selector.Selected="tabitem_openClaims_Selected" />
+                        <!--
                         <TabItem Header="Rechnungen" Name="tabitem_invoice" Selector.Selected="tabitem_invoice_Selected"/>
                         <TabItem Header="Rechnungsübersicht" Name="tabitem_invoiceOverview" Selector.Selected="tabitem_invoiceOverview_Selected"/>
                         -->
-						<TabItem Header="Spitzabrechnungen" Name="tabitem_settlementinvoice" Selector.Selected="tabitem_settlementinvoice_Selected" />
-						<TabItem Header="Rechnungen für Eigenanteil" Name="tabitem_equityinvoice" Selector.Selected="tabitem_equityinvoice_Selected" />
-                        <TabItem Header="Sammelrechnung" Name="tabitem_collectiveinvoice"
-                                Selector.Selected="tabitem_collectiveinvoice_Selected" />
-                        <TabItem Header="Allgemeine Rechnungen" Name="tabitem_otherinvoice" Selector.Selected="tabitem_otherinvoice_Selected" />
-						<TabItem Header="Rechnungsübersicht" Name="tabitem_overviewinvoice" Selector.Selected="tabitem_overviewinvoice_Selected" />
-                        <TabItem Header="GKV-Abrechnungen" Name="tabitem_gkvabrechnung" Selector.Selected="tabitem_gkvabrechnung_Selected" />
-                        <TabItem Header="Digitale Abrechnung" Name="tabitem_gkvabrechnung_alt" Selector.Selected="tabitem_gkvabrechnung_alt_Selected" />
-                        <TabItem Header="Bargeldverwaltung" Name="tabitem_bargeldverwaltung" Selector.Selected="tabitem_bargeldverwaltung_Selected"/>
-                        <TabItem Header="Dokumente" Name="tabitem_documents" Selector.Selected="tabitem_documents_Selected" />
-					</TabControl>
-					<Border Grid.Row="2" Grid.ColumnSpan="3" Height="40" Margin="0,0,0,0" VerticalAlignment="Stretch" Background="#FF000000">
-						<Border.OpacityMask>
-							<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-								<GradientStop Color="#19000000" Offset="0" />
-								<GradientStop Color="#33FFFFFF" Offset="1" />
-							</LinearGradientBrush>
-						</Border.OpacityMask>
-					</Border>
-					<StackPanel Grid.ColumnSpan="3" Grid.Row="2" Orientation="Horizontal" VerticalAlignment="Center" Height="Auto" Margin="0,5,5,0" HorizontalAlignment="Right">
-						<!--<Button x:Name="btnSave" Command="ApplicationCommands.Save" Content="Speichern" Margin="0,0,2,0" Height="25" />-->
-						<Button x:Name="btnClose" Command="ApplicationCommands.Close" Content="Schließen" Margin="0,0,0,0" Height="25" />
-					</StackPanel>
-				</Grid>
-			</GroupBox>
-		</uc:ShadowChrome>
-	</Grid>
+                        <TabItem
+                            Name="tabitem_settlementinvoice"
+                            Header="Spitzabrechnungen"
+                            Selector.Selected="tabitem_settlementinvoice_Selected" />
+                        <TabItem
+                            Name="tabitem_equityinvoice"
+                            Header="Rechnungen für Eigenanteil"
+                            Selector.Selected="tabitem_equityinvoice_Selected" />
+                        <TabItem
+                            Name="tabitem_collectiveinvoice"
+                            Header="Sammelrechnung"
+                            Selector.Selected="tabitem_collectiveinvoice_Selected" />
+                        <TabItem
+                            Name="tabitem_otherinvoice"
+                            Header="Allgemeine Rechnungen"
+                            Selector.Selected="tabitem_otherinvoice_Selected" />
+                        <TabItem
+                            Name="tabitem_overviewinvoice"
+                            Header="Rechnungsübersicht"
+                            Selector.Selected="tabitem_overviewinvoice_Selected" />
+                        <TabItem
+                            Name="tabitem_gkvabrechnung"
+                            Header="GKV-Abrechnungen">
+                            <TabItem.Visibility>
+                                <MultiBinding Converter="{StaticResource BooleanAndVisibilityMultiConverter}">
+                                    <Binding Converter="{StaticResource AppSettingsConverter}" ConverterParameter="{x:Static core:SettingsKeys.AllowGkvAbrechnung}"/>
+                                    <Binding Converter="{StaticResource UserRightType2Enabled}" ConverterParameter="{x:Static shared:UserRightType.Finance_Gkv_View}"/>
+                                </MultiBinding>
+                            </TabItem.Visibility>
+                            <accounting:GkvAbrechnungOverview />
+                        </TabItem>
+                        <TabItem
+                            Name="tabitem_bargeldverwaltung"
+                            Header="Bargeldverwaltung"
+                            Selector.Selected="tabitem_bargeldverwaltung_Selected" />
+                        <TabItem
+                            Name="tabitem_documents"
+                            Header="Dokumente"
+                            Selector.Selected="tabitem_documents_Selected" />
+                    </TabControl>
+                    <Border
+                        Grid.Row="2"
+                        Grid.ColumnSpan="3"
+                        Height="40"
+                        Margin="0,0,0,0"
+                        VerticalAlignment="Stretch"
+                        Background="#FF000000">
+                        <Border.OpacityMask>
+                            <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
+                                <GradientStop Offset="0" Color="#19000000" />
+                                <GradientStop Offset="1" Color="#33FFFFFF" />
+                            </LinearGradientBrush>
+                        </Border.OpacityMask>
+                    </Border>
+                    <StackPanel
+                        Grid.Row="2"
+                        Grid.ColumnSpan="3"
+                        Height="Auto"
+                        Margin="0,5,5,0"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Center"
+                        Orientation="Horizontal">
+                        <!--<Button x:Name="btnSave" Command="ApplicationCommands.Save" Content="Speichern" Margin="0,0,2,0" Height="25" />-->
+                        <Button
+                            x:Name="btnClose"
+                            Height="25"
+                            Margin="0,0,0,0"
+                            Command="ApplicationCommands.Close"
+                            Content="Schließen" />
+                    </StackPanel>
+                </Grid>
+            </GroupBox>
+        </uc:ShadowChrome>
+    </Grid>
 </localView:BeWoView>

BeWo/View/Master/FinanceView.xaml.cs

@@ -25,6 +25,13 @@ namespace BeWo.View.Master
             InitializeComponent();
 
             InitRights();
+
+#if DEBUG
+            if(DebugConfig.CurrentConfig is DebugConfig config && config.SelectView == UIContext.Finance)
+            {
+                root.SelectedIndex = config.SelectIndex ?? 0;
+            }
+#endif
         }
 
         public override bool IsDirty
@@ -135,25 +142,16 @@ namespace BeWo.View.Master
                 tabitem_bargeldverwaltung.Visibility = Visibility.Collapsed;
             }
 
-            if (BeWoApp.AppSettings.AllowGkvAbrechnung)
-            {
-                tabitem_gkvabrechnung.Visibility = Visibility.Visible;
-                tabitem_gkvabrechnung_alt.Visibility = Visibility.Collapsed;
-            }
-            else
-            {
-                tabitem_gkvabrechnung.Visibility = Visibility.Collapsed;
-                tabitem_gkvabrechnung_alt.Visibility = Visibility.Collapsed;
-            }
+            root.SelectedIndex = 0;
 
-            foreach (TabItem tabitem in root.Items)
-            {
-                if (tabitem.Visibility == Visibility.Visible)
-                {
-                    tabitem.IsSelected = true;
-                    break;
-                }
-            }
+            //foreach (TabItem tabitem in root.Items)
+            //{
+            //    if (tabitem.Visibility == Visibility.Visible)
+            //    {
+            //        tabitem.IsSelected = true;
+            //        break;
+            //    }
+            //}
         }
 
         private void tabitem_equityinvoice_Selected(object sender, RoutedEventArgs e)
@@ -245,22 +243,6 @@ namespace BeWo.View.Master
             }
         }
 
-        private void tabitem_gkvabrechnung_Selected(object sender, RoutedEventArgs e)
-        {
-            if (!_OpenViews.ContainsKey(tabitem_gkvabrechnung) || _SavePerformed)
-            {
-                AddView(tabitem_gkvabrechnung, new GkvAbrechnungOverview(new GkvAbrechnungListVM(null)));
-            }
-        }
-
-        private void tabitem_gkvabrechnung_alt_Selected(object sender, RoutedEventArgs e)
-        {
-            if (!_OpenViews.ContainsKey(tabitem_gkvabrechnung_alt) || _SavePerformed)
-            {
-                AddView(tabitem_gkvabrechnung_alt, new DigitalInvoiceOverview());
-            }
-        }
-
         //Dokument Selection
         private void tabitem_documents_Selected(object sender, RoutedEventArgs e)
         {

BeWo/ViewModel/GkvAbrechnungVM.cs

@@ -16,381 +16,433 @@ using DevExpress.Xpf.Core;
 
 namespace BeWo.ViewModel
 {
-    public class GkvAbrechnungVM : AbstractDCMapperVM<GkvAbrechnungDC>
-    {
-        public static string PropertyName_AbrechnungsZeitraumStart = "AbrechnungsZeitraumStart";
-        public static string PropertyName_AbrechnungsZeitraumEnde = "AbrechnungsZeitraumEnde";
-
-        public static string PropertyName_ErstelltAm = "ErstelltAm";
-
-        private long? _GkvAbrechnungOid;
-        private long? _GkvAbrechnungVersion;
-        private string _Notice;
-
-        private DateTime? _AbrechnungsZeitraumStart;
-        private DateTime? _AbrechnungsZeitraumEnde;
-
-        private DateTime _ErstelltAm;
-
-        private decimal _Betrag;
-        private bool _Bezahlt;
-
-        internal bool _IsChecked;
-
-        private List<InvoiceBaseVM> _InvoiceBases2;
-        private BindingList<InvoiceBaseVM> _InvoiceBases;
-        private OrganisationDC _Organisation;
-
-        private List<GkvTransferProtokollDC> _TransferProtokolle;
-
-        public GkvAbrechnungVM(GkvAbrechnungDC pDC) : base(pDC, !pDC.GkvAbrechnungOid.HasValue)
-        {
-            _InvoiceBases = new BindingList<InvoiceBaseVM>();
-        }
-
-        #region
-
-        public string AbrechnungsZeitraum => $"{AbrechnungsZeitraumStart.Value.ToShortDateString()} - {AbrechnungsZeitraumEnde.Value.ToShortDateString()}";
-
-        [Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
-        public DateTime? AbrechnungsZeitraumStart
-        {
-            get { return this._AbrechnungsZeitraumStart; }
-
-            set
-            {
-                if (this.AreDifferent(this._AbrechnungsZeitraumStart, value))
-                {
-                    this._AbrechnungsZeitraumStart = value;
-                    this.StoreDirtyInformation(this.AreDifferent(this.DataContract.AbrechnungsZeitraumStart, value), PropertyName_AbrechnungsZeitraumStart);
-                    this.FirePropertyChanged(PropertyName_AbrechnungsZeitraumStart);
-
-                    // RE893748923
-                    // var day = value.Value.Day;
-                    // AbrechnungsZeitraumEnde = value.Value.AddDays(1 - day).AddMonths(1).AddDays(-1);
-                }
-            }
-        }
-
-        [Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
-        public DateTime? AbrechnungsZeitraumEnde
-        {
-            get { return this._AbrechnungsZeitraumEnde; }
-
-            set
-            {
-                if (this.AreDifferent(this._AbrechnungsZeitraumEnde, value))
-                {
-                    this._AbrechnungsZeitraumEnde = value;
-                    this.StoreDirtyInformation(this.AreDifferent(this.DataContract.AbrechnungsZeitraumEnde, value), PropertyName_AbrechnungsZeitraumEnde);
-                    this.FirePropertyChanged(PropertyName_AbrechnungsZeitraumEnde);
-                }
-            }
-        }
-
-        [Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
-        public DateTime ErstelltAm
-        {
-            get { return this._ErstelltAm; }
-
-            set
-            {
-                if (this.AreDifferent(this._ErstelltAm, value))
-                {
-                    this._ErstelltAm = value;
-                    this.StoreDirtyInformation(this.AreDifferent(this.DataContract.ErstelltAm, value), nameof(ErstelltAm));
-                    this.FirePropertyChanged(nameof(ErstelltAm));
-                }
-            }
-        }
-
-        [Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
-        public long? GkvAbrechnungOid
-        {
-            get { return this._GkvAbrechnungOid; }
-
-            set
-            {
-                if (this.AreDifferent(this._GkvAbrechnungOid, value))
-                {
-                    this._GkvAbrechnungOid = value;
-                    this.StoreDirtyInformation(this.AreDifferent(this.DataContract.GkvAbrechnungOid, value), nameof(GkvAbrechnungOid));
-                    this.FirePropertyChanged(nameof(GkvAbrechnungOid));
-                }
-            }
-        }
-
-        [Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
-        public long? GkvAbrechnungVersion
-        {
-            get { return this._GkvAbrechnungOid; }
-
-            set
-            {
-                if (this.AreDifferent(this._GkvAbrechnungVersion, value))
-                {
-                    this._GkvAbrechnungVersion = value;
-                    this.StoreDirtyInformation(this.AreDifferent(this.DataContract.GkvAbrechnungVersion, value), nameof(GkvAbrechnungVersion));
-                    this.FirePropertyChanged(nameof(GkvAbrechnungVersion));
-                }
-            }
-        }
-        [Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
-        public string Notice
-        {
-            get { return this._Notice; }
-
-            set
-            {
-                if (this.AreDifferent(this._Notice, value))
-                {
-                    this._Notice = value;
-                    this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Notice, value), nameof(Notice));
-                    this.FirePropertyChanged(nameof(Notice));
-                }
-            }
-        }
-
-        [Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
-        public decimal Betrag
-        {
-            get { return this._Betrag; }
-
-            set
-            {
-                if (this.AreDifferent(this._Betrag, value))
-                {
-                    this._Betrag = value;
-                    this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Betrag, value), nameof(Betrag));
-                    this.FirePropertyChanged(nameof(Betrag));
-                }
-            }
-        }
-
-        [Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
-        public bool Bezahlt
-        {
-            get { return _Bezahlt; }
-
-            set
-            {
-                if (AreDifferent(this._Bezahlt, value))
-                {
-                    _Bezahlt = value;
-                    StoreDirtyInformation(AreDifferent(DataContract.Bezahlt, value), nameof(Bezahlt));
-                    FirePropertyChanged(nameof(Bezahlt));
-                    FirePropertyChanged(nameof(GkvState));
-                    FirePropertyChanged(nameof(Fehlermeldung));
-                }
-            }
-        }
-
-        [Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
-        public GkvState GkvState
-        {
-            get { return GetState(this); }
-        }
-
-        public bool IsChecked
-        {
-            get { return _IsChecked; }
-
-            set
-            {
-                if (AreDifferent(_IsChecked, value))
-                {
-                    _IsChecked = value;
-                    FirePropertyChanged("IsChecked");
-                }
-            }
-        }
-
-        public List<InvoiceBaseVM> InvoiceBases2
-        {
-            get { return _InvoiceBases2; }
-            set { _InvoiceBases2 = value; }
-        }
-
-        public BindingList<InvoiceBaseVM> InvoiceBases
-        {
-            get { return _InvoiceBases; }
-            set { _InvoiceBases = value; }
-        }
-
-        public List<GkvTransferProtokollDC> TransferProtokolle
-        {
-            get { return _TransferProtokolle; }
-            set
-            {
-                _TransferProtokolle = value;
-                FirePropertyChanged(nameof(TransferProtokolle));
-                FirePropertyChanged(nameof(GkvState));
-                FirePropertyChanged(nameof(Fehlermeldung));
-                FirePropertyChanged(nameof(LastTransferDateTime));
-            }
-        }
-
-        [Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
-        public OrganisationDC Organisation
-        {
-            get { return this._Organisation; }
-
-            set
-            {
-                if (this.AreDifferent(this._Organisation, value))
-                {
-                    this._Organisation = value;
-                    this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Organisation, value), nameof(Organisation));
-                    this.FirePropertyChanged(nameof(Organisation));
-                }
-            }
-        }
-        #endregion
-
-        public string RecipientString
-        {
-            get
-            {
-                if (_InvoiceBases2 != null && _InvoiceBases2.Any())
-                {
-                    return _InvoiceBases2.First().RecipientString;
-                }
-
-                return string.Empty;
-            }
-        }
-
-        public string Fehlermeldung
-        {
-            get
-            {
-                var last = TransferProtokolle?.LastOrDefault();
-
-                if (last is null || string.IsNullOrWhiteSpace(last.Fehlernachricht))
-                    return null;
-
-                if (string.IsNullOrWhiteSpace(last.Fehlertitel))
-                    return last.Fehlernachricht;
-
-                return $"{last.Fehlertitel}: {last.Fehlernachricht}";
-            }
-        }
-
-        public DateTime? LastTransferDateTime
-        {
-            get
-            {
-                var last = TransferProtokolle?.LastOrDefault();
-
-                if (last is null)
-                    return null;
-
-                return last.ErstelltAm;
-            }
-        }
-
-
-        public static GkvState GetState(GkvAbrechnungVM vm)
-        {
-            return GkvAbrechnungExtensions.GetState(
-                vm,
-                () => vm.Bezahlt,
-                () => vm.TransferProtokolle,
-                (x) => x.Fehlerdatum,
-                (x) => x.Fehlerlevel,
-                (x) => x.ErstelltAm.Value);
-        }
-
-        protected override void InitByDataContract(GkvAbrechnungDC pDataContract)
-        {
-            _AbrechnungsZeitraumStart = pDataContract.AbrechnungsZeitraumStart;
-            _AbrechnungsZeitraumEnde = pDataContract.AbrechnungsZeitraumEnde;
-
-            _ErstelltAm = pDataContract.ErstelltAm;
-
-            _GkvAbrechnungOid = pDataContract.GkvAbrechnungOid;
-            _GkvAbrechnungVersion = pDataContract.GkvAbrechnungVersion;
-
-            _Notice = pDataContract.Notice;
-
-            _Betrag = pDataContract.Betrag;
-            _Bezahlt = pDataContract.Bezahlt;
-
-            if (pDataContract.InvoiceBases != null)
-            {
-                _InvoiceBases2 = pDataContract.InvoiceBases.Select(x => new InvoiceBaseVM(x, true)).ToList();
-                _InvoiceBases = new BindingList<InvoiceBaseVM>(_InvoiceBases2);
-            }
-
-            if (pDataContract.TransferProtokolle != null)
-            {
-                _TransferProtokolle = new List<GkvTransferProtokollDC>(pDataContract.TransferProtokolle);
-            }
-
-            _Organisation = pDataContract.Organisation;
-        }
-        protected override GkvAbrechnungDC MapToDataContract(GkvAbrechnungDC pDataContract, bool doCommit)
-        {
-            pDataContract.AbrechnungsZeitraumStart = _AbrechnungsZeitraumStart;
-            pDataContract.AbrechnungsZeitraumEnde = _AbrechnungsZeitraumEnde;
-
-            pDataContract.ErstelltAm = _ErstelltAm;
-
-            pDataContract.GkvAbrechnungOid = _GkvAbrechnungOid;
-            pDataContract.GkvAbrechnungVersion = _GkvAbrechnungVersion;
-
-            pDataContract.Notice = _Notice;
-            pDataContract.Betrag = _Betrag;
-            pDataContract.Bezahlt = _Bezahlt;
-
-            if (_InvoiceBases != null && _InvoiceBases.Any())
-                pDataContract.InvoiceBases = _InvoiceBases.Where(x => x.IsChecked).Select(vm => vm.CommitToDataContract()).ToList();
-            else if (_InvoiceBases2 != null && _InvoiceBases2.Any())
-                pDataContract.InvoiceBases = _InvoiceBases2.Where(x => x.IsChecked).Select(vm => vm.CommitToDataContract()).ToList();
-
-            pDataContract.Organisation = _Organisation;
-            pDataContract.TransferProtokolle = _TransferProtokolle?.ToList();
-
-            return pDataContract;
-        }
-
-        public void SendGkvAbrechnung()
-        {
-            var req = new GkvAbrechnungSendRequestDC();
-
-            req.GkvAbrechnungOid = GkvAbrechnungOid.Value;
-
-            ServiceFacade.DoAccountingServiceAsync(s => s.SendNewGkvAbrechnung(req),
-                 cb => Application.Current.Dispatch(() => Update(cb)), true);
-        }
-
-        public void Update(GkvAbrechnungSendResponseDC cb)
-        {
-            var dc = cb.GkvAbrechnungDC;
-
-            if(dc is null)
-            {
-                MessageBox.Show(Application.Current.MainWindow, "Unerwarteter Übertragungsfehler");
-                return;
-            }
-
-            GkvAbrechnungVersion = dc.GkvAbrechnungVersion;
-            TransferProtokolle = dc.TransferProtokolle.ToList();
-
-            var protokoll = cb.TransferProtokoll;
-
-            if (protokoll.Fehlerlevel == GkvTransferFehlerlevel.Soft)
-            {
-                MessageBox.Show(Application.Current.MainWindow, protokoll.Fehlernachricht, protokoll.Fehlertitel);
-            }
-            else if (protokoll.Fehlerlevel == GkvTransferFehlerlevel.Fatal)
-            {
-                BeWoApp.ShowError(protokoll.Fehlertitel + ": " + protokoll.Fehlernachricht, null, false, false);
-            }
-            else
-            {
-                MessageBox.Show(Application.Current.MainWindow, "Ihre Sendung wurde korrekt übertragen");
-            }
-        }
-    }
+	public class GkvAbrechnungVM : AbstractDCMapperVM<GkvAbrechnungDC>
+	{
+		public static string PropertyName_AbrechnungsZeitraumStart = "AbrechnungsZeitraumStart";
+		public static string PropertyName_AbrechnungsZeitraumEnde = "AbrechnungsZeitraumEnde";
+
+		public static string PropertyName_ErstelltAm = "ErstelltAm";
+
+		private long? _GkvAbrechnungOid;
+		private long? _GkvAbrechnungVersion;
+		private string _Notice;
+
+		private DateTime? _AbrechnungsZeitraumStart;
+		private DateTime? _AbrechnungsZeitraumEnde;
+
+		private DateTime _ErstelltAm;
+
+		private decimal _Betrag;
+		private bool _Bezahlt;
+		private bool _UrbelegeGesendet;
+		private GkvVerfahrensstufe _Verfahrensstufe;
+
+		internal bool _IsChecked;
+
+		private List<InvoiceBaseVM> _InvoiceBases2;
+		private BindingList<InvoiceBaseVM> _InvoiceBases;
+		private OrganisationDC _Organisation;
+
+		private List<GkvTransferProtokollDC> _TransferProtokolle;
+
+		public GkvAbrechnungVM(GkvAbrechnungDC pDC) : base(pDC, !pDC.GkvAbrechnungOid.HasValue)
+		{
+			_InvoiceBases = new BindingList<InvoiceBaseVM>();
+		}
+
+		#region
+
+		public string AbrechnungsZeitraum => $"{AbrechnungsZeitraumStart.Value.ToShortDateString()} - {AbrechnungsZeitraumEnde.Value.ToShortDateString()}";
+
+		[Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
+		public DateTime? AbrechnungsZeitraumStart
+		{
+			get { return this._AbrechnungsZeitraumStart; }
+
+			set
+			{
+				if (this.AreDifferent(this._AbrechnungsZeitraumStart, value))
+				{
+					this._AbrechnungsZeitraumStart = value;
+					this.StoreDirtyInformation(this.AreDifferent(this.DataContract.AbrechnungsZeitraumStart, value), PropertyName_AbrechnungsZeitraumStart);
+					this.FirePropertyChanged(PropertyName_AbrechnungsZeitraumStart);
+
+					// RE893748923
+					// var day = value.Value.Day;
+					// AbrechnungsZeitraumEnde = value.Value.AddDays(1 - day).AddMonths(1).AddDays(-1);
+				}
+			}
+		}
+
+		[Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
+		public DateTime? AbrechnungsZeitraumEnde
+		{
+			get { return this._AbrechnungsZeitraumEnde; }
+
+			set
+			{
+				if (this.AreDifferent(this._AbrechnungsZeitraumEnde, value))
+				{
+					this._AbrechnungsZeitraumEnde = value;
+					this.StoreDirtyInformation(this.AreDifferent(this.DataContract.AbrechnungsZeitraumEnde, value), PropertyName_AbrechnungsZeitraumEnde);
+					this.FirePropertyChanged(PropertyName_AbrechnungsZeitraumEnde);
+				}
+			}
+		}
+
+		[Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
+		public DateTime ErstelltAm
+		{
+			get { return this._ErstelltAm; }
+
+			set
+			{
+				if (this.AreDifferent(this._ErstelltAm, value))
+				{
+					this._ErstelltAm = value;
+					this.StoreDirtyInformation(this.AreDifferent(this.DataContract.ErstelltAm, value), nameof(ErstelltAm));
+					this.FirePropertyChanged(nameof(ErstelltAm));
+				}
+			}
+		}
+
+		[Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
+		public long? GkvAbrechnungOid
+		{
+			get { return this._GkvAbrechnungOid; }
+
+			set
+			{
+				if (this.AreDifferent(this._GkvAbrechnungOid, value))
+				{
+					this._GkvAbrechnungOid = value;
+					this.StoreDirtyInformation(this.AreDifferent(this.DataContract.GkvAbrechnungOid, value), nameof(GkvAbrechnungOid));
+					this.FirePropertyChanged(nameof(GkvAbrechnungOid));
+				}
+			}
+		}
+
+		[Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
+		public long? GkvAbrechnungVersion
+		{
+			get { return this._GkvAbrechnungOid; }
+
+			set
+			{
+				if (this.AreDifferent(this._GkvAbrechnungVersion, value))
+				{
+					this._GkvAbrechnungVersion = value;
+					this.StoreDirtyInformation(this.AreDifferent(this.DataContract.GkvAbrechnungVersion, value), nameof(GkvAbrechnungVersion));
+					this.FirePropertyChanged(nameof(GkvAbrechnungVersion));
+				}
+			}
+		}
+		[Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
+		public string Notice
+		{
+			get { return this._Notice; }
+
+			set
+			{
+				if (this.AreDifferent(this._Notice, value))
+				{
+					this._Notice = value;
+					this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Notice, value), nameof(Notice));
+					this.FirePropertyChanged(nameof(Notice));
+				}
+			}
+		}
+
+		[Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
+		public decimal Betrag
+		{
+			get { return this._Betrag; }
+
+			set
+			{
+				if (this.AreDifferent(this._Betrag, value))
+				{
+					this._Betrag = value;
+					this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Betrag, value), nameof(Betrag));
+					this.FirePropertyChanged(nameof(Betrag));
+				}
+			}
+		}
+
+		[Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
+		public bool Bezahlt
+		{
+			get { return _Bezahlt; }
+
+			set
+			{
+				if (AreDifferent(this._Bezahlt, value))
+				{
+					_Bezahlt = value;
+					StoreDirtyInformation(AreDifferent(DataContract.Bezahlt, value), nameof(Bezahlt));
+					FirePropertyChanged(nameof(Bezahlt));
+					FirePropertyChanged(nameof(GkvState));
+					FirePropertyChanged(nameof(Fehlermeldung));
+				}
+			}
+		}
+
+		public bool UrbelegeGesendet
+		{
+			get { return _UrbelegeGesendet; }
+
+			set
+			{
+				if (!AreDifferent(_UrbelegeGesendet, value))
+					return;
+				_UrbelegeGesendet = value;
+				StoreDirtyInformation(AreDifferent(DataContract.UrbelegeGesendet, value), nameof(UrbelegeGesendet));
+				FirePropertyChanged(nameof(UrbelegeGesendet));
+				FirePropertyChanged(nameof(GkvState));
+			}
+		}
+
+
+		[Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
+		public GkvState GkvState
+		{
+			get { return GetState(this); }
+		}
+
+		public bool IsChecked
+		{
+			get { return _IsChecked; }
+
+			set
+			{
+				if (AreDifferent(_IsChecked, value))
+				{
+					_IsChecked = value;
+					FirePropertyChanged("IsChecked");
+				}
+			}
+		}
+
+		public List<InvoiceBaseVM> InvoiceBases2
+		{
+			get { return _InvoiceBases2; }
+			set { _InvoiceBases2 = value; }
+		}
+
+		public BindingList<InvoiceBaseVM> InvoiceBases
+		{
+			get { return _InvoiceBases; }
+			set { _InvoiceBases = value; }
+		}
+
+		public List<GkvTransferProtokollDC> TransferProtokolle
+		{
+			get { return _TransferProtokolle; }
+			set
+			{
+				_TransferProtokolle = value;
+				FirePropertyChanged(nameof(TransferProtokolle));
+				FirePropertyChanged(nameof(GkvState));
+				FirePropertyChanged(nameof(Fehlermeldung));
+				FirePropertyChanged(nameof(LastTransferDateTime));
+			}
+		}
+
+		[Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
+		public OrganisationDC Organisation
+		{
+			get { return this._Organisation; }
+
+			set
+			{
+				if (this.AreDifferent(this._Organisation, value))
+				{
+					this._Organisation = value;
+					this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Organisation, value), nameof(Organisation));
+					this.FirePropertyChanged(nameof(Organisation));
+				}
+			}
+		}
+
+		public GkvVerfahrensstufe Verfahrensstufe
+		{
+			get { return this._Verfahrensstufe; }
+
+			set
+			{
+				if (this.AreDifferent(this._Verfahrensstufe, value))
+				{
+					this._Verfahrensstufe = value;
+					this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Verfahrensstufe, value), nameof(Verfahrensstufe));
+					this.FirePropertyChanged(nameof(Verfahrensstufe));
+				}
+			}
+		}
+
+		public int VerfahrensstufeInt
+		{
+			get { return (int)Verfahrensstufe; }
+
+			set
+			{
+				if (!AreDifferent(this.VerfahrensstufeInt, value))
+					return;
+
+				Verfahrensstufe = (GkvVerfahrensstufe)value;
+				//FirePropertyChanged(nameof(VerfahrensstufeInt));
+			}
+		}
+		#endregion
+
+		public string RecipientString
+		{
+			get
+			{
+				if (_InvoiceBases2 != null && _InvoiceBases2.Any())
+				{
+					return _InvoiceBases2.First().RecipientString;
+				}
+
+				return string.Empty;
+			}
+		}
+
+		public string Fehlermeldung
+		{
+			get
+			{
+				var last = TransferProtokolle?.LastOrDefault();
+
+				if (last is null || string.IsNullOrWhiteSpace(last.Fehlernachricht))
+					return null;
+
+				if (string.IsNullOrWhiteSpace(last.Fehlertitel))
+					return last.Fehlernachricht;
+
+				return $"{last.Fehlertitel}: {last.Fehlernachricht}";
+			}
+		}
+
+		public DateTime? LastTransferDateTime
+		{
+			get
+			{
+				var last = TransferProtokolle?.LastOrDefault();
+
+				if (last is null)
+					return null;
+
+				return last.ErstelltAm;
+			}
+		}
+
+
+		public static GkvState GetState(GkvAbrechnungVM vm)
+		{
+			return GkvAbrechnungExtensions.GetState(
+				vm,
+				() => vm.Bezahlt,
+				() => vm.UrbelegeGesendet,
+				() => vm.TransferProtokolle,
+				(x) => x.Fehlerdatum,
+				(x) => x.Fehlerlevel,
+				(x) => x.ErstelltAm.Value);
+		}
+
+		protected override void InitByDataContract(GkvAbrechnungDC pDataContract)
+		{
+			_AbrechnungsZeitraumStart = pDataContract.AbrechnungsZeitraumStart;
+			_AbrechnungsZeitraumEnde = pDataContract.AbrechnungsZeitraumEnde;
+
+			_ErstelltAm = pDataContract.ErstelltAm;
+
+			_GkvAbrechnungOid = pDataContract.GkvAbrechnungOid;
+			_GkvAbrechnungVersion = pDataContract.GkvAbrechnungVersion;
+
+			_Notice = pDataContract.Notice;
+
+			_Betrag = pDataContract.Betrag;
+			_Bezahlt = pDataContract.Bezahlt;
+			_UrbelegeGesendet = pDataContract.UrbelegeGesendet;
+			_Verfahrensstufe = pDataContract.Verfahrensstufe;
+
+			if (pDataContract.InvoiceBases != null)
+			{
+				_InvoiceBases2 = pDataContract.InvoiceBases.Select(x => new InvoiceBaseVM(x, true)).ToList();
+				_InvoiceBases = new BindingList<InvoiceBaseVM>(_InvoiceBases2);
+			}
+
+			if (pDataContract.TransferProtokolle != null)
+			{
+				_TransferProtokolle = new List<GkvTransferProtokollDC>(pDataContract.TransferProtokolle);
+			}
+
+			_Organisation = pDataContract.Organisation;
+		}
+		protected override GkvAbrechnungDC MapToDataContract(GkvAbrechnungDC pDataContract, bool doCommit)
+		{
+			pDataContract.AbrechnungsZeitraumStart = _AbrechnungsZeitraumStart;
+			pDataContract.AbrechnungsZeitraumEnde = _AbrechnungsZeitraumEnde;
+
+			pDataContract.ErstelltAm = _ErstelltAm;
+
+			pDataContract.GkvAbrechnungOid = _GkvAbrechnungOid;
+			pDataContract.GkvAbrechnungVersion = _GkvAbrechnungVersion;
+
+			pDataContract.Notice = _Notice;
+			pDataContract.Betrag = _Betrag;
+			pDataContract.Bezahlt = _Bezahlt;
+			pDataContract.UrbelegeGesendet = _UrbelegeGesendet;
+			pDataContract.Verfahrensstufe = _Verfahrensstufe;
+
+			if (_InvoiceBases != null && _InvoiceBases.Any())
+				pDataContract.InvoiceBases = _InvoiceBases.Where(x => x.IsChecked).Select(vm => vm.CommitToDataContract()).ToList();
+			else if (_InvoiceBases2 != null && _InvoiceBases2.Any())
+				pDataContract.InvoiceBases = _InvoiceBases2.Where(x => x.IsChecked).Select(vm => vm.CommitToDataContract()).ToList();
+
+			pDataContract.Organisation = _Organisation;
+			pDataContract.TransferProtokolle = _TransferProtokolle?.ToList();
+
+			return pDataContract;
+		}
+
+		public void SendGkvAbrechnung()
+		{
+			var req = new GkvAbrechnungSendRequestDC();
+
+			req.GkvAbrechnungOid = GkvAbrechnungOid.Value;
+
+			ServiceFacade.DoAccountingServiceAsync(s => s.SendNewGkvAbrechnung(req),
+				 cb => Application.Current.Dispatch(() => Update(cb)), true);
+		}
+
+		public void Update(GkvAbrechnungSendResponseDC cb)
+		{
+			var dc = cb.GkvAbrechnungDC;
+
+			if (dc is null)
+			{
+				MessageBox.Show(Application.Current.MainWindow, "Unerwarteter Übertragungsfehler");
+				return;
+			}
+
+			GkvAbrechnungVersion = dc.GkvAbrechnungVersion;
+			TransferProtokolle = dc.TransferProtokolle.ToList();
+
+			var protokoll = cb.TransferProtokoll;
+
+			if (protokoll.Fehlerlevel == GkvTransferFehlerlevel.Soft)
+			{
+				MessageBox.Show(Application.Current.MainWindow, protokoll.Fehlernachricht, protokoll.Fehlertitel);
+			}
+			else if (protokoll.Fehlerlevel == GkvTransferFehlerlevel.Fatal)
+			{
+				BeWoApp.ShowError(protokoll.Fehlertitel + ": " + protokoll.Fehlernachricht, null, false, false);
+			}
+			else
+			{
+				MessageBox.Show(Application.Current.MainWindow, "Ihre Sendung wurde korrekt übertragen");
+			}
+		}
+	}
 }

BeWo/ViewModel/ListViewModel/GkvAbrechnungListVM.cs

@@ -19,6 +19,10 @@ namespace BeWo.ViewModel.ListViewModel
             this.VMList.ListChanged += (s, e) => this.FirePropertyChanged(PropertyName_FilterResultAmountSum);
             this.VMList.ListChanged += (s, e) => this.FirePropertyChanged(PropertyName_FilterResultAmountNotPaidSum);
         }
+        public GkvAbrechnungListVM() : this(null)
+        {
+
+        }
 
         public DateTimeSpan DateTimeSpanFilter
         {

BeWo/ViewModel/OrganisationVM.cs

@@ -84,13 +84,9 @@ namespace BeWo.ViewModel
         public static string PropertyName_Feiertage = "Feiertage";
 
         public static string PropertyName_IKKrankenkasse = nameof(IKKrankenkasse);
-
         public static string PropertyName_IKKostentrager = nameof(IKKostentrager);
-
         public static string PropertyName_IKDatenannahmestelle = nameof(IKDatenannahmestelle);
-
         public static string PropertyName_Leistungserbringergruppe = nameof(Leistungserbringergruppe);
-
         public static string PropertyName_BusinessPartnerId = nameof(BusinessPartnerId);
 
         private readonly List<ValueListEntryDC> _AllQualifications;
@@ -166,14 +162,12 @@ namespace BeWo.ViewModel
         private FeiertagListVM _Feiertage;
 
         private string _IKKrankenkasse; 
-
         private string _IKKostentrager; 
-
         private string _IKDatenannahmestelle;
-
+        private string _BezDatenannahmestelle;
         private string _Leistungserbringergruppe;
-
         private string _BusinessPartnerId;
+        private GkvVerfahrensstufe _Verfahrensstufe;
 
         public OrganisationVM(OrganisationDC pDataContract, List<ValueListEntryDC> pAllQualifications, List<ValueListEntryDC> pPossibleFunctions, List<ValueListEntryDC> pPossibleRoleInOrganisations)
             : base(pDataContract, pDataContract.OrganisationOid == null)
@@ -820,6 +814,21 @@ namespace BeWo.ViewModel
             }
         }
 
+        public string BezDatenannahmestelle
+        {
+            get { return this._BezDatenannahmestelle; }
+
+            set
+            {
+                if (this.AreDifferent(this._BezDatenannahmestelle, value))
+                {
+                    this._BezDatenannahmestelle = value;
+                    this.StoreDirtyInformation(this.AreDifferent(this.DataContract.BezDatenannahmestelle, value), nameof(BezDatenannahmestelle));
+                    this.FirePropertyChanged(nameof(BezDatenannahmestelle));
+                }
+            }
+        }
+
         public string Leistungserbringergruppe
         {
             get { return this._Leistungserbringergruppe; }
@@ -850,6 +859,35 @@ namespace BeWo.ViewModel
             }
         }
 
+        public GkvVerfahrensstufe Verfahrensstufe
+        {
+            get { return this._Verfahrensstufe; }
+
+            set
+            {
+                if (this.AreDifferent(this._Verfahrensstufe, value))
+                {
+                    this._Verfahrensstufe = value;
+                    this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Verfahrensstufe, value), nameof(Verfahrensstufe));
+                    this.FirePropertyChanged(nameof(Verfahrensstufe));
+                }
+            }
+        }
+
+        public int VerfahrensstufeInt
+        {
+            get { return (int)Verfahrensstufe; }
+
+            set
+            {
+                if (!AreDifferent(this.VerfahrensstufeInt, value))
+                    return;
+
+                Verfahrensstufe = (GkvVerfahrensstufe)value;
+                //FirePropertyChanged(nameof(VerfahrensstufeInt));
+            }
+        }
+
         protected void CommitContact(string pValue, ContactType pContactType)
         {
             List<ContactDC> lOldContactDCs;
@@ -914,8 +952,10 @@ namespace BeWo.ViewModel
                 this._IKKrankenkasse = pDataContract.IKKrankenkasse;
                 this._IKKostentrager = pDataContract.IKKostentrager;
                 this._IKDatenannahmestelle = pDataContract.IKDatenannahmestelle;
+                this._BezDatenannahmestelle = pDataContract.BezDatenannahmestelle;
                 _Leistungserbringergruppe = pDataContract.Leistungserbringergruppe;
                 _BusinessPartnerId = pDataContract.BusinessPartnerId;
+                _Verfahrensstufe = pDataContract.Verfahrensstufe;
 
                 _Function = pDataContract.Function;
 
@@ -1020,10 +1060,12 @@ namespace BeWo.ViewModel
 			pDataContract.ActivationType = this._IsArchived ? ActivationTypeId.Archived : ActivationTypeId.Active;
             pDataContract.Function = this._Function;
             pDataContract.IKDatenannahmestelle = this._IKDatenannahmestelle;
+            pDataContract.BezDatenannahmestelle = this._BezDatenannahmestelle;
             pDataContract.IKKostentrager = this._IKKostentrager;
             pDataContract.IKKrankenkasse = this._IKKrankenkasse;
             pDataContract.Leistungserbringergruppe = _Leistungserbringergruppe;
             pDataContract.BusinessPartnerId = _BusinessPartnerId;
+            pDataContract.Verfahrensstufe = _Verfahrensstufe;
 
             this.CommitContact(this._Phone, ContactType.business_Phone);
             this.CommitContact(this._Website, ContactType.business_Homepage);

BeWoDakota.sln

@@ -39,6 +39,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UnitTests", "UnitTests", "{
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DakotaUnitTest", "DakotaUnitTest\DakotaUnitTest.csproj", "{B1FF561D-1677-4B06-9168-E7B024084B69}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TranslationUnitTest", "TranslationUnitTest\TranslationUnitTest.csproj", "{83C43FEC-233D-49EF-BD23-BF842A3EBDF5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|.NET = Debug|.NET
@@ -185,6 +187,18 @@ Global
 		{B1FF561D-1677-4B06-9168-E7B024084B69}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B1FF561D-1677-4B06-9168-E7B024084B69}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B1FF561D-1677-4B06-9168-E7B024084B69}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{83C43FEC-233D-49EF-BD23-BF842A3EBDF5}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{83C43FEC-233D-49EF-BD23-BF842A3EBDF5}.Debug|.NET.Build.0 = Debug|Any CPU
+		{83C43FEC-233D-49EF-BD23-BF842A3EBDF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{83C43FEC-233D-49EF-BD23-BF842A3EBDF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83C43FEC-233D-49EF-BD23-BF842A3EBDF5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{83C43FEC-233D-49EF-BD23-BF842A3EBDF5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{83C43FEC-233D-49EF-BD23-BF842A3EBDF5}.Release|.NET.ActiveCfg = Release|Any CPU
+		{83C43FEC-233D-49EF-BD23-BF842A3EBDF5}.Release|.NET.Build.0 = Release|Any CPU
+		{83C43FEC-233D-49EF-BD23-BF842A3EBDF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{83C43FEC-233D-49EF-BD23-BF842A3EBDF5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{83C43FEC-233D-49EF-BD23-BF842A3EBDF5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{83C43FEC-233D-49EF-BD23-BF842A3EBDF5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -201,6 +215,7 @@ Global
 		{47331732-DD96-4075-869F-83AA9F3F9937} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
 		{A959FE9A-1647-4C02-B2EE-6A95EBF6DC9A} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
 		{B1FF561D-1677-4B06-9168-E7B024084B69} = {2AA59C1D-5537-4C49-9F9D-6E7CF827F687}
+		{83C43FEC-233D-49EF-BD23-BF842A3EBDF5} = {2AA59C1D-5537-4C49-9F9D-6E7CF827F687}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5352BE53-F2FD-442F-85A8-4157599AA153}

Dakota/DakotaValidator.cs

@@ -12,12 +12,14 @@ namespace Dakota
 {
     public static class DakotaValidator
     {
-        public static void ClearTextString(string input)
+        public static string ClearTextString(string input)
         {
             foreach (var specialChar in DakotaConfig.SpecialCollection)
             {
                 input = input.Replace(specialChar, DakotaConfig.Aufhebungszeichen + specialChar);
             }
+
+            return input.Trim();
         }
 
         /// <summary>
@@ -63,8 +65,8 @@ namespace Dakota
                 throw new DakotaException(error);
         }
 
-        public static bool ValidateIKNumbers(Organisation orga)
-            => ValidateIKNumbers(orga.IKDatenannahmestelle, orga.IKKostentrager, orga.IKKrankenkasse);
+        public static bool ValidateOrganisationInformations(Organisation orga)
+            => ValidateIKNumbers(orga.IKDatenannahmestelle, orga.IKKostentrager, orga.IKKrankenkasse) && !string.IsNullOrEmpty(orga.BezDatenannahmestelle);
         private static bool ValidateIKNumbers(params string[] iks)
             => iks?.All(ValidateIKNumber) ?? false;
 

Dakota/Logic/DakotaInfoCreator.cs

@@ -1,4 +1,5 @@
 using BeWo.Data.Entities;
+using BS.Shared;
 using BS.Shared.DataContracts;
 using Dakota.Models.Infos;
 using Dakota.Models.Schlüssels;
@@ -46,7 +47,7 @@ namespace Dakota.Logic
         //    return info;
         //}
 
-        internal InfoDateiNutzdaten GetEmptyInfoNutzdatendatei(string absender, string empfang, string logischerDateiname, int datenaustauschreferenz)
+        internal InfoDateiNutzdaten GetEmptyInfoNutzdatendatei(string absender, string empfang, int verfahrensstufe, string logischerDateiname, int datenaustauschreferenz)
         {
             var info = new InfoDateiNutzdaten();
 
@@ -57,7 +58,7 @@ namespace Dakota.Logic
             info.Datenaustauschreferenz = datenaustauschreferenz;
             info.Leistungsbereich = SchlüsselLeistungserbringerSammelgruppenschlussel.SoziotherapeutischerLeistungserbringer;
             info.Anwendungsreferenz = logischerDateiname;
-            info.Testindikator = SchlüsselTestindikator.Testdatei;
+            info.Testindikator = SchlüsselTestindikator.GetSchlüsselTestindikator((GkvVerfahrensstufe)verfahrensstufe);
 
             return info;
         }

Dakota/Logic/DakotaKTDReader.cs

@@ -44,14 +44,23 @@ namespace Dakota.Logic
         /// <returns>Item1:Datenannahmestelle -
         /// Item2:Kostenträger -
         /// Item3:Krankenkasse</returns>
-        public Tuple<string, string, string> Resolve(string ikkrankenkasse, string abrechnungscode, string tarifkennzeichen)
+        public Tuple<string, string, string, string> Resolve(string ikkrankenkasse, string abrechnungscode, string tarifkennzeichen)
         {
             foreach (var kv in FileDictionary)
             {
-                var search = GetIKNummern(kv.Value, ikkrankenkasse, abrechnungscode, tarifkennzeichen);
+                var dict = kv.Value;
+
+                var search = GetIKNummern(dict, ikkrankenkasse, abrechnungscode, tarifkennzeichen);
 
                 if (search is object)
-                    return search;
+				{
+                    var datenannahmestelle = search.Item1;
+
+                    var bez = dict[datenannahmestelle].SegmentIDK.Kurzbezeichnung;
+
+                    return new Tuple<string, string, string, string>(datenannahmestelle, search.Item2, search.Item3, bez);
+                }
+                    
             }
 
             return null;
@@ -88,7 +97,7 @@ namespace Dakota.Logic
             if (datenannahmestellen_2.Count() == 1)
                 return GetIKNummern(datenannahmestellen_2.First(), kostentrager, ikkrankenkasse);
 
-            var datenannahmestellen_3 = datenannahmestellen.Where(x => x.Tarifkennzeichen == tarifkennzeichen);
+            var datenannahmestellen_3 = datenannahmestellen_2.Where(x => x.Tarifkennzeichen == tarifkennzeichen);
 
             if (datenannahmestellen_3.Count() == 1)
                 return GetIKNummern(datenannahmestellen_3.First(), kostentrager, ikkrankenkasse);

Dakota/Logic/DakotaManager.cs

@@ -49,15 +49,18 @@ namespace Dakota.Logic
 
                 if (!success)
                 {
+                    var verfahrensstufe = organisation.Verfahrensstufe;
+
                     // Verfahrenkennung
                     // Erste Stelle:
                     //      "E" - Echtdaten
                     //      "T" - Testdaten
-
-                    var verfahrenkennung = "TSOL0";
+                    // Annahme: "E" auch für Erprobungsverfahrenstufe
+                    
+                    var verfahrenkennung = verfahrensstufe == 0 ? "TSOL0" : "ESOL0";
                     var logischer_dateiname = DakotaConfig.GetLogischerDateiname(Month).Trim();
 
-                    var info_nutz_add = DakotaInfoCreator.GetEmptyInfoNutzdatendatei(DakotaConfig.IKAbsender, organisation.IKDatenannahmestelle, logischer_dateiname, datenaustauschreferenz);
+                    var info_nutz_add = DakotaInfoCreator.GetEmptyInfoNutzdatendatei(DakotaConfig.IKAbsender, organisation.IKDatenannahmestelle, (int)verfahrensstufe, logischer_dateiname, datenaustauschreferenz);
                     var info_auf_add = DakotaInfoCreator.GetEmptyInfoAuftragsdatei(organisation.IKDatenannahmestelle, logischer_dateiname, verfahrenkennung, transfernummer);
 
                     DakotaInfoNutzDict.Add(ik_datenannahmestelle, info_nutz_add);

Dakota/Models/Daten/Datenelement.cs

@@ -97,9 +97,9 @@ namespace Dakota.Models.Daten
                 throw new DakotaException($"Das Feld \"{Title}\" hat bei der Erstellung {_Value.Length} Stellen ergeben! Nach Vorgabe darf es jedoch maximal {MaxStellen} Stellen haben");
             }
 
-            DakotaValidator.ClearTextString(value);
+            var mod_value = DakotaValidator.ClearTextString(value);
 
-            _Value = value;
+            _Value = mod_value;
         }
     }
 }

Dakota/Models/Schlüssels/SchlüsselTestindikator.cs

@@ -1,4 +1,5 @@
-using System;
+using BS.Shared;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -6,12 +7,24 @@ using System.Threading.Tasks;
 
 namespace Dakota.Models.Schlüssels
 {
-    public class SchlüsselTestindikator : Schlüssel
-    {
-        public SchlüsselTestindikator(string val) : base(val) { }
+	public class SchlüsselTestindikator : Schlüssel
+	{
+		public SchlüsselTestindikator(string val) : base(val) { }
 
-        public static SchlüsselTestindikator Testdatei => new SchlüsselTestindikator("0");
-        public static SchlüsselTestindikator Erprobungsdatei => new SchlüsselTestindikator("1");
-        public static SchlüsselTestindikator Echtdatei => new SchlüsselTestindikator("2");
-    }
+		public static SchlüsselTestindikator Testdatei => new SchlüsselTestindikator("0");
+		public static SchlüsselTestindikator Erprobungsdatei => new SchlüsselTestindikator("1");
+		public static SchlüsselTestindikator Echtdatei => new SchlüsselTestindikator("2");
+
+		public static SchlüsselTestindikator GetSchlüsselTestindikator(GkvVerfahrensstufe verfahrensstufe)
+		{
+			switch (verfahrensstufe)
+			{
+				case GkvVerfahrensstufe.Test: return Testdatei;
+				case GkvVerfahrensstufe.Erprobung: return Erprobungsdatei;
+				case GkvVerfahrensstufe.Echt: return Echtdatei;
+			}
+
+			throw new ArgumentOutOfRangeException(nameof(verfahrensstufe));
+		}
+	}
 }

DakotaSender/Program.cs

@@ -59,7 +59,8 @@ namespace DakotaSender
             PrintLine("-------------------");
         }
 
-        static void PrintLine(string line = null)
+        static void PrintLine() => PrintLine(null);
+        static void PrintLine(string line)
         {
             PrintWithTime(line + "\n", !time_in_line);
 
@@ -78,6 +79,13 @@ namespace DakotaSender
             else
                 Console.Write(line);
         }
+        static void PrintFileInfo(DakotaSystemFile file)
+        {
+            PrintLine($"Verarbeite Datei: {file.SourceNutzdatendatei.Name}");
+            PrintLine($"- Tenant: {file.Tenant}");
+            PrintLine($"- Protokoll Oid: {file.ProtokollOid}");
+            PrintLine($"- Datenannahmestelle: {file.Datenannahmestelle}");
+        }
 
         static void CheckDakotaStatus()
         {
@@ -176,64 +184,65 @@ namespace DakotaSender
 
             return toCheck.Any() ? toCheck : null;
         }
+
         static void TryProcessFile(DakotaSystemFile file)
         {
+            string error;
             bool copied = false;
             try
             {
-                var protokoll_oid = file.ProtokollOid;
-
-                PrintLine($"Verarbeite Datei: {file.SourceNutzdatendatei.Name}");
-                PrintLine($"- Tenant: {file.Tenant}");
-                PrintLine($"- Protokoll Oid: {protokoll_oid}");
-                PrintLine($"- Datenannahmestelle: {file.Datenannahmestelle}");
-
-                copied = true;
-                CopyFileToDestination(file);
-
-                Print("Sende via Dakota. ");
-
-                var code = ExecuteDakota("-x");
-
-                if (AcceptSendCodes.Contains(code))
-                {
-                    PrintLine($"Ok.");
-
-                    DeleteQueueFile(file);
-                }
-                else
-                {
-                    if(code == RC_DAKOTA_ALREADY_LOADED)
-                    {
-                        PrintLine($"Verarbeitung fehlgeschlagen. Dakota läuft bereits.");
-
-                        PrintLine("Ignoriere Verarbeitung aktuell. Versuche im nächsten Programm Aufruf erneut.");
-
-                        DeleteDakotaFile(file);
-                    }
-                    else
-                    {
-                        var error = $"Verarbeitung fehlgeschlagen. Statuscode {code} wird nicht akzeptiert.";
-
-                        PrintLine(error);
-
-                        MoveQueueToFailed(file);
-
-                        DeleteDakotaFile(file);
-
-                        CreateResultXmlFile(file, error);
-                    }
-                }
+                error = ProcessFile(file, out copied);
             }
             catch (Exception e)
             {
-                PrintLine($"Verarbeitung fehlgeschlagen. Exception: {e}");
+                error = e.ToString();
+            }
+
+            if (error is string)
+            {
+                PrintLine(error);
+                MoveQueueToFailed(file);
 
                 if (copied)
                     DeleteDakotaFile(file);
+
+                CreateResultXmlFile(file, error);
             }
         }
+        static string ProcessFile(DakotaSystemFile file, out bool copied)
+        {
+            copied = false;
 
+            PrintFileInfo(file);
+
+            if (!IsDakotaFolderDatenannahmestelleValid(file.Datenannahmestelle))
+                return "Datenannahmestelle unbekannt.";
+
+            CopyFileToDestination(file);
+            copied = true;
+
+            Print("Sende via Dakota. ");
+
+            var code = ExecuteDakota("-x");
+
+            if (code == RC_DAKOTA_ALREADY_LOADED)
+            {
+                PrintLine($"Verarbeitung fehlgeschlagen. Dakota läuft bereits.");
+
+                PrintLine("Ignoriere Verarbeitung aktuell. Versuche im nächsten Programm Aufruf erneut.");
+
+                DeleteDakotaFile(file);
+
+                return null;
+            }
+
+            if (!AcceptSendCodes.Contains(code))
+                return $"Verarbeitung fehlgeschlagen. Statuscode {code} wird nicht akzeptiert.";
+
+            PrintLine($"Ok.");
+            DeleteQueueFile(file);
+            return null;
+        }
         static void CreateResultXmlFile(DakotaSystemFile file, string error)
         {
             Print("Speichere Fehler als Xml. ");
@@ -338,6 +347,19 @@ namespace DakotaSender
             }
         }
 
+        static bool IsDakotaFolderDatenannahmestelleValid(string datenannahmestelle)
+        {
+            try
+            {
+                _ = GetDakotaFolderDatenannahmestelle(datenannahmestelle);
+
+                return true;
+            }
+            catch (Exception e)
+            {
+                return false;
+            }
+        }
         static DirectoryInfo GetDakotaFolderDatenannahmestelle(string datenannahmestelle)
         {
             var folder = new DirectoryInfo(Path.Combine(GetDakotaFolder().FullName, "TP5Daten", datenannahmestelle));
@@ -359,7 +381,7 @@ namespace DakotaSender
 
             return dirinfo;
         }
-        
+
         static string GetLogPath()
             => ConfigurationManager.AppSettings.Get("LogPath") ?? @"C:\GkvAbrechnung\Sender\log.txt";
         static int GetProcessWaitForExitMs()

Data/Entities/GkvAbrechnung.cs

@@ -19,6 +19,8 @@ namespace BeWo.Data.Entities
         public virtual DateTime? AbrechnungsZeitraumEnde { get; set; }
         public virtual decimal Betrag { get; set; }
         public virtual bool Bezahlt { get; set; }
+        public virtual bool UrbelegeGesendet { get; set; }
+        public virtual GkvVerfahrensstufe Verfahrensstufe { get; set; }
 
         public virtual IList<InvoiceBase> InvoiceBases { get; set; }
         public virtual IList<GkvTransferProtokoll> GkvTransferProtokolle { get; set; }
@@ -27,6 +29,7 @@ namespace BeWo.Data.Entities
             GkvAbrechnungExtensions.GetState(
                 entity, 
                 () => entity.Bezahlt, 
+                () => entity.UrbelegeGesendet, 
                 () => entity.GkvTransferProtokolle,
                 (x) => x.Fehlerdatum,
                 (x) => x.Fehlerlevel,

Data/Entities/Organisation.cs

@@ -66,6 +66,8 @@ namespace BeWo.Data.Entities
 
         private string _IKDatenannahmestelle;
 
+        private string _BezDatenannahmestelle;
+
         private string _Leistungserbringergruppe;
 
         private string _BusinessPartnerId;
@@ -320,6 +322,22 @@ namespace BeWo.Data.Entities
             }
         }
 
+        public virtual string BezDatenannahmestelle
+        {
+            get
+            {
+                return this._BezDatenannahmestelle;
+            }
+
+            set
+            {
+                if (this.AreDifferent(this._BezDatenannahmestelle, value))
+                {
+                    this._BezDatenannahmestelle = value;
+                }
+            }
+        }
+
         public virtual string Leistungserbringergruppe
         {
             get
@@ -351,5 +369,7 @@ namespace BeWo.Data.Entities
                 }
             }
         }
+
+        public virtual GkvVerfahrensstufe Verfahrensstufe { get; set; }
     }
 }

Data/Mappings/GkvAbrechnung.hbm.xml

@@ -20,8 +20,10 @@
 
 		<property column="Betrag" type="decimal" name="Betrag" />
 		<property column="Bezahlt" type="bool" name="Bezahlt" />
+		<property column="UrbelegeGesendet" type="bool" name="UrbelegeGesendet" />
 
 		<property column="ErstelltAm" type="DateTime" name="ErstelltAm" />
+    <property column="Verfahrensstufe" type="BS.Shared.GkvVerfahrensstufe, BS.Shared" name="Verfahrensstufe"/>
 
 		<bag name="InvoiceBases" table="gkvabrechnung2invoicebase" generic="true" cascade="none" batch-size="250">
 			<key column="gkvabrechnungoid" />

Data/Mappings/Organisation.hbm.xml

@@ -19,7 +19,9 @@
 		<property column="IKKrankenkasse" type="String" name="IKKrankenkasse" length="256" />
 		<property column="IKKostentrager" type="String" name="IKKostentrager" length="256" />
 		<property column="IKDatenannahmestelle" type="String" name="IKDatenannahmestelle" length="256" />
+		<property column="BezDatenannahmestelle" type="String" name="BezDatenannahmestelle" length="256" />
 		<property column="Leistungserbringergruppe" type="String" name="Leistungserbringergruppe" length="256" />
+    <property column="Verfahrensstufe" type="BS.Shared.GkvVerfahrensstufe, BS.Shared" name="Verfahrensstufe"/>
 		<property column="BusinessPartnerId" type="String" name="BusinessPartnerId" length="256" />
 
 		<many-to-one name="Address" column="AddressOid" class="BeWo.Data.Entities.Address, BeWo.Data" cascade="all" fetch="join"/>

Data/Security/UserRightHelper.cs

@@ -169,6 +169,10 @@ namespace BeWo.Data.Security
                 UserRightType.Customer_GemeinnutzigeArbeit_Manage,
                 UserRightType.Customer_Wohnhilfe_View,
                 UserRightType.Customer_Wohnhilfe_Manage,
+                UserRightType.Finance_Gkv_View,
+                UserRightType.Finance_Gkv_Create,
+                UserRightType.Finance_Gkv_Send,
+                UserRightType.Finance_Gkv_Delete
             };
 
             if (rights_3_22.Contains(r))

Host/GkvAbrechnungView.aspx.cs

@@ -269,6 +269,7 @@ namespace Host
                 response.IKDatenannahmestelle = resolved.Item1;
                 response.IKKostentrager = resolved.Item2;
                 response.IKKrankenkasse = resolved.Item3;
+                response.BezDatenannahmestelle = resolved.Item4;
             }
 
             SendResponse(response);

Model/Changes_2024_09_30 GkvAbrechnung UrbelegeGesendet.txt

@@ -0,0 +1,2 @@
+ALTER TABLE `gkvabrechnung` 
+ADD COLUMN `UrbelegeGesendet` TINYINT NULL DEFAULT NULL AFTER `Bezahlt`;

Model/Changes_2024_10_09 GkvAbrechnung Verfahrensstufe.txt

@@ -0,0 +1,5 @@
+ALTER TABLE `organisation` 
+ADD COLUMN `Verfahrensstufe` INT NULL DEFAULT 0 AFTER `BusinessPartnerId`;
+
+ALTER TABLE `gkvabrechnung` 
+ADD COLUMN `Verfahrensstufe` INT NULL DEFAULT 0 AFTER `ErstelltAm`;

Model/Changes_2024_10_15 Organisation BezDatenannahmestelle.txt

@@ -0,0 +1,2 @@
+ALTER TABLE `organisation` 
+ADD COLUMN `BezDatenannahmestelle` VARCHAR(4096) NULL DEFAULT NULL AFTER `IKDatenannahmestelle`;

Model/Changes_alle_fuer_neue_db.txt

@@ -1075,7 +1075,6 @@ ALTER TABLE `servicerecordhistory`
 ADD INDEX `cb2scIdx` (`CostBearer2SupportConceptOid` ASC);
 
 
-
 ALTER TABLE `vorlagentabelle` 
 ADD COLUMN `ImageName` VARCHAR(128) NULL AFTER `Tabellenname`;
 

Report/DefaultReports/SettlementReport2.Designer.cs

@@ -256,8 +256,8 @@ namespace BeWo.Report.DefaultReports
             this.xrLabel3.SizeF = new System.Drawing.SizeF(650F, 16F);
             this.xrLabel3.StylePriority.UseBackColor = false;
             this.xrLabel3.StylePriority.UseFont = false;
-            this.xrLabel3.Text = "Abrechnung Betreuungsleistungen für [Salutation2] [CustomerFirstName], geb. [Cust" +
-    "omerBirthday!dd.MM.yyyy]";
+            this.xrLabel3.Text = "Abrechnung Betreuungsleistungen für [Salutation2] [CustomerFirstName] [CustomerLa" +
+    "stName], geb. [CustomerBirthday!dd.MM.yyyy]";
             this.xrLabel3.WordWrap = false;
             // 
             // xrLabel2

Report/ReportObjects/AdditionalServiceBookingRO.cs

@@ -249,6 +249,18 @@ namespace BeWo.Report.ReportObjects
                                         {
                                             SetInfo(dt, row, "U");
                                         }
+                                        else if (name.Contains("unentschuldigt"))
+                                        {
+                                            SetInfo(dt, row, "UE");
+                                        }
+                                        else if (name.Contains("entschuldigt"))
+                                        {
+                                            SetInfo(dt, row, "E");
+                                        }
+                                        else if (name.Contains("corona"))
+                                        {
+                                            SetInfo(dt, row, "C");
+                                        }
                                         else //(name.Contains("krank"))
                                         {
                                             SetInfo(dt, row, "K");

ReportImp/AWOMuensterlandRecklinghausen/Export/DiamantExporter.cs

@@ -296,22 +296,24 @@ ORDER BY ib.invoicenumber
                     DataRow row = table.NewRow();
                     DataRow invoice = dtRg.Rows[i];
                     row[0] = invoice[1];
-                    var start = DateTime.ParseExact(invoice[2].ToString(), "ddMMyyyy", CultureInfo.InvariantCulture, DateTimeStyles.AssumeLocal);
-                    var end = DateTime.ParseExact(invoice[3].ToString(), "ddMMyyyy", CultureInfo.InvariantCulture, DateTimeStyles.AssumeLocal);
-                    row[1] = string.Format("{0:dd.MM.yyyy} - {1:dd.MM.yyyy}", start, end);
-                    row[2] = invoice[14];
+                    //var start = DateTime.ParseExact(invoice[2].ToString(), "ddMMyyyy", CultureInfo.InvariantCulture, DateTimeStyles.AssumeLocal);
+                    //var end = DateTime.ParseExact(invoice[3].ToString(), "ddMMyyyy", CultureInfo.InvariantCulture, DateTimeStyles.AssumeLocal);
+                    //row[1] = string.Format("{0:dd.MM.yyyy} - {1:dd.MM.yyyy}", start, end);
+                    row[1] = invoice[14];
                     var datum = DateTime.ParseExact(invoice[11].ToString(), "ddMMyyyy", CultureInfo.InvariantCulture, DateTimeStyles.AssumeLocal);
-                    row[3] = string.Format("{0:dd.MM.yyyy}", datum);
-                    row[4] = invoice[4];
-                    row[5] = string.Format("{0:0.00}", invoice[19]);
+                    row[2] = string.Format("{0:dd.MM.yyyy}", datum);
+                    row[3] = invoice[4];
+                    row[4] = string.Format("{0:0.00}", invoice[26]);
+                    row[5] = string.Format("{0:0.00}", invoice[32]);
+                    row[6] = string.Format("{0:0.00}", invoice[19]);
                     table.Rows.Add(row);
                 }
                 var queryReportObject = QueryRO.Create(new Query() { Title = "Export" }, table);
-                queryReportObject.Name = String.Format("Rechnungsausgangbuch {0:MMMM yyyy}", dt);
+                queryReportObject.Name = String.Format("AWO Schulbegleitung - Rechnungsausgangbuch {0:MMMM yyyy} vom {1:dd.MM.yyyy}", dt, DateTime.Now);
                 queryReport.SetReportDataSource(queryReportObject);
                 queryReport.CreateDocument();
 
-                pdf.FileName = String.Format("RA-Buch {0:MM.yyyy}.pdf", dt);
+                pdf.FileName = String.Format("{0:MM-yyyy} RA-Buch {1:yyyyMMdd}.pdf", dt, DateTime.Now);
                 using (var ms = new MemoryStream())
                 {
                     queryReport.ExportToPdf(ms);

ReportImp/AWOMuensterlandRecklinghausen/Export/QueryListReport.Designer.cs

@@ -36,39 +36,31 @@ namespace AWOMuensterlandRecklinghausen.Export
             this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable();
             this.xrTableRowDetail = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
             this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
             this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
             this.xrTableHeader = new DevExpress.XtraReports.UI.XRTable();
             this.xrTableRowHeader = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
             this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
             this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
             this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
             this.lblSumme = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
             this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
             this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
             this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo();
-            this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo();
             this.Title = new DevExpress.XtraReports.UI.XRControlStyle();
             this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle();
             this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle();
@@ -76,6 +68,14 @@ namespace AWOMuensterlandRecklinghausen.Export
             this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField();
             this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
             this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+            this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
@@ -108,7 +108,7 @@ namespace AWOMuensterlandRecklinghausen.Export
             this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
             this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.xrTableRowDetail});
-            this.xrTableDetail.SizeF = new System.Drawing.SizeF(1019F, 25F);
+            this.xrTableDetail.SizeF = new System.Drawing.SizeF(865.0297F, 25F);
             this.xrTableDetail.StylePriority.UseBorders = false;
             this.xrTableDetail.StylePriority.UsePadding = false;
             // 
@@ -116,12 +116,12 @@ namespace AWOMuensterlandRecklinghausen.Export
             // 
             this.xrTableRowDetail.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
             this.xrTableCell3,
-            this.xrTableCell13,
             this.xrTableCell12,
             this.xrTableCell10,
             this.xrTableCell9,
-            this.xrTableCell8,
-            this.xrTableCell19});
+            this.xrTableCell21,
+            this.xrTableCell20,
+            this.xrTableCell8});
             this.xrTableRowDetail.Name = "xrTableRowDetail";
             this.xrTableRowDetail.Weight = 1D;
             // 
@@ -133,34 +133,24 @@ namespace AWOMuensterlandRecklinghausen.Export
             this.xrTableCell3.Name = "xrTableCell3";
             this.xrTableCell3.StylePriority.UseFont = false;
             this.xrTableCell3.Text = "xrTableCell3";
-            this.xrTableCell3.Weight = 1.3329015595509226D;
-            // 
-            // xrTableCell13
-            // 
-            this.xrTableCell13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field2")});
-            this.xrTableCell13.Multiline = true;
-            this.xrTableCell13.Name = "xrTableCell13";
-            this.xrTableCell13.StylePriority.UseFont = false;
-            this.xrTableCell13.Text = "xrTableCell13";
-            this.xrTableCell13.Weight = 1.3721222381235081D;
+            this.xrTableCell3.Weight = 1.6290227101462493D;
             // 
             // xrTableCell12
             // 
             this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field3")});
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field2")});
             this.xrTableCell12.Multiline = true;
             this.xrTableCell12.Name = "xrTableCell12";
             this.xrTableCell12.StylePriority.UseFont = false;
             this.xrTableCell12.StylePriority.UseTextAlignment = false;
             this.xrTableCell12.Text = "xrTableCell12";
             this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-            this.xrTableCell12.Weight = 0.78112926757578538D;
+            this.xrTableCell12.Weight = 0.48500811698045854D;
             // 
             // xrTableCell10
             // 
             this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field4")});
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field3")});
             this.xrTableCell10.Multiline = true;
             this.xrTableCell10.Name = "xrTableCell10";
             this.xrTableCell10.StylePriority.UseFont = false;
@@ -172,7 +162,7 @@ namespace AWOMuensterlandRecklinghausen.Export
             // xrTableCell9
             // 
             this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field5")});
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field4")});
             this.xrTableCell9.Multiline = true;
             this.xrTableCell9.Name = "xrTableCell9";
             this.xrTableCell9.StylePriority.UseFont = false;
@@ -184,7 +174,7 @@ namespace AWOMuensterlandRecklinghausen.Export
             // xrTableCell8
             // 
             this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field6")});
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field7")});
             this.xrTableCell8.Multiline = true;
             this.xrTableCell8.Name = "xrTableCell8";
             this.xrTableCell8.StylePriority.UseFont = false;
@@ -192,16 +182,7 @@ namespace AWOMuensterlandRecklinghausen.Export
             this.xrTableCell8.Text = "xrTableCell8";
             this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
             this.xrTableCell8.TextFormatString = "{0} €";
-            this.xrTableCell8.Weight = 0.78320651456435919D;
-            // 
-            // xrTableCell19
-            // 
-            this.xrTableCell19.Multiline = true;
-            this.xrTableCell19.Name = "xrTableCell19";
-            this.xrTableCell19.StylePriority.UseFont = false;
-            this.xrTableCell19.StylePriority.UseTextAlignment = false;
-            this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-            this.xrTableCell19.Weight = 1.3430122126172495D;
+            this.xrTableCell8.Weight = 0.93949322461274654D;
             // 
             // DetailReport
             // 
@@ -233,7 +214,7 @@ namespace AWOMuensterlandRecklinghausen.Export
             this.xrTableHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
             this.xrTableHeader.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.xrTableRowHeader});
-            this.xrTableHeader.SizeF = new System.Drawing.SizeF(1019F, 25F);
+            this.xrTableHeader.SizeF = new System.Drawing.SizeF(865.0297F, 25F);
             this.xrTableHeader.StylePriority.UseBorders = false;
             this.xrTableHeader.StylePriority.UseFont = false;
             this.xrTableHeader.StylePriority.UsePadding = false;
@@ -242,12 +223,12 @@ namespace AWOMuensterlandRecklinghausen.Export
             // 
             this.xrTableRowHeader.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
             this.xrTableCell5,
-            this.xrTableCell1,
             this.xrTableCell4,
             this.xrTableCell6,
             this.xrTableCell2,
-            this.xrTableCell7,
-            this.xrTableCell18});
+            this.xrTableCell19,
+            this.xrTableCell18,
+            this.xrTableCell7});
             this.xrTableRowHeader.Name = "xrTableRowHeader";
             this.xrTableRowHeader.Weight = 1D;
             // 
@@ -255,23 +236,16 @@ namespace AWOMuensterlandRecklinghausen.Export
             // 
             this.xrTableCell5.Name = "xrTableCell5";
             this.xrTableCell5.Text = "Klient/in";
-            this.xrTableCell5.Weight = 1.1424870514351642D;
-            // 
-            // xrTableCell1
-            // 
-            this.xrTableCell1.Multiline = true;
-            this.xrTableCell1.Name = "xrTableCell1";
-            this.xrTableCell1.Text = "Zeitraum";
-            this.xrTableCell1.Weight = 1.1761047716888708D;
+            this.xrTableCell5.Weight = 1.3963049234331344D;
             // 
             // xrTableCell4
             // 
             this.xrTableCell4.Multiline = true;
             this.xrTableCell4.Name = "xrTableCell4";
             this.xrTableCell4.StylePriority.UseTextAlignment = false;
-            this.xrTableCell4.Text = "Re-Nummer";
+            this.xrTableCell4.Text = "Re-Nr.";
             this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-            this.xrTableCell4.Weight = 0.66953937851411771D;
+            this.xrTableCell4.Weight = 0.41572150651614753D;
             // 
             // xrTableCell6
             // 
@@ -294,16 +268,9 @@ namespace AWOMuensterlandRecklinghausen.Export
             this.xrTableCell7.Multiline = true;
             this.xrTableCell7.Name = "xrTableCell7";
             this.xrTableCell7.StylePriority.UseTextAlignment = false;
-            this.xrTableCell7.Text = "Betrag";
+            this.xrTableCell7.Text = "Gesamtbetrag";
             this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-            this.xrTableCell7.Weight = 0.67131984255264876D;
-            // 
-            // xrTableCell18
-            // 
-            this.xrTableCell18.Multiline = true;
-            this.xrTableCell18.Name = "xrTableCell18";
-            this.xrTableCell18.Text = "Notiz";
-            this.xrTableCell18.Weight = 1.1511536262018458D;
+            this.xrTableCell7.Weight = 0.80527988032453557D;
             // 
             // ReportFooter
             // 
@@ -322,7 +289,7 @@ namespace AWOMuensterlandRecklinghausen.Export
             this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
             this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.xrTableRow1});
-            this.xrTable1.SizeF = new System.Drawing.SizeF(1019F, 25F);
+            this.xrTable1.SizeF = new System.Drawing.SizeF(865.0297F, 25F);
             this.xrTable1.StylePriority.UseBorders = false;
             this.xrTable1.StylePriority.UseFont = false;
             this.xrTable1.StylePriority.UsePadding = false;
@@ -331,12 +298,12 @@ namespace AWOMuensterlandRecklinghausen.Export
             // 
             this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
             this.xrTableCell11,
-            this.xrTableCell14,
             this.xrTableCell15,
             this.xrTableCell16,
             this.xrTableCell17,
-            this.lblSumme,
-            this.xrTableCell20});
+            this.xrTableCell23,
+            this.xrTableCell22,
+            this.lblSumme});
             this.xrTableRow1.Name = "xrTableRow1";
             this.xrTableRow1.Weight = 1D;
             // 
@@ -345,21 +312,14 @@ namespace AWOMuensterlandRecklinghausen.Export
             this.xrTableCell11.Multiline = true;
             this.xrTableCell11.Name = "xrTableCell11";
             this.xrTableCell11.StylePriority.UseFont = false;
-            this.xrTableCell11.Weight = 1.3329015009775924D;
-            // 
-            // xrTableCell14
-            // 
-            this.xrTableCell14.Multiline = true;
-            this.xrTableCell14.Name = "xrTableCell14";
-            this.xrTableCell14.StylePriority.UseFont = false;
-            this.xrTableCell14.Weight = 1.3721221795501779D;
+            this.xrTableCell11.Weight = 1.6290223315586974D;
             // 
             // xrTableCell15
             // 
             this.xrTableCell15.Multiline = true;
             this.xrTableCell15.Name = "xrTableCell15";
             this.xrTableCell15.StylePriority.UseFont = false;
-            this.xrTableCell15.Weight = 0.78112938472244531D;
+            this.xrTableCell15.Weight = 0.48500855414134042D;
             // 
             // xrTableCell16
             // 
@@ -383,20 +343,7 @@ namespace AWOMuensterlandRecklinghausen.Export
             this.lblSumme.StylePriority.UseTextAlignment = false;
             this.lblSumme.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
             this.lblSumme.TextFormatString = "{0} €";
-            this.lblSumme.Weight = 0.78320651456435919D;
-            // 
-            // xrTableCell20
-            // 
-            this.xrTableCell20.Multiline = true;
-            this.xrTableCell20.Name = "xrTableCell20";
-            this.xrTableCell20.StylePriority.UseFont = false;
-            this.xrTableCell20.StylePriority.UseTextAlignment = false;
-            this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-            this.xrTableCell20.Weight = 1.3430122126172495D;
-            // 
-            // bindingSource1
-            // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.QueryRO);
+            this.lblSumme.Weight = 0.93949273273102207D;
             // 
             // ReportHeader
             // 
@@ -421,15 +368,15 @@ namespace AWOMuensterlandRecklinghausen.Export
             // pageFooterBand1
             // 
             this.pageFooterBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
-            this.xrPageInfo2,
-            this.xrPageInfo1});
+            this.xrLabel2,
+            this.xrPageInfo2});
             this.pageFooterBand1.HeightF = 48F;
             this.pageFooterBand1.Name = "pageFooterBand1";
             // 
             // xrPageInfo2
             // 
             this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
-            this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(924.0834F, 25F);
+            this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(771.1131F, 25F);
             this.xrPageInfo2.Name = "xrPageInfo2";
             this.xrPageInfo2.SizeF = new System.Drawing.SizeF(93.91663F, 23F);
             this.xrPageInfo2.StyleName = "PageInfo";
@@ -437,16 +384,6 @@ namespace AWOMuensterlandRecklinghausen.Export
             this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
             this.xrPageInfo2.TextFormatString = "Seite {0} von {1}";
             // 
-            // xrPageInfo1
-            // 
-            this.xrPageInfo1.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
-            this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F);
-            this.xrPageInfo1.Name = "xrPageInfo1";
-            this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime;
-            this.xrPageInfo1.SizeF = new System.Drawing.SizeF(924.0834F, 23F);
-            this.xrPageInfo1.StyleName = "PageInfo";
-            this.xrPageInfo1.StylePriority.UseFont = false;
-            // 
             // Title
             // 
             this.Title.BackColor = System.Drawing.Color.White;
@@ -501,9 +438,82 @@ namespace AWOMuensterlandRecklinghausen.Export
             // 
             // bottomMarginBand1
             // 
-            this.bottomMarginBand1.HeightF = 50F;
+            this.bottomMarginBand1.HeightF = 51.37501F;
             this.bottomMarginBand1.Name = "bottomMarginBand1";
             // 
+            // xrTableCell18
+            // 
+            this.xrTableCell18.Multiline = true;
+            this.xrTableCell18.Name = "xrTableCell18";
+            this.xrTableCell18.StylePriority.UseTextAlignment = false;
+            this.xrTableCell18.Text = "Teilbetrag";
+            this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            this.xrTableCell18.Weight = 0.67131984255264876D;
+            // 
+            // xrTableCell19
+            // 
+            this.xrTableCell19.Multiline = true;
+            this.xrTableCell19.Name = "xrTableCell19";
+            this.xrTableCell19.StylePriority.UseTextAlignment = false;
+            this.xrTableCell19.Text = "Kostenstelle";
+            this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            this.xrTableCell19.Weight = 0.67131984255264876D;
+            // 
+            // xrTableCell20
+            // 
+            this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field6")});
+            this.xrTableCell20.Multiline = true;
+            this.xrTableCell20.Name = "xrTableCell20";
+            this.xrTableCell20.StylePriority.UseFont = false;
+            this.xrTableCell20.StylePriority.UseTextAlignment = false;
+            this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            this.xrTableCell20.Weight = 0.78320651456435919D;
+            // 
+            // xrTableCell21
+            // 
+            this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field5")});
+            this.xrTableCell21.Multiline = true;
+            this.xrTableCell21.Name = "xrTableCell21";
+            this.xrTableCell21.StylePriority.UseFont = false;
+            this.xrTableCell21.StylePriority.UseTextAlignment = false;
+            this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            this.xrTableCell21.Weight = 0.78320651456435919D;
+            // 
+            // xrTableCell22
+            // 
+            this.xrTableCell22.Multiline = true;
+            this.xrTableCell22.Name = "xrTableCell22";
+            this.xrTableCell22.StylePriority.UseFont = false;
+            this.xrTableCell22.StylePriority.UseTextAlignment = false;
+            this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            this.xrTableCell22.Weight = 0.78320651456435919D;
+            // 
+            // xrTableCell23
+            // 
+            this.xrTableCell23.Multiline = true;
+            this.xrTableCell23.Name = "xrTableCell23";
+            this.xrTableCell23.StylePriority.UseFont = false;
+            this.xrTableCell23.StylePriority.UseTextAlignment = false;
+            this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            this.xrTableCell23.Weight = 0.78320651456435919D;
+            // 
+            // xrLabel2
+            // 
+            this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F);
+            this.xrLabel2.Multiline = true;
+            this.xrLabel2.Name = "xrLabel2";
+            this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel2.SizeF = new System.Drawing.SizeF(199.872F, 23F);
+            this.xrLabel2.StylePriority.UseFont = false;
+            this.xrLabel2.Text = "Erstellt im BeWoPlaner";
+            // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.QueryRO);
+            // 
             // Bericht
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -517,7 +527,7 @@ namespace AWOMuensterlandRecklinghausen.Export
             this.fieldFLS});
             this.DataSource = this.bindingSource1;
             this.Landscape = true;
-            this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 50F, 50F);
+            this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 50F, 51.37501F);
             this.PageHeight = 827;
             this.PageWidth = 1169;
             this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
@@ -547,7 +557,6 @@ namespace AWOMuensterlandRecklinghausen.Export
         private DevExpress.XtraReports.UI.XRLabel xrLabel1;
         private DevExpress.XtraReports.UI.PageFooterBand pageFooterBand1;
         private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo2;
-        private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo1;
         private DevExpress.XtraReports.UI.XRControlStyle Title;
         private DevExpress.XtraReports.UI.XRControlStyle FieldCaption;
         private DevExpress.XtraReports.UI.XRControlStyle PageInfo;
@@ -562,11 +571,9 @@ namespace AWOMuensterlandRecklinghausen.Export
         private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
         private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
         private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
@@ -576,13 +583,16 @@ namespace AWOMuensterlandRecklinghausen.Export
         private DevExpress.XtraReports.UI.XRTable xrTable1;
         private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
         private DevExpress.XtraReports.UI.XRTableCell lblSumme;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell18;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell23;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel2;
     }
 }

ReportImp/AkggMid/LeistungsnachweisHelper.cs

@@ -676,7 +676,7 @@ where scap2e.EmployeeOid = {0} and scap.Start <= '{1:yyyy-MM-dd}' and scap.EndDa
                                     }
                                     
 
-                                    if (at.AbsenceReason.Description.Contains("<24h_SA"))
+                                    if (at.AbsenceReason.Description.Contains("<24h_SA") || at.AbsenceReason.Description.Contains("unter 24"))
                                     {
                                         info.AbwesenheitsNotiz = "Abwesenheit gem. § 8 Ziff. 3 LV";
                                     }

ReportImp/AkggMid/Mitarbeiterarbeitszeitkonto.designer.cs

@@ -86,6 +86,7 @@ namespace AkggMid
             this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell64 = new DevExpress.XtraReports.UI.XRTableCell();
             this.cellSumHoursInVacationDecimal = new DevExpress.XtraReports.UI.XRTableCell();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             this.Title = new DevExpress.XtraReports.UI.XRControlStyle();
             this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle();
             this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle();
@@ -103,7 +104,6 @@ namespace AkggMid
             this.fieldSumHoliday2 = new DevExpress.XtraReports.UI.CalculatedField();
             this.fieldIstArbeitszeit = new DevExpress.XtraReports.UI.CalculatedField();
             this.fieldUeberstundenGesamt = new DevExpress.XtraReports.UI.CalculatedField();
-            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
@@ -120,7 +120,8 @@ namespace AkggMid
             // 
             // Detail1
             // 
-            this.Detail1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Detail1.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.Detail1.HeightF = 0F;
             this.Detail1.Name = "Detail1";
             this.Detail1.StylePriority.UseFont = false;
@@ -151,7 +152,7 @@ namespace AkggMid
             // 
             this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
             this.xrTableDetail});
-            this.Detail2.Font = new System.Drawing.Font("Arial", 8F);
+            this.Detail2.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
             this.Detail2.HeightF = 22F;
             this.Detail2.Name = "Detail2";
             this.Detail2.StylePriority.UseFont = false;
@@ -160,7 +161,8 @@ namespace AkggMid
             // 
             this.xrTableDetail.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableDetail.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableDetail.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.xrTableDetail.LocationFloat = new DevExpress.Utils.PointFloat(9.536743E-05F, 0F);
             this.xrTableDetail.Name = "xrTableDetail";
             this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -246,7 +248,7 @@ namespace AkggMid
             // 
             this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
             this.xrTable3});
-            this.GroupHeader2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+            this.GroupHeader2.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
             this.GroupHeader2.HeightF = 51.87499F;
             this.GroupHeader2.Name = "GroupHeader2";
             this.GroupHeader2.StylePriority.UseFont = false;
@@ -347,7 +349,7 @@ namespace AkggMid
             this.xrLabel2,
             this.xrLabel1,
             this.lblMonat});
-            this.GroupHeader3.Font = new System.Drawing.Font("Arial", 10F);
+            this.GroupHeader3.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
             this.GroupHeader3.HeightF = 135.625F;
             this.GroupHeader3.Level = 1;
             this.GroupHeader3.Name = "GroupHeader3";
@@ -358,7 +360,7 @@ namespace AkggMid
             // 
             this.xrLabel6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FullName")});
-            this.xrLabel6.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
             this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(228.0374F, 47.91667F);
             this.xrLabel6.Multiline = true;
             this.xrLabel6.Name = "xrLabel6";
@@ -370,7 +372,7 @@ namespace AkggMid
             // 
             this.lblRegelarbeitszeit.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Regelarbeitszeit")});
-            this.lblRegelarbeitszeit.Font = new System.Drawing.Font("Arial", 10F);
+            this.lblRegelarbeitszeit.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
             this.lblRegelarbeitszeit.LocationFloat = new DevExpress.Utils.PointFloat(228.0374F, 67.70834F);
             this.lblRegelarbeitszeit.Multiline = true;
             this.lblRegelarbeitszeit.Name = "lblRegelarbeitszeit";
@@ -382,7 +384,7 @@ namespace AkggMid
             // 
             this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenSollMax", "{0:0.00}")});
-            this.xrLabel8.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
             this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(228.0374F, 87.5F);
             this.xrLabel8.Multiline = true;
             this.xrLabel8.Name = "xrLabel8";
@@ -394,7 +396,7 @@ namespace AkggMid
             // 
             this.xrLabel9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.ArbeitstageImBerichtszeitraum")});
-            this.xrLabel9.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
             this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(228.0374F, 107.2917F);
             this.xrLabel9.Multiline = true;
             this.xrLabel9.Name = "xrLabel9";
@@ -404,7 +406,7 @@ namespace AkggMid
             // 
             // xrLabel5
             // 
-            this.xrLabel5.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
             this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 107.2917F);
             this.xrLabel5.Multiline = true;
             this.xrLabel5.Name = "xrLabel5";
@@ -415,7 +417,7 @@ namespace AkggMid
             // 
             // xrLabel4
             // 
-            this.xrLabel4.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
             this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 87.5F);
             this.xrLabel4.Multiline = true;
             this.xrLabel4.Name = "xrLabel4";
@@ -426,7 +428,7 @@ namespace AkggMid
             // 
             // xrLabel3
             // 
-            this.xrLabel3.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
             this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 67.70834F);
             this.xrLabel3.Multiline = true;
             this.xrLabel3.Name = "xrLabel3";
@@ -437,7 +439,7 @@ namespace AkggMid
             // 
             // xrLabel2
             // 
-            this.xrLabel2.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
             this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 47.91667F);
             this.xrLabel2.Multiline = true;
             this.xrLabel2.Name = "xrLabel2";
@@ -450,7 +452,7 @@ namespace AkggMid
             // 
             this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReportStartDate", "{0:MMM yyyy}")});
-            this.xrLabel1.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
+            this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(489.5621F, 0F);
             this.xrLabel1.Multiline = true;
             this.xrLabel1.Name = "xrLabel1";
@@ -462,7 +464,7 @@ namespace AkggMid
             // 
             // lblMonat
             // 
-            this.lblMonat.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold);
+            this.lblMonat.Font = new DevExpress.Drawing.DXFont("Arial", 14F, DevExpress.Drawing.DXFontStyle.Bold);
             this.lblMonat.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
             this.lblMonat.Multiline = true;
             this.lblMonat.Name = "lblMonat";
@@ -476,7 +478,7 @@ namespace AkggMid
             this.GroupFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
             this.xrTable5,
             this.xrTable4});
-            this.GroupFooter2.Font = new System.Drawing.Font("Arial", 10F);
+            this.GroupFooter2.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
             this.GroupFooter2.HeightF = 132.5F;
             this.GroupFooter2.KeepTogether = true;
             this.GroupFooter2.Name = "GroupFooter2";
@@ -647,7 +649,7 @@ namespace AkggMid
             this.xrTableCell32,
             this.xrTableCell35,
             this.xrTableCell39});
-            this.xrTableRow11.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+            this.xrTableRow11.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrTableRow11.Name = "xrTableRow11";
             this.xrTableRow11.StylePriority.UseFont = false;
             this.xrTableRow11.Weight = 1.6D;
@@ -655,7 +657,7 @@ namespace AkggMid
             // xrTableCell37
             // 
             this.xrTableCell37.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell37.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrTableCell37.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
             this.xrTableCell37.Multiline = true;
             this.xrTableCell37.Name = "xrTableCell37";
             this.xrTableCell37.StylePriority.UseBorders = false;
@@ -670,7 +672,7 @@ namespace AkggMid
             this.xrTableCell8.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
             this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Ueberstunden", "{0:0.00}")});
-            this.xrTableCell8.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrTableCell8.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
             this.xrTableCell8.Name = "xrTableCell8";
             this.xrTableCell8.StylePriority.UseBorders = false;
             this.xrTableCell8.StylePriority.UseFont = false;
@@ -682,7 +684,7 @@ namespace AkggMid
             // xrTableCell32
             // 
             this.xrTableCell32.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
-            this.xrTableCell32.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrTableCell32.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
             this.xrTableCell32.Name = "xrTableCell32";
             this.xrTableCell32.Padding = new DevExpress.XtraPrinting.PaddingInfo(20, 2, 0, 0, 100F);
             this.xrTableCell32.StylePriority.UseBorders = false;
@@ -696,7 +698,7 @@ namespace AkggMid
             // xrTableCell35
             // 
             this.xrTableCell35.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
-            this.xrTableCell35.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrTableCell35.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
             this.xrTableCell35.Name = "xrTableCell35";
             this.xrTableCell35.Padding = new DevExpress.XtraPrinting.PaddingInfo(20, 2, 0, 0, 100F);
             this.xrTableCell35.StylePriority.UseBorders = false;
@@ -711,7 +713,7 @@ namespace AkggMid
             this.xrTableCell39.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell39.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenGesamt", "{0:0.00}")});
-            this.xrTableCell39.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrTableCell39.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
             this.xrTableCell39.Name = "xrTableCell39";
             this.xrTableCell39.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrTableCell39.StylePriority.UseBorders = false;
@@ -748,7 +750,8 @@ namespace AkggMid
             // xrTableCell40
             // 
             this.xrTableCell40.Borders = DevExpress.XtraPrinting.BorderSide.Right;
-            this.xrTableCell40.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell40.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.xrTableCell40.Name = "xrTableCell40";
             this.xrTableCell40.StylePriority.UseBorders = false;
             this.xrTableCell40.StylePriority.UseFont = false;
@@ -760,7 +763,8 @@ namespace AkggMid
             // 
             this.xrTableCell64.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell64.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell64.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.xrTableCell64.Name = "xrTableCell64";
             this.xrTableCell64.StylePriority.UseBorders = false;
             this.xrTableCell64.StylePriority.UseFont = false;
@@ -783,13 +787,17 @@ namespace AkggMid
             this.cellSumHoursInVacationDecimal.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
             this.cellSumHoursInVacationDecimal.Weight = 0.085029315396800059D;
             // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);
+            // 
             // Title
             // 
             this.Title.BackColor = System.Drawing.Color.White;
             this.Title.BorderColor = System.Drawing.SystemColors.ControlText;
             this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None;
             this.Title.BorderWidth = 1F;
-            this.Title.Font = new System.Drawing.Font("Times New Roman", 24F);
+            this.Title.Font = new DevExpress.Drawing.DXFont("Times New Roman", 24F);
             this.Title.ForeColor = System.Drawing.Color.Black;
             this.Title.Name = "Title";
             // 
@@ -799,7 +807,7 @@ namespace AkggMid
             this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText;
             this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None;
             this.FieldCaption.BorderWidth = 1F;
-            this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold);
+            this.FieldCaption.Font = new DevExpress.Drawing.DXFont("Times New Roman", 10F, DevExpress.Drawing.DXFontStyle.Bold);
             this.FieldCaption.ForeColor = System.Drawing.Color.Black;
             this.FieldCaption.Name = "FieldCaption";
             // 
@@ -809,7 +817,7 @@ namespace AkggMid
             this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText;
             this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None;
             this.PageInfo.BorderWidth = 1F;
-            this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F);
+            this.PageInfo.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F);
             this.PageInfo.ForeColor = System.Drawing.Color.Black;
             this.PageInfo.Name = "PageInfo";
             // 
@@ -819,7 +827,7 @@ namespace AkggMid
             this.DataField.BorderColor = System.Drawing.SystemColors.ControlText;
             this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None;
             this.DataField.BorderWidth = 1F;
-            this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F);
+            this.DataField.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F);
             this.DataField.ForeColor = System.Drawing.SystemColors.ControlText;
             this.DataField.Name = "DataField";
             // 
@@ -912,10 +920,6 @@ namespace AkggMid
             this.fieldUeberstundenGesamt.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
             this.fieldUeberstundenGesamt.Name = "fieldUeberstundenGesamt";
             // 
-            // bindingSource1
-            // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);
-            // 
             // Mitarbeiterarbeitszeitkonto
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -937,8 +941,8 @@ namespace AkggMid
             this.fieldUeberstundenGesamt});
             this.DataSource = this.bindingSource1;
             this.DisplayName = "Mitarbeiterstundenkonto";
-            this.Font = new System.Drawing.Font("Arial", 8F);
-            this.Margins = new System.Drawing.Printing.Margins(75, 50, 50, 50);
+            this.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
+            this.Margins = new DevExpress.Drawing.DXMargins(75F, 50F, 50F, 50F);
             this.PageHeight = 1169;
             this.PageWidth = 827;
             this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
@@ -947,7 +951,7 @@ namespace AkggMid
             this.FieldCaption,
             this.PageInfo,
             this.DataField});
-            this.Version = "17.1";
+            this.Version = "23.2";
             ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();

ReportImp/AkggMid/Mitarbeiterarbeitszeitkonto.resx

@@ -117,7 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
 </root>

ReportImp/AsbRheinErftDueren/AsbRheinErftDueren.csproj

@@ -65,6 +65,12 @@
     <Compile Include="Finanzauswertung.designer.cs">
       <DependentUpon>Finanzauswertung.cs</DependentUpon>
     </Compile>
+    <Compile Include="Mitarbeiterarbeitszeitkonto.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Mitarbeiterarbeitszeitkonto.designer.cs">
+      <DependentUpon>Mitarbeiterarbeitszeitkonto.cs</DependentUpon>
+    </Compile>
     <Compile Include="Mitarbeiterstundenkonto.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -96,6 +102,9 @@
       <DependentUpon>Finanzauswertung.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Mitarbeiterarbeitszeitkonto.resx">
+      <DependentUpon>Mitarbeiterarbeitszeitkonto.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Mitarbeiterstundenkonto.resx">
       <DependentUpon>Mitarbeiterstundenkonto.cs</DependentUpon>
       <SubType>Designer</SubType>

ReportImp/AsbRheinErftDueren/CustomMitarbeiterstundenkontoBerechnung.cs

@@ -30,28 +30,28 @@ namespace AsbRheinErftDueren
 			return list;
 		}
 
-		protected override void StarteBerechnung(DateTime berichtsAnfang, DateTime berichtsEnde, MitarbeiterstundenkontoRO.EmployeeDetail empDetail)
-		{
+        //protected override void StarteBerechnung(DateTime berichtsAnfang, DateTime berichtsEnde, MitarbeiterstundenkontoRO.EmployeeDetail empDetail)
+        //{
 
-			BerechneFerienTage = true;
-			//Ansatz falls tatsächlich pro Schule/Organisation eigene Brückentage angelegt werden müssten...
-			//foreach (var e2c in empDetail.Employee.Employee2CustomerList)
-			//{
-			//	foreach (var sc in e2c.Customer.SupportConcepts)
-			//	{
-			//		foreach (var c2s in sc.CostBearer2SupportConceptList)
-			//		{
-			//			foreach (var item in c2s.CostBearer.Organisation.Feiertage)
-			//			{
+        //    BerechneFerienTage = true;
+        //    //Ansatz falls tatsächlich pro Schule/Organisation eigene Brückentage angelegt werden müssten...
+        //    //foreach (var e2c in empDetail.Employee.Employee2CustomerList)
+        //    //{
+        //    //	foreach (var sc in e2c.Customer.SupportConcepts)
+        //    //	{
+        //    //		foreach (var c2s in sc.CostBearer2SupportConceptList)
+        //    //		{
+        //    //			foreach (var item in c2s.CostBearer.Organisation.Feiertage)
+        //    //			{
 
-			//			}
-			//		}
-			//	}
+        //    //			}
+        //    //		}
+        //    //	}
 
 
-		}
+        //}
 
-		public override decimal GetFeiertagsFaktor(DateTime start)
+        public override decimal GetFeiertagsFaktor(DateTime start)
 		{
 			if (BerechneFerienTage)
 			{
@@ -107,17 +107,17 @@ namespace AsbRheinErftDueren
 			}
 		}
 
-		public override bool IstAnrechenbareAbsenceTime(AbsenceTime item)
-		{
-			return IsKrankheitAbsenceTime(item);
-		}
+        public override bool IstAnrechenbareAbsenceTime(AbsenceTime item)
+        {
+            return IsKrankheitAbsenceTime(item);
+        }
 
-		protected override bool StundenDurchAbwesenheitenDuerfenNegativSein()
-		{
-			return true;
-		}
+        protected override bool StundenDurchAbwesenheitenDuerfenNegativSein()
+        {
+            return true;
+        }
 
-		public override bool AddServiceRecordToDuration(ServiceRecord item)
+        public override bool AddServiceRecordToDuration(ServiceRecord item)
 		{
 
 			if (item.CostBearer2SupportConcept != null && item.CostBearer2SupportConcept.CostBearer.Organisation.Name != "Jugendamt Brühl")

ReportImp/AsbRheinErftDueren/Mitarbeiterarbeitszeitkonto.cs

@@ -0,0 +1,63 @@
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using BeWo.Report;
+using BeWo.Report.ReportObjects;
+using BeWo.Service.Plugins;
+using BS.Shared.Core;
+using DevExpress.XtraReports.UI;
+
+namespace AsbRheinErftDueren
+{
+	[IDSpecificClass(Identifier = "Mitarbeiterarbeitszeitkonto")]
+	public partial class Mitarbeiterarbeitszeitkonto : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<MitarbeiterstundenkontoRO>
+	{
+        
+        public Mitarbeiterarbeitszeitkonto()
+		{
+			InitializeComponent();
+		}
+
+		public void SetReportDataSource(MitarbeiterstundenkontoRO pRO)
+		{
+		    var msb = PluginLoader.FindClass<MitarbeiterstundenkontoBerechnung>();
+		    msb.CreateReport(pRO);
+
+		    foreach (var ed in pRO.EmployeeDetailList)
+		    {
+		        var c = ed.Employee.GetValidContractForDate(pRO.ReportStartDate);
+		        if (c != null)
+		        {
+		            if (c.MonthlyTotalHours.HasValue)
+		            {
+		                ed.Regelarbeitszeit = String.Format("{0:0.00} Stunden im Monat", c.MonthlyTotalHours);
+		            }
+		            else if (c.WeeklyTotalHours.HasValue)
+		            {
+		                ed.Regelarbeitszeit = String.Format("{0:0.00} Stunden pro Woche", c.WeeklyTotalHours);
+                    }
+                }
+
+				ed.UrlaubUndKrankheit = 0;
+				if (ed.Days != null)
+				{
+					foreach (var day in ed.Days)
+					{
+						if (day.HoursOtherAbsenceTimes > 0)
+						{
+							//CB: In der Standard Berechnungsklasse wurden die anderen Abwesenheiten auch auf die MinutesTotal addiert, daher hier wieder abziehen
+							//Ich traue mich nicht, das in der Berechnungsklasse zu ändern, weil es dann bestimmt wieder zu Fehlern in angepassten Konten führt.
+							day.MinutesTotal -= day.HoursOtherAbsenceTimes * 60;
+						}
+
+						ed.UrlaubUndKrankheit += (day.HoursSick + day.HoursInVacation + day.HoursOtherAbsenceTimes);
+					}
+				}
+		        
+		    }
+		    this.bindingSource1.DataSource = pRO;
+        }
+        
+    }
+}

ReportImp/AsbRheinErftDueren/Mitarbeiterarbeitszeitkonto.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

ReportImp/AsbRheinErftDueren/Properties/licenses.licx

@@ -0,0 +1 @@
+DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

ReportImp/AssistenzaReports/AssistenzaReports.csproj

@@ -71,12 +71,14 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <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.Data.Desktop.v23.2, 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.Xpo.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.XtraPrinting.v23.2, Version=23.2.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.XtraCharts.v23.2.Wizard, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />

ReportImp/AssistenzaReports/FLSGroupReport.Designer.cs

@@ -85,6 +85,18 @@ namespace BeWo.AssistenzaReports
             this.fieldGroupFLS = new DevExpress.XtraReports.UI.CalculatedField();
             this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
             this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+            this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel();
+            this.TextStunden = new DevExpress.XtraReports.UI.FormattingRule();
+            this.xrLabel23 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel24 = new DevExpress.XtraReports.UI.XRLabel();
+            this.TextFLS = new DevExpress.XtraReports.UI.FormattingRule();
             this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
@@ -135,6 +147,14 @@ namespace BeWo.AssistenzaReports
             // Detail1
             // 
             this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel20,
+            this.xrLabel21,
+            this.xrLabel22,
+            this.xrLabel19,
+            this.xrLabel15,
+            this.xrLabel16,
+            this.xrLabel17,
+            this.xrLabel18,
             this.xrLabel13,
             this.xrLabel12,
             this.xrLabel11,
@@ -142,7 +162,7 @@ namespace BeWo.AssistenzaReports
             this.xrTable1});
             this.Detail1.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
             new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
-            this.Detail1.HeightF = 92F;
+            this.Detail1.HeightF = 129.5F;
             this.Detail1.Name = "Detail1";
             this.Detail1.StylePriority.UseFont = false;
             // 
@@ -153,7 +173,7 @@ namespace BeWo.AssistenzaReports
             this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
             this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(160F, 57.99999F);
             this.xrLabel13.Name = "xrLabel13";
-            this.xrLabel13.SizeF = new System.Drawing.SizeF(50F, 25F);
+            this.xrLabel13.SizeF = new System.Drawing.SizeF(50F, 19.79F);
             this.xrLabel13.StylePriority.UseFont = false;
             this.xrLabel13.StylePriority.UsePadding = false;
             this.xrLabel13.StylePriority.UseTextAlignment = false;
@@ -165,7 +185,7 @@ namespace BeWo.AssistenzaReports
             this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
             this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 58F);
             this.xrLabel12.Name = "xrLabel12";
-            this.xrLabel12.SizeF = new System.Drawing.SizeF(110F, 25F);
+            this.xrLabel12.SizeF = new System.Drawing.SizeF(110F, 19.79F);
             this.xrLabel12.StylePriority.UseFont = false;
             this.xrLabel12.StylePriority.UsePadding = false;
             this.xrLabel12.Text = "Minuten gesamt:";
@@ -173,14 +193,15 @@ namespace BeWo.AssistenzaReports
             // xrLabel11
             // 
             this.xrLabel11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.fieldGroupFLS", "{0:0.00} FLS")});
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.fieldGroupFLS")});
             this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
             this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(280F, 57.99999F);
             this.xrLabel11.Name = "xrLabel11";
             this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel11.SizeF = new System.Drawing.SizeF(203F, 25F);
+            this.xrLabel11.SizeF = new System.Drawing.SizeF(203F, 19.79F);
             this.xrLabel11.StylePriority.UseFont = false;
             this.xrLabel11.Text = "xrLabel11";
+            this.xrLabel11.TextFormatString = "{0:0.00} Stunden";
             // 
             // xrLabel10
             // 
@@ -188,7 +209,7 @@ namespace BeWo.AssistenzaReports
             this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(210F, 57.99999F);
             this.xrLabel10.Name = "xrLabel10";
             this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel10.SizeF = new System.Drawing.SizeF(70F, 25F);
+            this.xrLabel10.SizeF = new System.Drawing.SizeF(70F, 19.79F);
             this.xrLabel10.StylePriority.UseFont = false;
             this.xrLabel10.StylePriority.UseTextAlignment = false;
             this.xrLabel10.Text = "entspricht";
@@ -218,6 +239,8 @@ namespace BeWo.AssistenzaReports
             // Detail2
             // 
             this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel24,
+            this.xrLabel23,
             this.xrLabel14,
             this.lblAufteilungLeistungen,
             this.xrLabel8,
@@ -225,7 +248,7 @@ namespace BeWo.AssistenzaReports
             this.xrLabel6,
             this.xrLabel7,
             this.xrTable3});
-            this.Detail2.HeightF = 101.6666F;
+            this.Detail2.HeightF = 101.3333F;
             this.Detail2.KeepTogether = true;
             this.Detail2.KeepTogetherWithDetailReports = true;
             this.Detail2.Name = "Detail2";
@@ -258,15 +281,15 @@ namespace BeWo.AssistenzaReports
             // 
             // xrLabel8
             // 
-            this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.FLSReportDetails.fieldFLS", "{0:0.00} FLS")});
             this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel8.FormattingRules.Add(this.TextStunden);
             this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(280F, 50F);
             this.xrLabel8.Name = "xrLabel8";
             this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel8.SizeF = new System.Drawing.SizeF(203F, 25F);
+            this.xrLabel8.SizeF = new System.Drawing.SizeF(40F, 25F);
             this.xrLabel8.StylePriority.UseFont = false;
-            this.xrLabel8.Text = "xrLabel8";
+            this.xrLabel8.Text = "[fieldFLS!0.00]";
+            this.xrLabel8.TextFormatString = "{0:#.00}";
             // 
             // xrLabel9
             // 
@@ -650,6 +673,142 @@ namespace BeWo.AssistenzaReports
             this.bottomMarginBand1.HeightF = 50F;
             this.bottomMarginBand1.Name = "bottomMarginBand1";
             // 
+            // xrLabel15
+            // 
+            this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(210F, 77.78998F);
+            this.xrLabel15.Name = "xrLabel15";
+            this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel15.SizeF = new System.Drawing.SizeF(70F, 19.79166F);
+            this.xrLabel15.StylePriority.UseFont = false;
+            this.xrLabel15.StylePriority.UseTextAlignment = false;
+            this.xrLabel15.Text = "entspricht";
+            this.xrLabel15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            // 
+            // xrLabel16
+            // 
+            this.xrLabel16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.CustomValue2")});
+            this.xrLabel16.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(280F, 77.78998F);
+            this.xrLabel16.Name = "xrLabel16";
+            this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel16.SizeF = new System.Drawing.SizeF(203F, 19.79166F);
+            this.xrLabel16.StylePriority.UseFont = false;
+            this.xrLabel16.Text = "xrLabel11";
+            this.xrLabel16.TextFormatString = "{0:0} FLS";
+            // 
+            // xrLabel17
+            // 
+            this.xrLabel17.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 77.79001F);
+            this.xrLabel17.Name = "xrLabel17";
+            this.xrLabel17.SizeF = new System.Drawing.SizeF(140.8333F, 19.79166F);
+            this.xrLabel17.StylePriority.UseFont = false;
+            this.xrLabel17.StylePriority.UsePadding = false;
+            this.xrLabel17.Text = "davon abrechenbar:";
+            // 
+            // xrLabel18
+            // 
+            this.xrLabel18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.CustomValue1", "{0:0.##}")});
+            this.xrLabel18.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(160F, 77.78998F);
+            this.xrLabel18.Name = "xrLabel18";
+            this.xrLabel18.SizeF = new System.Drawing.SizeF(50F, 19.79166F);
+            this.xrLabel18.StylePriority.UseFont = false;
+            this.xrLabel18.StylePriority.UsePadding = false;
+            this.xrLabel18.StylePriority.UseTextAlignment = false;
+            this.xrLabel18.Text = "xrLabel13";
+            this.xrLabel18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            // 
+            // xrLabel19
+            // 
+            this.xrLabel19.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(0F, 97.58167F);
+            this.xrLabel19.Name = "xrLabel19";
+            this.xrLabel19.SizeF = new System.Drawing.SizeF(140.8333F, 19.79166F);
+            this.xrLabel19.StylePriority.UseFont = false;
+            this.xrLabel19.StylePriority.UsePadding = false;
+            this.xrLabel19.Text = "davon indirekt:";
+            // 
+            // xrLabel20
+            // 
+            this.xrLabel20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.CustomValue3", "{0:0.##}")});
+            this.xrLabel20.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(160F, 97.58164F);
+            this.xrLabel20.Name = "xrLabel20";
+            this.xrLabel20.SizeF = new System.Drawing.SizeF(50F, 19.79166F);
+            this.xrLabel20.StylePriority.UseFont = false;
+            this.xrLabel20.StylePriority.UsePadding = false;
+            this.xrLabel20.StylePriority.UseTextAlignment = false;
+            this.xrLabel20.Text = "xrLabel13";
+            this.xrLabel20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            // 
+            // xrLabel21
+            // 
+            this.xrLabel21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.CustomValue4")});
+            this.xrLabel21.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(280F, 97.58164F);
+            this.xrLabel21.Name = "xrLabel21";
+            this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel21.SizeF = new System.Drawing.SizeF(203F, 19.79166F);
+            this.xrLabel21.StylePriority.UseFont = false;
+            this.xrLabel21.Text = "xrLabel11";
+            this.xrLabel21.TextFormatString = "{0:0} Stunden";
+            // 
+            // xrLabel22
+            // 
+            this.xrLabel22.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(210F, 97.58164F);
+            this.xrLabel22.Name = "xrLabel22";
+            this.xrLabel22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel22.SizeF = new System.Drawing.SizeF(70F, 19.79166F);
+            this.xrLabel22.StylePriority.UseFont = false;
+            this.xrLabel22.StylePriority.UseTextAlignment = false;
+            this.xrLabel22.Text = "entspricht";
+            this.xrLabel22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            // 
+            // TextStunden
+            // 
+            this.TextStunden.Condition = "[Name] == \'Indirekte Leistungen\'";
+            this.TextStunden.DataMember = "FLSReportGroups.FLSReportDetails";
+            this.TextStunden.Formatting.Visible = DevExpress.Utils.DefaultBoolean.True;
+            this.TextStunden.Name = "TextStunden";
+            // 
+            // xrLabel23
+            // 
+            this.xrLabel23.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel23.FormattingRules.Add(this.TextStunden);
+            this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(320F, 50F);
+            this.xrLabel23.Name = "xrLabel23";
+            this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel23.SizeF = new System.Drawing.SizeF(107.75F, 25F);
+            this.xrLabel23.StylePriority.UseFont = false;
+            this.xrLabel23.Text = "Stunden";
+            this.xrLabel23.Visible = false;
+            // 
+            // xrLabel24
+            // 
+            this.xrLabel24.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel24.FormattingRules.Add(this.TextFLS);
+            this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(320F, 50F);
+            this.xrLabel24.Name = "xrLabel24";
+            this.xrLabel24.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel24.SizeF = new System.Drawing.SizeF(70.70834F, 25F);
+            this.xrLabel24.StylePriority.UseFont = false;
+            this.xrLabel24.Text = "FLS";
+            this.xrLabel24.Visible = false;
+            // 
+            // TextFLS
+            // 
+            this.TextFLS.Condition = "[Name] != \'Indirekte Leistungen\'";
+            this.TextFLS.DataMember = "FLSReportGroups.FLSReportDetails";
+            this.TextFLS.Formatting.Visible = DevExpress.Utils.DefaultBoolean.True;
+            this.TextFLS.Name = "TextFLS";
+            // 
             // bindingSource1
             // 
             this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.FLSReportRO);
@@ -667,6 +826,9 @@ namespace BeWo.AssistenzaReports
             this.fieldFLS,
             this.fieldGroupFLS});
             this.DataSource = this.bindingSource1;
+            this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
+            this.TextStunden,
+            this.TextFLS});
             this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 50F, 50F);
             this.PageHeight = 1169;
             this.PageWidth = 827;
@@ -745,5 +907,17 @@ namespace BeWo.AssistenzaReports
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
         private DevExpress.XtraReports.UI.XRLabel lblAufteilungLeistungen;
         private DevExpress.XtraReports.UI.XRLabel xrLabel14;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel15;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel16;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel17;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel18;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel19;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel20;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel21;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel22;
+        private DevExpress.XtraReports.UI.FormattingRule TextStunden;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel23;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel24;
+        private DevExpress.XtraReports.UI.FormattingRule TextFLS;
     }
 }

ReportImp/AssistenzaReports/FLSGroupReport.cs

@@ -18,6 +18,8 @@ namespace BeWo.AssistenzaReports
             {
                 foreach (var group in pRO.FLSReportGroups)
                 {
+                    var abrechenbar = 0m;
+                    var indirekt = 0m;
 
                     FLSReportRO.FLSReportDetail sonstigesAlt = null;
                     FLSReportRO.FLSReportDetail fahrzeiten = null;
@@ -49,6 +51,11 @@ namespace BeWo.AssistenzaReports
 
                                 foreach (var item in leistungenZuMinuten)
                                 {
+                                    if (item.Key == "Sonstiges")
+                                        indirekt += item.Value;
+                                    else
+                                        abrechenbar += item.Value;
+
                                     detail.CustomValue1 += string.Format("{0}\n", item.Key);
                                     detail.CustomValue2 += string.Format("{0:0.00}\n", item.Value);
                                 }
@@ -56,7 +63,7 @@ namespace BeWo.AssistenzaReports
 
                             if (detail.Name == "Sonstiges")
                             {
-                                detail.Name = "Mittelbare Leistungen";
+                                detail.Name = "Indirekte Leistungen";
                                 //sonstigesAlt = detail;
                             }
                             else 
@@ -126,6 +133,11 @@ namespace BeWo.AssistenzaReports
                         }
                     }
 
+                    group.CustomValue1 = string.Format("{0:0}", abrechenbar); // Abrechenbar in Minuten
+                    group.CustomValue2 = string.Format("{0:0.00}", abrechenbar / 60); // Abrechenbar in Stunden
+                    group.CustomValue3 = string.Format("{0:0}", indirekt); // Indirekt in Minuten
+                    group.CustomValue4 = string.Format("{0:0.00}", indirekt / 60); // Indirekt in Stunden
+
                 }
             }
            

ReportImp/AssistenzaReports/Mitarbeiterarbeitszeitkonto.designer.cs

@@ -35,6 +35,8 @@ namespace AssistenzaReports
             DevExpress.XtraReports.UI.XRSummary xrSummary3 = new DevExpress.XtraReports.UI.XRSummary();
             DevExpress.XtraReports.UI.XRSummary xrSummary4 = new DevExpress.XtraReports.UI.XRSummary();
             DevExpress.XtraReports.UI.XRSummary xrSummary5 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary7 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary6 = new DevExpress.XtraReports.UI.XRSummary();
             DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
             this.Detail = new DevExpress.XtraReports.UI.DetailBand();
             this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
@@ -105,6 +107,7 @@ namespace AssistenzaReports
             this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             this.Title = new DevExpress.XtraReports.UI.XRControlStyle();
             this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle();
             this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle();
@@ -123,7 +126,11 @@ namespace AssistenzaReports
             this.fieldIstArbeitszeit = new DevExpress.XtraReports.UI.CalculatedField();
             this.fieldUeberstundenGesamt = new DevExpress.XtraReports.UI.CalculatedField();
             this.fieldTatsSoll = new DevExpress.XtraReports.UI.CalculatedField();
-            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell();
             ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
@@ -565,7 +572,7 @@ namespace AssistenzaReports
             this.xrTable4,
             this.xrTable1});
             this.GroupFooter2.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
-            this.GroupFooter2.HeightF = 116.6667F;
+            this.GroupFooter2.HeightF = 136.6667F;
             this.GroupFooter2.KeepTogether = true;
             this.GroupFooter2.Name = "GroupFooter2";
             this.GroupFooter2.StylePriority.UseFont = false;
@@ -677,9 +684,10 @@ namespace AssistenzaReports
             this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.xrTableRow4,
             this.xrTableRow2,
+            this.xrTableRow7,
             this.xrTableRow5,
             this.xrTableRow6});
-            this.xrTable1.SizeF = new System.Drawing.SizeF(669.9999F, 80F);
+            this.xrTable1.SizeF = new System.Drawing.SizeF(669.9999F, 100F);
             this.xrTable1.StylePriority.UseBorders = false;
             this.xrTable1.StylePriority.UseFont = false;
             this.xrTable1.StylePriority.UsePadding = false;
@@ -761,7 +769,7 @@ namespace AssistenzaReports
             this.xrTableCell4.StylePriority.UseBorders = false;
             this.xrTableCell4.StylePriority.UsePadding = false;
             this.xrTableCell4.StylePriority.UseTextAlignment = false;
-            this.xrTableCell4.Text = "Stunden Abwesenheiten:";
+            this.xrTableCell4.Text = "Stunden Krankheit:";
             this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
             this.xrTableCell4.Weight = 0.17987241552156494D;
             // 
@@ -769,10 +777,13 @@ namespace AssistenzaReports
             // 
             this.xrTableCell9.Borders = DevExpress.XtraPrinting.BorderSide.Top;
             this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UrlaubUndKrankheit", "{0:0.00}")});
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.HoursSick")});
             this.xrTableCell9.Name = "xrTableCell9";
             this.xrTableCell9.StylePriority.UseBorders = false;
             this.xrTableCell9.StylePriority.UseTextAlignment = false;
+            xrSummary5.FormatString = "{0:0.00}";
+            xrSummary5.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell9.Summary = xrSummary5;
             this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
             this.xrTableCell9.Weight = 0.089936205759550983D;
             // 
@@ -894,9 +905,9 @@ namespace AssistenzaReports
             this.xrTableCell57.StylePriority.UseBorders = false;
             this.xrTableCell57.StylePriority.UseFont = false;
             this.xrTableCell57.StylePriority.UseTextAlignment = false;
-            xrSummary5.FormatString = "{0:0.00}";
-            xrSummary5.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
-            this.xrTableCell57.Summary = xrSummary5;
+            xrSummary7.FormatString = "{0:0.00}";
+            xrSummary7.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell57.Summary = xrSummary7;
             this.xrTableCell57.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
             this.xrTableCell57.Weight = 0.089936204907626063D;
             // 
@@ -925,6 +936,10 @@ namespace AssistenzaReports
             this.xrTableCell26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
             this.xrTableCell26.Weight = 0.11143081848591821D;
             // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);
+            // 
             // Title
             // 
             this.Title.BackColor = System.Drawing.Color.White;
@@ -1061,9 +1076,67 @@ namespace AssistenzaReports
             this.fieldTatsSoll.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
             this.fieldTatsSoll.Name = "fieldTatsSoll";
             // 
-            // bindingSource1
+            // xrTableRow7
             // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);
+            this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell29,
+            this.xrTableCell30,
+            this.xrTableCell32,
+            this.xrTableCell33});
+            this.xrTableRow7.Name = "xrTableRow7";
+            this.xrTableRow7.Weight = 0.8D;
+            // 
+            // xrTableCell29
+            // 
+            this.xrTableCell29.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)));
+            this.xrTableCell29.Multiline = true;
+            this.xrTableCell29.Name = "xrTableCell29";
+            this.xrTableCell29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 8, 0, 0, 100F);
+            this.xrTableCell29.StylePriority.UseBorders = false;
+            this.xrTableCell29.StylePriority.UsePadding = false;
+            this.xrTableCell29.StylePriority.UseTextAlignment = false;
+            this.xrTableCell29.Text = "Stunden Urlaub:";
+            this.xrTableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell29.Weight = 0.17987241552156494D;
+            // 
+            // xrTableCell30
+            // 
+            this.xrTableCell30.Borders = DevExpress.XtraPrinting.BorderSide.Top;
+            this.xrTableCell30.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.HoursInVacation")});
+            this.xrTableCell30.Multiline = true;
+            this.xrTableCell30.Name = "xrTableCell30";
+            this.xrTableCell30.StylePriority.UseBorders = false;
+            this.xrTableCell30.StylePriority.UseTextAlignment = false;
+            xrSummary6.FormatString = "{0:0.00}";
+            xrSummary6.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell30.Summary = xrSummary6;
+            this.xrTableCell30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell30.Weight = 0.089936205759550983D;
+            // 
+            // xrTableCell32
+            // 
+            this.xrTableCell32.Borders = DevExpress.XtraPrinting.BorderSide.Top;
+            this.xrTableCell32.Multiline = true;
+            this.xrTableCell32.Name = "xrTableCell32";
+            this.xrTableCell32.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 8, 0, 0, 100F);
+            this.xrTableCell32.StylePriority.UseBorders = false;
+            this.xrTableCell32.StylePriority.UsePadding = false;
+            this.xrTableCell32.StylePriority.UseTextAlignment = false;
+            this.xrTableCell32.Text = "xrTableCell32";
+            this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell32.Weight = 0.22133304473557486D;
+            // 
+            // xrTableCell33
+            // 
+            this.xrTableCell33.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)));
+            this.xrTableCell33.Multiline = true;
+            this.xrTableCell33.Name = "xrTableCell33";
+            this.xrTableCell33.StylePriority.UseBorders = false;
+            this.xrTableCell33.StylePriority.UseTextAlignment = false;
+            this.xrTableCell33.Text = "xrTableCell33";
+            this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell33.Weight = 0.11143080023343803D;
             // 
             // Mitarbeiterarbeitszeitkonto
             // 
@@ -1202,5 +1275,10 @@ namespace AssistenzaReports
         private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow7;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell29;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell30;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell32;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell33;
     }
 }

ReportImp/AssistenzaReports/Mitarbeiterstundenkonto.designer.cs

@@ -49,6 +49,8 @@ namespace AssistenzaReports
             this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
             this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
             this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+            this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrTableHeader = new DevExpress.XtraReports.UI.XRTable();
             this.xrTableRowHeader = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -78,6 +80,7 @@ namespace AssistenzaReports
             this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
             this.lblMonat = new DevExpress.XtraReports.UI.XRLabel();
             this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
@@ -90,9 +93,9 @@ namespace AssistenzaReports
             this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField();
             this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
             this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
-            this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
-            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
             ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
@@ -127,7 +130,7 @@ namespace AssistenzaReports
             this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.xrTableRowDetail});
-            this.xrTableDetail.SizeF = new System.Drawing.SizeF(1005F, 25F);
+            this.xrTableDetail.SizeF = new System.Drawing.SizeF(1049F, 25F);
             this.xrTableDetail.StylePriority.UseBorders = false;
             this.xrTableDetail.StylePriority.UseFont = false;
             this.xrTableDetail.StylePriority.UsePadding = false;
@@ -140,6 +143,7 @@ namespace AssistenzaReports
             this.xrTableCell3,
             this.xrTableCell19,
             this.xrTableCell20,
+            this.xrTableCell6,
             this.xrTableCell28,
             this.xrTableCell16,
             this.xrTableCell27,
@@ -176,7 +180,7 @@ namespace AssistenzaReports
             // xrTableCell20
             // 
             this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UrlaubUndKrankheit", "{0:0.00}")});
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.TageUrlaub", "{0:0.00}")});
             this.xrTableCell20.Name = "xrTableCell20";
             this.xrTableCell20.Text = "xrTableCell20";
             this.xrTableCell20.Weight = 0.094679933071566441D;
@@ -274,6 +278,29 @@ namespace AssistenzaReports
             this.GroupHeader1.Name = "GroupHeader1";
             this.GroupHeader1.RepeatEveryPage = true;
             // 
+            // xrLabel2
+            // 
+            this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(82.29166F, 0F);
+            this.xrLabel2.Multiline = true;
+            this.xrLabel2.Name = "xrLabel2";
+            this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel2.SizeF = new System.Drawing.SizeF(105.2083F, 23F);
+            this.xrLabel2.StylePriority.UseFont = false;
+            this.xrLabel2.Text = "[Custom1!0.0] Tage";
+            this.xrLabel2.TextFormatString = "{0:0.0}";
+            // 
+            // xrLabel1
+            // 
+            this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrLabel1.Multiline = true;
+            this.xrLabel1.Name = "xrLabel1";
+            this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel1.SizeF = new System.Drawing.SizeF(82.29166F, 23F);
+            this.xrLabel1.StylePriority.UseFont = false;
+            this.xrLabel1.Text = "Resturlaub:";
+            // 
             // xrTableHeader
             // 
             this.xrTableHeader.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
@@ -285,7 +312,7 @@ namespace AssistenzaReports
             this.xrTableHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrTableHeader.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.xrTableRowHeader});
-            this.xrTableHeader.SizeF = new System.Drawing.SizeF(1005F, 55.41668F);
+            this.xrTableHeader.SizeF = new System.Drawing.SizeF(1049F, 55.41668F);
             this.xrTableHeader.StylePriority.UseBorders = false;
             this.xrTableHeader.StylePriority.UseFont = false;
             this.xrTableHeader.StylePriority.UsePadding = false;
@@ -298,6 +325,7 @@ namespace AssistenzaReports
             this.xrTableCell5,
             this.xrTableCell4,
             this.xrTableCell2,
+            this.xrTableCell1,
             this.xrTableCell9,
             this.xrTableCell8,
             this.xrTableCell10,
@@ -329,7 +357,7 @@ namespace AssistenzaReports
             // xrTableCell2
             // 
             this.xrTableCell2.Name = "xrTableCell2";
-            this.xrTableCell2.Text = "Fehlzeiten Urlaub Krankheit(Tage)";
+            this.xrTableCell2.Text = "Urlaub (Tage)";
             this.xrTableCell2.Weight = 0.094679896646570338D;
             // 
             // xrTableCell9
@@ -369,7 +397,7 @@ namespace AssistenzaReports
             // xrTableCell12
             // 
             this.xrTableCell12.Name = "xrTableCell12";
-            this.xrTableCell12.Text = "Relation FLS IST zu Mittelbare IST (in %)";
+            this.xrTableCell12.Text = "Relation FLS IST zu Indirekte IST (in %)";
             this.xrTableCell12.Weight = 0.063119929511863376D;
             // 
             // xrTableCell13
@@ -409,7 +437,7 @@ namespace AssistenzaReports
             this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.xrTableRow1});
-            this.xrTable1.SizeF = new System.Drawing.SizeF(1005F, 25F);
+            this.xrTable1.SizeF = new System.Drawing.SizeF(1049F, 25F);
             this.xrTable1.StylePriority.UseBorders = false;
             this.xrTable1.StylePriority.UseFont = false;
             this.xrTable1.StylePriority.UsePadding = false;
@@ -422,6 +450,7 @@ namespace AssistenzaReports
             this.xrTableCell35,
             this.xrTableCell37,
             this.xrTableCell39,
+            this.xrTableCell17,
             this.cellSollGesamt,
             this.cellFLSSollGesamt,
             this.cellFLSIstGesamt,
@@ -518,6 +547,10 @@ namespace AssistenzaReports
             this.xrTableCell51.Name = "xrTableCell51";
             this.xrTableCell51.Weight = 0.063119927862939573D;
             // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);
+            // 
             // ReportHeader
             // 
             this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -623,32 +656,26 @@ namespace AssistenzaReports
             this.bottomMarginBand1.HeightF = 30F;
             this.bottomMarginBand1.Name = "bottomMarginBand1";
             // 
-            // xrLabel1
+            // xrTableCell1
             // 
-            this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
-            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
-            this.xrLabel1.Multiline = true;
-            this.xrLabel1.Name = "xrLabel1";
-            this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel1.SizeF = new System.Drawing.SizeF(82.29166F, 23F);
-            this.xrLabel1.StylePriority.UseFont = false;
-            this.xrLabel1.Text = "Resturlaub:";
+            this.xrTableCell1.Multiline = true;
+            this.xrTableCell1.Name = "xrTableCell1";
+            this.xrTableCell1.Text = "Krankheit (Tage)\r\n";
+            this.xrTableCell1.Weight = 0.094679896646570338D;
             // 
-            // xrLabel2
+            // xrTableCell6
             // 
-            this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
-            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(82.29166F, 0F);
-            this.xrLabel2.Multiline = true;
-            this.xrLabel2.Name = "xrLabel2";
-            this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel2.SizeF = new System.Drawing.SizeF(105.2083F, 23F);
-            this.xrLabel2.StylePriority.UseFont = false;
-            this.xrLabel2.Text = "[Custom1!0.0] Tage";
-            this.xrLabel2.TextFormatString = "{0:0.0}";
+            this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.TageKrankheit")});
+            this.xrTableCell6.Multiline = true;
+            this.xrTableCell6.Name = "xrTableCell6";
+            this.xrTableCell6.Weight = 0.094679933071566441D;
             // 
-            // bindingSource1
+            // xrTableCell17
             // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);
+            this.xrTableCell17.Multiline = true;
+            this.xrTableCell17.Name = "xrTableCell17";
+            this.xrTableCell17.Weight = 0.094679919312514085D;
             // 
             // Mitarbeiterstundenkonto
             // 
@@ -663,7 +690,7 @@ namespace AssistenzaReports
             this.fieldFLS});
             this.DataSource = this.bindingSource1;
             this.Landscape = true;
-            this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 50F, 30F);
+            this.Margins = new DevExpress.Drawing.DXMargins(75F, 45F, 50F, 30F);
             this.PageHeight = 827;
             this.PageWidth = 1169;
             this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
@@ -747,5 +774,8 @@ namespace AssistenzaReports
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell51;
         private DevExpress.XtraReports.UI.XRLabel xrLabel1;
         private DevExpress.XtraReports.UI.XRLabel xrLabel2;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
     }
 }

ReportImp/AssistenzaReports/MitarbeiterstundenkontoJahr.designer.cs

@@ -95,12 +95,15 @@ namespace AssistenzaReports
             this.Detail3 = new DevExpress.XtraReports.UI.DetailBand();
             this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
             this.GroupHeader3 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+            this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
             this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand();
             this.fieldRelationGesamt = new DevExpress.XtraReports.UI.CalculatedField();
-            this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
             this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
             ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
@@ -125,7 +128,7 @@ namespace AssistenzaReports
             this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.xrTableRowDetail});
-            this.xrTableDetail.SizeF = new System.Drawing.SizeF(1005F, 25F);
+            this.xrTableDetail.SizeF = new System.Drawing.SizeF(1019F, 25F);
             this.xrTableDetail.StylePriority.UseBorders = false;
             this.xrTableDetail.StylePriority.UseFont = false;
             this.xrTableDetail.StylePriority.UsePadding = false;
@@ -138,6 +141,7 @@ namespace AssistenzaReports
             this.xrTableCell3,
             this.xrTableCell19,
             this.xrTableCell20,
+            this.xrTableCell6,
             this.xrTableCell28,
             this.xrTableCell16,
             this.xrTableCell27,
@@ -160,7 +164,7 @@ namespace AssistenzaReports
             this.xrTableCell3.StylePriority.UsePadding = false;
             this.xrTableCell3.StylePriority.UseTextAlignment = false;
             this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            this.xrTableCell3.Weight = 0.15329125338142471D;
+            this.xrTableCell3.Weight = 0.15279402063754533D;
             // 
             // xrTableCell19
             // 
@@ -168,15 +172,15 @@ namespace AssistenzaReports
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.StundenSollMax", "{0:0.00}")});
             this.xrTableCell19.Name = "xrTableCell19";
             this.xrTableCell19.Text = "xrTableCell19";
-            this.xrTableCell19.Weight = 0.081154151689479551D;
+            this.xrTableCell19.Weight = 0.080890968171161093D;
             // 
             // xrTableCell20
             // 
             this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.UrlaubUndKrankheit", "{0:0.00}")});
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.TageUrlaub", "{0:0.00}")});
             this.xrTableCell20.Name = "xrTableCell20";
             this.xrTableCell20.Text = "xrTableCell20";
-            this.xrTableCell20.Weight = 0.094679933071566441D;
+            this.xrTableCell20.Weight = 0.0616044091665026D;
             // 
             // xrTableCell28
             // 
@@ -184,7 +188,7 @@ namespace AssistenzaReports
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.StundenSollOhneUrlaubKrankheit", "{0:0.00}")});
             this.xrTableCell28.Name = "xrTableCell28";
             this.xrTableCell28.Text = "xrTableCell28";
-            this.xrTableCell28.Weight = 0.0721370604147881D;
+            this.xrTableCell28.Weight = 0.10303344612983333D;
             // 
             // xrTableCell16
             // 
@@ -261,7 +265,7 @@ namespace AssistenzaReports
             this.xrTableHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrTableHeader.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.xrTableRowHeader});
-            this.xrTableHeader.SizeF = new System.Drawing.SizeF(1005F, 70F);
+            this.xrTableHeader.SizeF = new System.Drawing.SizeF(1019F, 70F);
             this.xrTableHeader.StylePriority.UseBorders = false;
             this.xrTableHeader.StylePriority.UseFont = false;
             this.xrTableHeader.StylePriority.UsePadding = false;
@@ -274,6 +278,7 @@ namespace AssistenzaReports
             this.xrTableCell5,
             this.xrTableCell4,
             this.xrTableCell2,
+            this.xrTableCell1,
             this.xrTableCell9,
             this.xrTableCell8,
             this.xrTableCell10,
@@ -305,15 +310,15 @@ namespace AssistenzaReports
             // xrTableCell2
             // 
             this.xrTableCell2.Name = "xrTableCell2";
-            this.xrTableCell2.Text = "Fehlzeiten Urlaub Krankheit(Tage)";
-            this.xrTableCell2.Weight = 0.094679896646570338D;
+            this.xrTableCell2.Text = "Urlaub (Tage)";
+            this.xrTableCell2.Weight = 0.061804918165728216D;
             // 
             // xrTableCell9
             // 
             this.xrTableCell9.Multiline = true;
             this.xrTableCell9.Name = "xrTableCell9";
             this.xrTableCell9.Text = "Tatsächliche SOLL Stunden";
-            this.xrTableCell9.Weight = 0.072137063712635591D;
+            this.xrTableCell9.Weight = 0.10501204219347771D;
             // 
             // xrTableCell8
             // 
@@ -345,7 +350,7 @@ namespace AssistenzaReports
             // xrTableCell12
             // 
             this.xrTableCell12.Name = "xrTableCell12";
-            this.xrTableCell12.Text = "Relation FLS IST zu Mittelbare IST (in %)";
+            this.xrTableCell12.Text = "Relation FLS IST zu Indirekte IST (in %)";
             this.xrTableCell12.Weight = 0.063119929511863376D;
             // 
             // xrTableCell13
@@ -378,7 +383,7 @@ namespace AssistenzaReports
             this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.xrTableRow1});
-            this.xrTable1.SizeF = new System.Drawing.SizeF(1005F, 25F);
+            this.xrTable1.SizeF = new System.Drawing.SizeF(1019F, 25F);
             this.xrTable1.StylePriority.UseBorders = false;
             this.xrTable1.StylePriority.UseFont = false;
             this.xrTable1.StylePriority.UsePadding = false;
@@ -391,6 +396,7 @@ namespace AssistenzaReports
             this.xrTableCell35,
             this.xrTableCell37,
             this.xrTableCell39,
+            this.xrTableCell17,
             this.cellSollGesamt,
             this.cellFLSSollGesamt,
             this.cellFLSIstGesamt,
@@ -412,17 +418,17 @@ namespace AssistenzaReports
             this.xrTableCell35.StylePriority.UseTextAlignment = false;
             this.xrTableCell35.Text = "Gesamt";
             this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            this.xrTableCell35.Weight = 0.15329126714047708D;
+            this.xrTableCell35.Weight = 0.15279400618906355D;
             // 
             // xrTableCell37
             // 
             this.xrTableCell37.Name = "xrTableCell37";
-            this.xrTableCell37.Weight = 0.081154151689479551D;
+            this.xrTableCell37.Weight = 0.080890968171161093D;
             // 
             // xrTableCell39
             // 
             this.xrTableCell39.Name = "xrTableCell39";
-            this.xrTableCell39.Weight = 0.094679919312514085D;
+            this.xrTableCell39.Weight = 0.0616044091665026D;
             // 
             // cellSollGesamt
             // 
@@ -432,7 +438,7 @@ namespace AssistenzaReports
             xrSummary1.FormatString = "{0:0.00}";
             xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
             this.cellSollGesamt.Summary = xrSummary1;
-            this.cellSollGesamt.Weight = 0.0721370604147881D;
+            this.cellSollGesamt.Weight = 0.10303346057831508D;
             // 
             // cellFLSSollGesamt
             // 
@@ -637,6 +643,29 @@ namespace AssistenzaReports
             this.GroupHeader3.Level = 1;
             this.GroupHeader3.Name = "GroupHeader3";
             // 
+            // xrLabel2
+            // 
+            this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 44.29167F);
+            this.xrLabel2.Multiline = true;
+            this.xrLabel2.Name = "xrLabel2";
+            this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel2.SizeF = new System.Drawing.SizeF(82.29166F, 23F);
+            this.xrLabel2.StylePriority.UseFont = false;
+            this.xrLabel2.Text = "Resturlaub:";
+            // 
+            // xrLabel3
+            // 
+            this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(82.29166F, 44.29169F);
+            this.xrLabel3.Multiline = true;
+            this.xrLabel3.Name = "xrLabel3";
+            this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel3.SizeF = new System.Drawing.SizeF(593.75F, 23F);
+            this.xrLabel3.StylePriority.UseFont = false;
+            this.xrLabel3.Text = "[EmployeeDetail.Custom1!0.0] Tage";
+            this.xrLabel3.TextFormatString = "{0:0.0}";
+            // 
             // xrLabel1
             // 
             this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 14F, DevExpress.Drawing.DXFontStyle.Bold);
@@ -663,33 +692,32 @@ namespace AssistenzaReports
             this.fieldRelationGesamt.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
             this.fieldRelationGesamt.Name = "fieldRelationGesamt";
             // 
-            // xrLabel2
-            // 
-            this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
-            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 44.29167F);
-            this.xrLabel2.Multiline = true;
-            this.xrLabel2.Name = "xrLabel2";
-            this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel2.SizeF = new System.Drawing.SizeF(82.29166F, 23F);
-            this.xrLabel2.StylePriority.UseFont = false;
-            this.xrLabel2.Text = "Resturlaub:";
-            // 
-            // xrLabel3
-            // 
-            this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
-            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(82.29166F, 44.29169F);
-            this.xrLabel3.Multiline = true;
-            this.xrLabel3.Name = "xrLabel3";
-            this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel3.SizeF = new System.Drawing.SizeF(593.75F, 23F);
-            this.xrLabel3.StylePriority.UseFont = false;
-            this.xrLabel3.Text = "[EmployeeDetail.Custom1!0.0] Tage";
-            this.xrLabel3.TextFormatString = "{0:0.0}";
-            // 
             // bindingSource1
             // 
             this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoMonateRO);
             // 
+            // xrTableCell1
+            // 
+            this.xrTableCell1.Multiline = true;
+            this.xrTableCell1.Name = "xrTableCell1";
+            this.xrTableCell1.Text = "Krankheit\r\n(Tage)";
+            this.xrTableCell1.Weight = 0.061804918165728216D;
+            // 
+            // xrTableCell6
+            // 
+            this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.TageKrankheit")});
+            this.xrTableCell6.Multiline = true;
+            this.xrTableCell6.Name = "xrTableCell6";
+            this.xrTableCell6.Text = "xrTableCell6";
+            this.xrTableCell6.Weight = 0.061604452511947905D;
+            // 
+            // xrTableCell17
+            // 
+            this.xrTableCell17.Multiline = true;
+            this.xrTableCell17.Name = "xrTableCell17";
+            this.xrTableCell17.Weight = 0.061604452511947905D;
+            // 
             // MitarbeiterstundenkontoJahr
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -791,5 +819,8 @@ namespace AssistenzaReports
         private DevExpress.XtraReports.UI.CalculatedField fieldRelationGesamt;
         private DevExpress.XtraReports.UI.XRLabel xrLabel2;
         private DevExpress.XtraReports.UI.XRLabel xrLabel3;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
     }
 }

ReportImp/AssistenzaReports/Teamstundenkonto.designer.cs

@@ -30,6 +30,7 @@ namespace BeWo.Report.DefaultReports
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
+            DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
             this.Detail = new DevExpress.XtraReports.UI.DetailBand();
             this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable();
             this.xrTableRowDetail = new DevExpress.XtraReports.UI.XRTableRow();
@@ -105,8 +106,11 @@ namespace BeWo.Report.DefaultReports
             this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             this.ReportFooter1 = new DevExpress.XtraReports.UI.ReportFooterBand();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
             ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
@@ -125,13 +129,14 @@ namespace BeWo.Report.DefaultReports
             // 
             this.xrTableDetail.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableDetail.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableDetail.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.xrTableDetail.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
             this.xrTableDetail.Name = "xrTableDetail";
             this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.xrTableRowDetail});
-            this.xrTableDetail.SizeF = new System.Drawing.SizeF(1005F, 25F);
+            this.xrTableDetail.SizeF = new System.Drawing.SizeF(1019F, 25F);
             this.xrTableDetail.StylePriority.UseBorders = false;
             this.xrTableDetail.StylePriority.UseFont = false;
             this.xrTableDetail.StylePriority.UsePadding = false;
@@ -144,6 +149,7 @@ namespace BeWo.Report.DefaultReports
             this.xrTableCell3,
             this.xrTableCell19,
             this.xrTableCell20,
+            this.xrTableCell4,
             this.xrTableCell28,
             this.xrTableCell16,
             this.xrTableCell27,
@@ -180,7 +186,7 @@ namespace BeWo.Report.DefaultReports
             // xrTableCell20
             // 
             this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.UrlaubUndKrankheit", "{0:0.00}")});
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.TageUrlaub", "{0:0.00}")});
             this.xrTableCell20.Name = "xrTableCell20";
             this.xrTableCell20.Text = "xrTableCell20";
             this.xrTableCell20.Weight = 0.09467990555346173D;
@@ -259,13 +265,14 @@ namespace BeWo.Report.DefaultReports
             // 
             // xrTable1
             // 
-            this.xrTable1.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTable1.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
             this.xrTable1.Name = "xrTable1";
             this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.xrTableRow1});
-            this.xrTable1.SizeF = new System.Drawing.SizeF(1005F, 25F);
+            this.xrTable1.SizeF = new System.Drawing.SizeF(1019F, 25F);
             this.xrTable1.StylePriority.UseBorders = false;
             this.xrTable1.StylePriority.UseFont = false;
             this.xrTable1.StylePriority.UsePadding = false;
@@ -279,6 +286,7 @@ namespace BeWo.Report.DefaultReports
             this.xrTableCell37,
             this.xrTableCell38,
             this.xrTableCell39,
+            this.xrTableCell5,
             this.cellSollGesamt,
             this.cellFLSSollGesamt,
             this.cellFLSIstGesamt,
@@ -323,7 +331,7 @@ namespace BeWo.Report.DefaultReports
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "SollGesamt", "{0:0.00}")});
             this.cellSollGesamt.Name = "cellSollGesamt";
             this.cellSollGesamt.Text = "cellSollGesamt";
-            this.cellSollGesamt.Weight = 0.0721370604147881D;
+            this.cellSollGesamt.Weight = 0.069862493442848825D;
             // 
             // cellFLSSollGesamt
             // 
@@ -331,7 +339,7 @@ namespace BeWo.Report.DefaultReports
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsSollGesamt", "{0:0.00}")});
             this.cellFLSSollGesamt.Name = "cellFLSSollGesamt";
             this.cellFLSSollGesamt.Text = "cellFLSSollGesamt";
-            this.cellFLSSollGesamt.Weight = 0.063119927862939587D;
+            this.cellFLSSollGesamt.Weight = 0.061129633680917159D;
             // 
             // cellFLSIstGesamt
             // 
@@ -339,7 +347,7 @@ namespace BeWo.Report.DefaultReports
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsIstGesamt", "{0:0.00}")});
             this.cellFLSIstGesamt.Name = "cellFLSIstGesamt";
             this.cellFLSIstGesamt.Text = "cellFLSIstGesamt";
-            this.cellFLSIstGesamt.Weight = 0.063119927862939615D;
+            this.cellFLSIstGesamt.Weight = 0.061129865923999147D;
             // 
             // cellFLSPlusMinusGesamt
             // 
@@ -347,7 +355,7 @@ namespace BeWo.Report.DefaultReports
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsDiffGesamt", "{0:0.00}")});
             this.cellFLSPlusMinusGesamt.Name = "cellFLSPlusMinusGesamt";
             this.cellFLSPlusMinusGesamt.Text = "cellFLSPlusMinusGesamt";
-            this.cellFLSPlusMinusGesamt.Weight = 0.063119927862939587D;
+            this.cellFLSPlusMinusGesamt.Weight = 0.061129517559376172D;
             // 
             // cellGesamtGesamt
             // 
@@ -355,7 +363,7 @@ namespace BeWo.Report.DefaultReports
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "StundenGesamt", "{0:0.00}")});
             this.cellGesamtGesamt.Name = "cellGesamtGesamt";
             this.cellGesamtGesamt.Text = "cellGesamtGesamt";
-            this.cellGesamtGesamt.Weight = 0.063119927862939573D;
+            this.cellGesamtGesamt.Weight = 0.061129633680917138D;
             // 
             // cellRelationGesamt
             // 
@@ -363,12 +371,12 @@ namespace BeWo.Report.DefaultReports
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "RelationFlsZuMittelbar", "{0:0.00}")});
             this.cellRelationGesamt.Name = "cellRelationGesamt";
             this.cellRelationGesamt.Text = "cellRelationGesamt";
-            this.cellRelationGesamt.Weight = 0.0631199278629396D;
+            this.cellRelationGesamt.Weight = 0.061129633680917179D;
             // 
             // xrTableCell47
             // 
             this.xrTableCell47.Name = "xrTableCell47";
-            this.xrTableCell47.Weight = 0.063119927862939587D;
+            this.xrTableCell47.Weight = 0.057149161438413289D;
             // 
             // xrTableCell48
             // 
@@ -391,7 +399,7 @@ namespace BeWo.Report.DefaultReports
             // 
             this.lblMonat.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReportStartDate", "Stundenkonto {0:MMMM yy}")});
-            this.lblMonat.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold);
+            this.lblMonat.Font = new DevExpress.Drawing.DXFont("Arial", 14F, DevExpress.Drawing.DXFontStyle.Bold);
             this.lblMonat.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
             this.lblMonat.Multiline = true;
             this.lblMonat.Name = "lblMonat";
@@ -410,18 +418,18 @@ namespace BeWo.Report.DefaultReports
             // 
             // xrPageInfo2
             // 
-            this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F);
-            this.xrPageInfo2.Format = "Seite {0} von {1}";
+            this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
             this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(522.0001F, 25F);
             this.xrPageInfo2.Name = "xrPageInfo2";
             this.xrPageInfo2.SizeF = new System.Drawing.SizeF(482.9998F, 23F);
             this.xrPageInfo2.StyleName = "PageInfo";
             this.xrPageInfo2.StylePriority.UseFont = false;
             this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            this.xrPageInfo2.TextFormatString = "Seite {0} von {1}";
             // 
             // xrPageInfo1
             // 
-            this.xrPageInfo1.Font = new System.Drawing.Font("Arial", 8F);
+            this.xrPageInfo1.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
             this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(8F, 25F);
             this.xrPageInfo1.Name = "xrPageInfo1";
             this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime;
@@ -435,7 +443,7 @@ namespace BeWo.Report.DefaultReports
             this.Title.BorderColor = System.Drawing.SystemColors.ControlText;
             this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None;
             this.Title.BorderWidth = 1F;
-            this.Title.Font = new System.Drawing.Font("Times New Roman", 24F);
+            this.Title.Font = new DevExpress.Drawing.DXFont("Times New Roman", 24F);
             this.Title.ForeColor = System.Drawing.Color.Black;
             this.Title.Name = "Title";
             // 
@@ -445,7 +453,7 @@ namespace BeWo.Report.DefaultReports
             this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText;
             this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None;
             this.FieldCaption.BorderWidth = 1F;
-            this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold);
+            this.FieldCaption.Font = new DevExpress.Drawing.DXFont("Times New Roman", 10F, DevExpress.Drawing.DXFontStyle.Bold);
             this.FieldCaption.ForeColor = System.Drawing.Color.Black;
             this.FieldCaption.Name = "FieldCaption";
             // 
@@ -455,7 +463,7 @@ namespace BeWo.Report.DefaultReports
             this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText;
             this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None;
             this.PageInfo.BorderWidth = 1F;
-            this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F);
+            this.PageInfo.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F);
             this.PageInfo.ForeColor = System.Drawing.Color.Black;
             this.PageInfo.Name = "PageInfo";
             // 
@@ -465,7 +473,7 @@ namespace BeWo.Report.DefaultReports
             this.DataField.BorderColor = System.Drawing.SystemColors.ControlText;
             this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None;
             this.DataField.BorderWidth = 1F;
-            this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F);
+            this.DataField.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F);
             this.DataField.ForeColor = System.Drawing.SystemColors.ControlText;
             this.DataField.Name = "DataField";
             // 
@@ -507,7 +515,7 @@ namespace BeWo.Report.DefaultReports
             // 
             this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.TeamName")});
-            this.xrLabel1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
+            this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
             this.xrLabel1.Multiline = true;
             this.xrLabel1.Name = "xrLabel1";
@@ -546,13 +554,13 @@ namespace BeWo.Report.DefaultReports
             this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTable2.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold);
+            this.xrTable2.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
             this.xrTable2.Name = "xrTable2";
             this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.xrTableRow2});
-            this.xrTable2.SizeF = new System.Drawing.SizeF(1005F, 70F);
+            this.xrTable2.SizeF = new System.Drawing.SizeF(1019F, 70F);
             this.xrTable2.StylePriority.UseBorders = false;
             this.xrTable2.StylePriority.UseFont = false;
             this.xrTable2.StylePriority.UsePadding = false;
@@ -565,6 +573,7 @@ namespace BeWo.Report.DefaultReports
             this.xrTableCell6,
             this.xrTableCell18,
             this.xrTableCell30,
+            this.xrTableCell2,
             this.xrTableCell31,
             this.xrTableCell32,
             this.xrTableCell33,
@@ -596,7 +605,7 @@ namespace BeWo.Report.DefaultReports
             // xrTableCell30
             // 
             this.xrTableCell30.Name = "xrTableCell30";
-            this.xrTableCell30.Text = "Fehlzeiten Urlaub Krankheit(Tage)";
+            this.xrTableCell30.Text = "Fehlzeiten Urlaub (Tage)";
             this.xrTableCell30.Weight = 0.094679896646570338D;
             // 
             // xrTableCell31
@@ -636,7 +645,7 @@ namespace BeWo.Report.DefaultReports
             // xrTableCell40
             // 
             this.xrTableCell40.Name = "xrTableCell40";
-            this.xrTableCell40.Text = "Relation FLS IST zu Mittelbare IST (in %)";
+            this.xrTableCell40.Text = "Relation FLS IST zu Indirekte IST (in %)";
             this.xrTableCell40.Weight = 0.063119929511863376D;
             // 
             // xrTableCell41
@@ -667,13 +676,14 @@ namespace BeWo.Report.DefaultReports
             // 
             // xrTable3
             // 
-            this.xrTable3.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTable3.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
             this.xrTable3.Name = "xrTable3";
             this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.xrTableRow3});
-            this.xrTable3.SizeF = new System.Drawing.SizeF(1005F, 25F);
+            this.xrTable3.SizeF = new System.Drawing.SizeF(1019F, 25F);
             this.xrTable3.StylePriority.UseBorders = false;
             this.xrTable3.StylePriority.UseFont = false;
             this.xrTable3.StylePriority.UsePadding = false;
@@ -705,7 +715,7 @@ namespace BeWo.Report.DefaultReports
             this.xrTableCell1.StylePriority.UseTextAlignment = false;
             this.xrTableCell1.Text = "Gesamt [TeamDetailList.TeamName]";
             this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            this.xrTableCell1.Weight = 0.32912533814247075D;
+            this.xrTableCell1.Weight = 0.41426005342806138D;
             // 
             // xrTableCell7
             // 
@@ -713,7 +723,7 @@ namespace BeWo.Report.DefaultReports
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.SollGesamt", "{0:0.00}")});
             this.xrTableCell7.Name = "xrTableCell7";
             this.xrTableCell7.Text = "xrTableCell7";
-            this.xrTableCell7.Weight = 0.07213706041478804D;
+            this.xrTableCell7.Weight = 0.070512380520681456D;
             // 
             // xrTableCell8
             // 
@@ -721,7 +731,7 @@ namespace BeWo.Report.DefaultReports
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.FlsSollGesamt", "{0:0.00}")});
             this.xrTableCell8.Name = "xrTableCell8";
             this.xrTableCell8.Text = "xrTableCell8";
-            this.xrTableCell8.Weight = 0.063119927862939587D;
+            this.xrTableCell8.Weight = 0.061698336666200365D;
             // 
             // xrTableCell9
             // 
@@ -729,7 +739,7 @@ namespace BeWo.Report.DefaultReports
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.FlsIstGesamt", "{0:0.00}")});
             this.xrTableCell9.Name = "xrTableCell9";
             this.xrTableCell9.Text = "xrTableCell9";
-            this.xrTableCell9.Weight = 0.063119927862939615D;
+            this.xrTableCell9.Weight = 0.061698219464458359D;
             // 
             // xrTableCell10
             // 
@@ -737,7 +747,7 @@ namespace BeWo.Report.DefaultReports
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.FlsDiffGesamt", "{0:0.00}")});
             this.xrTableCell10.Name = "xrTableCell10";
             this.xrTableCell10.Text = "xrTableCell10";
-            this.xrTableCell10.Weight = 0.063119927862939587D;
+            this.xrTableCell10.Weight = 0.061698219464458581D;
             // 
             // xrTableCell11
             // 
@@ -745,7 +755,7 @@ namespace BeWo.Report.DefaultReports
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.StundenGesamt", "{0:0.00}")});
             this.xrTableCell11.Name = "xrTableCell11";
             this.xrTableCell11.Text = "xrTableCell11";
-            this.xrTableCell11.Weight = 0.063119927862939573D;
+            this.xrTableCell11.Weight = 0.061698336666200351D;
             // 
             // xrTableCell12
             // 
@@ -753,26 +763,22 @@ namespace BeWo.Report.DefaultReports
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.RelationFlsZuMittelbar", "{0:0.00}")});
             this.xrTableCell12.Name = "xrTableCell12";
             this.xrTableCell12.Text = "xrTableCell12";
-            this.xrTableCell12.Weight = 0.0631199278629396D;
+            this.xrTableCell12.Weight = 0.061698278065329487D;
             // 
             // xrTableCell13
             // 
             this.xrTableCell13.Name = "xrTableCell13";
-            this.xrTableCell13.Weight = 0.063119927862939587D;
+            this.xrTableCell13.Weight = 0.061698278065329681D;
             // 
             // xrTableCell14
             // 
             this.xrTableCell14.Name = "xrTableCell14";
-            this.xrTableCell14.Weight = 0.063119927862939587D;
+            this.xrTableCell14.Weight = 0.061698395267071049D;
             // 
             // xrTableCell15
             // 
             this.xrTableCell15.Name = "xrTableCell15";
-            this.xrTableCell15.Weight = 0.063119927862939573D;
-            // 
-            // bindingSource1
-            // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);
+            this.xrTableCell15.Weight = 0.061698387941961752D;
             // 
             // ReportFooter1
             // 
@@ -781,6 +787,32 @@ namespace BeWo.Report.DefaultReports
             this.ReportFooter1.HeightF = 60F;
             this.ReportFooter1.Name = "ReportFooter1";
             // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);
+            // 
+            // xrTableCell2
+            // 
+            this.xrTableCell2.Multiline = true;
+            this.xrTableCell2.Name = "xrTableCell2";
+            this.xrTableCell2.Text = "Fehlzeiten Krankheit (Tage)";
+            this.xrTableCell2.Weight = 0.094679896646570338D;
+            // 
+            // xrTableCell4
+            // 
+            this.xrTableCell4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.TageKrankheit")});
+            this.xrTableCell4.Multiline = true;
+            this.xrTableCell4.Name = "xrTableCell4";
+            this.xrTableCell4.Text = "xrTableCell4";
+            this.xrTableCell4.Weight = 0.09467990555346173D;
+            // 
+            // xrTableCell5
+            // 
+            this.xrTableCell5.Multiline = true;
+            this.xrTableCell5.Name = "xrTableCell5";
+            this.xrTableCell5.Weight = 0.0813166160479763D;
+            // 
             // Teamstundenkonto
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -795,7 +827,7 @@ namespace BeWo.Report.DefaultReports
             this.fieldFLS});
             this.DataSource = this.bindingSource1;
             this.Landscape = true;
-            this.Margins = new System.Drawing.Printing.Margins(75, 75, 50, 30);
+            this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 50F, 30F);
             this.PageHeight = 827;
             this.PageWidth = 1169;
             this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
@@ -804,7 +836,9 @@ namespace BeWo.Report.DefaultReports
             this.FieldCaption,
             this.PageInfo,
             this.DataField});
-            this.Version = "17.1";
+            this.Version = "23.2";
+            xrWatermark1.Id = "Watermark1";
+            this.Watermarks.Add(xrWatermark1);
             ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
@@ -893,5 +927,8 @@ namespace BeWo.Report.DefaultReports
 		private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
 		private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
 		private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter1;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
     }
 }

ReportImp/AssistenzaReports/Teamstundenkonto.resx

@@ -117,7 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 14</value>
-  </metadata>
 </root>

ReportImp/AwoDortmund/Export/DiamantExporter.cs

@@ -184,7 +184,7 @@ namespace AwoDortmund.Export
                             decimal betrag = ErzeugeBetrag(item);
                             if (betrag != 0)
                             {
-                                sb.Append(String.Format("{0:0.00}", betrag * -1));
+                                sb.Append(String.Format("{0:0.00}", betrag));
                                 sb.Append(";");
                             }
                         }

ReportImp/BeWoNeuss/Properties/licenses.licx

@@ -0,0 +1 @@
+DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

ReportImp/BeWoNordeifel/SettlementReport.Designer.cs

@@ -32,6 +32,7 @@ namespace BeWoNordeifel.Alt
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung));
             this.Detail = new DevExpress.XtraReports.UI.DetailBand();
             this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
+            this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
@@ -120,7 +121,6 @@ namespace BeWoNordeifel.Alt
             this.xrTableRow36 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
@@ -149,6 +149,17 @@ namespace BeWoNordeifel.Alt
             this.ReportHeader.Name = "ReportHeader";
             this.ReportHeader.StylePriority.UseFont = false;
             // 
+            // xrLabel2
+            // 
+            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(426.3802F, 82.22221F);
+            this.xrLabel2.Name = "xrLabel2";
+            this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel2.SizeF = new System.Drawing.SizeF(223.62F, 20F);
+            this.xrLabel2.StylePriority.UseFont = false;
+            this.xrLabel2.StylePriority.UseTextAlignment = false;
+            this.xrLabel2.Text = "GP-Nummer: [BusinessPartnerId]";
+            this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            // 
             // xrLabel14
             // 
             this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(426.3799F, 62.22221F);
@@ -1058,17 +1069,6 @@ namespace BeWoNordeifel.Alt
             this.xrTableCell58.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
             this.xrTableCell58.Weight = 0.21685899000901443D;
             // 
-            // xrLabel2
-            // 
-            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(426.3802F, 82.22221F);
-            this.xrLabel2.Name = "xrLabel2";
-            this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel2.SizeF = new System.Drawing.SizeF(223.62F, 20F);
-            this.xrLabel2.StylePriority.UseFont = false;
-            this.xrLabel2.StylePriority.UseTextAlignment = false;
-            this.xrLabel2.Text = "GP-Nummer: 2000087058";
-            this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
-            // 
             // Spitzabrechnung
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {

ReportImp/BeWoNordeifel/SettlementReport2.Designer.cs

@@ -33,6 +33,7 @@ namespace BeWoNordeifel.Neu
             DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary();
             this.Detail = new DevExpress.XtraReports.UI.DetailBand();
             this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
+            this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
@@ -133,7 +134,6 @@ namespace BeWoNordeifel.Neu
             this.xrTableRow36 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
@@ -163,6 +163,17 @@ namespace BeWoNordeifel.Neu
             this.ReportHeader.Name = "ReportHeader";
             this.ReportHeader.StylePriority.UseFont = false;
             // 
+            // xrLabel2
+            // 
+            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(426.3802F, 82.22221F);
+            this.xrLabel2.Name = "xrLabel2";
+            this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel2.SizeF = new System.Drawing.SizeF(223.62F, 20F);
+            this.xrLabel2.StylePriority.UseFont = false;
+            this.xrLabel2.StylePriority.UseTextAlignment = false;
+            this.xrLabel2.Text = "GP-Nummer: [BusinessPartnerId]";
+            this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            // 
             // xrLabel14
             // 
             this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(426.3799F, 62.22221F);
@@ -1198,17 +1209,6 @@ namespace BeWoNordeifel.Neu
             this.xrTableCell58.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
             this.xrTableCell58.Weight = 0.21685899000901443D;
             // 
-            // xrLabel2
-            // 
-            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(426.3802F, 82.22221F);
-            this.xrLabel2.Name = "xrLabel2";
-            this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel2.SizeF = new System.Drawing.SizeF(223.62F, 20F);
-            this.xrLabel2.StylePriority.UseFont = false;
-            this.xrLabel2.StylePriority.UseTextAlignment = false;
-            this.xrLabel2.Text = "GP-Nummer: 2000087058";
-            this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
-            // 
             // Spitzabrechnung
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {

ReportImp/BeWoPyramide/BeWoPyramide.csproj

@@ -31,6 +31,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="DevExpress.DataAccess.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <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" />
@@ -39,6 +40,7 @@
     <Reference Include="DevExpress.Printing.v23.2.Core, 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.Utils.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.XtraPrinting.v23.2, Version=23.2.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.XtraCharts.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />

ReportImp/BeWoPyramide/Mitarbeiterstundenkonto.designer.cs

@@ -42,6 +42,7 @@ namespace BeWoPyramide
             this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -58,6 +59,7 @@ namespace BeWoPyramide
             this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -73,6 +75,7 @@ namespace BeWoPyramide
             this.cellSollGesamt = new DevExpress.XtraReports.UI.XRTableCell();
             this.cellFLSIstGesamt = new DevExpress.XtraReports.UI.XRTableCell();
             this.cellFLSPlusMinusGesamt = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell();
             this.cellGesamtGesamt = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -90,9 +93,6 @@ namespace BeWoPyramide
             this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField();
             this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
             this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
-            this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell();
             this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit();
@@ -178,7 +178,7 @@ namespace BeWoPyramide
             // xrTableCell20
             // 
             this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom1", "{0:0.00}")});
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.TageUrlaub", "{0:0.00}")});
             this.xrTableCell20.Name = "xrTableCell20";
             this.xrTableCell20.Text = "xrTableCell20";
             this.xrTableCell20.Weight = 0.073474920097250415D;
@@ -186,7 +186,7 @@ namespace BeWoPyramide
             // xrTableCell6
             // 
             this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom2")});
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.TageKrankheit")});
             this.xrTableCell6.Multiline = true;
             this.xrTableCell6.Name = "xrTableCell6";
             this.xrTableCell6.TextFormatString = "{0:0.00}";
@@ -198,23 +198,32 @@ namespace BeWoPyramide
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenSollOhneUrlaubKrankheit", "{0:0.00}")});
             this.xrTableCell28.Name = "xrTableCell28";
             this.xrTableCell28.Text = "xrTableCell28";
-            this.xrTableCell28.Weight = 0.10922457470630435D;
+            this.xrTableCell28.Weight = 0.099048935486823156D;
             // 
             // xrTableCell27
             // 
             this.xrTableCell27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsIst", "{0:0.00}")});
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsSoll", "{0:0.00}")});
             this.xrTableCell27.Name = "xrTableCell27";
             this.xrTableCell27.Text = "xrTableCell27";
-            this.xrTableCell27.Weight = 0.081160008068460673D;
+            this.xrTableCell27.Weight = 0.091335647287941871D;
             // 
             // xrTableCell22
             // 
             this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsDiff", "{0:0.00}")});
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsIst", "{0:0.00}")});
             this.xrTableCell22.Name = "xrTableCell22";
             this.xrTableCell22.Text = "xrTableCell22";
-            this.xrTableCell22.Weight = 0.080932067830889687D;
+            this.xrTableCell22.Weight = 0.092125101792834174D;
+            // 
+            // xrTableCell16
+            // 
+            this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.MittelbarIst")});
+            this.xrTableCell16.Multiline = true;
+            this.xrTableCell16.Name = "xrTableCell16";
+            this.xrTableCell16.TextFormatString = "{0:0.00}";
+            this.xrTableCell16.Weight = 0.073809060009242866D;
             // 
             // xrTableCell23
             // 
@@ -327,7 +336,7 @@ namespace BeWoPyramide
             // 
             this.xrTableCell4.Multiline = true;
             this.xrTableCell4.Name = "xrTableCell4";
-            this.xrTableCell4.Text = "Reguläre SOLL Stunden lt. Arbeitsvertrag";
+            this.xrTableCell4.Text = "Reguläre SOLL Gesamstunden \r\n(FLS + Admin)";
             this.xrTableCell4.Weight = 0.0841890706295664D;
             // 
             // xrTableCell2
@@ -348,36 +357,43 @@ namespace BeWoPyramide
             // 
             this.xrTableCell9.Multiline = true;
             this.xrTableCell9.Name = "xrTableCell9";
-            this.xrTableCell9.Text = "Tatsächliche SOLL Stunden lt.\r\nArbeitsvertrag";
-            this.xrTableCell9.Weight = 0.10922453132027059D;
+            this.xrTableCell9.Text = "Tatsächlich \r\nzu erbringende Gesamtstunden\r\n(FLS + Admin)";
+            this.xrTableCell9.Weight = 0.09904893045718266D;
             // 
             // xrTableCell10
             // 
             this.xrTableCell10.Multiline = true;
             this.xrTableCell10.Name = "xrTableCell10";
             this.xrTableCell10.StylePriority.UseBackColor = false;
-            this.xrTableCell10.Text = "Geleistete abrechenbare\r\nStunden ";
-            this.xrTableCell10.Weight = 0.081160175222247735D;
+            this.xrTableCell10.Text = "Tatsächlich zu erbringende \r\nFachleistungs-Stunden";
+            this.xrTableCell10.Weight = 0.091335776085335663D;
             // 
             // xrTableCell7
             // 
             this.xrTableCell7.Multiline = true;
             this.xrTableCell7.Name = "xrTableCell7";
-            this.xrTableCell7.Text = "Abrechenbare\r\nStunden Plus/Minus lfd. Monat";
-            this.xrTableCell7.Weight = 0.080931882814507083D;
+            this.xrTableCell7.Text = "Erbrachte\r\nFachleistungs-Stunden";
+            this.xrTableCell7.Weight = 0.092125034820495874D;
+            // 
+            // xrTableCell8
+            // 
+            this.xrTableCell8.Multiline = true;
+            this.xrTableCell8.Name = "xrTableCell8";
+            this.xrTableCell8.Text = "Erbrachte\r\nAdmin-\r\nStunden";
+            this.xrTableCell8.Weight = 0.073808995002841285D;
             // 
             // xrTableCell11
             // 
             this.xrTableCell11.Multiline = true;
             this.xrTableCell11.Name = "xrTableCell11";
             this.xrTableCell11.StylePriority.UseBackColor = false;
-            this.xrTableCell11.Text = "Gesamt-\r\nstunden lfd. Monat";
+            this.xrTableCell11.Text = "Erbrachte Gesamt-stunden lfd. Monat\r\n(FLS + Admin)";
             this.xrTableCell11.Weight = 0.082037701978632416D;
             // 
             // xrTableCell13
             // 
             this.xrTableCell13.Name = "xrTableCell13";
-            this.xrTableCell13.Text = "Überstd. neu";
+            this.xrTableCell13.Text = "Überstd. neu lfd. Monat";
             this.xrTableCell13.Weight = 0.069681727563423543D;
             // 
             // xrTableCell14
@@ -478,23 +494,32 @@ namespace BeWoPyramide
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "SollGesamt", "{0:0.00}")});
             this.cellSollGesamt.Name = "cellSollGesamt";
             this.cellSollGesamt.Text = "cellSollGesamt";
-            this.cellSollGesamt.Weight = 0.10912441190254743D;
+            this.cellSollGesamt.Weight = 0.098958197541459375D;
             // 
             // cellFLSIstGesamt
             // 
             this.cellFLSIstGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsIstGesamt", "{0:0.00}")});
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsSollGesamt", "{0:0.00}")});
             this.cellFLSIstGesamt.Name = "cellFLSIstGesamt";
             this.cellFLSIstGesamt.Text = "cellFLSIstGesamt";
-            this.cellFLSIstGesamt.Weight = 0.081085664785240763D;
+            this.cellFLSIstGesamt.Weight = 0.091251879146328818D;
             // 
             // cellFLSPlusMinusGesamt
             // 
             this.cellFLSPlusMinusGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsDiffGesamt", "{0:0.00}")});
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsIstGesamt", "{0:0.00}")});
             this.cellFLSPlusMinusGesamt.Name = "cellFLSPlusMinusGesamt";
             this.cellFLSPlusMinusGesamt.Text = "cellFLSPlusMinusGesamt";
-            this.cellFLSPlusMinusGesamt.Weight = 0.080857758900604121D;
+            this.cellFLSPlusMinusGesamt.Weight = 0.092040532151328028D;
+            // 
+            // xrTableCell31
+            // 
+            this.xrTableCell31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "MittelbarIst")});
+            this.xrTableCell31.Multiline = true;
+            this.xrTableCell31.Name = "xrTableCell31";
+            this.xrTableCell31.TextFormatString = "{0:0.00}";
+            this.xrTableCell31.Weight = 0.073741519048771034D;
             // 
             // cellGesamtGesamt
             // 
@@ -630,31 +655,6 @@ namespace BeWoPyramide
             this.bottomMarginBand1.HeightF = 30F;
             this.bottomMarginBand1.Name = "bottomMarginBand1";
             // 
-            // xrTableCell8
-            // 
-            this.xrTableCell8.Multiline = true;
-            this.xrTableCell8.Name = "xrTableCell8";
-            this.xrTableCell8.Text = "Erbrachte\r\nAdmin-\r\nStunden";
-            this.xrTableCell8.Weight = 0.085002147008830076D;
-            // 
-            // xrTableCell16
-            // 
-            this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.MittelbarIst")});
-            this.xrTableCell16.Multiline = true;
-            this.xrTableCell16.Name = "xrTableCell16";
-            this.xrTableCell16.TextFormatString = "{0:0.00}";
-            this.xrTableCell16.Weight = 0.08500209397118734D;
-            // 
-            // xrTableCell31
-            // 
-            this.xrTableCell31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "MittelbarIst")});
-            this.xrTableCell31.Multiline = true;
-            this.xrTableCell31.Name = "xrTableCell31";
-            this.xrTableCell31.TextFormatString = "{0:0.00}";
-            this.xrTableCell31.Weight = 0.084924292299494941D;
-            // 
             // bindingSource1
             // 
             this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);

ReportImp/BeWoPyramide/MitarbeiterstundenkontoJahr.designer.cs

@@ -29,11 +29,12 @@ namespace BeWo.Report.DefaultReports
         /// </summary>
         private void InitializeComponent()
         {
+            this.components = new System.ComponentModel.Container();
             DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary();
             DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary();
             DevExpress.XtraReports.UI.XRSummary xrSummary3 = new DevExpress.XtraReports.UI.XRSummary();
-            DevExpress.XtraReports.UI.XRSummary xrSummary5 = new DevExpress.XtraReports.UI.XRSummary();
             DevExpress.XtraReports.UI.XRSummary xrSummary4 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary5 = new DevExpress.XtraReports.UI.XRSummary();
             DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
             this.Detail = new DevExpress.XtraReports.UI.DetailBand();
             this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable();
@@ -46,8 +47,9 @@ namespace BeWo.Report.DefaultReports
             this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableHeader = new DevExpress.XtraReports.UI.XRTable();
             this.xrTableRowHeader = new DevExpress.XtraReports.UI.XRTableRow();
@@ -59,8 +61,9 @@ namespace BeWo.Report.DefaultReports
             this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
             this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -70,9 +73,10 @@ namespace BeWo.Report.DefaultReports
             this.cellSollGesamt = new DevExpress.XtraReports.UI.XRTableCell();
             this.cellFLSIstGesamt = new DevExpress.XtraReports.UI.XRTableCell();
             this.cellFLSPlusMinusGesamt = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
             this.cellGesamtGesamt = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell();
             this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
             this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo();
@@ -93,13 +97,7 @@ namespace BeWo.Report.DefaultReports
             this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
             this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand();
             this.fieldRelationGesamt = new DevExpress.XtraReports.UI.CalculatedField();
-            this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.bindingSource1 = new System.Windows.Forms.BindingSource();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
@@ -124,7 +122,7 @@ namespace BeWo.Report.DefaultReports
             this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.xrTableRowDetail});
-            this.xrTableDetail.SizeF = new System.Drawing.SizeF(1103F, 25F);
+            this.xrTableDetail.SizeF = new System.Drawing.SizeF(1041.541F, 25F);
             this.xrTableDetail.StylePriority.UseBorders = false;
             this.xrTableDetail.StylePriority.UseFont = false;
             this.xrTableDetail.StylePriority.UsePadding = false;
@@ -144,7 +142,6 @@ namespace BeWo.Report.DefaultReports
             this.xrTableCell23,
             this.xrTableCell12,
             this.xrTableCell25,
-            this.xrTableCell24,
             this.xrTableCell18,
             this.xrTableCell26});
             this.xrTableRowDetail.Name = "xrTableRowDetail";
@@ -173,7 +170,7 @@ namespace BeWo.Report.DefaultReports
             // xrTableCell20
             // 
             this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.Custom1")});
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.TageUrlaub")});
             this.xrTableCell20.Name = "xrTableCell20";
             this.xrTableCell20.Text = "xrTableCell20";
             this.xrTableCell20.TextFormatString = "{0:0.00}";
@@ -182,7 +179,7 @@ namespace BeWo.Report.DefaultReports
             // xrTableCell6
             // 
             this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.Custom2")});
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.TageKrankheit")});
             this.xrTableCell6.Multiline = true;
             this.xrTableCell6.Name = "xrTableCell6";
             this.xrTableCell6.TextFormatString = "{0:0.00}";
@@ -199,7 +196,7 @@ namespace BeWo.Report.DefaultReports
             // xrTableCell27
             // 
             this.xrTableCell27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsIst", "{0:0.00}")});
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsSoll", "{0:0.00}")});
             this.xrTableCell27.Name = "xrTableCell27";
             this.xrTableCell27.Text = "xrTableCell27";
             this.xrTableCell27.Weight = 0.080195772315728026D;
@@ -207,10 +204,10 @@ namespace BeWo.Report.DefaultReports
             // xrTableCell22
             // 
             this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsDiff", "{0:0.00}")});
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsIst", "{0:0.00}")});
             this.xrTableCell22.Name = "xrTableCell22";
             this.xrTableCell22.Text = "xrTableCell22";
-            this.xrTableCell22.Weight = 0.073917419475203444D;
+            this.xrTableCell22.Weight = 0.083429934432064451D;
             // 
             // xrTableCell23
             // 
@@ -218,7 +215,15 @@ namespace BeWo.Report.DefaultReports
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.StundenMittelbarIst", "{0:0.00}")});
             this.xrTableCell23.Name = "xrTableCell23";
             this.xrTableCell23.Text = "xrTableCell23";
-            this.xrTableCell23.Weight = 0.076160632803850548D;
+            this.xrTableCell23.Weight = 0.066648117846989541D;
+            // 
+            // xrTableCell12
+            // 
+            this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.StundenGesamtIst")});
+            this.xrTableCell12.Name = "xrTableCell12";
+            this.xrTableCell12.TextFormatString = "{0:0.00}";
+            this.xrTableCell12.Weight = 0.077392503034074411D;
             // 
             // xrTableCell25
             // 
@@ -226,15 +231,16 @@ namespace BeWo.Report.DefaultReports
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.Ueberstunden", "{0:0.00}")});
             this.xrTableCell25.Name = "xrTableCell25";
             this.xrTableCell25.Text = "xrTableCell25";
-            this.xrTableCell25.Weight = 0.0850922328825746D;
+            this.xrTableCell25.Weight = 0.0831994527768745D;
             // 
-            // xrTableCell24
+            // xrTableCell18
             // 
-            this.xrTableCell24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.LaufendeGesamtsumme", "{0:0.00}")});
-            this.xrTableCell24.Name = "xrTableCell24";
-            this.xrTableCell24.Text = "xrTableCell24";
-            this.xrTableCell24.Weight = 0.066878166488619023D;
+            this.xrTableCell18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.UeberstundenAusbezahlt")});
+            this.xrTableCell18.Multiline = true;
+            this.xrTableCell18.Name = "xrTableCell18";
+            this.xrTableCell18.TextFormatString = "{0:0.00}";
+            this.xrTableCell18.Weight = 0.075579810863956431D;
             // 
             // xrTableCell26
             // 
@@ -242,7 +248,7 @@ namespace BeWo.Report.DefaultReports
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.UeberstundenGesamt", "{0:0.00}")});
             this.xrTableCell26.Name = "xrTableCell26";
             this.xrTableCell26.Text = "xrTableCell26";
-            this.xrTableCell26.Weight = 0.077688179216946346D;
+            this.xrTableCell26.Weight = 0.080541715298604682D;
             // 
             // xrTableHeader
             // 
@@ -255,7 +261,7 @@ namespace BeWo.Report.DefaultReports
             this.xrTableHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrTableHeader.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.xrTableRowHeader});
-            this.xrTableHeader.SizeF = new System.Drawing.SizeF(1103F, 70F);
+            this.xrTableHeader.SizeF = new System.Drawing.SizeF(1041.541F, 70F);
             this.xrTableHeader.StylePriority.UseBorders = false;
             this.xrTableHeader.StylePriority.UseFont = false;
             this.xrTableHeader.StylePriority.UsePadding = false;
@@ -275,7 +281,6 @@ namespace BeWo.Report.DefaultReports
             this.xrTableCell11,
             this.xrTableCell8,
             this.xrTableCell13,
-            this.xrTableCell14,
             this.xrTableCell17,
             this.xrTableCell15});
             this.xrTableRowHeader.Name = "xrTableRowHeader";
@@ -293,8 +298,9 @@ namespace BeWo.Report.DefaultReports
             // 
             // xrTableCell4
             // 
+            this.xrTableCell4.Multiline = true;
             this.xrTableCell4.Name = "xrTableCell4";
-            this.xrTableCell4.Text = "Reguläre SOLL Stunden lt. Arbeitsvertrag";
+            this.xrTableCell4.Text = "Reguläre SOLL Gesamstunden \r\n(FLS + Admin)";
             this.xrTableCell4.Weight = 0.086772110582925041D;
             // 
             // xrTableCell2
@@ -314,7 +320,7 @@ namespace BeWo.Report.DefaultReports
             // 
             this.xrTableCell9.Multiline = true;
             this.xrTableCell9.Name = "xrTableCell9";
-            this.xrTableCell9.Text = "Tatsächliche SOLL Stunden lt.\r\nArbeitsvertrag";
+            this.xrTableCell9.Text = "Tatsächlich \r\nzu erbringende Gesamtstunden\r\n(FLS + Admin)";
             this.xrTableCell9.Weight = 0.10022545399328517D;
             // 
             // xrTableCell10
@@ -322,15 +328,15 @@ namespace BeWo.Report.DefaultReports
             this.xrTableCell10.Multiline = true;
             this.xrTableCell10.Name = "xrTableCell10";
             this.xrTableCell10.StylePriority.UseBackColor = false;
-            this.xrTableCell10.Text = "Geleistete abrechenbare\r\nStunden ";
+            this.xrTableCell10.Text = "Tatsächlich zu erbringende \r\nFachleistungs-Stunden";
             this.xrTableCell10.Weight = 0.08025517698462753D;
             // 
             // xrTableCell7
             // 
             this.xrTableCell7.Multiline = true;
             this.xrTableCell7.Name = "xrTableCell7";
-            this.xrTableCell7.Text = "Abrechenbare\r\nStunden Plus/Minus lfd. Monat";
-            this.xrTableCell7.Weight = 0.073972117778875038D;
+            this.xrTableCell7.Text = "Erbrachte\r\nFachleistungs-Stunden";
+            this.xrTableCell7.Weight = 0.083491655223042638D;
             // 
             // xrTableCell11
             // 
@@ -338,28 +344,35 @@ namespace BeWo.Report.DefaultReports
             this.xrTableCell11.Name = "xrTableCell11";
             this.xrTableCell11.StylePriority.UseBackColor = false;
             this.xrTableCell11.Text = "Erbrachte\r\nAdmin-\r\nStunden";
-            this.xrTableCell11.Weight = 0.07635738556555674D;
+            this.xrTableCell11.Weight = 0.066837848121389126D;
+            // 
+            // xrTableCell8
+            // 
+            this.xrTableCell8.Multiline = true;
+            this.xrTableCell8.Name = "xrTableCell8";
+            this.xrTableCell8.Text = "Erbrachte Gesamt-stunden lfd. Monat\r\n(FLS + Admin)";
+            this.xrTableCell8.Weight = 0.077309361082474728D;
             // 
             // xrTableCell13
             // 
             this.xrTableCell13.Name = "xrTableCell13";
-            this.xrTableCell13.Text = "Überstd. neu";
-            this.xrTableCell13.Weight = 0.085014919049127211D;
+            this.xrTableCell13.Text = "Überstd. neu lfd. Monat";
+            this.xrTableCell13.Weight = 0.083401674983903981D;
             // 
-            // xrTableCell14
+            // xrTableCell17
             // 
-            this.xrTableCell14.Multiline = true;
-            this.xrTableCell14.Name = "xrTableCell14";
-            this.xrTableCell14.StylePriority.UseBackColor = false;
-            this.xrTableCell14.Text = "Überstd.\r\ndieses Jahr";
-            this.xrTableCell14.Weight = 0.066927707215509419D;
+            this.xrTableCell17.Multiline = true;
+            this.xrTableCell17.Name = "xrTableCell17";
+            this.xrTableCell17.StylePriority.UseBackColor = false;
+            this.xrTableCell17.Text = "Anpassung Überstunden";
+            this.xrTableCell17.Weight = 0.075495268603757243D;
             // 
             // xrTableCell15
             // 
             this.xrTableCell15.Multiline = true;
             this.xrTableCell15.Name = "xrTableCell15";
             this.xrTableCell15.Text = "Überstd. Gesamt";
-            this.xrTableCell15.Weight = 0.077745572578547362D;
+            this.xrTableCell15.Weight = 0.08060123546448221D;
             // 
             // xrTable1
             // 
@@ -370,7 +383,7 @@ namespace BeWo.Report.DefaultReports
             this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.xrTableRow1});
-            this.xrTable1.SizeF = new System.Drawing.SizeF(1103F, 25F);
+            this.xrTable1.SizeF = new System.Drawing.SizeF(1041.541F, 25F);
             this.xrTable1.StylePriority.UseBorders = false;
             this.xrTable1.StylePriority.UseFont = false;
             this.xrTable1.StylePriority.UsePadding = false;
@@ -389,7 +402,6 @@ namespace BeWo.Report.DefaultReports
             this.xrTableCell16,
             this.cellGesamtGesamt,
             this.xrTableCell47,
-            this.xrTableCell48,
             this.xrTableCell21,
             this.xrTableCell51});
             this.xrTableRow1.Name = "xrTableRow1";
@@ -429,7 +441,7 @@ namespace BeWo.Report.DefaultReports
             // cellFLSIstGesamt
             // 
             this.cellFLSIstGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsIst")});
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsSoll")});
             this.cellFLSIstGesamt.Name = "cellFLSIstGesamt";
             xrSummary2.FormatString = "{0:0.00}";
             xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
@@ -439,12 +451,23 @@ namespace BeWo.Report.DefaultReports
             // cellFLSPlusMinusGesamt
             // 
             this.cellFLSPlusMinusGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsDiff")});
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsIst")});
             this.cellFLSPlusMinusGesamt.Name = "cellFLSPlusMinusGesamt";
             xrSummary3.FormatString = "{0:0.00}";
             xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
             this.cellFLSPlusMinusGesamt.Summary = xrSummary3;
-            this.cellFLSPlusMinusGesamt.Weight = 0.072987479922790824D;
+            this.cellFLSPlusMinusGesamt.Weight = 0.082380179511251414D;
+            // 
+            // xrTableCell16
+            // 
+            this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.StundenMittelbarIst")});
+            this.xrTableCell16.Multiline = true;
+            this.xrTableCell16.Name = "xrTableCell16";
+            xrSummary4.FormatString = "{0:0.00}";
+            xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell16.Summary = xrSummary4;
+            this.xrTableCell16.Weight = 0.065809657546345532D;
             // 
             // cellGesamtGesamt
             // 
@@ -454,22 +477,23 @@ namespace BeWo.Report.DefaultReports
             xrSummary5.FormatString = "{0:0.00}";
             xrSummary5.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
             this.cellGesamtGesamt.Summary = xrSummary5;
-            this.cellGesamtGesamt.Weight = 0.065809431023041987D;
+            this.cellGesamtGesamt.Weight = 0.076418602820587059D;
             // 
             // xrTableCell47
             // 
             this.xrTableCell47.Name = "xrTableCell47";
-            this.xrTableCell47.Weight = 0.084160153807405186D;
+            this.xrTableCell47.Weight = 0.082291400234857148D;
             // 
-            // xrTableCell48
+            // xrTableCell21
             // 
-            this.xrTableCell48.Name = "xrTableCell48";
-            this.xrTableCell48.Weight = 0.0660367855566253D;
+            this.xrTableCell21.Multiline = true;
+            this.xrTableCell21.Name = "xrTableCell21";
+            this.xrTableCell21.Weight = 0.074628872879250269D;
             // 
             // xrTableCell51
             // 
             this.xrTableCell51.Name = "xrTableCell51";
-            this.xrTableCell51.Weight = 0.0765720087568224D;
+            this.xrTableCell51.Weight = 0.0793896284301426D;
             // 
             // pageFooterBand1
             // 
@@ -635,54 +659,6 @@ namespace BeWo.Report.DefaultReports
             this.fieldRelationGesamt.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
             this.fieldRelationGesamt.Name = "fieldRelationGesamt";
             // 
-            // xrTableCell8
-            // 
-            this.xrTableCell8.Name = "xrTableCell8";
-            this.xrTableCell8.Text = "Gesamt-\r\nstunden lfd. Monat";
-            this.xrTableCell8.Weight = 0.066837847582387325D;
-            // 
-            // xrTableCell12
-            // 
-            this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.StundenGesamtIst")});
-            this.xrTableCell12.Name = "xrTableCell12";
-            this.xrTableCell12.TextFormatString = "{0:0.00}";
-            this.xrTableCell12.Weight = 0.066648085093909432D;
-            // 
-            // xrTableCell16
-            // 
-            this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.StundenMittelbarIst")});
-            this.xrTableCell16.Multiline = true;
-            this.xrTableCell16.Name = "xrTableCell16";
-            xrSummary4.FormatString = "{0:0.00}";
-            xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
-            this.xrTableCell16.Summary = xrSummary4;
-            this.xrTableCell16.Weight = 0.075202357134806122D;
-            // 
-            // xrTableCell17
-            // 
-            this.xrTableCell17.Multiline = true;
-            this.xrTableCell17.Name = "xrTableCell17";
-            this.xrTableCell17.StylePriority.UseBackColor = false;
-            this.xrTableCell17.Text = "Anpassung Überstunden";
-            this.xrTableCell17.Weight = 0.076447244659677033D;
-            // 
-            // xrTableCell18
-            // 
-            this.xrTableCell18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.UeberstundenAusbezahlt")});
-            this.xrTableCell18.Multiline = true;
-            this.xrTableCell18.Name = "xrTableCell18";
-            this.xrTableCell18.TextFormatString = "{0:0.00}";
-            this.xrTableCell18.Weight = 0.076531012892622319D;
-            // 
-            // xrTableCell21
-            // 
-            this.xrTableCell21.Multiline = true;
-            this.xrTableCell21.Name = "xrTableCell21";
-            this.xrTableCell21.Weight = 0.075568175859821785D;
-            // 
             // bindingSource1
             // 
             this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoMonateRO);
@@ -754,10 +730,8 @@ namespace BeWo.Report.DefaultReports
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell23;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell25;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell24;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell26;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
         private DevExpress.XtraReports.UI.XRTable xrTable1;
         private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
@@ -769,7 +743,6 @@ namespace BeWo.Report.DefaultReports
         private DevExpress.XtraReports.UI.XRTableCell cellFLSPlusMinusGesamt;
         private DevExpress.XtraReports.UI.XRTableCell cellGesamtGesamt;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell47;
-		private DevExpress.XtraReports.UI.XRTableCell xrTableCell48;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell51;
         private DevExpress.XtraReports.UI.DetailReportBand DetailReport1;
         private DevExpress.XtraReports.UI.DetailBand Detail2;

ReportImp/BetreuwoWesel/BetreuwoWesel.csproj

@@ -36,12 +36,14 @@
     <Reference Include="BS.Shared">
       <HintPath>..\..\Host\Bin\BS.Shared.dll</HintPath>
     </Reference>
+    <Reference Include="DevExpress.DataAccess.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <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.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.Data.Desktop.v23.2, 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.Xpo.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.XtraPrinting.v23.2, Version=23.2.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.XtraCharts.v23.2.Wizard, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />

ReportImp/BetreuwoWesel/Mitarbeiterarbeitszeitkonto.cs

@@ -31,35 +31,35 @@ namespace BetreuWoWesel
 
 				if (ed.Days != null)
 				{
-					for (int i = ed.Days.Count - 1; i > 0; i--)
-                    {
-						var item = ed.Days[i];
+					//for (int i = ed.Days.Count - 1; i > 0; i--)
+     //               {
+					//	var item = ed.Days[i];
 
-						if (item.MinutesTotal == 0)
-							ed.Days.Remove(item);
-					}
+					//	if (item.MinutesTotal == 0)
+					//		ed.Days.Remove(item);
+					//}
 
 					foreach (var dayDetail in ed.Days)
 					{
 						if (dayDetail.ServiceRecords != null && dayDetail.ServiceRecords.Count > 0)
 						{
-							var sr = dayDetail.ServiceRecords[0];
+                            foreach (var sr in dayDetail.ServiceRecords)
+                            {
+								// Es muss gezählt werden, wie oft die Leistung "Kommen aus frei" eingetragen wurde und am Ende mit 25 EUR multipliziert werden (Feld Regelarbeitszeit)
+								if (sr.ServiceDescription.Name.ToLower().Contains("kommen aus frei"))
+									kommenAusFrei++;
 
-							// Es muss gezählt werden, wie oft die Leistung "Kommen aus frei" eingetragen wurde und am Ende mit 25 EUR multipliziert werden (Feld Regelarbeitszeit)
-							if (sr.ServiceDescription.Name.ToLower().Contains("kommen aus frei"))
-								kommenAusFrei++;
+								if (sr.Customer != null)
+								{
+									dayDetail.Custom1 = String.Format("{0}, {1}", sr.Customer.Person.LastName,
+										sr.Customer.Person.FirstName);
+								}
 
-							if (sr.Customer != null)
-							{
-								dayDetail.Custom1 = String.Format("{0}, {1}", sr.Customer.Person.LastName,
-									sr.Customer.Person.FirstName);
+								if (String.IsNullOrEmpty(dayDetail.Custom2) && sr.ServiceDescription != null)
+								{
+									dayDetail.Custom2 = sr.ServiceDescription.Name;
+								}
 							}
-
-							if (String.IsNullOrEmpty(dayDetail.Custom2) && sr.ServiceDescription != null)
-							{
-								dayDetail.Custom2 = sr.ServiceDescription.Name;
-							}
-
 						}
 
 						if (dayDetail.StartDateTime1.HasValue || dayDetail.EndDateTime1.HasValue)
@@ -99,7 +99,7 @@ namespace BetreuWoWesel
 			}
 
 		}
-		private void FooterGfb_BeforePrint(object sender, System.ComponentModel.CancelEventArgs e)
+		private void lblFooterMehrarbeit_BeforePrint(object sender, System.ComponentModel.CancelEventArgs e)
 		{
 			var ro = this.GetCurrentRow() as MitarbeiterstundenkontoRO;
 			var emp = DetailReport.GetCurrentRow() as MitarbeiterstundenkontoRO.EmployeeDetail;
@@ -115,6 +115,22 @@ namespace BetreuWoWesel
 				//footer.BackColor = IstGfb(ro, emp) ? Color.Aqua : Color.IndianRed;
 			}
 		}
+		private void FooterGfb_BeforePrint(object sender, System.ComponentModel.CancelEventArgs e)
+		{
+			var ro = this.GetCurrentRow() as MitarbeiterstundenkontoRO;
+			var emp = DetailReport.GetCurrentRow() as MitarbeiterstundenkontoRO.EmployeeDetail;
+			var footer = sender as GroupFooterBand;
+
+			if (ro != null && emp != null && footer != null)
+			{
+				if (!IstGfb(ro, emp))
+				{
+					e.Cancel = true;
+				}
+				//footer.Visible = IstGfb(ro, emp);
+				//footer.BackColor = IstGfb(ro, emp) ? Color.Aqua : Color.IndianRed;
+			}
+		}
 		private bool IstGfb(MitarbeiterstundenkontoRO ro, MitarbeiterstundenkontoRO.EmployeeDetail emp)
 		{
 			var c = emp.Employee.GetValidContractForDate(ro.ReportStartDate);
@@ -130,5 +146,6 @@ namespace BetreuWoWesel
 			return false;
 		}
 
-	}
+        
+    }
 }

ReportImp/BetreuwoWesel/Mitarbeiterarbeitszeitkonto.designer.cs

@@ -92,6 +92,7 @@ namespace BetreuWoWesel
             this.lblSaldo2 = new DevExpress.XtraReports.UI.XRLabel();
             this.lblSaldo5 = new DevExpress.XtraReports.UI.XRLabel();
             this.lblSaldo1 = new DevExpress.XtraReports.UI.XRLabel();
+            this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
             this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
@@ -102,6 +103,7 @@ namespace BetreuWoWesel
             this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             this.Title = new DevExpress.XtraReports.UI.XRControlStyle();
             this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle();
             this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle();
@@ -125,8 +127,6 @@ namespace BetreuWoWesel
             this.fieldSundayHours = new DevExpress.XtraReports.UI.CalculatedField();
             this.fieldHolidayHours = new DevExpress.XtraReports.UI.CalculatedField();
             this.fieldMinutenGesamtIst = new DevExpress.XtraReports.UI.CalculatedField();
-            this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
-            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
@@ -240,7 +240,7 @@ namespace BetreuWoWesel
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.MinutesTotal", "{0:0.##}")});
             this.xrTableCell20.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
             this.xrTableCell20.Name = "xrTableCell20";
-            this.xrTableCell20.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F);
+            this.xrTableCell20.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
             this.xrTableCell20.StylePriority.UseFont = false;
             this.xrTableCell20.StylePriority.UsePadding = false;
             this.xrTableCell20.StylePriority.UseTextAlignment = false;
@@ -366,7 +366,7 @@ namespace BetreuWoWesel
             // 
             this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrTableCell1.Name = "xrTableCell1";
-            this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F);
+            this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
             this.xrTableCell1.StylePriority.UseFont = false;
             this.xrTableCell1.StylePriority.UsePadding = false;
             this.xrTableCell1.StylePriority.UseTextAlignment = false;
@@ -376,8 +376,6 @@ namespace BetreuWoWesel
             // 
             // xrTableCell2
             // 
-            this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "GroupTypeHeader")});
             this.xrTableCell2.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrTableCell2.Name = "xrTableCell2";
             this.xrTableCell2.StylePriority.UseFont = false;
@@ -650,7 +648,7 @@ namespace BetreuWoWesel
             this.lblFooterMehrarbeit.HeightF = 131.3318F;
             this.lblFooterMehrarbeit.Level = 2;
             this.lblFooterMehrarbeit.Name = "lblFooterMehrarbeit";
-            this.lblFooterMehrarbeit.BeforePrint += new DevExpress.XtraReports.UI.BeforePrintEventHandler(this.FooterGfb_BeforePrint);
+            this.lblFooterMehrarbeit.BeforePrint += new DevExpress.XtraReports.UI.BeforePrintEventHandler(this.lblFooterMehrarbeit_BeforePrint);
             // 
             // lblSaldo4
             // 
@@ -812,6 +810,23 @@ namespace BetreuWoWesel
             this.lblSaldo1.Text = "Saldo Mehrarbeit / Gesamt (Vortrag Vormonat)";
             this.lblSaldo1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
             // 
+            // GroupFooter1
+            // 
+            this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel10,
+            this.xrLabel11,
+            this.xrLabel5,
+            this.xrLabel6,
+            this.lblKommenAusFrei,
+            this.xrLabel3,
+            this.xrLabel15,
+            this.xrLabel17,
+            this.xrLabel8,
+            this.xrLabel7});
+            this.GroupFooter1.HeightF = 100.0001F;
+            this.GroupFooter1.Level = 3;
+            this.GroupFooter1.Name = "GroupFooter1";
+            // 
             // xrLabel10
             // 
             this.xrLabel10.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
@@ -988,6 +1003,10 @@ namespace BetreuWoWesel
             this.xrLabel7.Text = "Su. Feiertagszuschläge / Leistungsmonat";
             this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
             // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);
+            // 
             // Title
             // 
             this.Title.BackColor = System.Drawing.Color.White;
@@ -1154,27 +1173,6 @@ namespace BetreuWoWesel
             this.fieldMinutenGesamtIst.Expression = "[StundenGesamtIst] * 60\n";
             this.fieldMinutenGesamtIst.Name = "fieldMinutenGesamtIst";
             // 
-            // GroupFooter1
-            // 
-            this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
-            this.xrLabel10,
-            this.xrLabel11,
-            this.xrLabel5,
-            this.xrLabel6,
-            this.lblKommenAusFrei,
-            this.xrLabel3,
-            this.xrLabel15,
-            this.xrLabel17,
-            this.xrLabel8,
-            this.xrLabel7});
-            this.GroupFooter1.HeightF = 100.0001F;
-            this.GroupFooter1.Level = 3;
-            this.GroupFooter1.Name = "GroupFooter1";
-            // 
-            // bindingSource1
-            // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);
-            // 
             // Mitarbeiterarbeitszeitkonto
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1205,7 +1203,7 @@ namespace BetreuWoWesel
             this.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
             this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
             this.ruleIstFeiertagOderWE});
-            this.Margins = new DevExpress.Drawing.DXMargins(75F, 14F, 50F, 50F);
+            this.Margins = new DevExpress.Drawing.DXMargins(68F, 14F, 50F, 50F);
             this.PageHeight = 1169;
             this.PageWidth = 827;
             this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;

ReportImp/BetreuwoWesel/Mitarbeiterstundenkonto.cs

@@ -36,11 +36,13 @@ namespace BetreuWoWesel
 					{
 						if (dayDetail.ServiceRecords != null && dayDetail.ServiceRecords.Count > 0)
 						{
-							var sr = dayDetail.ServiceRecords[0];
-
-							// Es muss gezählt werden, wie oft die Leistung "Kommen aus frei" eingetragen wurde und am Ende mit 25 EUR multipliziert werden (Feld Regelarbeitszeit)
-							if (sr.ServiceDescription.Name.ToLower().Contains("kommen aus frei"))
-								kommenAusFrei++;
+                            foreach (var sr in dayDetail.ServiceRecords)
+                            {
+								// Es muss gezählt werden, wie oft die Leistung "Kommen aus frei" eingetragen wurde und am Ende mit 25 EUR multipliziert werden (Feld Regelarbeitszeit)
+								if (sr.ServiceDescription.Name.ToLower().Contains("kommen aus frei"))
+									kommenAusFrei++;
+							}
+						
 
 							if (dayDetail.HoursSunday > 0)
 								ed.Custom1 += dayDetail.HoursSunday;

ReportImp/BfpDus/BfpDus.csproj

@@ -70,6 +70,8 @@
     <Compile Include="InvoiceCustomerReport.Designer.cs">
       <DependentUpon>InvoiceCustomerReport.cs</DependentUpon>
     </Compile>
+    <Compile Include="Invoicing\CustomInvoiceCreation.cs" />
+    <Compile Include="Invoicing\CustomInvoiceFactory.cs" />
     <Compile Include="Invoicing\SettlementInvoiceCreation.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ServiceInvoiceReport.cs">

ReportImp/BfpDus/CustomReportCreator.cs

@@ -31,11 +31,10 @@ namespace BfpDus
                 {
                     ansprechpartner.AppendLine(treport.SettlementRo.InvoiceDate);
                     ansprechpartner.AppendLine();
-                    ansprechpartner.AppendLine("Frau Aust");
-                    ansprechpartner.AppendLine("Tel.:  0211/88 000 99");
-                    ansprechpartner.AppendLine("Fax.: 0211/88 000 97");
-                    ansprechpartner.Append("aust@bfp-dus.de");
-
+                    ansprechpartner.AppendLine("Frau Jondral");
+                    ansprechpartner.AppendLine("Tel.:  0211/962 90 200");
+                    ansprechpartner.AppendLine("Fax.: 0211/962 90 207");
+                    ansprechpartner.Append("jondral@bfp-dus.de");
                     if (!String.IsNullOrEmpty(treport.SettlementRo.RecipientOrganisation))
                     {
                         anschrift.AppendLine(treport.SettlementRo.RecipientOrganisation);
@@ -69,10 +68,10 @@ namespace BfpDus
                 {
                     ansprechpartner.AppendLine(String.Format("{0:dd.MM.yyyy}", treport.SettlementRo.InvoiceDate));
                     ansprechpartner.AppendLine();
-                    ansprechpartner.AppendLine("Frau Aust");
-                    ansprechpartner.AppendLine("Tel.:  0211/88 000 99");
-                    ansprechpartner.AppendLine("Fax.: 0211/88 000 97");
-                    ansprechpartner.Append("aust@bfp-dus.de");
+                    ansprechpartner.AppendLine("Frau Jondral");
+                    ansprechpartner.AppendLine("Tel.:  0211/962 90 200");
+                    ansprechpartner.AppendLine("Fax.: 0211/962 90 207");
+                    ansprechpartner.Append("jondral@bfp-dus.de");
 
                     if (!String.IsNullOrEmpty(treport.SettlementRo.RecipientOrganisation))
                     {
@@ -155,96 +154,96 @@ namespace BfpDus
             return report;
         }
 
-	    public override XtraReport CreateServiceInvoiceReport(string dcIds, long? invoiceBaseOid)
-	    {
-	        XtraReport allReports = null;
+	    //public override XtraReport CreateServiceInvoiceReport(string dcIds, long? invoiceBaseOid)
+	    //{
+	    //    XtraReport allReports = null;
 
-            if (String.IsNullOrEmpty(dcIds) && invoiceBaseOid.HasValue)
-            {
-                var serviceInvoice = DAOFactory.SearchDAO.GetServiceInvoiceByInvoiceBaseOid(invoiceBaseOid.Value);
-                dcIds = String.Format("{0}", serviceInvoice.Oid);
-            }
+     //       if (String.IsNullOrEmpty(dcIds) && invoiceBaseOid.HasValue)
+     //       {
+     //           var serviceInvoice = DAOFactory.SearchDAO.GetServiceInvoiceByInvoiceBaseOid(invoiceBaseOid.Value);
+     //           dcIds = String.Format("{0}", serviceInvoice.Oid);
+     //       }
 
-            if (!string.IsNullOrEmpty(dcIds))
-            {
-                var serviceInvoiceOid2CostbearerId = new Dictionary<long, string>();
-                var dcList = new List<ServiceInvoiceDC>();
+     //       if (!string.IsNullOrEmpty(dcIds))
+     //       {
+     //           var serviceInvoiceOid2CostbearerId = new Dictionary<long, string>();
+     //           var dcList = new List<ServiceInvoiceDC>();
 
-                var dcidStrs = dcIds.Split(';');
-                foreach (var oidStr in dcidStrs)
-                {
-                    var oid = long.Parse(oidStr);
-                    var invoice = DAOFactory.GenericDAO.LoadByID<ServiceInvoice>(oid);
-                    var dc = MapperFactory.ServiceInvoiceDC_ServiceInvoice.MapToNewDC(invoice);
-                    dcList.Add(dc);
+     //           var dcidStrs = dcIds.Split(';');
+     //           foreach (var oidStr in dcidStrs)
+     //           {
+     //               var oid = long.Parse(oidStr);
+     //               var invoice = DAOFactory.GenericDAO.LoadByID<ServiceInvoice>(oid);
+     //               var dc = MapperFactory.ServiceInvoiceDC_ServiceInvoice.MapToNewDC(invoice);
+     //               dcList.Add(dc);
 
-                    if (serviceInvoiceOid2CostbearerId.ContainsKey(oid))
-                        continue;
+     //               if (serviceInvoiceOid2CostbearerId.ContainsKey(oid))
+     //                   continue;
 
-                    if (!String.IsNullOrEmpty(invoice.InvoiceBase.InvoiceId))
-                        serviceInvoiceOid2CostbearerId.Add(oid, invoice.InvoiceBase.InvoiceId);
-                    else
-                    {
-                        foreach (var period in invoice.ServiceInvoicePeriodList)
-                        {
-                            try
-                            {
-                                if (period.SupportConceptApprovalPeriod != null)
-                                {
-                                    AddCostBearerIdToDict(oid, serviceInvoiceOid2CostbearerId,
-                                        period.SupportConceptApprovalPeriod.CostBearer2SupportConcept);
+     //               if (!String.IsNullOrEmpty(invoice.InvoiceBase.InvoiceId))
+     //                   serviceInvoiceOid2CostbearerId.Add(oid, invoice.InvoiceBase.InvoiceId);
+     //               else
+     //               {
+     //                   foreach (var period in invoice.ServiceInvoicePeriodList)
+     //                   {
+     //                       try
+     //                       {
+     //                           if (period.SupportConceptApprovalPeriod != null)
+     //                           {
+     //                               AddCostBearerIdToDict(oid, serviceInvoiceOid2CostbearerId,
+     //                                   period.SupportConceptApprovalPeriod.CostBearer2SupportConcept);
 
-                                }
-                                foreach (var item in period.InvoiceItemList)
-                                {
-                                    if (item.SupportConceptApprovalPeriodOid.HasValue)
-                                    {
-                                        var approvalPeriod =
-                                            DAOFactory.GenericDAO.LoadByID<SupportConceptApprovalPeriod>(item.SupportConceptApprovalPeriodOid.Value);
-                                        if (approvalPeriod.CostBearer2SupportConcept != null)
-                                        {
-                                            AddCostBearerIdToDict(oid, serviceInvoiceOid2CostbearerId, approvalPeriod.CostBearer2SupportConcept);
-                                        }
-                                    }
-                                }
-                            }
-                            catch (Exception)
-                            {
-                                //ignore
-                            }
+     //                           }
+     //                           foreach (var item in period.InvoiceItemList)
+     //                           {
+     //                               if (item.SupportConceptApprovalPeriodOid.HasValue)
+     //                               {
+     //                                   var approvalPeriod =
+     //                                       DAOFactory.GenericDAO.LoadByID<SupportConceptApprovalPeriod>(item.SupportConceptApprovalPeriodOid.Value);
+     //                                   if (approvalPeriod.CostBearer2SupportConcept != null)
+     //                                   {
+     //                                       AddCostBearerIdToDict(oid, serviceInvoiceOid2CostbearerId, approvalPeriod.CostBearer2SupportConcept);
+     //                                   }
+     //                               }
+     //                           }
+     //                       }
+     //                       catch (Exception)
+     //                       {
+     //                           //ignore
+     //                       }
 
-                        }
-                    }
-                }
+     //                   }
+     //               }
+     //           }
 
                 
 
-                foreach (var iDC in dcList)
-                {
-                    String reportId = null;
-                    if (serviceInvoiceOid2CostbearerId.ContainsKey(iDC.ServiceInvoiceOid.Value))
-                        reportId = serviceInvoiceOid2CostbearerId[iDC.ServiceInvoiceOid.Value];
+     //           foreach (var iDC in dcList)
+     //           {
+     //               String reportId = null;
+     //               if (serviceInvoiceOid2CostbearerId.ContainsKey(iDC.ServiceInvoiceOid.Value))
+     //                   reportId = serviceInvoiceOid2CostbearerId[iDC.ServiceInvoiceOid.Value];
 
-                    IBeWoReport<ServiceInvoiceRO> singleReport = FindReportImp<ServiceInvoiceRO>(reportId);
+     //               IBeWoReport<ServiceInvoiceRO> singleReport = FindReportImp<ServiceInvoiceRO>(reportId);
 
-                    singleReport.SetReportDataSource(ServiceInvoiceRO.Create(iDC));
+     //               singleReport.SetReportDataSource(ServiceInvoiceRO.Create(iDC));
 
-                    var briefkopf = CreateReportMitBriefkopf(singleReport);
+     //               var briefkopf = CreateReportMitBriefkopf(singleReport);
                     
-                    if (allReports == null)
-                        allReports = briefkopf;
-                    else
-                        allReports.Pages.AddRange(briefkopf.Pages);
-                }
+     //               if (allReports == null)
+     //                   allReports = briefkopf;
+     //               else
+     //                   allReports.Pages.AddRange(briefkopf.Pages);
+     //           }
                 
-            }
+     //       }
 
             
-	        allReports.DisplayName = "Rechnung";
-	        allReports.CreateDocument();
-	        return allReports;
+	    //    allReports.DisplayName = "Rechnung";
+	    //    allReports.CreateDocument();
+	    //    return allReports;
             
-	    }
+	    //}
 
 	    private Briefkopf CreateReportMitBriefkopf(IBeWoReport<ServiceInvoiceRO> subreport)
 	    {

ReportImp/BfpDus/Invoicing/CustomInvoiceCreation.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+using BeWo.Report.ReportObjects;
+using BeWo.Service.DCEntityMapper;
+using BeWo.Service.Invoicing;
+using BS.Shared;
+using BS.Shared.Core;
+using BS.Shared.DataContracts;
+using BS.Shared.Extensions;
+using BS.Shared.Services;
+using Service.Invoicing;
+
+namespace BfpDus.Invoicing
+{
+    public class CustomInvoiceCreation : InvoiceCreation
+	{
+        public override void SetRecipientInformation(ServiceInvoice serviceInvoice, CostBearer costBearer)
+        {
+            if (costBearer.Organisation.Name == "Privat")
+            {
+                serviceInvoice.InvoiceBase.RecipientOrganisationOid = costBearer.Organisation.Oid;
+                serviceInvoice.InvoiceBase.RecipientOrganisation = costBearer.Organisation.Name;
+                //serviceInvoice.InvoiceBase.RecipientContacts = costBearer.Organisation.Contacts.Select(i => i.CopyToNew()).ToList();
+                serviceInvoice.InvoiceBase.RecipientCostBearerOid = costBearer.Oid;
+
+                if (serviceInvoice.InvoiceBase.CostBearer2SupportConcept != null)
+                {
+                    var cust = serviceInvoice.InvoiceBase.CostBearer2SupportConcept.SupportConcept.Customer;
+
+                    if (cust.Person.InvoiceAddress != null)
+                    {
+                        serviceInvoice.InvoiceBase.RecipientAddress = cust.Person.InvoiceAddress.CopyToNew();
+                    }
+                    else if (cust.Person.Address != null)
+                    {
+                        serviceInvoice.InvoiceBase.RecipientAddress = cust.Person.Address.CopyToNew();
+                    }
+
+                    serviceInvoice.InvoiceBase.RecipientPersonFirstName = cust.Person.FirstName;
+                    serviceInvoice.InvoiceBase.RecipientPersonLastName = cust.Person.LastName;
+                    serviceInvoice.InvoiceBase.RecipientCustomerOid = cust.Oid;
+                }
+            }
+        }
+    }
+}

ReportImp/BfpDus/Invoicing/CustomInvoiceFactory.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using BeWo.Data.Entities;
+using BeWo.Service.Invoicing;
+using BS.Shared.DataContracts;
+using BS.Shared.DataContracts.Compact;
+
+namespace BfpDus.Invoicing
+{
+	public class CustomInvoiceFactory : InvoiceFactory
+	{
+        public override InvoiceCreation CreateInvoiceCreator(string specificId, string tenant, Dictionary<CompactSupportConceptDC, List<ServiceRecordDC>> supportConcepts2ServiceRecords)
+        {
+            return new CustomInvoiceCreation();
+        }
+    }
+}

ReportImp/BfpDus/ServiceInvoiceReport.Designer.cs

@@ -29,18 +29,16 @@ namespace BfpDus
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ServiceInvoiceReport));
+            DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
             this.Detail = new DevExpress.XtraReports.UI.DetailBand();
             this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
             this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
             this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
             this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
             this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+            this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
             this.lblAbrechnungszeitraum = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
-            this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableRow14 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
             this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
             this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
@@ -57,10 +55,25 @@ namespace BfpDus
             this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
             this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
+            this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox();
+            this.lblMonat = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblAnschrift = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
             this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
-            this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
             // 
@@ -73,8 +86,16 @@ namespace BfpDus
             // 
             // ReportHeader
             // 
-            this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
-            this.ReportHeader.HeightF = 0F;
+            this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable1,
+            this.xrRichText2,
+            this.xrPictureBox2,
+            this.lblMonat,
+            this.xrLabel4,
+            this.xrLabel5,
+            this.xrLabel6,
+            this.lblAnschrift});
+            this.ReportHeader.HeightF = 398.3333F;
             this.ReportHeader.Name = "ReportHeader";
             this.ReportHeader.StylePriority.UseFont = false;
             // 
@@ -86,7 +107,7 @@ namespace BfpDus
             // 
             // topMarginBand1
             // 
-            this.topMarginBand1.HeightF = 157.5F;
+            this.topMarginBand1.HeightF = 50F;
             this.topMarginBand1.Name = "topMarginBand1";
             // 
             // bottomMarginBand1
@@ -97,15 +118,30 @@ namespace BfpDus
             // Page1
             // 
             this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel3,
             this.xrLabel2,
             this.lblAbrechnungszeitraum});
-            this.Page1.HeightF = 107.4166F;
+            this.Page1.HeightF = 148.2499F;
             this.Page1.Name = "Page1";
             this.Page1.StylePriority.UseFont = false;
             // 
+            // xrLabel2
+            // 
+            this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 14F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrLabel2.Name = "xrLabel2";
+            this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel2.SizeF = new System.Drawing.SizeF(536.0416F, 28.33333F);
+            this.xrLabel2.StylePriority.UseBackColor = false;
+            this.xrLabel2.StylePriority.UseFont = false;
+            this.xrLabel2.Text = "Rechnung";
+            this.xrLabel2.WordWrap = false;
+            // 
             // lblAbrechnungszeitraum
             // 
-            this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 43.33333F);
+            this.lblAbrechnungszeitraum.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 94.16666F);
             this.lblAbrechnungszeitraum.Multiline = true;
             this.lblAbrechnungszeitraum.Name = "lblAbrechnungszeitraum";
             this.lblAbrechnungszeitraum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -113,55 +149,14 @@ namespace BfpDus
             this.lblAbrechnungszeitraum.StylePriority.UseFont = false;
             this.lblAbrechnungszeitraum.Text = "Für die von uns geleistete Betreuungsarbeit berechnen wir:";
             // 
-            // xrTable4
-            // 
-            this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 68.75F);
-            this.xrTable4.Name = "xrTable4";
-            this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
-            this.xrTableRow10,
-            this.xrTableRow14});
-            this.xrTable4.SizeF = new System.Drawing.SizeF(536.0416F, 26F);
-            this.xrTable4.StylePriority.UseFont = false;
-            // 
-            // xrTableRow10
-            // 
-            this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell9});
-            this.xrTableRow10.Name = "xrTableRow10";
-            this.xrTableRow10.Weight = 0.38095238095238093D;
-            // 
-            // xrTableCell9
-            // 
-            this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Notice")});
-            this.xrTableCell9.Name = "xrTableCell9";
-            this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell9.StylePriority.UsePadding = false;
-            this.xrTableCell9.Text = "xrTableCell1";
-            this.xrTableCell9.Weight = 3D;
-            // 
-            // xrTableRow14
-            // 
-            this.xrTableRow14.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell12});
-            this.xrTableRow14.Name = "xrTableRow14";
-            this.xrTableRow14.Weight = 0.23809523809523808D;
-            // 
-            // xrTableCell12
-            // 
-            this.xrTableCell12.Name = "xrTableCell12";
-            this.xrTableCell12.Weight = 3D;
-            // 
             // xrLabel9
             // 
-            this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Tahoma", 11F, DevExpress.Drawing.DXFontStyle.Italic, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
-            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 43.75F);
             this.xrLabel9.Name = "xrLabel9";
             this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel9.SizeF = new System.Drawing.SizeF(250F, 17F);
+            this.xrLabel9.SizeF = new System.Drawing.SizeF(464F, 17F);
             this.xrLabel9.StylePriority.UseFont = false;
-            this.xrLabel9.Text = "Abschließende Bemerkungen:";
+            this.xrLabel9.Text = "Zahlbar innerhalb 14 Tagen ab Rechnungsdatum ohne Abzug";
             // 
             // DetailReport
             // 
@@ -175,7 +170,7 @@ namespace BfpDus
             // 
             // Detail1
             // 
-            this.Detail1.HeightF = 25F;
+            this.Detail1.HeightF = 0F;
             this.Detail1.Name = "Detail1";
             // 
             // DetailReport2
@@ -197,13 +192,11 @@ namespace BfpDus
             // 
             // xrTable6
             // 
-            this.xrTable6.Font = new DevExpress.Drawing.DXFont("Verdana", 8.25F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
-            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(1.059638E-05F, 0F);
             this.xrTable6.Name = "xrTable6";
             this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.xrTableRow25});
-            this.xrTable6.SizeF = new System.Drawing.SizeF(536.0416F, 25F);
+            this.xrTable6.SizeF = new System.Drawing.SizeF(666.9999F, 25F);
             this.xrTable6.StylePriority.UseFont = false;
             // 
             // xrTableRow25
@@ -221,43 +214,39 @@ namespace BfpDus
             // xrTableCell42
             // 
             this.xrTableCell42.BorderColor = System.Drawing.Color.DarkGray;
-            this.xrTableCell42.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell42.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.ServiceDescription")});
+            this.xrTableCell42.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrTableCell42.Name = "xrTableCell42";
             this.xrTableCell42.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
             this.xrTableCell42.StylePriority.UseBorderColor = false;
             this.xrTableCell42.StylePriority.UseBorders = false;
+            this.xrTableCell42.StylePriority.UseFont = false;
             this.xrTableCell42.StylePriority.UsePadding = false;
             this.xrTableCell42.StylePriority.UseTextAlignment = false;
             this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            this.xrTableCell42.Weight = 0.85081229498678679D;
+            this.xrTableCell42.Weight = 1.0096009226264111D;
             // 
             // xrTableCell43
             // 
             this.xrTableCell43.BorderColor = System.Drawing.Color.DarkGray;
-            this.xrTableCell43.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell43.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.HourlyRate", "{0:0.00}")});
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.Hours", "{0:0.00}")});
             this.xrTableCell43.Name = "xrTableCell43";
-            this.xrTableCell43.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell43.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 2, 2, 100F);
             this.xrTableCell43.StylePriority.UseBorderColor = false;
             this.xrTableCell43.StylePriority.UseBorders = false;
             this.xrTableCell43.StylePriority.UsePadding = false;
             this.xrTableCell43.StylePriority.UseTextAlignment = false;
             this.xrTableCell43.Text = "xrTableCell43";
             this.xrTableCell43.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
-            this.xrTableCell43.Weight = 0.23245943032832414D;
+            this.xrTableCell43.Weight = 0.28785140803176246D;
             // 
             // xrTableCell44
             // 
             this.xrTableCell44.BorderColor = System.Drawing.Color.DarkGray;
-            this.xrTableCell44.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell44.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.Hours", "{0:0.##}")});
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.UnitDescription")});
             this.xrTableCell44.Name = "xrTableCell44";
             this.xrTableCell44.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
             this.xrTableCell44.StylePriority.UseBorderColor = false;
@@ -265,33 +254,27 @@ namespace BfpDus
             this.xrTableCell44.StylePriority.UsePadding = false;
             this.xrTableCell44.StylePriority.UseTextAlignment = false;
             this.xrTableCell44.Text = "xrTableCell44";
-            this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
-            this.xrTableCell44.Weight = 0.2893277257020575D;
+            this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell44.Weight = 0.47765820502594919D;
             // 
             // xrTableCell45
             // 
             this.xrTableCell45.BorderColor = System.Drawing.Color.DarkGray;
-            this.xrTableCell45.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell45.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.NetAmount", "{0:0.00}")});
             this.xrTableCell45.Name = "xrTableCell45";
             this.xrTableCell45.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
             this.xrTableCell45.StylePriority.UseBorderColor = false;
             this.xrTableCell45.StylePriority.UseBorders = false;
             this.xrTableCell45.StylePriority.UsePadding = false;
             this.xrTableCell45.StylePriority.UseTextAlignment = false;
-            this.xrTableCell45.Text = "xrTableCell45";
+            this.xrTableCell45.Text = "à";
             this.xrTableCell45.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
-            this.xrTableCell45.Weight = 0.26310971709438763D;
+            this.xrTableCell45.Weight = 0.13386361730403046D;
             // 
             // xrTableCell46
             // 
             this.xrTableCell46.BorderColor = System.Drawing.Color.DarkGray;
-            this.xrTableCell46.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell46.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.RateFactor")});
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.HourlyRate")});
             this.xrTableCell46.Name = "xrTableCell46";
             this.xrTableCell46.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
             this.xrTableCell46.StylePriority.UseBorderColor = false;
@@ -299,79 +282,248 @@ namespace BfpDus
             this.xrTableCell46.StylePriority.UsePadding = false;
             this.xrTableCell46.StylePriority.UseTextAlignment = false;
             this.xrTableCell46.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
-            this.xrTableCell46.Weight = 0.42042083402151886D;
+            this.xrTableCell46.TextFormatString = "{0:c}";
+            this.xrTableCell46.Weight = 0.37980001881796405D;
             // 
             // xrTableCell47
             // 
             this.xrTableCell47.BorderColor = System.Drawing.Color.DarkGray;
-            this.xrTableCell47.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell47.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.GrossAmount")});
+            this.xrTableCell47.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrTableCell47.Name = "xrTableCell47";
             this.xrTableCell47.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
             this.xrTableCell47.StylePriority.UseBorderColor = false;
             this.xrTableCell47.StylePriority.UseBorders = false;
+            this.xrTableCell47.StylePriority.UseFont = false;
             this.xrTableCell47.StylePriority.UsePadding = false;
             this.xrTableCell47.StylePriority.UseTextAlignment = false;
             this.xrTableCell47.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
-            this.xrTableCell47.Weight = 0.31923915575667006D;
+            this.xrTableCell47.Weight = 0.6669123533858502D;
             // 
             // GroupFooter1
             // 
             this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
             this.xrLabel10,
             this.xrLabel1,
-            this.xrLabel9,
-            this.xrTable4});
-            this.GroupFooter1.HeightF = 218.0417F;
+            this.xrLabel9});
+            this.GroupFooter1.HeightF = 167.2084F;
             this.GroupFooter1.Name = "GroupFooter1";
             // 
             // xrLabel10
             // 
+            this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
             this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 114.9306F);
             this.xrLabel10.Multiline = true;
             this.xrLabel10.Name = "xrLabel10";
             this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel10.SizeF = new System.Drawing.SizeF(262.5F, 103.1111F);
+            this.xrLabel10.SizeF = new System.Drawing.SizeF(262.5F, 52.27778F);
             this.xrLabel10.StylePriority.UseFont = false;
-            this.xrLabel10.Text = "Mit freundlichen Grüßen\r\n\r\n\r\nChristine Aust\r\nSozialpädagogin M.A.\r\n";
+            this.xrLabel10.Text = "Leistungen der ambulanten\r\nEingliederungshilfe sind von der\r\nUmsatzsteuerpflicht " +
+    "befreit.";
             // 
             // xrLabel1
             // 
+            this.xrLabel1.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrLabel1.Borders = DevExpress.XtraPrinting.BorderSide.Top;
             this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim", "Gesamtsumme: {0}")});
-            this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Tahoma", 11F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
-            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
-            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(280.2083F, 0F);
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim")});
+            this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
             this.xrLabel1.Name = "xrLabel1";
             this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
-            this.xrLabel1.SizeF = new System.Drawing.SizeF(255.8333F, 25F);
+            this.xrLabel1.SizeF = new System.Drawing.SizeF(666.9999F, 25F);
+            this.xrLabel1.StylePriority.UseBorderColor = false;
+            this.xrLabel1.StylePriority.UseBorders = false;
             this.xrLabel1.StylePriority.UseFont = false;
             this.xrLabel1.StylePriority.UsePadding = false;
             this.xrLabel1.StylePriority.UseTextAlignment = false;
-            this.xrLabel1.Text = "xrLabel1";
             this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrLabel1.TextFormatString = "Rechnungsbetrag: {0}";
+            // 
+            // xrLabel3
+            // 
+            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 42.5F);
+            this.xrLabel3.Multiline = true;
+            this.xrLabel3.Name = "xrLabel3";
+            this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel3.SizeF = new System.Drawing.SizeF(536.0416F, 31.58334F);
+            this.xrLabel3.StylePriority.UseFont = false;
+            this.xrLabel3.Text = "Für die von uns geleistete Betreuungsarbeit berechnen wir:";
+            // 
+            // xrRichText2
+            // 
+            this.xrRichText2.Font = new DevExpress.Drawing.DXFont("Arial", 7F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline))));
+            this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 142.9792F);
+            this.xrRichText2.Name = "xrRichText2";
+            this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
+            this.xrRichText2.SizeF = new System.Drawing.SizeF(397.6249F, 24.81248F);
+            this.xrRichText2.StylePriority.UseFont = false;
+            // 
+            // xrPictureBox2
+            // 
+            this.xrPictureBox2.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox2.ImageSource"));
+            this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(210F, 3F);
+            this.xrPictureBox2.Name = "xrPictureBox2";
+            this.xrPictureBox2.SizeF = new System.Drawing.SizeF(52.75116F, 78.00001F);
+            this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
+            // 
+            // lblMonat
+            // 
+            this.lblMonat.Font = new DevExpress.Drawing.DXFont("Tahoma", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.lblMonat.LocationFloat = new DevExpress.Utils.PointFloat(268F, 0F);
+            this.lblMonat.Multiline = true;
+            this.lblMonat.Name = "lblMonat";
+            this.lblMonat.SizeF = new System.Drawing.SizeF(337.2131F, 25F);
+            this.lblMonat.StylePriority.UseFont = false;
+            this.lblMonat.StylePriority.UseTextAlignment = false;
+            this.lblMonat.Text = "Freie gemeinnützige";
+            this.lblMonat.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
+            // 
+            // xrLabel4
+            // 
+            this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Tahoma", 16F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(265.3559F, 25F);
+            this.xrLabel4.Multiline = true;
+            this.xrLabel4.Name = "xrLabel4";
+            this.xrLabel4.SizeF = new System.Drawing.SizeF(337.21F, 28F);
+            this.xrLabel4.StylePriority.UseFont = false;
+            this.xrLabel4.Text = "eratungsstelle";
+            // 
+            // xrLabel5
+            // 
+            this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Tahoma", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(268F, 55F);
+            this.xrLabel5.Multiline = true;
+            this.xrLabel5.Name = "xrLabel5";
+            this.xrLabel5.SizeF = new System.Drawing.SizeF(337.2131F, 25F);
+            this.xrLabel5.StylePriority.UseFont = false;
+            this.xrLabel5.Text = "für Psychotherapie e.V.";
+            // 
+            // xrLabel6
+            // 
+            this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Tahoma", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 100.5207F);
+            this.xrLabel6.Multiline = true;
+            this.xrLabel6.Name = "xrLabel6";
+            this.xrLabel6.SizeF = new System.Drawing.SizeF(676.9999F, 25F);
+            this.xrLabel6.StylePriority.UseFont = false;
+            this.xrLabel6.StylePriority.UseTextAlignment = false;
+            this.xrLabel6.Text = "Selbstbestimmt Leben mit Unterstützung in Einzelwohnungen und Wohngemeinschaften";
+            this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
+            // 
+            // lblAnschrift
+            // 
+            this.lblAnschrift.LocationFloat = new DevExpress.Utils.PointFloat(0F, 167.7917F);
+            this.lblAnschrift.Multiline = true;
+            this.lblAnschrift.Name = "lblAnschrift";
+            this.lblAnschrift.SizeF = new System.Drawing.SizeF(422.625F, 142.1874F);
+            this.lblAnschrift.StylePriority.UseFont = false;
+            this.lblAnschrift.StylePriority.UseTextAlignment = false;
+            this.lblAnschrift.Text = "Frau\r\nMaria Mustermann\r\nMusterstr. 1\r\n\r\n40212 Düsseldorf\r\n";
+            this.lblAnschrift.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            // 
+            // xrTable1
+            // 
+            this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(504.2082F, 274.1666F);
+            this.xrTable1.Name = "xrTable1";
+            this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow1,
+            this.xrTableRow2,
+            this.xrTableRow3});
+            this.xrTable1.SizeF = new System.Drawing.SizeF(162.7917F, 75F);
+            this.xrTable1.StylePriority.UseFont = false;
+            // 
+            // xrTableRow1
+            // 
+            this.xrTableRow1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right)));
+            this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell1});
+            this.xrTableRow1.Name = "xrTableRow1";
+            this.xrTableRow1.StylePriority.UseBorders = false;
+            this.xrTableRow1.Weight = 1D;
+            // 
+            // xrTableCell1
+            // 
+            this.xrTableCell1.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
+            this.xrTableCell1.Name = "xrTableCell1";
+            this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell1.StylePriority.UseBorderColor = false;
+            this.xrTableCell1.StylePriority.UseBorders = false;
+            this.xrTableCell1.StylePriority.UseFont = false;
+            this.xrTableCell1.StylePriority.UsePadding = false;
+            this.xrTableCell1.StylePriority.UseTextAlignment = false;
+            this.xrTableCell1.Text = "Bei Zahlung bitte angeben";
+            this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell1.Weight = 0.85081229498678679D;
+            // 
+            // xrTableRow2
+            // 
+            this.xrTableRow2.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)));
+            this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell2});
+            this.xrTableRow2.Name = "xrTableRow2";
+            this.xrTableRow2.StylePriority.UseBorders = false;
+            this.xrTableRow2.Weight = 1D;
+            // 
+            // xrTableCell2
+            // 
+            this.xrTableCell2.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")});
+            this.xrTableCell2.Multiline = true;
+            this.xrTableCell2.Name = "xrTableCell2";
+            this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 2, 2, 100F);
+            this.xrTableCell2.StylePriority.UseBorderColor = false;
+            this.xrTableCell2.StylePriority.UseBorders = false;
+            this.xrTableCell2.StylePriority.UsePadding = false;
+            this.xrTableCell2.StylePriority.UseTextAlignment = false;
+            this.xrTableCell2.Text = "xrTableCell2";
+            this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell2.Weight = 0.85081229498678679D;
+            // 
+            // xrTableRow3
+            // 
+            this.xrTableRow3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell3});
+            this.xrTableRow3.Name = "xrTableRow3";
+            this.xrTableRow3.StylePriority.UseBorders = false;
+            this.xrTableRow3.Weight = 1D;
+            // 
+            // xrTableCell3
+            // 
+            this.xrTableCell3.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "DebitorNumber")});
+            this.xrTableCell3.Multiline = true;
+            this.xrTableCell3.Name = "xrTableCell3";
+            this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 2, 2, 100F);
+            this.xrTableCell3.StylePriority.UseBorderColor = false;
+            this.xrTableCell3.StylePriority.UseBorders = false;
+            this.xrTableCell3.StylePriority.UsePadding = false;
+            this.xrTableCell3.StylePriority.UseTextAlignment = false;
+            this.xrTableCell3.Text = "xrTableCell3";
+            this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell3.Weight = 0.85081229498678679D;
             // 
             // bindingSource1
             // 
             this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
             // 
-            // xrLabel2
-            // 
-            this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
-            this.xrLabel2.CanShrink = true;
-            this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Tahoma", 11F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
-            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
-            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
-            this.xrLabel2.Name = "xrLabel2";
-            this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel2.SizeF = new System.Drawing.SizeF(536.0416F, 20F);
-            this.xrLabel2.StylePriority.UseBackColor = false;
-            this.xrLabel2.StylePriority.UseFont = false;
-            this.xrLabel2.Text = "Rechnung";
-            this.xrLabel2.WordWrap = false;
-            // 
             // ServiceInvoiceReport
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -383,17 +535,19 @@ namespace BfpDus
             this.DetailReport});
             this.DataSource = this.bindingSource1;
             this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
-            this.Font = new DevExpress.Drawing.DXFont("Tahoma", 11F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
-            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
             this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
             this.ruleRateFactorNull});
-            this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 157.5F, 50F);
+            this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 50F, 50F);
             this.PageHeight = 1169;
             this.PageWidth = 827;
             this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
             this.Version = "23.2";
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
+            xrWatermark1.Id = "Watermark1";
+            this.Watermarks.Add(xrWatermark1);
             ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
 
@@ -408,11 +562,6 @@ namespace BfpDus
 		private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
         private DevExpress.XtraReports.UI.GroupHeaderBand Page1;
         private DevExpress.XtraReports.UI.XRLabel lblAbrechnungszeitraum;
-        private DevExpress.XtraReports.UI.XRTable xrTable4;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow10;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow14;
-		private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
         private DevExpress.XtraReports.UI.XRLabel xrLabel9;
         private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
 		private DevExpress.XtraReports.UI.DetailBand Detail1;
@@ -430,5 +579,20 @@ namespace BfpDus
 		private DevExpress.XtraReports.UI.XRLabel xrLabel1;
         private DevExpress.XtraReports.UI.XRLabel xrLabel10;
         private DevExpress.XtraReports.UI.XRLabel xrLabel2;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel3;
+        private DevExpress.XtraReports.UI.XRTable xrTable1;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
+        private DevExpress.XtraReports.UI.XRRichText xrRichText2;
+        private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2;
+        private DevExpress.XtraReports.UI.XRLabel lblMonat;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel4;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel5;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel6;
+        private DevExpress.XtraReports.UI.XRLabel lblAnschrift;
     }
 }

ReportImp/BfpDus/ServiceInvoiceReport.cs

@@ -1,4 +1,6 @@
 using System;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
 using BeWo.Report;
 using BeWo.Report.ReportObjects;
 
@@ -24,15 +26,77 @@ namespace BfpDus
         {
             ro = pRO;
             DateTime start = pRO.AccountingPeriodStart;
-			DateTime end = pRO.AccountingPeriodEnd;
-			if (start.Month == end.Month && start.Year == end.Year)
-			{
-				lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Monat {0:MMMM yyyy} folgende erbrachte Tätigkeiten:", start);
-			}
-			else
-			{
-				lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Zeitraum {0:MMMM yyyy} - {1:MMMM yyyy} folgende erbrachte Tätigkeiten:", start, end);
-			}
+            DateTime end = pRO.AccountingPeriodEnd;
+            if (pRO.InvoiceBase != null && pRO.InvoiceBase.SupportConceptCostBearerRelDc != null)
+            {
+                if (pRO.InvoiceBase.SupportConceptCostBearerRelDc.StartDate.HasValue)
+                {
+                    start = pRO.InvoiceBase.SupportConceptCostBearerRelDc.StartDate.Value;
+                }
+                if (pRO.InvoiceBase.SupportConceptCostBearerRelDc.EndDate.HasValue)
+                {
+                    end = pRO.InvoiceBase.SupportConceptCostBearerRelDc.EndDate.Value;
+                }
+            }
+            
+            if (pRO.RecipientOrganisation == "Privat")
+            {
+                pRO.RecipientOrganisation = "";
+
+                if (pRO.InvoiceBase != null)
+                {
+                    var cOid = pRO.InvoiceBase?.RecipientCustomerOid;
+                    if (cOid.HasValue)
+                    {
+                        var c = DAOFactory.GenericDAO.LoadByID<Customer>(cOid.Value);
+                        if (c.Person.Sex.HasValue)
+                        {
+                            if (c.Person.Sex.Value == BS.Shared.Sex.Male)
+                            {
+                                pRO.RecipientOrganisation = "Herr";
+                            }
+                            else if (c.Person.Sex.Value == BS.Shared.Sex.Female)
+                            {
+                                pRO.RecipientOrganisation = "Frau";
+                            }
+                        }
+                    }
+                }
+            }
+
+            foreach (var sip in pRO.ServiceInvoicePeriods)
+            {
+                int index = 1;
+                foreach (var item in sip.ServiceInvoiceItems)
+                {
+                    if (item.ServiceDescription.Contains("Fehl"))
+                    {
+                        item.UnitDescription = item.ServiceDescription;
+                    }
+                    else
+                    {
+                        item.UnitDescription = "Stunden";
+                    }
+                    if (index++ == 1)
+                    {
+                        item.ServiceDescription = String.Format("Monat {0:yyyy.MM}", pRO.AccountingPeriodStart);
+                    }
+                    else
+                    {
+                        item.ServiceDescription = "";
+                    }
+                    
+                }
+            }
+
+			//if (start.Month == end.Month && start.Year == end.Year)
+			//{
+			//	lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Monat {0:MMMM yyyy} folgende erbrachte Tätigkeiten:", start);
+			//}
+			//else
+			//{
+				lblAbrechnungszeitraum.Text = String.Format("Zeitraum von {0:MMMM yyyy} bis {1:MMMM yyyy} folgende erbrachte Tätigkeiten:", start, end);
+			//}
 
             this.bindingSource1.DataSource = pRO;
         }

ReportImp/BfpDus/ServiceInvoiceReport.resx

@@ -117,4 +117,10 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="xrRichText2.SerializableRtfString" xml:space="preserve">
+    <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAKgBcAGQAZQBmAHAAYQBwACAAXAB3AGkAZABjAHQAbABwAGEAcgB9AHsAXABzAHQAeQBsAGUAcwBoAGUAZQB0ACAAewBcAHEAbABcAGYAMQBcAGYAcwAyADQAIABOAG8AcgBtAGEAbAA7AH0AewBcACoAXABjAHMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEQAZQBmAGEAdQBsAHQAIABQAGEAcgBhAGcAcgBhAHAAaAAgAEYAbwBuAHQAOwB9AHsAXAAqAFwAYwBzADIAXABzAGIAYQBzAGUAZABvAG4AMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEwAaQBuAGUAIABOAHUAbQBiAGUAcgA7AH0AewBcACoAXABjAHMAMwBcAGYAMQBcAGYAcwAyADQAXAB1AGwAXABjAGYAMgAgAEgAeQBwAGUAcgBsAGkAbgBrADsAfQB7AFwAKgBcAHQAcwA0AFwAdABzAHIAbwB3AGQAXABmADEAXABmAHMAMgA0AFwAcQBsAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBiADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHQAMwBcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAATgBvAHIAbQBhAGwAIABUAGEAYgBsAGUAOwB9AHsAXAAqAFwAdABzADUAXAB0AHMAcgBvAHcAZABcAHMAYgBhAHMAZQBkAG8AbgA0AFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcgBiAHIAZAByAHQAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAbABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBiAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAaABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgB2AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABUAGEAYgBsAGUAIABTAGkAbQBwAGwAZQAgADEAOwB9AH0AewBcACoAXABsAGkAcwB0AG8AdgBlAHIAcgBpAGQAZQB0AGEAYgBsAGUAfQBcAG4AbwB1AGkAYwBvAG0AcABhAHQAXABoAHQAbQBhAHUAdABzAHAAXABzAHAAbAB5AHQAdwBuAGkAbgBlAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAZgAyAFwAZgBzADEANABcAGIAXAB1AGwAXABjAGYAMQAgAEIAZQByAGEAdAB1AG4AZwBzAHMAdABlAGwAbABlACAAfQB7AFwAZgAyAFwAZgBzADEANABcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABiAFwAdQBsAFwAYwBmADEAIABmAFwAdQAyADUAMgBcACcAZgBjAHIAIAB9AHsAXABmADIAXABmAHMAMQA0AFwAYgBcAHUAbABcAGMAZgAxACAAUABzAHkAYwBoAG8AdABoAGUAcgBhAHAAaQBlACAAZQAuAFYALgAgACAAQgBlAHIAbABpAG4AZQByACAAQQBsAGwAZQBlACAAMwAyACAAIAAgACAANAAwADIAMQAyACAARABcAHUAMgA1ADIAXAAnAGYAYwBzAHMAZQBsAGQAbwByAGYAfQBcAGYAMgBcAGYAcwAxADQAXABiAFwAdQBsAFwAYwBmADEAXABwAGEAcgB9AA==</value>
+  </data>
+  <data name="xrPictureBox2.ImageSource" xml:space="preserve">
+    <value>iVBORw0KGgoAAAANSUhEUgAAAMEAAADYCAYAAABSm4fPAAAABGdBTUEAALGPC/xhBQAACulJREFUeF7tmluyHDcORLWR2YI/vY359gYc4b16T5qBLMgQlVVNggBJVOWJOKEb3VXFV2a3r6UvXzfx5e8/6cOsCktA06wCS0CXeDIsAV3iybAEdKknwhLQLZ4ES0C3egIsAd3ublgCeoQ7YQnoEe6EJaDHuAuWgB7lDlgCepyrYQnoka6EJaBHuwKWgB7tClgCerzZsAT0eLNhCWgJM2EJaBmzYAloGbNgCWgpM2AJaDmjYQloOaNhCWhJI2EJaEkjYQloSSNhCWhJI2EJaFmj2FYCUhsUytVGwRKQKVA4VxoBS0BCQAFdYQQsAQkDhTTbCFgCEgoKarazsAQkBRTWLGdhCUgaKLAZzsISkDRQYLOcgSUgqaDAZjgDS0BSQYHNcIZjSvD31z9LSfpAgc1wBpbAKekDBTbDGVgCp6QfFNoMvbAETkk/KLAZemEJnJJ+UGAz9MISOCX9oMBm6IUlcEr6QYHN0AtL4JSMgUIbrReWwCkZA4U2Wi8sgVMyBgpttF5YAqdkDBTaaL2wBE7JGCi00XphCZySMVBoo/XCEjglY6DQRuuFJXBKxkChjdYLS+CU9IMCm6EXlsAp6QcFNkMvx5SAPBcU2Ay9sAQkFRTWLL2wBCQVFNYMZ2AJSCoosFl6YQlIGiioWc7AEpA0UFiznIElIGmgsGY5A0tA0kBhzXIGloCkgIKa5SwsAQkFhTTbWVgCEgYK6ApnYQn+z+///esIq4KCucoIHlkCFLBP/ue3P75pf5716lnodZ1HJVAoVxvBo0qgQUIhqyw6fPqPEZQvgQ3+08L/SRSKNxlFuRK0oX9b8D2iAD3BKEqWAB00vRYFqLqRlCkBP/ljRcGqZCSlSoAOk+aIgneSkZT8JlDR4dEYUfBOMZpyvxMoLMJ6USB3GE3ZEgj2W6G3FLqR6D3apw3kajMoXQIE2rhZPSFo73mqaO2ZZsASbBCFqbpondFmwRIcIgpWJdGaIs2EJThEFKzqonV6zYQlOEQUoieJ1jxiJizBgaIQPUW03k9mwxIcLApRddE671wBS1BEFKjqonW2roAlKCIK0RNEaxVXwhIUFIWpunZ9q2EJHiIKVjVlHTtgCR4oClgF5d9+7YAleKgoZKfb/mPIVbAELxGF7mRZgglQAOi/osCd6MpvBJbgpaLgneiKIrAELxUF7lSzi8ASvFwUuhNlCQZAB03HRCHcrX4bZJSBJXD4dDRsKIy7ZQk6QKGN9g2cWASdUzQsgcO3cGoJoovAEjh8CzZ0KgrnamUekbAEDt/KKYWwc4iAJXBIzvidgSW4AIU2WvIPu4ug48/CEjgk/6JBRKLgRqtjzcASOCSfWV2EGVgCh6SPVUXQcbywBA5JPytKILIEBhTaaEk/K0vgLQJL4JD0o+FEwY2WJfgOCm20ZIxVRdBxRmEJHJJxVpRA3FICbZ9n8AxQaKMl42hGUHAj9WRxqgR2YZ7BM0ChjZb4sHnJdDSH7hKgBY0OngEKbbTEz6oSjGRxqgRo8N2g0EZL/GhA2+xEq+P0wBI4JHNoQNv8RMsSJErmWVUC9Y7wEnwaMBsU2mjJPJoVlKNoP2UytAQ9A2aDQhstiWNFEViCBEksK0qgIlgChySWqyxFu7QEO4uAQhstiUUzg/IU6VUup0pwNfGrwVaAQhstiadkCYS7EuwqAgpttCSeVSVAuZwuwdXk0WArQKGNlsRzl6VIUS6nSiDclQANmA0KbbQkh1UlaHOZVgIRDZgNCm20JIe7LEW6tAQiS0B6kaysKIKOo7AEDkkeK0og2iKwBA5JHhpOlKVol5ZAB1sBCm20JJeSJfg0ab1GB80EhTZaksunPEVo85j+TWC1A2eBQhstyWUkU15tDpd8E1hZAvKJciUQWAISyaoSaBZZAocklxUlELeWILMIKLTRklzKlmBk4iwBuaNkCYTREmQVAYU2WpLLyhKIW0ogsgTkilUlEFkCpyQXlmASFNpoSS6SDRVlJ9qtJVAjQaGNlqyhVAlsoNEgd7IE5IpyJUAP75ElIFeUK4F3wnpvFCi00ZJcNBPeTI267XcCqy44AhTaaEkuq8IvylhHlEBkCYhSsgTyoIgSiLOg0EZL8ojI0ogy1rcS6MDiKHofGmBU7xwsKLTRkjyistSj5u2L/mBfHEHvjVLnMDoPBYU2WpJHdJ7u1Ix9KwF6oxe5PmPio/NQUGijJXlkZOlKzRgswWgAMyY+OgcFhTZakkdGlq7UjP30n0Ptm71kTHx0DgoKbbQkj4wsIWUczdiPX4yvLuihvT/C0TkoKLTRkhz0zFEeorXZgiXQi+yFd+i17TNm7R3fgkIbLckhI0NX2mz99L9I0YVXtshr7f2zXo11BwpttCQePWuUg2jbXP34y7KRSei19kG9947ajvMJFNpoSTxZ+UG2efpRAkEDh25E2odlLqKd9B0otNGSWEZzN6uOp/5SAnTTlfoQz70j2nE+gUIbLYlDzxade5Z2TPkTfhPoBT3ae0buG1Wf/wkU2mhJHJmZadUM2THl559KoLQXflKvH71v1HYcBApttCSOzLy0Xo0FSyBo0NBNSL1+5J4ZZRwECm20JIZVebkbR16/LQG66ZMrFiXqwkQLCm20ZB49O3S20d6NI++FfRPsUuZoQaGNlsyzIls9GZb3L0sgrJjorDJHCwpttMSPBnNFtnrGkfc/lsCKHrJbOz8BhTZaMo49J3SOO9T53JbActoCWn8sCIQ2WtKHnomKzm233zLzfb5dnLwY0c4NhTdKco/m5OSsiDrHoRIIFRYnovBGSe6pkA/NsTBcAoElIC0aKhWdyUnKHBV3CSosFAU4QvIrFfKgan4VVwmENxeB/EqVPIi2AIK7BMJbi0AwmodWdCY7lTlZpkognLrQVhRmr6SPUwsQXgJBH3zioltRqEclnzkxDzqnlpASKCcuvBWFelTymRNzgAoghJZAOL0EVhTwHglGPwRVtOc7lTkhUkpw4gbciYJ+J/kZPfOTz13nhwgvgXD6htyJQt9Kzv/Ut+ocr0gpgVBhc3p8ewn0HJFov07SzvWOtBIIdhIimmgl31CC9szsudmfKyjz7SG1BJZ2Qyura6mIzv1OtOZq6lp6WFYC4YmbrJ5GOz8rWs+T1HX2srQEwhMPw67pytXImGiuT9ez38tLoOhk0UIqatfTrkvfs2aj49h5PF3v3m4rgfDGgxJ13chI0PNFNKfq6to8bC2B8OSDGdV7iCM8cb91TV62l0B42qF4nTnIEZ5YghlYgoOUfRjxDnS9FY1fVVnPDMeU4GkHk63u2Z3ovidp1zrDESUQ7ILQgiltnQ2/ckwJFJaA3mk/LB9dAhFtAKVRwbccVwJBi8AyUKtmIpojS6CwCLQ1owhHl0DQRbMMVH1dCRRbBhbindrzj6RMCSx2M9Bm0WdpzzuDkiVQ7OagzaP1zQy/UroECkvwXLMLIDymBFa0mfR89eza88zmESWw2M1rN5mepz0v60oeVwIFbSw6BLre9lx289gStLQbr6JDojnafT+J15QAYQ9FRAdHY9Q9PpFXl8DCEuR6agEEluA7+kl1JTpYem+7h6fCEnTQHiY68Lfb7pFaAZZgEHTQV6KwPFFdb1VYgiRsGZAoTNW066kMS7ABG547UfA+6X0Ouk+9u+4JsASH0oav1zaYvc+5CnR7/9V1lWEJDkXCdqUNpQbTarGvj9yntNdcXVcZlqAYKJTiJ9A9Ivn69X9nxmxLjs/ZnQAAAABJRU5ErkJggg==</value>
+  </data>
 </root>

ReportImp/BfpDus/SettlementReport.Designer.cs

@@ -253,10 +253,10 @@ namespace BfpDus.Alt
             this.xrLabel3.CanShrink = true;
             this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Tahoma", 11F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
             new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
-            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 17.00001F);
+            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 17.00002F);
             this.xrLabel3.Name = "xrLabel3";
             this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel3.SizeF = new System.Drawing.SizeF(539.0416F, 16F);
+            this.xrLabel3.SizeF = new System.Drawing.SizeF(539.0416F, 21.83334F);
             this.xrLabel3.StylePriority.UseBackColor = false;
             this.xrLabel3.StylePriority.UseFont = false;
             this.xrLabel3.Text = "Leistungsabrechnung";

ReportImp/BfpDus/SettlementReport2.cs

@@ -76,36 +76,39 @@ namespace BfpDus
             int index = 2;
             foreach (var at in customer.AbsenceTimes)
             {
-                if (at.AbsenceReason.BillableMinutes.HasValue && at.AbsenceReason.BillableMinutes.Value > 0)
+                if ((!at.Start.HasValue || at.Start <= pRO.AccountingEndDate) && (!at.End.HasValue || at.End >= pRO.AccountingStartDate))
                 {
-                    DevExpress.XtraReports.UI.XRTableRow row = null;
-                    if (index == 2)
+                    if (at.AbsenceReason.BillableMinutes.HasValue && at.AbsenceReason.BillableMinutes.Value > 0)
                     {
-                        row = tableRowKHAufenthalte;
+                        DevExpress.XtraReports.UI.XRTableRow row = null;
+                        if (index == 2)
+                        {
+                            row = tableRowKHAufenthalte;
+                        }
+                        else
+                        {
+                            row = tableCustomer.InsertRowBelow(tableCustomer.Rows[tableCustomer.Rows.Count - 3]);
+                        }
+
+                        String text = String.Format("{0:dd.MM.yyyy} - ", at.Start);
+                        int? days = null;
+
+                        if (at.End.HasValue)
+                        {
+                            days = (int)at.End.Value.Subtract(at.Start.Value).TotalDays + 1;
+
+                            text += String.Format("{0:dd.MM.yyyy} = {1:0.#} Tage", at.End, days);
+
+                        }
+                        else
+                        {
+                            text += "unbekannt";
+                        }
+
+                        row.Cells[1].Text = text;
+
+                        index++;
                     }
-                    else
-                    {
-                        row = tableCustomer.InsertRowBelow(tableCustomer.Rows[tableCustomer.Rows.Count - 3]);
-                    }
-
-                    String text = String.Format("{0:dd.MM.yyyy} - ", at.Start);
-                    int? days = null;
-
-                    if (at.End.HasValue)
-                    {
-                        days = (int)at.End.Value.Subtract(at.Start.Value).TotalDays + 1;
-
-                        text += String.Format("{0:dd.MM.yyyy} = {1:0.#} Tage", at.End, days);
-                        
-                    }
-                    else
-                    {
-                        text += "unbekannt";
-                    }
-
-                    row.Cells[1].Text = text;
-
-                    index++;
                 }
             }
 

ReportImp/CaritasverbandDuerenJuelichEV/CaritasverbandDuerenJuelichEV.csproj

@@ -31,6 +31,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="DevExpress.DataAccess.v23.2, 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" />
@@ -39,6 +40,7 @@
     <Reference Include="DevExpress.Printing.v23.2.Core, 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.Utils.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.XtraPrinting.v23.2, Version=23.2.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.XtraCharts.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
@@ -56,6 +58,18 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Calculations\CustomServiceRecordStatisticFactory.cs" />
+    <Compile Include="EmployeeKilometerauswertungsListReport.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="EmployeeKilometerauswertungsListReport.Designer.cs">
+      <DependentUpon>EmployeeKilometerauswertungsListReport.cs</DependentUpon>
+    </Compile>
+    <Compile Include="EmployeeKilometerauswertungsReport.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="EmployeeKilometerauswertungsReport.designer.cs">
+      <DependentUpon>EmployeeKilometerauswertungsReport.cs</DependentUpon>
+    </Compile>
     <Compile Include="Export\CustomDataExporter.cs" />
     <Compile Include="Export\DiamantExporter.cs" />
     <Compile Include="Finanzauswertung.cs">
@@ -104,6 +118,13 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="EmployeeKilometerauswertungsListReport.resx">
+      <DependentUpon>EmployeeKilometerauswertungsListReport.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="EmployeeKilometerauswertungsReport.resx">
+      <DependentUpon>EmployeeKilometerauswertungsReport.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Finanzauswertung.resx">
       <DependentUpon>Finanzauswertung.cs</DependentUpon>
       <SubType>Designer</SubType>

ReportImp/CaritasverbandDuerenJuelichEV/EmployeeKilometerauswertungsListReport.Designer.cs

@@ -0,0 +1,500 @@
+using BeWo.Report.ReportObjects;
+namespace CaritasverbandDuerenJuelichEV
+{
+    partial class EmployeeKilometerauswertungsListReport
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if(disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            this.Detail = new DevExpress.XtraReports.UI.DetailBand();
+            this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
+            this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
+            this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
+            this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
+            this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand();
+            this.Detail2 = new DevExpress.XtraReports.UI.DetailBand();
+            this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+            this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
+            this.objectDataSource1 = new DevExpress.DataAccess.ObjectBinding.ObjectDataSource(this.components);
+            this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
+            this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+            this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
+            this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo();
+            this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo();
+            this.Title = new DevExpress.XtraReports.UI.XRControlStyle();
+            this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle();
+            this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle();
+            this.DataField = new DevExpress.XtraReports.UI.XRControlStyle();
+            this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField();
+            this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
+            this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.objectDataSource1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
+            // 
+            // Detail
+            // 
+            this.Detail.HeightF = 0F;
+            this.Detail.Name = "Detail";
+            this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            // 
+            // xrTableCell1
+            // 
+            this.xrTableCell1.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.xrTableCell1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Employees2Entries.EmployeeName")});
+            this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrTableCell1.Name = "xrTableCell1";
+            this.xrTableCell1.StylePriority.UseBorderColor = false;
+            this.xrTableCell1.StylePriority.UseBorders = false;
+            this.xrTableCell1.StylePriority.UseFont = false;
+            this.xrTableCell1.Weight = 4.0816326530612246D;
+            // 
+            // xrTableRow1
+            // 
+            this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell1});
+            this.xrTableRow1.Name = "xrTableRow1";
+            this.xrTableRow1.Weight = 1D;
+            // 
+            // xrTable1
+            // 
+            this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F);
+            this.xrTable1.Name = "xrTable1";
+            this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow1});
+            this.xrTable1.SizeF = new System.Drawing.SizeF(600F, 25F);
+            this.xrTable1.StylePriority.UseBorders = false;
+            this.xrTable1.StylePriority.UsePadding = false;
+            // 
+            // Detail1
+            // 
+            this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel7,
+            this.xrTable1});
+            this.Detail1.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.Detail1.HeightF = 83F;
+            this.Detail1.Name = "Detail1";
+            this.Detail1.StylePriority.UseFont = false;
+            // 
+            // xrLabel7
+            // 
+            this.xrLabel7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Employees2Entries.TotalDistanceInMeters", "Kilometer gesamt: {0:}")});
+            this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 50F);
+            this.xrLabel7.Name = "xrLabel7";
+            this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel7.SizeF = new System.Drawing.SizeF(280F, 25F);
+            this.xrLabel7.StylePriority.UseFont = false;
+            // 
+            // DetailReport
+            // 
+            this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail1,
+            this.DetailReport1});
+            this.DetailReport.DataMember = "Employees2Entries";
+            this.DetailReport.DataSource = this.objectDataSource1;
+            this.DetailReport.Level = 0;
+            this.DetailReport.Name = "DetailReport";
+            // 
+            // DetailReport1
+            // 
+            this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail2,
+            this.GroupHeader2,
+            this.GroupFooter1});
+            this.DetailReport1.DataMember = "Employees2Entries.Entries";
+            this.DetailReport1.DataSource = this.objectDataSource1;
+            this.DetailReport1.Level = 0;
+            this.DetailReport1.Name = "DetailReport1";
+            // 
+            // Detail2
+            // 
+            this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable4});
+            this.Detail2.HeightF = 25F;
+            this.Detail2.Name = "Detail2";
+            this.Detail2.SortFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] {
+            new DevExpress.XtraReports.UI.GroupField("Datum", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)});
+            // 
+            // xrTable4
+            // 
+            this.xrTable4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTable4.Name = "xrTable4";
+            this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow4});
+            this.xrTable4.SizeF = new System.Drawing.SizeF(625.8302F, 25F);
+            this.xrTable4.StylePriority.UseBorders = false;
+            this.xrTable4.StylePriority.UsePadding = false;
+            // 
+            // xrTableRow4
+            // 
+            this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell3,
+            this.xrTableCell8,
+            this.xrTableCell4,
+            this.xrTableCell9});
+            this.xrTableRow4.Name = "xrTableRow4";
+            this.xrTableRow4.Weight = 1D;
+            // 
+            // xrTableCell3
+            // 
+            this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Employees2Entries.Entries.Datum", "{0:dd.MM.yyyy}")});
+            this.xrTableCell3.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F);
+            this.xrTableCell3.Name = "xrTableCell3";
+            this.xrTableCell3.StylePriority.UseFont = false;
+            this.xrTableCell3.StylePriority.UseTextAlignment = false;
+            this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell3.Weight = 0.6802721055263049D;
+            // 
+            // xrTableCell8
+            // 
+            this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Employees2Entries.Entries.TimeRange")});
+            this.xrTableCell8.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F);
+            this.xrTableCell8.Name = "xrTableCell8";
+            this.xrTableCell8.StylePriority.UseFont = false;
+            this.xrTableCell8.StylePriority.UseTextAlignment = false;
+            this.xrTableCell8.Text = "xrTableCell8";
+            this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell8.Weight = 0.89285797658466393D;
+            // 
+            // xrTableCell4
+            // 
+            this.xrTableCell4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Employees2Entries.Entries.DistanceInMeters", "{0:0.##}")});
+            this.xrTableCell4.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F);
+            this.xrTableCell4.Name = "xrTableCell4";
+            this.xrTableCell4.StylePriority.UseFont = false;
+            this.xrTableCell4.StylePriority.UseTextAlignment = false;
+            this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell4.Weight = 1.028912291234853D;
+            // 
+            // xrTableCell9
+            // 
+            this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Employees2Entries.Entries.Notice")});
+            this.xrTableCell9.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F);
+            this.xrTableCell9.Name = "xrTableCell9";
+            this.xrTableCell9.StylePriority.UseFont = false;
+            this.xrTableCell9.StylePriority.UsePadding = false;
+            this.xrTableCell9.StylePriority.UseTextAlignment = false;
+            this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell9.Weight = 1.6553058235012754D;
+            // 
+            // GroupHeader2
+            // 
+            this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable2});
+            this.GroupHeader2.HeightF = 25F;
+            this.GroupHeader2.Name = "GroupHeader2";
+            this.GroupHeader2.RepeatEveryPage = true;
+            // 
+            // xrTable2
+            // 
+            this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTable2.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTable2.Name = "xrTable2";
+            this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow2});
+            this.xrTable2.SizeF = new System.Drawing.SizeF(625.83F, 25F);
+            this.xrTable2.StylePriority.UseBorders = false;
+            this.xrTable2.StylePriority.UseFont = false;
+            this.xrTable2.StylePriority.UsePadding = false;
+            // 
+            // xrTableRow2
+            // 
+            this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell5,
+            this.xrTableCell2,
+            this.xrTableCell6,
+            this.xrTableCell7});
+            this.xrTableRow2.Name = "xrTableRow2";
+            this.xrTableRow2.Weight = 1D;
+            // 
+            // xrTableCell5
+            // 
+            this.xrTableCell5.Name = "xrTableCell5";
+            this.xrTableCell5.StylePriority.UseTextAlignment = false;
+            this.xrTableCell5.Text = "Datum";
+            this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell5.Weight = 0.68027211962967382D;
+            // 
+            // xrTableCell2
+            // 
+            this.xrTableCell2.Name = "xrTableCell2";
+            this.xrTableCell2.StylePriority.UseTextAlignment = false;
+            this.xrTableCell2.Text = "Uhrzeit";
+            this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell2.Weight = 0.892857131771576D;
+            // 
+            // xrTableCell6
+            // 
+            this.xrTableCell6.Name = "xrTableCell6";
+            this.xrTableCell6.StylePriority.UseTextAlignment = false;
+            this.xrTableCell6.Text = "gefahrene Kilometer";
+            this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell6.Weight = 1.0289115603020467D;
+            // 
+            // xrTableCell7
+            // 
+            this.xrTableCell7.Name = "xrTableCell7";
+            this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F);
+            this.xrTableCell7.StylePriority.UsePadding = false;
+            this.xrTableCell7.StylePriority.UseTextAlignment = false;
+            this.xrTableCell7.Text = "Dokumentation";
+            this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell7.Weight = 1.6553060397102077D;
+            // 
+            // GroupFooter1
+            // 
+            this.GroupFooter1.HeightF = 0F;
+            this.GroupFooter1.Name = "GroupFooter1";
+            this.GroupFooter1.PageBreak = DevExpress.XtraReports.UI.PageBreak.AfterBand;
+            // 
+            // objectDataSource1
+            // 
+            this.objectDataSource1.DataSource = typeof(BeWo.Report.ReportObjects.EmployeeKilometerauswertungsListRO);
+            this.objectDataSource1.Name = "objectDataSource1";
+            // 
+            // ReportHeader
+            // 
+            this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel2,
+            this.xrLabel1});
+            this.ReportHeader.HeightF = 50F;
+            this.ReportHeader.Name = "ReportHeader";
+            // 
+            // xrLabel2
+            // 
+            this.xrLabel2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "MonthInformation", "Zeitraum: {0:MMMM yyyy}")});
+            this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
+            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F);
+            this.xrLabel2.Name = "xrLabel2";
+            this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel2.SizeF = new System.Drawing.SizeF(280F, 25F);
+            this.xrLabel2.StylePriority.UseFont = false;
+            // 
+            // xrLabel1
+            // 
+            this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 14F);
+            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrLabel1.Multiline = true;
+            this.xrLabel1.Name = "xrLabel1";
+            this.xrLabel1.SizeF = new System.Drawing.SizeF(600F, 25F);
+            this.xrLabel1.StyleName = "Title";
+            this.xrLabel1.StylePriority.UseFont = false;
+            this.xrLabel1.Text = "Auswertung über gefahrene Kilometer";
+            // 
+            // pageFooterBand1
+            // 
+            this.pageFooterBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrPageInfo2,
+            this.xrPageInfo1});
+            this.pageFooterBand1.HeightF = 48F;
+            this.pageFooterBand1.Name = "pageFooterBand1";
+            // 
+            // xrPageInfo2
+            // 
+            this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
+            this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(382.5002F, 25F);
+            this.xrPageInfo2.Name = "xrPageInfo2";
+            this.xrPageInfo2.SizeF = new System.Drawing.SizeF(243.3297F, 23F);
+            this.xrPageInfo2.StyleName = "PageInfo";
+            this.xrPageInfo2.StylePriority.UseFont = false;
+            this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            this.xrPageInfo2.TextFormatString = "Seite {0} von {1}";
+            // 
+            // xrPageInfo1
+            // 
+            this.xrPageInfo1.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
+            this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F);
+            this.xrPageInfo1.Name = "xrPageInfo1";
+            this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime;
+            this.xrPageInfo1.SizeF = new System.Drawing.SizeF(231.2501F, 23F);
+            this.xrPageInfo1.StyleName = "PageInfo";
+            this.xrPageInfo1.StylePriority.UseFont = false;
+            // 
+            // Title
+            // 
+            this.Title.BackColor = System.Drawing.Color.White;
+            this.Title.BorderColor = System.Drawing.SystemColors.ControlText;
+            this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.Title.BorderWidth = 1F;
+            this.Title.Font = new DevExpress.Drawing.DXFont("Times New Roman", 24F);
+            this.Title.ForeColor = System.Drawing.Color.Black;
+            this.Title.Name = "Title";
+            // 
+            // FieldCaption
+            // 
+            this.FieldCaption.BackColor = System.Drawing.Color.White;
+            this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText;
+            this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.FieldCaption.BorderWidth = 1F;
+            this.FieldCaption.Font = new DevExpress.Drawing.DXFont("Times New Roman", 10F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.FieldCaption.ForeColor = System.Drawing.Color.Black;
+            this.FieldCaption.Name = "FieldCaption";
+            // 
+            // PageInfo
+            // 
+            this.PageInfo.BackColor = System.Drawing.Color.White;
+            this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText;
+            this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.PageInfo.BorderWidth = 1F;
+            this.PageInfo.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F);
+            this.PageInfo.ForeColor = System.Drawing.Color.Black;
+            this.PageInfo.Name = "PageInfo";
+            // 
+            // DataField
+            // 
+            this.DataField.BackColor = System.Drawing.Color.White;
+            this.DataField.BorderColor = System.Drawing.SystemColors.ControlText;
+            this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.DataField.BorderWidth = 1F;
+            this.DataField.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F);
+            this.DataField.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.DataField.Name = "DataField";
+            // 
+            // fieldFLS
+            // 
+            this.fieldFLS.DataMember = "FLSReportGroups";
+            this.fieldFLS.Expression = "[TotalFLM] / 60";
+            this.fieldFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+            this.fieldFLS.Name = "fieldFLS";
+            // 
+            // topMarginBand1
+            // 
+            this.topMarginBand1.HeightF = 50F;
+            this.topMarginBand1.Name = "topMarginBand1";
+            // 
+            // bottomMarginBand1
+            // 
+            this.bottomMarginBand1.HeightF = 50F;
+            this.bottomMarginBand1.Name = "bottomMarginBand1";
+            // 
+            // EmployeeKilometerauswertungsListReport
+            // 
+            this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail,
+            this.DetailReport,
+            this.ReportHeader,
+            this.pageFooterBand1,
+            this.topMarginBand1,
+            this.bottomMarginBand1});
+            this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
+            this.fieldFLS});
+            this.ComponentStorage.AddRange(new System.ComponentModel.IComponent[] {
+            this.objectDataSource1});
+            this.DataSource = this.objectDataSource1;
+            this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 50F, 50F);
+            this.PageHeight = 1169;
+            this.PageWidth = 827;
+            this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
+            this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] {
+            this.Title,
+            this.FieldCaption,
+            this.PageInfo,
+            this.DataField});
+            this.Version = "23.2";
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.objectDataSource1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
+
+        }
+
+        #endregion
+
+        private DevExpress.XtraReports.UI.DetailBand Detail;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
+        private DevExpress.XtraReports.UI.XRTable xrTable1;
+        private DevExpress.XtraReports.UI.DetailBand Detail1;
+        private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
+        private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel1;
+        private DevExpress.XtraReports.UI.PageFooterBand pageFooterBand1;
+        private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo2;
+        private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo1;
+        private DevExpress.XtraReports.UI.XRControlStyle Title;
+        private DevExpress.XtraReports.UI.XRControlStyle FieldCaption;
+        private DevExpress.XtraReports.UI.XRControlStyle PageInfo;
+        private DevExpress.XtraReports.UI.XRControlStyle DataField;
+        private DevExpress.XtraReports.UI.XRTable xrTable2;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
+        private DevExpress.XtraReports.UI.DetailReportBand DetailReport1;
+        private DevExpress.XtraReports.UI.DetailBand Detail2;
+        private DevExpress.XtraReports.UI.XRTable xrTable4;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow4;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel2;
+        private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel7;
+        private DevExpress.XtraReports.UI.CalculatedField fieldFLS;
+        private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
+        private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
+        private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
+        private DevExpress.DataAccess.ObjectBinding.ObjectDataSource objectDataSource1;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
+    }
+}