Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo

# Conflicts:
#	BeWo/ServiceProxy/Generated.cs
#	Host/Multitenancy/demo.config
#	Service/ServiceContracts/IOperationsService.cs
#	Service/ServiceImplementations/OperationsServiceImp.cs

BeWo/BeWo.csproj

@@ -275,6 +275,14 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="View\Controls\ListboxSelectControl.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="View\Controls\ValueListEntryEditControl.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="View\Detail\NotizenKategorieView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -287,6 +295,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="View\Detail\Report\IcfImportControl.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="View\Detail\Report\FlexibleReportEntryDetail.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -834,12 +846,21 @@
     <Compile Include="ViewModel\OrganisationPersonRelationVM.cs" />
     <Compile Include="ViewModel\TextModuleVM.cs" />
     <Compile Include="ViewModel\VerordnungslistenVM.cs" />
+    <Compile Include="View\Controls\ListboxSelectControl.xaml.cs">
+      <DependentUpon>ListboxSelectControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\Controls\ValueListEntryEditControl.xaml.cs">
+      <DependentUpon>ValueListEntryEditControl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="View\Detail\NotizenKategorieView.xaml.cs">
       <DependentUpon>NotizenKategorieView.xaml</DependentUpon>
     </Compile>
     <Compile Include="View\Detail\BudgetView.xaml.cs">
       <DependentUpon>BudgetView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="View\Detail\Report\IcfImportControl.xaml.cs">
+      <DependentUpon>IcfImportControl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="View\Detail\Report\FlexibleReportEntryDetail.xaml.cs">
       <DependentUpon>FlexibleReportEntryDetail.xaml</DependentUpon>
     </Compile>

BeWo/Core/BeWoUtils.cs

@@ -52,6 +52,7 @@ using DevExpress.Xpf.Bars;
 using DevExpress.Xpf.DocumentViewer;
 using DevExpress.Xpf.Printing.PreviewControl.Bars;
 using DevExpress.XtraScheduler;
+using Control = System.Windows.Controls.Control;
 using Utils = BS.Shared.Core.Utils;
 
 namespace BeWo.Core
@@ -104,14 +105,64 @@ namespace BeWo.Core
 		}
 
 		public static void NavigateToReportUriWithDocumentPreviewControl(string navigateUriString, string title, DocumentPreviewControl dp)
-		{
-			BeWoApp.MainControl.StartWaiting();
+        {
+            var reportTemplates = ServiceFacade.DoOperationsServiceSync(x => x.GetReportTemplates(navigateUriString));
 
-			StartGetReportStreamAsync(GetReportStreamForWPFControl, navigateUriString, ms => BeWoApp.MainControl.Dispatch(delegate
-			{
-				ShowReportWindow(ms, title, dp);
-			}));
-		}
+            if (reportTemplates?.Count > 1)
+            {
+                var control = new ListboxSelectControl(reportTemplates.Cast<object>().ToList());
+
+                var beWoWindow = new BeWoWindow
+                {
+                    Height = 200,
+                    Width = 500,
+                    WindowStartupLocation = WindowStartupLocation.CenterOwner,
+                    GroupBoxContent = control,
+                    Owner = BeWoApp.CurrentBeWo.MainWindow,
+                    rootGroupBox = { Header = "Layout speichern" }
+                };
+
+                control.CancelButtonClicked += () => beWoWindow.Close();
+                control.SelectButtonClicked += () =>
+                {
+                    if (control.SelectedItem == null) return;
+
+                    beWoWindow.Close();
+
+                    var selectedTemplate = (ReportTemplateDC)control.SelectedItem;
+
+                    var newUri = navigateUriString + "&template=" + (selectedTemplate.Oid.HasValue ? selectedTemplate.Oid.Value.ToString() : "-1");
+
+                    //var start = navigateUriString.IndexOf("type=");
+                    //var end = navigateUriString.IndexOf('&', start);
+
+                    //if (end == -1) end = navigateUriString.Length - 1;
+
+                    //var typeString = navigateUriString.Substring(start, end - start + 1);
+
+
+                    //var newUri = navigateUriString.Replace(typeString, "template=" + (selectedTemplate.Oid.HasValue ? selectedTemplate.Oid.Value.ToString() : "-1"));
+
+                    BeWoApp.MainControl.StartWaiting();
+
+                    StartGetReportStreamAsync(GetReportStreamForWPFControl, newUri, ms => BeWoApp.MainControl.Dispatch(delegate
+                    {
+                        ShowReportWindow(ms, title, dp);
+                    }));
+                };
+
+                beWoWindow.ShowDialog();
+            }
+            else
+            {
+                BeWoApp.MainControl.StartWaiting();
+
+                StartGetReportStreamAsync(GetReportStreamForWPFControl, navigateUriString, ms => BeWoApp.MainControl.Dispatch(delegate
+                {
+                    ShowReportWindow(ms, title, dp);
+                }));
+            }
+        }
 
 	    public static void CustomizeReportPreviewToolBar(object s, RoutedEventArgs e)
 	    {

BeWo/Core/SupportConceptGoalTreeItem.cs

@@ -4,89 +4,44 @@ using BS.Shared;
 
 using BeWo.ViewModel;
 using BS.Shared.DataContracts.ClientPartials;
+using BS.Shared.Extensions;
 
 namespace BeWo.Core
 {
     public class SupportConceptGoalTreeItem : SupportConceptGoalDC
     {
         private ValueListEntryVM _GoalEntryVM;
-
         private BindingList<SupportConceptGoalTreeItem> _Children;
+        private bool _ShowNotice;
 
         public ValueListEntryVM GoalEntryVM
         {
-            get
-            {
-                return _GoalEntryVM;
-            }
+            get => _GoalEntryVM;
+            set => _GoalEntryVM = value;
+        }
 
+        public bool IsGoal => GoalEntryVM != null ?
+                GoalEntryVM.Type.Equals(ValueListEntryType.SupportConceptGoalType) || GoalEntryVM.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalType) :
+                GoalEntryDC.Type.Equals(ValueListEntryType.SupportConceptGoalType) || GoalEntryDC.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalType);
+
+
+
+        public bool ShowNotice
+        {
+            get => _ShowNotice;
             set
             {
-                _GoalEntryVM = value;
+                _ShowNotice = value;
+                RaisePropertyChanged(nameof(ShowNotice));
             }
         }
 
-        public string ItemName
+        public BindingList<SupportConceptGoalTreeItem> Items
         {
-            get => _GoalEntryVM != null ? _GoalEntryVM.Description : GoalEntryDC?.TypeDescription;
-            set
-            {
-                if (_GoalEntryVM != null)
-                {
-                    _GoalEntryVM.Description = value;
-                }
-                
-                if (GoalEntryDC != null)
-                {
-                    GoalEntryDC.TypeDescription = value;
-                }
-            }
+            get => _Children ?? (_Children = new BindingList<SupportConceptGoalTreeItem>());
+            set => _Children = value;
         }
 
-        public string Notice
-        {
-            get => _GoalEntryVM != null ? _GoalEntryVM.Notice : GoalEntryDC?.Notice;
-
-            set
-            {
-                if(_GoalEntryVM != null)
-                {
-                    _GoalEntryVM.Notice = value;
-                }
-
-                if(GoalEntryDC != null)
-                {
-                    GoalEntryDC.Notice = value;
-                }
-            }
-        }
-        
-	    public bool IsGoal
-	    {
-            get 
-            { 
-                return GoalEntryVM != null ? 
-                    GoalEntryVM.Type.Equals(ValueListEntryType.SupportConceptGoalType) || GoalEntryVM.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalType) : 
-                    GoalEntryDC.Type.Equals(ValueListEntryType.SupportConceptGoalType) || GoalEntryDC.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalType); 
-            }
-	    }
-
-	    public BindingList<SupportConceptGoalTreeItem> Items
-        {
-            get
-            {
-                return _Children ?? (_Children = new BindingList<SupportConceptGoalTreeItem>());
-            }
-
-            set
-            {
-                _Children = value;
-            }
-        }
-
-        public ValueListEntryType GoalType
-        {
-            get { return GoalEntryDC == null ? GoalEntryVM.Type : GoalEntryDC.Type; }
-        }
+        public ValueListEntryType GoalType => GoalEntryDC?.Type ?? GoalEntryVM.Type;
     }
 }

BeWo/MainControl.xaml

@@ -231,7 +231,7 @@
                                 </Button.RenderTransform>
                             </localView:ImageButton>
                           <localView:ImageButton r:DemandUserRight.VisibleDemands="VertretungenView_View"
-                                    ImageSource="Ressources\Icons\CoinsDisabled.png" x:Name="button_SchulbegleitenderDienst"
+                                    ImageSource="Ressources\Icons\CalendarDisabled.png" x:Name="button_SchulbegleitenderDienst"
                                     Click="Button_Vertretungen_OnClick" Style="{StaticResource NavBarButton}"
                                     Content="{t:Translate VertretungenMenuItem}" Background="{StaticResource SchulbegleitenderDienstContentBrush}"
                                     RenderTransformOrigin="0.5,0.5"

BeWo/MainControl.xaml.cs

@@ -770,7 +770,7 @@ namespace BeWo
 			}
 			else
 			{
-				_HomeView.ReorderPanels();
+				//_HomeView.ReorderPanels();
 			}
 
 			NavigateTo(_HomeView);

BeWo/ServiceProxy/Generated.cs

@@ -1060,6 +1060,11 @@ namespace BeWo.ServiceProxy
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/LoadCompactSupportConceptsByIdBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactSupportConceptDC> LoadCompactSupportConceptsById(System.Collections.Generic.List<long> pOids);
         
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/LoadContactInformationForCustomer", ReplyAction="http://tempuri.org/ICustomerService/LoadContactInformationForCustomerResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/LoadContactInformationForCustomerBeWoFaultFau" +
+            "lt", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.ContactDC> LoadContactInformationForCustomer(long customerOid);
+        
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetAllActiveCustomers", ReplyAction="http://tempuri.org/ICustomerService/GetAllActiveCustomersResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetAllActiveCustomersBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         System.Collections.Generic.List<BS.Shared.DataContracts.CustomerDC> GetAllActiveCustomers();
@@ -1853,6 +1858,11 @@ namespace BeWo.ServiceProxy
             return base.Channel.LoadCompactSupportConceptsById(pOids);
         }
         
+        public System.Collections.Generic.List<BS.Shared.DataContracts.ContactDC> LoadContactInformationForCustomer(long customerOid)
+        {
+            return base.Channel.LoadContactInformationForCustomer(customerOid);
+        }
+        
         public System.Collections.Generic.List<BS.Shared.DataContracts.CustomerDC> GetAllActiveCustomers()
         {
             return base.Channel.GetAllActiveCustomers();
@@ -4341,6 +4351,14 @@ namespace BeWo.ServiceProxy
             "lt", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         bool CheckForOverlappingAbsenceTimes(System.DateTime startDate, System.DateTime endDate, System.Nullable<long> employeeOid, System.Nullable<long> customerOid);
         
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetIcf", ReplyAction="http://tempuri.org/IOperationsService/GetIcfResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetIcfBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.ValueListEntryDC> GetIcf();
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetReportTemplates", ReplyAction="http://tempuri.org/IOperationsService/GetReportTemplatesResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetReportTemplatesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.ReportTemplateDC> GetReportTemplates(string url);
+        
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceBookings", ReplyAction="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceBookingsResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceBookingsBeWoFault" +
             "Fault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
@@ -5295,6 +5313,16 @@ namespace BeWo.ServiceProxy
             return base.Channel.CheckForOverlappingAbsenceTimes(startDate, endDate, employeeOid, customerOid);
         }
         
+        public System.Collections.Generic.List<BS.Shared.DataContracts.ValueListEntryDC> GetIcf()
+        {
+            return base.Channel.GetIcf();
+        }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.ReportTemplateDC> GetReportTemplates(string url)
+        {
+            return base.Channel.GetReportTemplates(url);
+        }
+        
         public System.Collections.Generic.List<long> InsertNewAdditionalServiceBookings(System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceBookingDC> pAdditionalServiceBookings)
         {
             return base.Channel.InsertNewAdditionalServiceBookings(pAdditionalServiceBookings);

BeWo/ServiceProxy/ServiceFacade.cs

@@ -91,8 +91,14 @@ namespace BeWo.ServiceProxy
 			DoAsync<AnalysisServiceClient, IAnalysisService, T>(pFunc, pCallBack, true);
 			
 		}
-		
-		public static void DoAccountingServiceSync(Action<IAccountingService> pAction)
+
+	    public static void DoAnalysisServiceAsync<T>(Func<IAnalysisService, T> pFunc, Action<T> pCallBack, bool showWaitDialog)
+	    {
+	        DoAsync<AnalysisServiceClient, IAnalysisService, T>(pFunc, pCallBack, showWaitDialog);
+
+	    }
+
+        public static void DoAccountingServiceSync(Action<IAccountingService> pAction)
         {
             pAction.Invoke(GetInstance<AccountingServiceClient, IAccountingService>());
         }
@@ -483,7 +489,12 @@ namespace BeWo.ServiceProxy
 			DoAsync<ReportServiceClient, IReportService, T>(pFunc, pCallBack, true);
 		}
 
-		public static void DoReportServiceSync(Action<IReportService> pAction)
+	    public static void DoReportServiceAsync<T>(Func<IReportService, T> pFunc, Action<T> pCallBack, bool showWaitDialog)
+	    {
+	        DoAsync<ReportServiceClient, IReportService, T>(pFunc, pCallBack, showWaitDialog);
+	    }
+
+        public static void DoReportServiceSync(Action<IReportService> pAction)
 		{
 			try
 			{

BeWo/View/Controls/ComboBoxTreeViewControl.xaml

@@ -67,9 +67,9 @@
 									          Click="Bd_OnClick" />
 									<TextBlock x:Name="BdText" Tag="{Binding}"
 									           Grid.Column="1" Margin="3 2"
-									           Text="{Binding Path=Name}"
+									           Text="{Binding Path=DetailDescription}"
 									           VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="Black"
-									           MouseDown="BdText_OnMouseDown" TextAlignment="Left" />
+									           MouseDown="BdText_OnMouseDown" TextAlignment="Left" ToolTip="{Binding Path=GoalEntryDC.Notice}" />
 								</Grid>
 							</HierarchicalDataTemplate>
 						</TreeView.Resources>

BeWo/View/Controls/ComboBoxTreeViewControl.xaml.cs

@@ -47,7 +47,7 @@ namespace BeWo.View.Controls
 
             var allSelected = selectedGoals.Count == GoalCount && GoalCount > 0;
             
-            var ToolTipString = selectedGoals.Aggregate(string.Empty, (s, dc) => s + (dc.TypeDescription + "; "));
+            var ToolTipString = selectedGoals.Aggregate(string.Empty, (s, dc) => s + (dc.DisplayName + "; "));
 
             DeSelectAllCheckBox.IsChecked = allSelected;
 

BeWo/View/Controls/ListboxSelectControl.xaml

@@ -0,0 +1,25 @@
+<UserControl x:Class="BeWo.View.Controls.ListboxSelectControl"
+             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:validation="clr-namespace:BeWo.Validation"
+             xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
+             xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
+             mc:Ignorable="d"
+             d:DesignHeight="230" d:DesignWidth="300">
+  <Grid>
+    <Grid.ColumnDefinitions>
+      <ColumnDefinition Width="*" />
+      <ColumnDefinition Width="Auto" />
+      <ColumnDefinition Width="Auto" />
+    </Grid.ColumnDefinitions>
+    <Grid.RowDefinitions>
+      <RowDefinition Height="*" />
+      <RowDefinition Height="Auto" />
+    </Grid.RowDefinitions>
+    <ListBox x:Name="Listbox" Grid.ColumnSpan="3" Margin="3, 3, 3, 0" SelectionMode="Single"/>
+    <Button x:Name="CancelButton" Grid.Row="1" Grid.Column="1" Content="Abbrechen" Margin="3" Click="CancelButton_Click"/>
+    <Button x:Name="SelectButton" Grid.Row="1" Grid.Column="2" Content="Auswählen" Margin="3" Click="SelectButton_Click"/>
+  </Grid>
+</UserControl>

BeWo/View/Controls/ListboxSelectControl.xaml.cs

@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Linq;
+using System.Web.UI.WebControls;
+using System.Windows;
+using System.Windows.Documents;
+using BeWo.Annotations;
+
+using BS.Shared;
+using BS.Shared.Core;
+using BS.Shared.DataContracts;
+using BS.Shared.Extensions;
+
+namespace BeWo.View.Controls
+{
+    public partial class ListboxSelectControl
+    {
+        public event Action CancelButtonClicked;
+        public event Action SelectButtonClicked;
+
+        public ListboxSelectControl(List<object> items)
+        {
+            InitializeComponent();
+
+            if (!items.Any()) throw new ArgumentOutOfRangeException();
+            Listbox.ItemsSource = items;
+            Listbox.SelectedItem = items.First();
+        }
+
+        public List<object> Items => Listbox.ItemsSource as List<object>;
+
+        public object SelectedItem => Listbox.SelectedItem;
+
+        private void CancelButton_Click(object sender, RoutedEventArgs e)
+        {
+            CancelButtonClicked?.Invoke();
+        }
+
+        private void SelectButton_Click(object sender, RoutedEventArgs e)
+        {
+            SelectButtonClicked?.Invoke();
+        }
+    }
+}

BeWo/View/Controls/ValueListEntryEditControl.xaml

@@ -0,0 +1,31 @@
+<UserControl x:Class="BeWo.View.Controls.ValueListEntryEditControl"
+             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:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
+             mc:Ignorable="d"
+             Height="Auto" Width="Auto">
+    <Grid Background="{StaticResource ObjectEditBackgroundBrush}">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+        <Label        x:Name="LabelCode"  Grid.Row="0" Grid.Column="0" Content="Abkürzung:" Margin="3"/>
+        <TextBox      x:Name="TxtCode" Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="3" Margin="3" Text="{Binding Abbreviation}"/>
+        <Label        x:Name="LabelBezeichnung"  Grid.Row="1" Grid.Column="0" Content="Bezeichnung:" Margin="3"/>
+        <TextBox      x:Name="TxtBezeichnung" Grid.Row="1"  Grid.Column="1" Grid.ColumnSpan="3" Margin="3" Text="{Binding Description}" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" />
+        <Label        x:Name="LabelNotice" Grid.Row="2" Grid.Column="0" Content="Beschreibung:" Margin="3"/>
+        <TextBox      x:Name="TxtNotice" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="3" Margin="3" Text="{Binding Notice}" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" />
+        <Button       x:Name="SaveButton" Grid.Row="3" Grid.Column="2" Content="Übernehmen" Margin="3" Click="SaveButton_OnClick" HorizontalAlignment="Right" Width="80"/>
+        <Button       x:Name="CancelButton" Grid.Row="3" Grid.Column="3" Content="Abbrechen" Margin="3" Click="CancelButton_OnClick" Width="80"/>
+    </Grid>
+</UserControl>

BeWo/View/Controls/ValueListEntryEditControl.xaml.cs

@@ -0,0 +1,59 @@
+using DevExpress.Xpf.Core;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using BeWo.ViewModel;
+
+namespace BeWo.View.Controls
+{
+    /// <summary>
+    /// Interaktionslogik für TestEMailControl.xaml
+    /// </summary>
+    public partial class ValueListEntryEditControl : UserControl
+	{
+		public event Action CancelButtonClicked;
+		public event Action SaveButtonClicked;
+		
+		public ValueListEntryEditControl(ValueListEntryVM valueListEntry)
+        {
+            InitializeComponent();
+            DataContext = valueListEntry;
+            ThemeManager.SetTheme(BeWoApp.CurrentBeWo.MainWindow, Theme.Office2010Black);
+
+            if (valueListEntry == null) return;
+
+            ValueListEntry = valueListEntry;
+        }
+
+        public ValueListEntryVM ValueListEntry { get; set; }
+        
+        private void SaveButton_OnClick(object sender, RoutedEventArgs e)
+        {
+            SaveButtonClicked?.Invoke();
+        }
+
+        private void CancelButton_OnClick(object sender, RoutedEventArgs e)
+        {
+            CancelButtonClicked?.Invoke();
+        }
+
+        public void ResetValueListEntry()
+        {
+            if (ValueListEntry?.DataContract == null) return;
+
+            ValueListEntry.Abbreviation = ValueListEntry.DataContract.Abbreviation;
+            ValueListEntry.Description = ValueListEntry.DataContract.TypeDescription;
+            ValueListEntry.Notice = ValueListEntry.DataContract.Notice;
+        }
+    }
+}

BeWo/View/Detail/BudgetView.xaml

@@ -24,7 +24,7 @@
       </Grid.RowDefinitions>
       <Label>Bezeichnung</Label>
       <TextBox Grid.Column="1" Margin="3" Height="23" Text="{val:ValidationBinding Path=NewVM.Name, UpdateSourceTrigger=PropertyChanged}" />
-      <Label Grid.Column="2">Betragshöhe</Label>
+      <Label Grid.Column="2">Budget</Label>
       <dxe:TextEdit Grid.Column="3" MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True" Height="23" Margin="3" EditValue="{val:ValidationBinding Path=NewVM.Betragshoehe, UpdateSourceTrigger=PropertyChanged}" />
       <Button Name="button_addBudget" Click="Button_addBudget_Click" Grid.Column="4" Height="25" Margin="3,3,3,3" Padding="5 0" IsDefault="True" Content="Hinzufügen" />
 

BeWo/View/Detail/MassnahmenTreeViewView.xaml

@@ -4,88 +4,96 @@
 					xmlns:local="clr-namespace:BeWo.Core" 
 					xmlns:localView="clr-namespace:BeWo.View" 
 					xmlns:view="clr-namespace:BeWo.View.Detail"
+					xmlns:converter="clr-namespace:BeWo.Converter"
 					Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True">
-	<localView:BeWoView.Resources>
-		<ResourceDictionary>
-			<view:ValueListEntryTypeToFontWeightConverter x:Key="ValueListEntryTypeToFontWeightConverter" />
-		</ResourceDictionary>
-	</localView:BeWoView.Resources>
-	<GroupBox Name="groupbox_root" Header="Ziele und Maßnahmen" Style="{StaticResource ObjectEditGroupBox}">
-		<GroupBox.Resources>
-			<ContextMenu x:Key="cmGoals" MenuItem.Click="ContextMenuGoals_Click" Opened="ContextMenuGoals_Opened">
-				<MenuItem Header="Neue Maßnahme">
-					<MenuItem.Icon>
-						<Image Source="..\..\Ressources\Icons\Add24.png"/>
-					</MenuItem.Icon>
-				</MenuItem>
-				<MenuItem Header="Neues Ziel" >
-					<MenuItem.Icon>
-						<Image Source="..\..\Ressources\Icons\Add24.png"/>
-					</MenuItem.Icon>
-				</MenuItem>
-			    <MenuItem Header="Notiz bearbeiten" />
-				<MenuItem Header="Umbenennen">
-					<MenuItem.Icon>
-						<Image Source="..\..\Ressources\Icons\Rename24.png"/>
-					</MenuItem.Icon>
-				</MenuItem>
-				<Separator />
-				<MenuItem Header="Löschen" >
-					<MenuItem.Icon>
-						<Image Source="..\..\Ressources\Icons\Delete24.png"/>
-					</MenuItem.Icon>
-				</MenuItem>
-			</ContextMenu>
-		</GroupBox.Resources>
-		<Grid>
-			<Grid.RowDefinitions>
-				<RowDefinition Height="Auto" />
-				<RowDefinition Height="*" />
-			</Grid.RowDefinitions>
-			<Grid Grid.Row="0">
-				<Grid.ColumnDefinitions>
-					<ColumnDefinition Width="Auto" />
-					<ColumnDefinition Width="*" />
-					<ColumnDefinition Width="Auto" />
-				</Grid.ColumnDefinitions>
-				
-				<Label Grid.Column="0" Content="Beschreibung" />
-				<TextBox Grid.Column="1" Margin="0,0,2,0" VerticalContentAlignment="Center" Text="{Binding ViewModel.NewVM.Description, UpdateSourceTrigger=PropertyChanged}" />
-				<Button Grid.Column="2" Height="25" Content="Hinzufügen" Margin="0,0,2,0" Click="ZielHinzufuegenButton_Click" />
-			</Grid>
-			<GroupBox Grid.Row="1" Style="{StaticResource ObjectEditGroupBox}">
-				<TreeView x:Name="treeview_individualGoals" Margin="3 3 7 3" Grid.Row="1" Padding="0 5 10 5"
+    <localView:BeWoView.Resources>
+        <ResourceDictionary>
+            <view:ValueListEntryTypeToFontWeightConverter x:Key="ValueListEntryTypeToFontWeightConverter" />
+        </ResourceDictionary>
+    </localView:BeWoView.Resources>
+    <GroupBox Name="groupbox_root" Header="Ziele und Maßnahmen" Style="{StaticResource ObjectEditGroupBox}">
+        <GroupBox.Resources>
+            <ContextMenu x:Key="cmGoals" MenuItem.Click="ContextMenuGoals_Click" Opened="ContextMenuGoals_Opened">
+                <MenuItem Header="Neue Maßnahme">
+                    <MenuItem.Icon>
+                        <Image Source="..\..\Ressources\Icons\Add24.png"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Header="Neues Ziel" >
+                    <MenuItem.Icon>
+                        <Image Source="..\..\Ressources\Icons\Add24.png"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Header="Bearbeiten">
+                    <MenuItem.Icon>
+                        <Image Source="..\..\Ressources\Icons\Rename24.png"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <!--<MenuItem Header="Umbenennen">
+                    <MenuItem.Icon>
+                        <Image Source="..\..\Ressources\Icons\Rename24.png"/>
+                    </MenuItem.Icon>
+                </MenuItem>-->
+                <Separator />
+                <MenuItem Header="Löschen" >
+                    <MenuItem.Icon>
+                        <Image Source="..\..\Ressources\Icons\Delete24.png"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+            </ContextMenu>
+        </GroupBox.Resources>
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+            <Grid Grid.Row="0">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+
+                <Label Grid.Column="0" Content="Neues Ziel" />
+                <TextBox Grid.Column="1" Margin="1" VerticalContentAlignment="Center" Text="{Binding ViewModel.NewVM.Description, UpdateSourceTrigger=PropertyChanged}" />
+                <Button Grid.Column="2" Height="25" Content="Hinzufügen" Margin="1" Click="ZielHinzufuegenButton_Click" />
+                <Button Grid.Column="3" Height="25" Content="Icf Importieren" Margin="1" Click="IcfImport_Click" />
+            </Grid>
+            <GroupBox Grid.Row="1" Style="{StaticResource ObjectEditGroupBox}">
+                <TreeView x:Name="TreeView" Margin="3 3 7 3" Grid.Row="1" Padding="0 5 10 5"
 						      ItemContainerStyle="{DynamicResource igoal_treeitemstyle}"
                   ItemTemplate="{DynamicResource igoal_treeitemtemplate}" Grid.RowSpan="1" ContextMenu="{StaticResource cmGoals}"
                   PreviewMouseDown="GoalTreeViewItem_PreviewMouseRightButtonDown" 
 						      ItemsSource="{Binding IndividualGoalTree, UpdateSourceTrigger=PropertyChanged}" >
-					<TreeView.Resources>
-						<Style x:Key="igoal_treeitemstyle" TargetType="TreeViewItem">
-							<Setter Property="IsExpanded" Value="{Binding Path=IsExpanded, Mode=TwoWay}" />
-						</Style>
-						<HierarchicalDataTemplate x:Key="igoal_treeitemtemplate" DataType="{x:Type local:SupportConceptGoalTreeItem}" ItemsSource="{Binding Path=Items}">
-							<Grid>
-								<Grid.ColumnDefinitions>
-									<ColumnDefinition Width="Auto" />
-									<ColumnDefinition Width="*" />
-								</Grid.ColumnDefinitions>
-							    <Grid.RowDefinitions>
-							        <RowDefinition Height="*" />
-							        <RowDefinition Height="Auto" />
-							    </Grid.RowDefinitions>
-								  <TextBox Margin="0,0,0,0" Grid.ColumnSpan="2" Cursor="Arrow" Background="Transparent" Height="21" Padding="1,3,1,3" VerticalAlignment="Center" 
+                    <TreeView.Resources>
+                        <Style x:Key="igoal_treeitemstyle" TargetType="TreeViewItem">
+                            <Setter Property="IsExpanded" Value="{Binding Path=IsExpanded, Mode=TwoWay}" />
+                        </Style>
+                        <HierarchicalDataTemplate x:Key="igoal_treeitemtemplate" DataType="{x:Type local:SupportConceptGoalTreeItem}" ItemsSource="{Binding Path=Items}">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                </Grid.RowDefinitions>
+                                <TextBox Margin="0,0,0,0" Cursor="Arrow" Background="Transparent" Height="21" Padding="1,3,1,3" VerticalAlignment="Center" 
 								           LostFocus="TextBox_LostFocus" KeyDown="TextBox_KeyDown" BorderThickness="0" 
-								           IsReadOnly="True" Text="{Binding Path=ItemName, UpdateSourceTrigger=PropertyChanged}"
+								           IsReadOnly="True" Text="{Binding Path=GoalEntryVM.DisplayName, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}"
 								           FontWeight="{Binding Path=IsGoal, Converter={StaticResource ValueListEntryTypeToFontWeightConverter}}"/>
-							    <Label Grid.Row="1" Grid.Column="0" Visibility="{Binding Path=IsGoal, Converter={StaticResource BoolVisibilityConverter}}" Foreground="#FF3C3C3C">Notiz:</Label>
-							    <TextBox Grid.Row="1" Grid.Column="1" Margin="0,0,0,0" Visibility="{Binding Path=IsGoal, Converter={StaticResource BoolVisibilityConverter}}" 
-							             Text="{Binding Path=Notice, UpdateSourceTrigger=PropertyChanged}" Height="21" VerticalAlignment="Center"
+                                <CheckBox Grid.Column="1" Margin="5, 5, 0, 0" Visibility="{Binding Path=GoalEntryVM.GotNotice}" IsChecked="{Binding Path=ShowNotice, UpdateSourceTrigger=PropertyChanged}"/>
+                                <TextBox Grid.Row="1" Grid.ColumnSpan="3"  Margin="0,0,0,0" Visibility="{Binding Path=ShowNotice, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BoolVisibilityConverter}}"
+							             Text="{Binding Path=GoalEntryVM.Notice, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center"
 							             BorderThickness="0" IsReadOnly="True" LostFocus="TextBox_LostFocus" KeyDown="TextBox_KeyDown" Background="Transparent"/>
-							</Grid>
-						</HierarchicalDataTemplate>
-					</TreeView.Resources>
-				</TreeView>
-			</GroupBox>
-		</Grid>
-	</GroupBox>
+                            </Grid>
+                        </HierarchicalDataTemplate>
+                    </TreeView.Resources>
+                </TreeView>
+            </GroupBox>
+        </Grid>
+    </GroupBox>
 </localView:BeWoView>

BeWo/View/Detail/MassnahmenTreeViewView.xaml.cs

@@ -14,6 +14,8 @@ using System.Windows.Threading;
 using BeWo.Core;
 using BeWo.Core.Service;
 using BeWo.ServiceProxy;
+using BeWo.View.Controls;
+using BeWo.View.Detail.Report;
 using BeWo.ViewModel;
 using BeWo.ViewModel.ListViewModel;
 
@@ -27,27 +29,20 @@ namespace BeWo.View.Detail
 {
     public partial class MassnahmenTreeViewView
     {
+        #region Constant Fields
+
+        #endregion
+
+        #region Fields
+
         private TreeViewItem _SelectedGoalTreeNode;
+        private GenericValueListEntryListVM _ViewModel;
+        private List<ValueListEntryDC> _Children2Delete;
+        private List<SupportConceptGoalTreeItem> _TreeViewItemsList;
 
-        public static bool IsAllowedToEditGoals
-        {
-            get { return BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConcept_AllowEditGoals); }
-        }
+        #endregion
 
-        private GenericValueListEntryListVM viewModel;
-
-        public GenericValueListEntryListVM ViewModel
-        {
-            get { return viewModel; }
-            set
-            {
-                viewModel = value;
-                InitGoalCategoriesTreeView();
-                treeview_individualGoals.ItemsSource = GoalTree;
-            }
-        }
-
-        public ObservableSortCollection<SupportConceptGoalTreeItem> GoalTree { get; private set; }
+        #region Constructors
 
         public MassnahmenTreeViewView(GenericValueListEntryListVM pViewModel)
         {
@@ -58,84 +53,17 @@ namespace BeWo.View.Detail
             DataContext = this;
         }
 
-        public override bool IsDirty
-        {
-            get
-            {
-                return ViewModel != null && ViewModel.IsDirty;
-            }
-        }
+        #endregion
 
-        protected override void Save()
-        {
-            var lToDos = new List<Action<IValueListService>>();
+        #region Finalizers
 
-            if (ViewModel.ChangedCount > 0)
-            {
-                lToDos.Add(s => s.UpdateValueListEntries(ViewModel.CommitChanged()));
-            }
+        #endregion
 
-            if (ViewModel.AddedCount > 0)
-            {
-                var neueVMs = ViewModel.VMList.Where(w => w.IsNew).ToList();
+        #region Delegates
 
-                TreeViewItemsList = new List<SupportConceptGoalTreeItem>();
-                GetAllTreeViewItems();
+        #endregion
 
-                var obersteZiele = neueVMs.Where(w => w.IsNew && (w.ParentEntry != null && w.ParentEntry.ValueListEntryOid != null) || w.ParentEntry == null);
-
-                foreach (var ziel in obersteZiele)
-                {
-	                var ve = TreeViewItemsList.FirstOrDefault(f => f.GoalEntryVM != null && f.GoalEntryVM.Equals(ziel));
-	                if (ve != null)
-	                {
-		                GoalService.RecursiveSynchronousValueListEntrySave(ve);
-	                }
-                }
-            }
-
-            if (ViewModel.RemovedCount > 0)
-            {
-                var entfernte = Children2Delete.Where(w => w.ValueListEntryOid != null).ToList();
-                var entfernteDic = entfernte.ToDictionary(k => k.ValueListEntryOid.Value, v => v.ValueListEntryVersion.Value);
-                entfernteDic.AddAndIgnoreDuplicates(ViewModel.GetRemoved().ToDictionary(dc => dc.ValueListEntryOid.Value, dc => dc.ValueListEntryVersion.Value));
-
-                lToDos.Add(s => s.DeactivateValueListEntries(entfernteDic));
-            }
-
-            ServiceFacade.DoMultipleValueListServicesAsync(lToDos, ReloadViewModel);
-
-			Cache.GetInstance().ClearAllValueListEntries();
-        }
-
-	    private bool IstGleichesZiel(ValueListEntryVM ziel1, ValueListEntryVM ziel2)
-	    {
-		    if (ziel1.DataContract.ValueListEntryOid.HasValue && ziel2.DataContract.ValueListEntryOid.HasValue)
-		    {
-			    return ziel1.DataContract.ValueListEntryOid.Value == ziel2.DataContract.ValueListEntryOid.Value;
-		    }
-			else if (!ziel1.DataContract.ValueListEntryOid.HasValue && !ziel2.DataContract.ValueListEntryOid.HasValue)
-			{
-				if (ziel1.ParentEntry != null && ziel2.ParentEntry != null && ziel1.ParentEntry.Equals(ziel1.ParentEntry))
-				{
-					bool test = ziel1.Equals(ziel2);
-					return ziel1.Description == ziel2.Description;
-				}
-				else if (ziel1.ParentEntry == null && ziel2.ParentEntry == null)
-				{
-					return ziel1.Description == ziel2.Description;
-				}
-			}
-		    return false;
-	    }
-
-        private void ReloadViewModel()
-        {
-            VMFactory.CreateGoalCategoryVMAsync(vm => this.Dispatch(() =>
-            {
-                ViewModel = vm;
-            }));
-        }
+        #region Events
 
         private void GoalTreeViewItem_PreviewMouseRightButtonDown(object sender, MouseButtonEventArgs e)
         {
@@ -171,51 +99,42 @@ namespace BeWo.View.Detail
 
         private void ContextMenuGoals_Click(object sender, RoutedEventArgs e)
         {
-            if (e.OriginalSource is MenuItem twi)
+            if (!(e.OriginalSource is MenuItem twi)) return;
+
+            var selectedItem = TreeView.SelectedItem as SupportConceptGoalTreeItem;
+
+            switch (twi.Header)
             {
-                var selectedItem = treeview_individualGoals.SelectedItem as SupportConceptGoalTreeItem;
-
-                if (twi.Header.Equals("Neue Maßnahme"))
-                {
+                case "Neue Maßnahme":
                     if (_SelectedGoalTreeNode != null)
                     {
-                        _SelectedGoalTreeNode.ItemContainerGenerator.StatusChanged += GoalTreeItemContainerGenerator_StatusChanged;
-
-                        AddMassnahme(selectedItem);
+                        AddTreeItemWithControl(selectedItem, ValueListEntryType.SupportConceptGoalType, "Maßnahme hinzufügen");
                     }
-                }
-                else if (twi.Header.Equals("Neues Ziel"))
-                {
+                    break;
+                case "Neues Ziel":
                     if (_SelectedGoalTreeNode != null)
                     {
-                        _SelectedGoalTreeNode.ItemContainerGenerator.StatusChanged += GoalTreeItemContainerGenerator_StatusChanged;
-
-                        AddZiel(selectedItem);
+                        AddTreeItemWithControl(selectedItem, ValueListEntryType.SupportConceptGoalCategoryType, "Ziel hinzufügen");
                     }
-                }
-                else if (twi.Header.Equals("Umbenennen"))
-                {
-                    EditItem(treeview_individualGoals, _SelectedGoalTreeNode, selectedItem);
-                }
-                else if (twi.Header.Equals("Löschen"))
-                {
+                    break;
+                case "Löschen":
                     if (selectedItem != null)
                     {
                         var zielOderMassnahme = selectedItem.GoalEntryVM.Type == ValueListEntryType.SupportConceptGoalCategoryType ? "das Ziel" : "die Maßnahme";
                         var pluralendung = zielOderMassnahme.Equals("das Ziel") ? "en" : "n";
 
                         if (MessageBox.Show("ACHTUNG: Das Löschen von " + zielOderMassnahme.Substring(4) + pluralendung + " kann nicht rückgängig gemacht werden.\n" +
-                                                                    "Alle verknüpften Eintragungen in der Zeiterfassung bleiben erhalten.\n\n" +
-                                                                    "Wollen Sie " + zielOderMassnahme + " '" + selectedItem.ItemName + "' wirklich löschen?", "Löschen bestätigen", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.Yes)
+                                            "Alle verknüpften Eintragungen in der Zeiterfassung bleiben erhalten.\n\n" +
+                                            "Wollen Sie " + zielOderMassnahme + " '" + selectedItem.GoalEntryVM?.DisplayName + "' wirklich löschen?", "Löschen bestätigen", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.Yes)
                         {
                             DeleteIndividualGoal(selectedItem);
                         }
                     }
-                }
-                else if(twi.Header.Equals("Notiz bearbeiten"))
-                {
-                    EditItem(treeview_individualGoals, _SelectedGoalTreeNode, selectedItem, true);
-                }
+                    break;
+                case "Bearbeiten":
+                    if (selectedItem != null)
+                        EditTreeItem(selectedItem.GoalEntryVM);
+                    break;
             }
         }
 
@@ -223,7 +142,7 @@ namespace BeWo.View.Detail
         {
             if (e.OriginalSource is ContextMenu menu)
             {
-                var goal = treeview_individualGoals.SelectedItem as SupportConceptGoalTreeItem;
+                var goal = TreeView.SelectedItem as SupportConceptGoalTreeItem;
 
                 foreach (var menuitem in menu.Items.OfType<MenuItem>().Select(item => item))
                 {
@@ -235,9 +154,9 @@ namespace BeWo.View.Detail
                     {
                         menuitem.IsEnabled = goal != null && !goal.IsGoal;
                     }
-                    else if(menuitem.Header.Equals("Notiz bearbeiten"))
+                    else if (menuitem.Header.Equals("Notiz bearbeiten"))
                     {
-                        menuitem.IsEnabled = goal != null && goal.IsGoal;
+                        menuitem.IsEnabled = goal != null; // && goal.IsGoal;
                     }
 
                     menuitem.IsEnabled = menuitem.IsEnabled && IsAllowedToEditGoals;
@@ -245,6 +164,254 @@ namespace BeWo.View.Detail
             }
         }
 
+        private void GoalTreeItemContainerGenerator_StatusChanged(object sender, EventArgs e)
+        {
+            var ig = (ItemContainerGenerator)sender;
+            if (ig.Status != GeneratorStatus.ContainersGenerated)
+            {
+                return;
+            }
+
+            if (ig.ContainerFromIndex(_SelectedGoalTreeNode.Items.Count - 1) is TreeViewItem n)
+            {
+                n.IsSelected = true;
+
+                new DispatcherTimer(
+                    TimeSpan.FromMilliseconds(200),
+                    DispatcherPriority.Background,
+                    (s1, e1) =>
+                    {
+                        _SelectedGoalTreeNode = n;
+                        var item = ig.ItemFromContainer(n) as SupportConceptGoalDC;
+                        EditItem(TreeView, _SelectedGoalTreeNode, item);
+                        ((DispatcherTimer)s1).Stop();
+                    },
+                    Dispatcher).Start();
+            }
+
+            _SelectedGoalTreeNode.ItemContainerGenerator.StatusChanged -= GoalTreeItemContainerGenerator_StatusChanged;
+        }
+
+        private void ZielHinzufuegenButton_Click(object sender, RoutedEventArgs e)
+        {
+            var newItem = new SupportConceptGoalTreeItem();
+            var vm = ViewModel.NewVM;
+            vm.Type = ValueListEntryType.SupportConceptGoalCategoryType;
+
+            newItem.GoalEntryVM = vm;
+            ViewModel.AddNewVMToList();
+
+            GoalTree.Add(newItem);
+
+            GoalTree.Sort((x, y) => x.GoalEntryVM?.DisplayName?.CompareTo(y.GoalEntryVM?.DisplayName) ?? string.Compare(string.Empty, y.GoalEntryVM?.DisplayName, StringComparison.Ordinal));
+        }
+
+        private void IcfImport_Click(object sender, RoutedEventArgs e)
+        {
+            var control = new IcfImportControl(ServiceFacade.DoOperationsServiceSync(x => x.GetIcf()));
+
+            var beWoWindow = new BeWoWindow
+            {
+                rootGroupBox = { Header = "Icf Importieren" },
+                Height = 500,
+                Width = 500,
+                WindowStartupLocation = WindowStartupLocation.CenterOwner,
+                GroupBoxContent = control,
+                Owner = BeWoApp.CurrentBeWo.MainWindow
+            };
+
+            control.ButtonImportClicked += () =>
+            {
+                ImportIcf(control.TreeViewGoalItem);
+                beWoWindow.Close();
+            };
+
+
+            beWoWindow.ShowDialog();
+        }
+
+        #endregion
+
+        #region InterfacesImplementations
+
+        #endregion
+
+        #region Properties
+
+        public static bool IsAllowedToEditGoals => BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConcept_AllowEditGoals);
+
+        public GenericValueListEntryListVM ViewModel
+        {
+            get => _ViewModel;
+            set
+            {
+                _ViewModel = value;
+                InitGoalCategoriesTreeView();
+                TreeView.ItemsSource = GoalTree;
+            }
+        }
+
+        public ObservableSortCollection<SupportConceptGoalTreeItem> GoalTree { get; private set; }
+
+        public override bool IsDirty => ViewModel != null && ViewModel.IsDirty;
+
+        #endregion
+
+        #region Indexers
+
+        #endregion
+
+        #region Methods
+
+        public void AddTreeItemWithControl(SupportConceptGoalTreeItem parent, ValueListEntryType valueListEntryType, string viewHeader)
+        {
+            var control = new ValueListEntryEditControl(new ValueListEntryVM(new ValueListEntryDC()));
+
+            var beWoWindow = new BeWoWindow();
+
+            control.CancelButtonClicked += () =>
+            {
+                if (control.ValueListEntry.IsDirty)
+                {
+                    if (MessageBox.Show("Möchten Sie die Änderung verwerfen?", "Änderungen vorhanden", MessageBoxButton.YesNo, MessageBoxImage.Question) != MessageBoxResult.Yes)
+                        return;
+                    control.ResetValueListEntry();
+                }
+                beWoWindow.Close();
+            };
+
+            control.SaveButtonClicked += () =>
+            {
+                var vm = control.ValueListEntry;
+                AddTreeItem(parent, valueListEntryType, vm.Description, vm.Abbreviation, vm.Notice);
+                beWoWindow.Close();
+            };
+
+            beWoWindow.Height = 200;
+            beWoWindow.Width = 500;
+            beWoWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner;
+            beWoWindow.GroupBoxContent = control;
+            beWoWindow.Owner = BeWoApp.CurrentBeWo.MainWindow;
+            beWoWindow.rootGroupBox.Header = viewHeader;
+            beWoWindow.ShowDialog();
+        }
+
+        public SupportConceptGoalTreeItem AddTreeItem(SupportConceptGoalTreeItem parent, ValueListEntryType valueListEntryType, string description, string abbreviation, string notice)
+        {
+            if (!valueListEntryType.HasFlag(ValueListEntryType.SupportConceptGoalCategoryType) &&
+                !valueListEntryType.HasFlag(ValueListEntryType.SupportConceptGoalType))
+                throw new ArgumentOutOfRangeException();
+
+            var vm = ViewModel.NewVM;
+            vm.Type = valueListEntryType;
+            vm.Description = description;
+            vm.Abbreviation = abbreviation;
+            vm.Notice = notice;
+
+            var newItem = new SupportConceptGoalTreeItem
+            {
+                GoalEntryVM = vm,
+                GoalEntryDC = vm.CommitToDataContract(),
+                ParentGoal = parent
+            };
+
+            ViewModel.AddNewVMToList();
+
+            if (parent == null) return newItem;
+
+            vm.ParentEntry = parent.GoalEntryDC ?? parent.GoalEntryVM.CommitToDataContract();
+            parent.GoalEntryVM = parent.GoalEntryVM;
+            parent.Items.Add(newItem);
+            parent.IsExpanded = true;
+
+            return newItem;
+        }
+
+        internal void DeleteIndividualGoal(SupportConceptGoalTreeItem selectedItem)
+        {
+            _Children2Delete = new List<ValueListEntryDC>();
+            TraverseCollection(selectedItem);
+
+            var parent = selectedItem.ParentGoal as SupportConceptGoalTreeItem;
+            if (parent != null && parent.Items != null)
+                parent.Items.Remove(selectedItem);
+            else
+                GoalTree.Remove(selectedItem);
+
+            ViewModel.VMList.Remove(selectedItem.GoalEntryVM);
+        }
+
+        protected override void Save()
+        {
+            var lToDos = new List<Action<IValueListService>>();
+
+            if (ViewModel.ChangedCount > 0)
+            {
+                lToDos.Add(s => s.UpdateValueListEntries(ViewModel.CommitChanged()));
+            }
+
+            if (ViewModel.AddedCount > 0)
+            {
+                var neueVMs = ViewModel.VMList.Where(w => w.IsNew).ToList();
+
+                _TreeViewItemsList = new List<SupportConceptGoalTreeItem>();
+                GetAllTreeViewItems();
+
+                var obersteZiele = neueVMs.Where(w => w.IsNew && (w.ParentEntry != null && w.ParentEntry.ValueListEntryOid != null) || w.ParentEntry == null);
+
+                foreach (var ziel in obersteZiele)
+                {
+                    var ve = _TreeViewItemsList.FirstOrDefault(f => f.GoalEntryVM != null && f.GoalEntryVM.Equals(ziel));
+                    if (ve != null)
+                    {
+                        GoalService.RecursiveSynchronousValueListEntrySave(ve);
+                    }
+                }
+            }
+
+            if (ViewModel.RemovedCount > 0)
+            {
+                var entfernte = _Children2Delete.Where(w => w.ValueListEntryOid != null).ToList();
+                var entfernteDic = entfernte.ToDictionary(k => k.ValueListEntryOid.Value, v => v.ValueListEntryVersion.Value);
+                entfernteDic.AddAndIgnoreDuplicates(ViewModel.GetRemoved().ToDictionary(dc => dc.ValueListEntryOid.Value, dc => dc.ValueListEntryVersion.Value));
+
+                lToDos.Add(s => s.DeactivateValueListEntries(entfernteDic));
+            }
+
+            ServiceFacade.DoMultipleValueListServicesAsync(lToDos, ReloadViewModel);
+
+            Cache.GetInstance().ClearAllValueListEntries();
+        }
+
+        private static void EditTreeItem(ValueListEntryVM valueListEntry)
+        {
+            if (valueListEntry == null) return;
+
+            var control = new ValueListEntryEditControl(valueListEntry);
+            var beWoWindow = new BeWoWindow();
+
+            control.CancelButtonClicked += () =>
+            {
+                if (control.ValueListEntry.IsDirty)
+                {
+                    if (MessageBox.Show("Möchten Sie die Änderung verwerfen?", "Änderungen vorhanden", MessageBoxButton.YesNo, MessageBoxImage.Question) != MessageBoxResult.Yes)
+                        return;
+                    control.ResetValueListEntry();
+                }
+                beWoWindow.Close();
+            };
+
+            control.SaveButtonClicked += () => beWoWindow.Close();
+
+            beWoWindow.Height = 200;
+            beWoWindow.Width = 500;
+            beWoWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner;
+            beWoWindow.GroupBoxContent = control;
+            beWoWindow.Owner = BeWoApp.CurrentBeWo.MainWindow;
+            beWoWindow.rootGroupBox.Header = "Bearbeiten";
+            beWoWindow.ShowDialog();
+        }
+
         private static void EditItem(TreeView tv, TreeViewItem tvi, object item, bool isNoticeTextBox = false)
         {
             if (item != null)
@@ -259,7 +426,7 @@ namespace BeWo.View.Detail
                 {
                     var textBox = BeWoWpfUtils.FindItem<TextBox>(treeItem, isNoticeTextBox ? 1 : 0);
 
-                    if(textBox == null)
+                    if (textBox == null)
                     {
                         return;
                     }
@@ -275,35 +442,6 @@ namespace BeWo.View.Detail
             }
         }
 
-        private void GoalTreeItemContainerGenerator_StatusChanged(object sender, EventArgs e)
-        {
-            var ig = (ItemContainerGenerator)sender;
-            if (ig.Status != GeneratorStatus.ContainersGenerated)
-            {
-                return;
-            }
-
-            var n = ig.ContainerFromIndex(_SelectedGoalTreeNode.Items.Count - 1) as TreeViewItem;
-            if (n != null)
-            {
-                n.IsSelected = true;
-
-                new DispatcherTimer(
-                    TimeSpan.FromMilliseconds(200),
-                    DispatcherPriority.Background,
-                    (s1, e1) =>
-                    {
-                        _SelectedGoalTreeNode = n;
-                        var item = ig.ItemFromContainer(n) as SupportConceptGoalDC;
-                        EditItem(treeview_individualGoals, _SelectedGoalTreeNode, item);
-                        ((DispatcherTimer)s1).Stop();
-                    },
-                    Dispatcher).Start();
-            }
-
-            _SelectedGoalTreeNode.ItemContainerGenerator.StatusChanged -= GoalTreeItemContainerGenerator_StatusChanged;
-        }
-
         private static void UpdateSelectedTreeItemText(TextBoxBase textBox)
         {
             if (!textBox.IsReadOnly)
@@ -315,6 +453,36 @@ namespace BeWo.View.Detail
             }
         }
 
+        private static SupportConceptGoalTreeItem SearchGoalTreeItem(SupportConceptGoalTreeItem supportConceptGoalTreeItem,
+            string description, string abbreviation, string notice)
+        {
+            if (supportConceptGoalTreeItem?.GoalEntryVM == null) return null;
+
+            if ((supportConceptGoalTreeItem.GoalEntryVM.Description ?? "") == (description ?? "") &&
+                (supportConceptGoalTreeItem.GoalEntryVM.Abbreviation ?? "") == (abbreviation ?? "") &&
+                (supportConceptGoalTreeItem.GoalEntryVM.Notice ?? "") == (notice ?? ""))
+                return supportConceptGoalTreeItem;
+
+            if (supportConceptGoalTreeItem.Items == null) return null;
+
+            foreach (var goal in supportConceptGoalTreeItem.Items)
+            {
+                var foundedGoal = SearchGoalTreeItem(goal, description, abbreviation, notice);
+                if (foundedGoal != null)
+                    return foundedGoal;
+            }
+
+            return null;
+        }
+
+        private void ReloadViewModel()
+        {
+            VMFactory.CreateGoalCategoryVMAsync(vm => this.Dispatch(() =>
+            {
+                ViewModel = vm;
+            }));
+        }
+
         private void InitGoalCategoriesTreeView()
         {
             var categoriesWithParent = new List<SupportConceptGoalTreeItem>();
@@ -385,78 +553,18 @@ namespace BeWo.View.Detail
             GoalTree = iGoalList;
         }
 
-        private List<ValueListEntryDC> Children2Delete;
-        internal void DeleteIndividualGoal(SupportConceptGoalTreeItem selectedItem)
-        {
-            Children2Delete = new List<ValueListEntryDC>();
-            TraverseCollection(selectedItem);
-
-            var parent = selectedItem.ParentGoal as SupportConceptGoalTreeItem;
-            if (parent != null && parent.Items != null)
-                parent.Items.Remove(selectedItem);
-            else
-                GoalTree.Remove(selectedItem);
-
-            ViewModel.VMList.Remove(selectedItem.GoalEntryVM);
-        }
-
         private void TraverseCollection(SupportConceptGoalTreeItem item)
         {
-            var result = new List<ValueListEntryDC> {item.GoalEntryDC ?? item.GoalEntryVM.CommitToDataContract()};
+            var result = new List<ValueListEntryDC> { item.GoalEntryDC ?? item.GoalEntryVM.CommitToDataContract() };
 
             foreach (var child in item.Items)
             {
                 TraverseCollection(child);
             }
 
-            Children2Delete.AddRange(result);
+            _Children2Delete.AddRange(result);
         }
 
-        public void AddMassnahme(SupportConceptGoalTreeItem parent)
-        {
-            var newItem = new SupportConceptGoalTreeItem();
-            var vm = ViewModel.NewVM;
-            vm.Type = ValueListEntryType.SupportConceptGoalType;
-            vm.Description = "Neue Maßnahme";
-
-            newItem.GoalEntryVM = vm;
-            newItem.GoalEntryDC = vm.CommitToDataContract();
-
-            ViewModel.AddNewVMToList();
-            newItem.ParentGoal = parent;
-
-            if (parent != null)
-            {
-                vm.ParentEntry = parent.GoalEntryDC ?? parent.GoalEntryVM.CommitToDataContract();
-                parent.GoalEntryVM = parent.GoalEntryVM;
-                parent.Items.Add(newItem);
-                parent.IsExpanded = true;
-            }
-        }
-
-        public void AddZiel(SupportConceptGoalTreeItem parent)
-        {
-            var newItem = new SupportConceptGoalTreeItem();
-            var vm = ViewModel.NewVM;
-            vm.Type = ValueListEntryType.SupportConceptGoalCategoryType;
-            vm.Description = "Neues Ziel";
-
-            newItem.GoalEntryVM = vm;
-            newItem.GoalEntryDC = vm.CommitToDataContract();
-
-            ViewModel.AddNewVMToList();
-            newItem.ParentGoal = parent;
-
-            if (parent != null)
-            {
-                vm.ParentEntry = parent.GoalEntryDC ?? parent.GoalEntryVM.CommitToDataContract();
-                parent.GoalEntryVM = parent.GoalEntryVM;
-                parent.Items.Add(newItem);
-                parent.IsExpanded = true;
-            }
-        }
-
-        private List<SupportConceptGoalTreeItem> TreeViewItemsList;
         private void GetAllTreeViewItems()
         {
             foreach (var parent in GoalTree)
@@ -467,31 +575,94 @@ namespace BeWo.View.Detail
 
         private void TraverseTreeViewItem(SupportConceptGoalTreeItem item)
         {
-            TreeViewItemsList.Add(item);
+            _TreeViewItemsList.Add(item);
             foreach (var child in item.Items)
             {
                 TraverseTreeViewItem(child);
             }
         }
 
-        private void ZielHinzufuegenButton_Click(object sender, RoutedEventArgs e)
+        private void ImportIcf(SupportConceptGoalDC goal)
         {
-            var newItem = new SupportConceptGoalTreeItem();
-            var vm = ViewModel.NewVM;
-            vm.Type = ValueListEntryType.SupportConceptGoalCategoryType;
+            if (goal == null) return;
 
-            newItem.GoalEntryVM = vm;
-            ViewModel.AddNewVMToList();
+            goal.Children?.ForEach(ImportIcf);
 
-            GoalTree.Add(newItem);
-
-            GoalTree.Sort((x, y) =>
-            {
-	            if (x.ItemName == null)
-		            return String.Empty.CompareTo(y.ItemName);
-	            return x.ItemName.CompareTo(y.ItemName);
-            });
+            if (goal.IsChecked)
+                AddIcf(goal);
         }
+
+        private SupportConceptGoalTreeItem AddIcf(SupportConceptGoalDC goal)
+        {
+            if (goal == null) return null;
+
+            // Schaut, ob das Child bereits existiert
+            var similarGoal = GoalTree.FirstOrDefault(x => SearchGoalTreeItem(x, goal.GoalEntryDC.TypeDescription, goal.GoalEntryDC.Abbreviation, goal.GoalEntryDC.Notice) != null);
+            if (similarGoal != null)
+                return similarGoal;
+
+            // Schaut, ob das Goal ein Parent hat
+            if (goal.ParentGoal == null)
+            {
+                var treeItem = AddTreeItem(null, ValueListEntryType.SupportConceptGoalCategoryType,
+                    goal.GoalEntryDC.TypeDescription, goal.GoalEntryDC.Abbreviation, goal.GoalEntryDC.Notice);
+
+                GoalTree.Add(treeItem);
+
+                GoalTree.Sort((x, y) => x.GoalEntryVM?.DisplayName?.CompareTo(y.GoalEntryVM?.DisplayName) ?? string.Compare(string.Empty, y.GoalEntryVM?.DisplayName, StringComparison.Ordinal));
+
+                return treeItem;
+            }
+
+            // Schaut, ob das ParentGoal bereits existiert
+            foreach (var goalTreeItem in GoalTree)
+            {
+                var similarParentGoal = SearchGoalTreeItem(goalTreeItem, goal.ParentGoal.GoalEntryDC.TypeDescription, goal.ParentGoal.GoalEntryDC.Abbreviation, goal.ParentGoal.GoalEntryDC.Notice);
+                if (similarParentGoal == null)
+                    continue;
+                return AddTreeItem(similarParentGoal, ValueListEntryType.SupportConceptGoalCategoryType, goal.GoalEntryDC.TypeDescription, goal.GoalEntryDC.Abbreviation, goal.GoalEntryDC.Notice);
+            }
+
+            // Fügt den Parent hinzu
+            var parent = AddIcf(goal.ParentGoal);
+            return AddTreeItem(parent, ValueListEntryType.SupportConceptGoalCategoryType,
+                goal.GoalEntryDC.TypeDescription, goal.GoalEntryDC.Abbreviation, goal.GoalEntryDC.Notice);
+        }
+
+        #endregion
+
+        #region Structs
+
+        #endregion
+
+        #region Classes
+
+        #endregion
+
+        #region NotNeeded
+
+        private bool IstGleichesZiel(ValueListEntryVM ziel1, ValueListEntryVM ziel2)
+        {
+            if (ziel1.DataContract.ValueListEntryOid.HasValue && ziel2.DataContract.ValueListEntryOid.HasValue)
+            {
+                return ziel1.DataContract.ValueListEntryOid.Value == ziel2.DataContract.ValueListEntryOid.Value;
+            }
+            else if (!ziel1.DataContract.ValueListEntryOid.HasValue && !ziel2.DataContract.ValueListEntryOid.HasValue)
+            {
+                if (ziel1.ParentEntry != null && ziel2.ParentEntry != null && ziel1.ParentEntry.Equals(ziel1.ParentEntry))
+                {
+                    bool test = ziel1.Equals(ziel2);
+                    return ziel1.Description == ziel2.Description;
+                }
+                else if (ziel1.ParentEntry == null && ziel2.ParentEntry == null)
+                {
+                    return ziel1.Description == ziel2.Description;
+                }
+            }
+            return false;
+        }
+
+        #endregion
     }
 
     public class ValueListEntryTypeToFontWeightConverter : IValueConverter

BeWo/View/Detail/Report/FlexibleReportLayoutSaveControl.xaml.cs

@@ -23,7 +23,6 @@ namespace BeWo.View.Detail.Report
 		public event Action CancelButtonClicked;
 		public event Action SaveButtonClicked;
 		
-
 		public FlexibleReportLayoutSaveControl()
 		{
 			InitializeComponent();

BeWo/View/Detail/Report/FlexibleReportView.xaml.cs

@@ -478,7 +478,7 @@ namespace BeWo.View.Detail.Report
             }
             else
             {
-                MessageBox.Show("Hier befindet sich keine Zeiterfassung!", "BeWoPlaner", MessageBoxButton.OK, MessageBoxImage.Stop);
+                MessageBox.Show("Keine Einträge vorhanden.", "BeWoPlaner", MessageBoxButton.OK, MessageBoxImage.Information);
             }
         }
         #endregion
@@ -513,7 +513,7 @@ namespace BeWo.View.Detail.Report
         #region Methoden
         private void InitChart()
         {
-            ChartControl.Diagram = ChartFactory.GenerateDiagram(typeof(AreaSeries2D), false);
+            ChartControl.Diagram = ChartFactory.GenerateDiagram(typeof(BarSideBySideSeries2D), false);
         }
 
         private IEnumerable<DataBarFormatCondition> CreateDataBarConditions(List<string> columns, List<string> rows, List<string> datas, string formatName)
@@ -831,9 +831,12 @@ namespace BeWo.View.Detail.Report
                 seriesTypes.Add(typeof(AreaStackedSeries3D), new SeriesTypeDescriptor { DiagramType = XYDiagram3DType, DisplayText = "Area Stacked Series 3D" });
                 seriesTypes.Add(typeof(AreaFullStackedSeries3D), new SeriesTypeDescriptor { DiagramType = XYDiagram3DType, DisplayText = "Area Full-Stacked Series 3D" });
                 seriesTypes.Add(typeof(BarSeries3D), new SeriesTypeDescriptor { DiagramType = XYDiagram3DType, DisplayText = "Bar Series 3D" });
+                seriesTypes.Add(typeof(BarSideBySideSeries2D), new SeriesTypeDescriptor { DiagramType = XYDiagram2DType, DisplayText = "Bar Series 2D" });
                 seriesTypes.Add(typeof(PointSeries3D), new SeriesTypeDescriptor { DiagramType = XYDiagram3DType, DisplayText = "Point Series 3D" });
                 seriesTypes.Add(typeof(PieSeries3D), new SeriesTypeDescriptor { DiagramType = SimpleDiagram3DType, DisplayText = "Pie Series 3D" });
                 seriesTypes.Add(typeof(PieSeries2D), new SeriesTypeDescriptor { DiagramType = SimpleDiagram2DType, DisplayText = "Pie Series 2D" });
+                
+
                 return seriesTypes;
             }
 

BeWo/View/Detail/Report/IcfImportControl.xaml

@@ -0,0 +1,56 @@
+<UserControl
+            xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
+            xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
+            Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
+			VerticalAlignment="Stretch" Focusable="True"
+            xmlns:val="clr-namespace:BeWo.Validation"
+            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:clientPartials="clr-namespace:BS.Shared.DataContracts.ClientPartials;assembly=BS.Shared"
+            x:Class="BeWo.View.Detail.Report.IcfImportControl"
+            d:DesignHeight="500" d:DesignWidth="1000"
+            mc:Ignorable="d">
+  <Grid Background="{StaticResource ObjectEditBackgroundBrush}">
+    <Grid.ColumnDefinitions>
+      <ColumnDefinition Width="*" />
+      <ColumnDefinition Width="Auto" />
+    </Grid.ColumnDefinitions>
+    <Grid.RowDefinitions>
+      <RowDefinition Height="*" />
+      <RowDefinition Height="Auto" />
+    </Grid.RowDefinitions>
+    <GroupBox Grid.ColumnSpan="2" Style="{StaticResource ObjectEditGroupBox}">
+      <TreeView x:Name="TreeView" Margin="3" Padding="0 5 10 5"
+                ItemTemplate="{DynamicResource TreeItemTemplate}"
+                >
+        <!--ItemContainerStyle="{DynamicResource TreeViewStyle}"-->
+        <TreeView.Resources>
+          <!--<Style x:Key="TreeViewStyle" TargetType="TreeViewItem">
+            <Setter Property="IsExpanded" Value="{Binding Path=IsExpanded, Mode=TwoWay}" />
+          </Style>-->
+          <HierarchicalDataTemplate x:Key="TreeItemTemplate" DataType="{x:Type clientPartials:SupportConceptGoalDC}" ItemsSource="{Binding Path=Children}">
+            <Grid>
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+              </Grid.ColumnDefinitions>
+              <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+              </Grid.RowDefinitions>
+              <CheckBox IsChecked="{Binding Path=IsChecked, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" Margin="0, 4, 2, 0"/>
+              <TextBox Grid.Row="0" Grid.Column="1" Background="Transparent" Height="21" Padding="0, 3, 0, 0" VerticalAlignment="Center" BorderThickness="0"
+                       IsReadOnly="True" Text="{Binding Path=GoalEntryDC.TypeDescription}" FontWeight="Bold"/>
+              <TextBox Grid.Column="1" Grid.Row="1" Visibility="{Binding Path=HasNotice, Converter={StaticResource BoolVisibilityConverter}}" Background="Transparent" Padding="3,1,0,0" VerticalAlignment="Center" BorderThickness="0"
+                       IsReadOnly="True" Text="{Binding Path=GoalEntryDC.Notice}" />
+            </Grid>
+          </HierarchicalDataTemplate>
+        </TreeView.Resources>
+      </TreeView>
+    </GroupBox>
+    <Button x:Name="ButtonImport" Grid.Row="1" Grid.Column="1" Content="Importieren" Margin="0, 0, 6, 3" Click="ButtonImport_Click" />
+  </Grid>
+</UserControl>

BeWo/View/Detail/Report/IcfImportControl.xaml.cs

@@ -0,0 +1,134 @@
+using BeWo.Core;
+using BeWo.ServiceProxy;
+using BS.Shared.Extensions;
+using DevExpress.Utils;
+using DevExpress.XtraGrid.Views.Grid.ViewInfo;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using BeWo.ViewModel;
+using BS.Shared;
+using BS.Shared.DataContracts;
+using BS.Shared.DataContracts.ClientPartials;
+using DevExpress.Data;
+using DevExpress.Mvvm.Native;
+using DevExpress.Xpf.Grid;
+using DevExpress.Xpf.Scheduler.UI;
+using DevExpress.XtraExport.Xls;
+using static BeWo.View.Detail.Report.FlexibleReportView;
+
+namespace BeWo.View.Detail.Report
+{
+    public partial class IcfImportControl
+    {
+        #region Constant Fields
+
+        #endregion
+
+        #region Fields
+
+        public event Action ButtonImportClicked;
+        private SupportConceptGoalDC _TreeViewGoalItem;
+
+        #endregion
+
+        #region Constructors
+
+        public IcfImportControl(List<ValueListEntryDC> icfs)
+        {
+            InitializeComponent();
+
+            DataContext = this;
+
+            InitTreeView(icfs);
+        }
+
+        #endregion
+
+        #region Finalizers
+
+        #endregion
+
+        #region Delegates
+
+        #endregion
+
+        #region Events
+
+        private void ButtonImport_Click(object sender, RoutedEventArgs e)
+        {
+            ButtonImportClicked?.Invoke();
+        }
+
+        #endregion
+
+        #region InterfacesImplementations
+
+        #endregion
+
+        #region Properties
+
+        public SupportConceptGoalDC TreeViewGoalItem
+        {
+            get => _TreeViewGoalItem;
+            set
+            {
+                _TreeViewGoalItem = value;
+                TreeView.ItemsSource = new List<SupportConceptGoalDC>() { value };
+            }
+        }
+
+        #endregion
+
+        #region Indexers
+
+        #endregion
+
+        #region Methods
+        
+        private static SupportConceptGoalDC GetSupportConceptGoal(SupportConceptGoalDC parent, ValueListEntryDC actual, List<ValueListEntryDC> allIcfs)
+        {
+            // Erzeugt das O
+            var goalItem = new SupportConceptGoalDC
+            {
+                GoalEntryDC = actual,
+                ParentGoal = parent
+            };
+
+            // Sucht nach Einträgen, wo die ParentID gleich der acutal.Oid ist
+            var remaining = allIcfs.Where(x =>
+            x.ParentOid == actual.ValueListEntryOid).ToList();
+
+            // Schaut, ob welche gefunden worden, sonst bleibt Children leer
+            if (remaining.Any())
+            {
+                goalItem.Children = remaining.Select(x => GetSupportConceptGoal(goalItem, x, allIcfs)).ToList();
+            }
+
+            return goalItem;
+        }
+
+        private void InitTreeView(List<ValueListEntryDC> icfs)
+        {
+            if (icfs == null || icfs.All(x => x.ParentOid != -1)) return;
+
+            TreeViewGoalItem = GetSupportConceptGoal(null, icfs.Find(x => x.ParentOid == -1), icfs);
+        }
+
+        #endregion
+
+        #region Structs
+
+        #endregion
+
+        #region Classes
+
+        #endregion
+    }
+}

BeWo/View/Detail/SupportConceptView.xaml

@@ -67,7 +67,7 @@
 						<Image Source="..\..\Ressources\Icons\Add24.png"/>
 					</MenuItem.Icon>
 				</MenuItem>
-				<MenuItem Header="Umbenennen">
+				<MenuItem Header="Bearbeiten">
 					<MenuItem.Icon>
 						<Image Source="..\..\Ressources\Icons\Rename24.png"/>
 					</MenuItem.Icon>
@@ -818,7 +818,13 @@
 													<Grid.ColumnDefinitions>
 														<ColumnDefinition Width="Auto" />
 														<ColumnDefinition Width="Auto" />
+                                                        <ColumnDefinition Width="Auto" />
+                                                        <ColumnDefinition Width="*" />
 													</Grid.ColumnDefinitions>
+                                                    <Grid.RowDefinitions>
+                                                        <RowDefinition Height="Auto"/>
+                                                        <RowDefinition Height="Auto"/>
+                                                    </Grid.RowDefinitions>
 													
 													<!--IsThreeState="{Binding Path=IsGoal,Converter={StaticResource BoolReverseConverter}}"-->
 
@@ -827,12 +833,16 @@
                                                                 IsChecked="{Binding Path=IsChecked, UpdateSourceTrigger=PropertyChanged}"
                                                                 Grid.Column="0" Margin="3 2" VerticalAlignment="Center"
 																Visibility="{Binding Path=GoalType, Converter={StaticResource IndividualGoalMassnahmeUncheckPreventConverter}}"/>
-													<TextBox x:Name="BdText" Tag="{Binding}" Grid.Column="1" Margin="0, 0, 0, 0"
-																Text="{Binding Path=ItemName, UpdateSourceTrigger=PropertyChanged}" IsReadOnly="True" Cursor="Arrow" Background="Transparent" Height="21" Padding="1,3,1,3" VerticalAlignment="Center" 
+													<TextBox x:Name="BdText" Tag="{Binding}" Grid.Row="0" Grid.Column="1" Margin="0, 0, 0, 5"
+																Text="{Binding Path=GoalEntryVM.DisplayName, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" IsReadOnly="True" Cursor="Arrow" Background="Transparent" Height="21" Padding="1,3,1,3" VerticalAlignment="Center" 
 																LostFocus="TextBox_LostFocus" KeyDown="TextBox_KeyDown" BorderThickness="0"
 																FontWeight="{Binding Path=IsGoal, Converter={StaticResource ValueListEntryTypeToFontWeightConverter}}"
 																Foreground="{Binding Path=GoalType, Converter={StaticResource ValueListEntryTypeToColorConverter}}"/>
-												</Grid>
+                                                    <CheckBox Grid.Row="0" Grid.Column="2" Margin="5, 5, 0, 0" Visibility="{Binding Path=GoalEntryVM.GotNotice}" IsChecked="{Binding Path=ShowNotice, UpdateSourceTrigger=PropertyChanged}"/>
+                                                    <TextBox Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3"  Margin="0,0,0,0" Visibility="{Binding Path=ShowNotice, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BoolVisibilityConverter}}"
+                                                             Text="{Binding Path=GoalEntryVM.Notice, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center"
+                                                             BorderThickness="0" IsReadOnly="True" LostFocus="TextBox_LostFocus" KeyDown="TextBox_KeyDown" Background="Transparent"/>
+                                                </Grid>
 											</HierarchicalDataTemplate>
 										</TreeView.Resources>
 									</TreeView>

BeWo/View/Detail/SupportConceptView.xaml.cs

@@ -91,7 +91,7 @@ namespace BeWo.View.Detail
                 tabitem_documents.Visibility = Visibility.Collapsed;
             }
             if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConceptView_Edit))
-            {                
+            {
                 grid_details.IsEnabled = false;
 
                 button_addCostBearer.IsEnabled = false;
@@ -952,109 +952,45 @@ namespace BeWo.View.Detail
 
         private void ContextMenuGoals_Click(object sender, RoutedEventArgs e)
         {
-            if (e.OriginalSource is MenuItem)
+            if (!(e.OriginalSource is MenuItem twi)) return;
+
+            var selectedItem = treeview_Goals.SelectedItem as SupportConceptGoalTreeItem;
+
+            switch (twi.Header)
             {
-                var twi = e.OriginalSource as MenuItem;
-
-                var selectedItem = treeview_Goals.SelectedItem as SupportConceptGoalTreeItem;
-
-                if (twi.Header.Equals("Neues individuelles Ziel") || twi.Header.Equals("Neue individuelle Maßnahme"))
-                {
+                case "Neues individuelles Ziel":
                     if (_SelectedGoalTreeNode != null)
                     {
-                        _SelectedGoalTreeNode.ItemContainerGenerator.StatusChanged += GoalTreeItemContainerGenerator_StatusChanged;
-
-                        ViewModel.AddZielOrMassnahme(selectedItem, twi.Header.Equals("Neues individuelles Ziel"));
+                        ViewModel.AddTreeItemWithControl(selectedItem, ValueListEntryType.SupportConceptIndividualGoalCategoryType, "Ziel hinzufügen");
                     }
-                    //EditItem(selectedItem);
-                    //if (this._SelectedTreeNode != null)
-                    //{
-                    //    this._SelectedTreeNode.ItemContainerGenerator.StatusChanged +=
-                    //        this.ItemContainerGenerator_StatusChanged;
-                    //    this._SelectedTreeNode.IsExpanded = true;
-                    //}
-                }
-                else if (twi.Header.Equals("Umbenennen"))
-                {
-                    EditItem(treeview_Goals, _SelectedGoalTreeNode, selectedItem);
-                }
-                else if (twi.Header.Equals("Löschen"))
-                {
+                    break;
+                case "Neue individuelle Maßnahme":
+                    if (_SelectedGoalTreeNode != null)
+                    {
+                        ViewModel.AddTreeItemWithControl(selectedItem, ValueListEntryType.SupportConceptIndividualGoalType, "Maßnahme hinzufügen");
+                    }
+                    break;
+                case "Löschen":
                     if (selectedItem != null)
                     {
                         var zielOderMassnahme = selectedItem.GoalEntryVM.Type == ValueListEntryType.SupportConceptGoalCategoryType || selectedItem.GoalEntryVM.Type == ValueListEntryType.SupportConceptIndividualGoalCategoryType ? "das Ziel" : "die Maßnahme";
                         var pluralendung = zielOderMassnahme.Equals("das Ziel") ? "en" : "n";
 
                         if (MessageBox.Show("ACHTUNG: Das Löschen von " + zielOderMassnahme.Substring(4) + pluralendung + " kann nicht rückgängig gemacht werden.\n" +
-                                                                    "Alle verknüpften Eintragungen in der Zeiterfassung bleiben erhalten.\n\n" +
-                                                                    "Wollen Sie " + zielOderMassnahme + " '" + selectedItem.ItemName + "' wirklich löschen?", "Löschen bestätigen", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.Yes)
+                                            "Alle verknüpften Eintragungen in der Zeiterfassung bleiben erhalten.\n\n" +
+                                            "Wollen Sie " + zielOderMassnahme + " '" + selectedItem.GoalEntryVM?.DisplayName + "' wirklich löschen?", "Löschen bestätigen", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.Yes)
                         {
-
-                            //var p = ItemsControl.ItemsControlFromItemContainer(this._SelectedTreeNode) as TreeViewItem;
-                            //p.IsSelected = true;
-                            //var parent = this.treeview_individualServiceAccountings.SelectedItem as ServiceCategoryTreeItem;
-                            //parent.Children.Remove(selectedItem);
                             ViewModel.DeleteIndividualGoal(selectedItem);
                         }
                     }
-                }
+                    break;
+                case "Bearbeiten":
+                    if (selectedItem != null)
+                        ViewModel.EditTreeItem(selectedItem.GoalEntryVM);
+                    break;
             }
         }
-
-        private static void EditItem(TreeView tv, TreeViewItem tvi, object item)
-        {
-            if (item != null)
-            {
-                var treeItem = tvi;
-                if (treeItem == null && tv != null)
-                    treeItem = tv.ItemContainerGenerator.ContainerFromItem(item) as TreeViewItem;
-
-                if (treeItem != null)
-                {
-                    var textBox = BeWoWpfUtils.FindVisualChild<TextBox>(treeItem);
-                    textBox.IsReadOnly = false;
-                    textBox.Padding = new Thickness(1, 1, 1, 1);
-                    textBox.BorderThickness = new Thickness(1);
-                    textBox.Background = Brushes.White;
-                    textBox.Tag = tv.SelectedItem;
-
-                    textBox.Focus();
-                    textBox.SelectAll();
-                }
-            }
-        }
-
-        private void GoalTreeItemContainerGenerator_StatusChanged(object sender, EventArgs e)
-        {
-            var ig = (ItemContainerGenerator)sender;
-            if (ig.Status != GeneratorStatus.ContainersGenerated)
-            {
-                return;
-            }
-
-            var n = ig.ContainerFromIndex(_SelectedGoalTreeNode.Items.Count - 1) as TreeViewItem;
-            //var n = ig.ContainerFromIndex(this.treeview_individualGoals.Items.Count - 1) as TreeViewItem;
-            if (n != null)
-            {
-                n.IsSelected = true;
-
-                new DispatcherTimer(
-                    TimeSpan.FromMilliseconds(200),
-                    DispatcherPriority.Background,
-                    (s1, e1) =>
-                        {
-                            _SelectedGoalTreeNode = n;
-                            var item = ig.ItemFromContainer(n) as SupportConceptGoalDC;
-                            EditItem(treeview_Goals, _SelectedGoalTreeNode, item);
-                            ((DispatcherTimer)s1).Stop();
-                        },
-
-                    Dispatcher).Start();
-            }
-
-            _SelectedGoalTreeNode.ItemContainerGenerator.StatusChanged -= GoalTreeItemContainerGenerator_StatusChanged;
-        }
-
+        
         private void ContextMenuGoals_Opened(object sender, RoutedEventArgs e)
         {
             if (e.OriginalSource is ContextMenu)
@@ -1064,7 +1000,7 @@ namespace BeWo.View.Detail
 
                 foreach (var menuitem in menu.Items.OfType<MenuItem>().Select(item => item))
                 {
-                    if (menuitem.Header.Equals("Umbenennen"))
+                    if (menuitem.Header.Equals("Bearbeiten"))
                     {
                         menuitem.IsEnabled = goal != null && (goal.GoalType.Equals(ValueListEntryType.SupportConceptIndividualGoalCategoryType) || goal.GoalType.Equals(ValueListEntryType.SupportConceptIndividualGoalType));
                     }
@@ -1590,7 +1526,7 @@ namespace BeWo.View.Detail
         {
             var check = (RadioButton)sender;
             var selected = (SupportConceptApprovalPeriodVM)check.Tag;
-            
+
             switch (check.Name)
             {
                 case "RadioButtonBudget":

BeWo/View/HomeView.xaml.cs

@@ -152,7 +152,10 @@ namespace BeWo.View
 
             PruefePasswortStaerke();
 
-            ServiceFacade.DoOperationsServiceAsync(s => s.GetHomeViewPanels(), r => Dispatcher?.Invoke(() => UpdatePanels(r)));
+            //ServiceFacade.DoOperationsServiceAsync(s => s.GetHomeViewPanels(), r => Dispatcher?.Invoke(() => UpdatePanels(r)));
+
+            var panels = ServiceFacade.DoOperationsServiceSync(s => s.GetHomeViewPanels());
+            UpdatePanels(panels);
         }
 
         #endregion
@@ -175,7 +178,7 @@ namespace BeWo.View
 
         private void HomeDragPanelViewLoaded(object o, RoutedEventArgs e)
         {
-            
+            SetMaximizedPanel();
             //Warum klappt das bei Köln Ring nicht?=
             if (BeWoApp.LoggedOnUser == null || BeWoApp.LoggedOnUser.ResetPasswordInfos == null)
             {
@@ -744,12 +747,11 @@ namespace BeWo.View
             //ListboxInternalNews.Items.Clear();
             InternalNewsGrid.Children.Clear();
 
-            ReorderPanels();
 
-            InitContent();
+            LoadContent();
         }
 
-        private void InitBewoNews()
+        private void LoadBewoNews()
         {
             try
             {
@@ -766,57 +768,92 @@ namespace BeWo.View
             }
         }
 
-        private void InitBirthdays()
+        private void LoadBirthdays()
         {
             var endOfWeek = DateTime.Now.GetNext(DayOfWeek.Sunday).Date;
             endOfWeek = endOfWeek.AddDays(1).GetNext(DayOfWeek.Sunday).Date;
-            ServiceFacade.DoAnalysisServiceAsync(s1 => s1.GetPersonsHavingBirthday(endOfWeek), ReloadBirthdays);
+            ServiceFacade.DoAnalysisServiceAsync(s1 => s1.GetPersonsHavingBirthday(endOfWeek), ReloadBirthdays, false);
         }
 
-        private void InitContent()
+        private void LoadContent()
         {
-            InitLoginInfo();
+            LoadLoginInfo();
 
+            if (IsPanelVisible("PanelTasks"))
+            {
+                LoadTasks();
+            }
 
+            if (IsPanelVisible("PanelExpiringSupportConcepts"))
+            {
+                LoadExpiredSupportConcepts();
+            }
+
+            if (IsPanelVisible("PanelConferenceDates"))
+            {
+                LoadNextConferenceDates();
+            }
+            
+            if (IsPanelVisible("PanelBirthdates"))
+            {
+                LoadBirthdays();
+            }
+
+            if (IsPanelVisible("PanelInternalNews"))
+            {
+                UpdateInternalNews();
+            }
+
+            if (IsPanelVisible("PanelBeWoNews"))
+            {
+                LoadBewoNews();
+            }
 
-            InitExpiredSupportConcepts();
-            InitNextConferenceDates();
-            InitBewoNews();
-            InitBirthdays();
-            UpdateInternalNews();
-            InitTasks();
 
             rb_open.IsChecked = true;
         }
 
-        private void InitExpiredSupportConcepts()
+        private bool IsPanelVisible(string test)
+        {
+            foreach (DragDockPanel panel in PanelHost.Children)
+            {
+                if (panel.Name == test)
+                {
+                    return true;
+                }
+            }
+
+            return true;
+        }
+
+        private void LoadExpiredSupportConcepts()
         {
             // DateTime endOfWeek = DateTime.Now.GetNext(DayOfWeek.Sunday).Date;
             // DateTime endOfWeek2 = endOfWeek.AddDays(8);
             var dt = DateTime.Now.AddMonths(BeWoApp.AppSettings.HilfeplanAuslaufAuswahl);
             ServiceFacade.DoAnalysisServiceAsync(
                 s1 => s1.GetExpiringSupportConcepts(BeWoApp.LoggedOnUser.Employee.EmployeeOid, dt),
-                ReloadExpiringSupportConcepts);
+                ReloadExpiringSupportConcepts, false);
         }
 
-        private void InitLoginInfo()
+        private void LoadLoginInfo()
         {
             DateTime endOfWeek = DateTime.Now.GetNext(DayOfWeek.Sunday).Date;
 
-            ServiceFacade.DoAnalysisServiceAsync(s1 => s1.GetLastLogins(BeWoApp.LoggedOnUser.LoginName), ReloadLogins);
+            ServiceFacade.DoAnalysisServiceAsync(s1 => s1.GetLastLogins(BeWoApp.LoggedOnUser.LoginName), ReloadLogins, false);
         }
 
-        private void InitNextConferenceDates()
+        private void LoadNextConferenceDates()
         {
             DateTime endOfWeek = DateTime.Now.GetNext(DayOfWeek.Sunday).Date;
             DateTime endOfWeek2 = endOfWeek.AddDays(8);
 
             ServiceFacade.DoAnalysisServiceAsync(
                 s1 => s1.GetSupportConceptsWithConferenceDate(BeWoApp.LoggedOnUser.Employee.EmployeeOid, endOfWeek2),
-                ReloadConferenceDates);
+                ReloadConferenceDates, false);
         }
 
-        private void InitTasks()
+        private void LoadTasks()
         {
             var test = 0;
 
@@ -861,7 +898,7 @@ namespace BeWo.View
                             EmployeesForAppointmentView = cb.OrderBy(o => o.LastName + ", " + o.FirstName).ToList();
                             employeeFilterBox.SelectedItem = BeWoApp.CompactLoggedOnEmployee;
                         });
-                    });
+                    }, false);
                 }
                 else
                 {
@@ -922,16 +959,16 @@ namespace BeWo.View
             //ServiceFacade.DoEmployeeServiceAsync(s => s.GetPublishedNewsItems(), cb => this.Dispatch(delegate { listboxInternalNews.ItemsSource = cb.OrderByDescending(i => i.PublishDate).ToList(); }));
             ServiceFacade.DoEmployeeServiceAsync(
                 s => s.GetPublishedNewsItemsForEmployee(BeWoApp.LoggedOnUser.Employee.EmployeeOid, showTeamNews),
-                RefreshInternalNews);
+                RefreshInternalNews, false);
         }
 
         private void UpdatePanels(List<HomeViewPanelDC> panels)
         {
-            if (panels == null || panels.Count == 0) return;
+            if (panels != null && panels.Count > 0)
+            {
+                PanelHost.Children.Clear();
 
-            PanelHost.Children.Clear();
-
-            var dict = new Dictionary<HomeViewPanelType, DragDockPanel>()
+                var dict = new Dictionary<HomeViewPanelType, DragDockPanel>()
                 {
                     {HomeViewPanelType.BeWoNewsPanel, PanelBeWoNews},
                     {HomeViewPanelType.BirthdatesPanel, PanelBirthdates},
@@ -942,43 +979,85 @@ namespace BeWo.View
                 };
 
 
-            //panels.Add(new HomeViewPanelDC { HeaderTitel = "TestTask", PanelType = HomeViewPanelType.TasksPanel });
-            //panels.Add(new HomeViewPanelDC { HeaderTitel = "TestNews", PanelType = HomeViewPanelType.BeWoNewsPanel });
-            //panels.Add(new HomeViewPanelDC { HeaderTitel = "TestDates", PanelType = HomeViewPanelType.ExpiringSupportConceptsPanel });
-            //panels.Add(new HomeViewPanelDC { HeaderTitel = "Test", PanelType = HomeViewPanelType.TasksPanel });
+                //panels.Add(new HomeViewPanelDC { HeaderTitel = "TestTask", PanelType = HomeViewPanelType.TasksPanel });
+                //panels.Add(new HomeViewPanelDC { HeaderTitel = "TestNews", PanelType = HomeViewPanelType.BeWoNewsPanel });
+                //panels.Add(new HomeViewPanelDC { HeaderTitel = "TestDates", PanelType = HomeViewPanelType.ExpiringSupportConceptsPanel });
+                //panels.Add(new HomeViewPanelDC { HeaderTitel = "Test", PanelType = HomeViewPanelType.TasksPanel });
 
-            foreach (var panelDC in panels)
-            {
-                if (dict.ContainsKey(panelDC.PanelType))
+                var save = BeWoApp.AppSettings.StartupPanelOrder;
+                if (save == null || save.Count != panels.Count)
                 {
-                    var panel = dict[panelDC.PanelType];
-                    PanelHost.Children.Add(panel);
-                    if (panelDC.HeaderTitel == null) continue;
+                    save = panels.Select(p => GetDefaultPanelName(p)).ToList();
+                }
 
-                    foreach (var child in ((StackPanel)panel.Header).Children)
+                foreach (var name in save)
+                {
+                    foreach (var panelDC in panels)
                     {
-                        if (child is TextBlock textBlock && (string)textBlock.Tag == "Titel")
+                        if (GetDefaultPanelName(panelDC) == name)
                         {
-                            textBlock.Text = panelDC.HeaderTitel;
+                            if (dict.ContainsKey(panelDC.PanelType))
+                            {
+                                var panel = dict[panelDC.PanelType];
+                                PanelHost.Children.Add(panel);
+                                if (String.IsNullOrEmpty(panelDC.HeaderTitel)) continue;
+
+                                foreach (var child in ((StackPanel) panel.Header).Children)
+                                {
+                                    if (child is TextBlock textBlock && (string) textBlock.Tag == "Titel")
+                                    {
+                                        textBlock.Text = panelDC.HeaderTitel;
+                                    }
+                                }
+                            }
+                            else if (panelDC.PanelType == HomeViewPanelType.CustomReportPanel)
+                            {
+                                PanelHost.Children.Add(CreateReportPanel(panelDC.HeaderTitel, panelDC.Value));
+                            }
+                            else if (panelDC.PanelType == HomeViewPanelType.CustomXamlPanel)
+                            {
+                                PanelHost.Children.Add(CreateXamlPanel(panelDC.HeaderTitel, panelDC.Value));
+                            }
+                            else
+                            {
+                                throw new ArgumentOutOfRangeException();
+                            }
                         }
                     }
                 }
-                else if (panelDC.PanelType == HomeViewPanelType.CustomReportPanel)
-                {
-                    PanelHost.Children.Add(CreateReportPanel(panelDC.HeaderTitel, panelDC.Value));
-                }
-                else if (panelDC.PanelType == HomeViewPanelType.CustomXamlPanel)
-                {
-                    PanelHost.Children.Add(null);
-                }
-                else
-                {
-                    throw new ArgumentOutOfRangeException();
-                }
+                
+                SetMaximizedPanel();
+            }
+            else
+            {
+
+                ReorderPanels();
             }
             InitPanels(null);
         }
-        
+
+        private string GetDefaultPanelName(HomeViewPanelDC p)
+        {
+            
+            switch (p.PanelType)
+            {
+                case HomeViewPanelType.TasksPanel:
+                    return "PanelTasks";
+                case HomeViewPanelType.ExpiringSupportConceptsPanel:
+                    return "PanelExpiringSupportConcepts";
+                case HomeViewPanelType.ConferenceDatesPanel:
+                    return "PanelConferenceDates";
+                case HomeViewPanelType.BirthdatesPanel:
+                    return "PanelBirthdates";
+                case HomeViewPanelType.InternalNewsPanel:
+                    return "PanelInternalNews";
+                case HomeViewPanelType.BeWoNewsPanel:
+                    return "PanelBeWoNews";
+            }
+
+            return p.HeaderTitel;
+        }
+
         private DragDockPanel CreateReportPanel(string title, string reportName)
         {
             var panel = new DragDockPanel()
@@ -1009,7 +1088,12 @@ namespace BeWo.View
                     }
                 }
             };
-
+            var ctrl = new DocumentPreviewControl
+            {
+                CommandBarStyle = CommandBarStyle.None,
+                Margin = new Thickness(-3, -4, -3, -3)
+            };
+            panel.Content = ctrl;
             panel.Loaded += (s, e) => LoadReport(reportName, title, panel);
 
             return panel;
@@ -1044,7 +1128,7 @@ namespace BeWo.View
                         }
                     }
                 },
-                Content = XamlReader.Load(XmlReader.Create(xamlString))
+                Content = XamlReader.Parse(xamlString)
             };
 
             return panel;
@@ -1052,7 +1136,7 @@ namespace BeWo.View
 
         private void LoadReport(string reportName, string title, DragDockPanel panel)
         {
-            ServiceFacade.DoReportServiceAsync(s => s.CreateCustomReport(BeWoApp.LoggedOnEmployee.EmployeeOid.Value, reportName),  ms => SetReportControl(ms, title, panel));
+            ServiceFacade.DoReportServiceAsync(s => s.CreateCustomReport(BeWoApp.LoggedOnEmployee.EmployeeOid.Value, reportName),  ms => SetReportControl(ms, title, panel), false);
         }
 
         private void SetReportControl(MemoryStream ms, string title, DragDockPanel panel)
@@ -1060,16 +1144,21 @@ namespace BeWo.View
             this.Dispatch(
                 delegate
                 {
-                    var grid = new Grid();
-                    grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
-                    grid.RowDefinitions.Add(new RowDefinition { Height = new GridLength(1, GridUnitType.Star) });
-                    var ctrl = new DocumentPreviewControl
+                    //var grid = new Grid();
+                    //grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
+                    //grid.RowDefinitions.Add(new RowDefinition { Height = new GridLength(1, GridUnitType.Star) });
+                    //var ctrl = new DocumentPreviewControl
+                    //{
+                    //    CommandBarStyle = CommandBarStyle.None
+                    //};
+                    //grid.Margin = new Thickness(-3, -4, -3, -3);
+                    //grid.Children.Add(ctrl);
+                    //panel.Content = grid;
+
+                    if (panel.Content is DocumentPreviewControl)
                     {
-                        CommandBarStyle = CommandBarStyle.None
-                    };
-                    grid.Children.Add(ctrl);
-                    panel.Content = grid;
-                    BeWoUtils.ShowReportWindow(ms, title, ctrl);
+                        BeWoUtils.ShowReportWindow(ms, title, panel.Content as DocumentPreviewControl);
+                    }
                 });
             
         }
@@ -1504,7 +1593,7 @@ namespace BeWo.View
                                                                                      i.Type != (int)AppointmentType.DeletedOccurrence).OrderBy(o => o.StartDate ?? DateTime.MinValue).ToList();
                         }
                     });
-                });
+                }, false);
             }
             else
             {
@@ -1629,7 +1718,7 @@ namespace BeWo.View
 
             save.DoForEach(x => PanelHost.AddPanel(panels[x]));
 
-            SetMaximizedPanel();
+            
         }
 
         private void SetMaximizedPanel()
@@ -1641,15 +1730,16 @@ namespace BeWo.View
                     var p = item as DragDockPanel;
                     if (BeWoApp.AppSettings.StartupPanelMaximized.Equals(p.Name))
                     {
-                        IEnumerable<DependencyObject> objekts = p.GetAllChildren();
+                        //IEnumerable<DependencyObject> objekts = p.GetAllChildren();
 
-                        foreach (DependencyObject child in objekts)
-                        {
-                            if (child is ToggleButton btn)
-                            {
-                                btn.IsChecked = true;
-                            }
-                        }
+                        //foreach (DependencyObject child in objekts)
+                        //{
+                        //    if (child is ToggleButton btn)
+                        //    {
+                        //        btn.IsChecked = true;
+                        //    }
+                        //}
+                        p.PanelMaximized = true;
                     }
                 }
             }

BeWo/ViewModel/SupportConceptVM.cs

@@ -3,12 +3,15 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Linq;
+using System.Windows;
 using System.Windows.Forms.VisualStyles;
 using BeWo.Core;
 using BeWo.Core.Service;
 using BeWo.Scheduler.ViewModel;
 using BeWo.ServiceProxy;
 using BeWo.Validation;
+using BeWo.View;
+using BeWo.View.Controls;
 using BeWo.ViewModel.ListViewModel;
 
 using BS.Shared;
@@ -752,35 +755,130 @@ namespace BeWo.ViewModel
 
             Children2Delete.AddRange(result);
         }
+        
+        //public void AddZielOrMassnahme(SupportConceptGoalTreeItem parent, bool isCategory)
+        //{
+        //    var newItem = new SupportConceptGoalTreeItem();
+        //    var vm = _CombinedGoals.NewVM;
+        //    vm.Type = isCategory ? ValueListEntryType.SupportConceptIndividualGoalCategoryType : ValueListEntryType.SupportConceptIndividualGoalType;
+        //    vm.Description = isCategory ? "Neues individuelles Ziel" : "Neue individuelle Maßnahme";
 
-        public void AddZielOrMassnahme(SupportConceptGoalTreeItem parent, bool isCategory)
+        //    newItem.GoalEntryVM = vm;
+        //    newItem.GoalEntryDC = vm.CommitToDataContract();
+
+        //    _CombinedGoals.AddNewVMToList();
+        //    newItem.ParentGoal = parent;
+
+        //    //CombinedGoalTree.Add(newItem);
+
+        //    var vorhanden = CombinedGoals.VMList.Contains(newItem.GoalEntryVM);
+            
+
+        //    if (parent != null)
+        //    {
+        //        vm.ParentEntry = parent.GoalEntryDC ?? parent.GoalEntryVM.CommitToDataContract();
+        //        parent.GoalEntryVM = parent.GoalEntryVM;
+        //        parent.Items.Add(newItem);
+        //        parent.IsExpanded = true;
+        //    }
+        //}
+        
+        public SupportConceptGoalTreeItem AddTreeItem(SupportConceptGoalTreeItem parent, ValueListEntryType valueListEntryType, string description, string abbreviation, string notice)
         {
-            var newItem = new SupportConceptGoalTreeItem();
-            var vm = _CombinedGoals.NewVM;
-            vm.Type = isCategory ? ValueListEntryType.SupportConceptIndividualGoalCategoryType : ValueListEntryType.SupportConceptIndividualGoalType;
-            vm.Description = isCategory ? "Neues individuelles Ziel" : "Neue individuelle Maßnahme";
+            if (!valueListEntryType.HasFlag(ValueListEntryType.SupportConceptIndividualGoalCategoryType) &&
+                !valueListEntryType.HasFlag(ValueListEntryType.SupportConceptIndividualGoalType))
+                throw new ArgumentOutOfRangeException();
 
-            newItem.GoalEntryVM = vm;
-            newItem.GoalEntryDC = vm.CommitToDataContract();
+            var vm = _CombinedGoals.NewVM;
+            vm.Type = valueListEntryType;
+            vm.Description = description;
+            vm.Abbreviation = abbreviation;
+            vm.Notice = notice;
+
+            var newItem = new SupportConceptGoalTreeItem
+            {
+                GoalEntryVM = vm,
+                GoalEntryDC = vm.CommitToDataContract(),
+                ParentGoal = parent
+            };
 
             _CombinedGoals.AddNewVMToList();
-            newItem.ParentGoal = parent;
 
-            //CombinedGoalTree.Add(newItem);
-
-            var vorhanden = CombinedGoals.VMList.Contains(newItem.GoalEntryVM);
             foreach (var item in CombinedGoalTree)
             {
                 FindGoalVMInTreeView(item, newItem);
             }
 
-            if (parent != null)
+            if (parent == null) return newItem;
+
+            vm.ParentEntry = parent.GoalEntryDC ?? parent.GoalEntryVM.CommitToDataContract();
+            parent.GoalEntryVM = parent.GoalEntryVM;
+            parent.Items.Add(newItem);
+            parent.IsExpanded = true;
+
+            return newItem;
+        }
+
+        public void EditTreeItem(ValueListEntryVM valueListEntry)
+        {
+            if (valueListEntry == null) return;
+
+            var control = new ValueListEntryEditControl(valueListEntry);
+            var beWoWindow = new BeWoWindow();
+
+            control.CancelButtonClicked += () =>
             {
-                vm.ParentEntry = parent.GoalEntryDC ?? parent.GoalEntryVM.CommitToDataContract();
-                parent.GoalEntryVM = parent.GoalEntryVM;
-                parent.Items.Add(newItem);
-                parent.IsExpanded = true;
-            }
+                if (control.ValueListEntry.IsDirty)
+                {
+                    if (MessageBox.Show("Möchten Sie die Änderung verwerfen?", "Änderungen vorhanden", MessageBoxButton.YesNo, MessageBoxImage.Question) != MessageBoxResult.Yes)
+                        return;
+                    control.ResetValueListEntry();
+                }
+                beWoWindow.Close();
+            };
+
+            control.SaveButtonClicked += () => beWoWindow.Close();
+
+            beWoWindow.Height = 200;
+            beWoWindow.Width = 500;
+            beWoWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner;
+            beWoWindow.GroupBoxContent = control;
+            beWoWindow.Owner = BeWoApp.CurrentBeWo.MainWindow;
+            beWoWindow.rootGroupBox.Header = "Bearbeiten";
+            beWoWindow.ShowDialog();
+        }
+
+        public void AddTreeItemWithControl(SupportConceptGoalTreeItem parent, ValueListEntryType valueListEntryType, string viewHeader)
+        {
+            var control = new ValueListEntryEditControl(new ValueListEntryVM(new ValueListEntryDC()));
+
+            var beWoWindow = new BeWoWindow();
+
+            control.CancelButtonClicked += () =>
+            {
+                if (control.ValueListEntry.IsDirty)
+                {
+                    if (MessageBox.Show("Möchten Sie die Änderung verwerfen?", "Änderungen vorhanden", MessageBoxButton.YesNo, MessageBoxImage.Question) != MessageBoxResult.Yes)
+                        return;
+                    control.ResetValueListEntry();
+                }
+                beWoWindow.Close();
+            };
+
+            control.SaveButtonClicked += () =>
+            {
+                var vm = control.ValueListEntry;
+                AddTreeItem(parent, valueListEntryType, vm.Description, vm.Abbreviation, vm.Notice);
+                beWoWindow.Close();
+            };
+
+            beWoWindow.Height = 200;
+            beWoWindow.Width = 500;
+            beWoWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner;
+            beWoWindow.GroupBoxContent = control;
+            beWoWindow.Owner = BeWoApp.CurrentBeWo.MainWindow;
+            beWoWindow.rootGroupBox.Header = viewHeader;
+            beWoWindow.ShowDialog();
         }
 
         private bool TreeViewContainsVM;

BeWo/ViewModel/ValueListEntryVM.cs

@@ -1,4 +1,5 @@
-using BeWo.Core.Service;
+using System.Windows;
+using BeWo.Core.Service;
 using BeWo.ServiceProxy;
 using BeWo.Validation;
 
@@ -17,19 +18,16 @@ namespace BeWo.ViewModel
 
         public static string PropertyName_Type = "Type";
 
-        private string _Description;
 
         private bool _IsDeleteable = true;
-
-        private ValueListEntryDC _ParentEntry;
-
         private long? _ParentOid;
-
+        private string _Description;
+        private string _Notice;
+        private string _Abbreviation;
+        private ValueListEntryDC _ParentEntry;
         private ValueListEntryType _Type;
 
-        public ValueListEntryVM(ValueListEntryDC pDC) : base(pDC, pDC.ValueListEntryOid == null)
-        {
-        }
+        public ValueListEntryVM(ValueListEntryDC pDC) : base(pDC, pDC.ValueListEntryOid == null) { }
 
         [Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
         public string Description
@@ -43,6 +41,7 @@ namespace BeWo.ViewModel
                     _Description = value;
                     StoreDirtyInformation(AreDifferent(DataContract.TypeDescription, value), PropertyName_Description);
                     FirePropertyChanged(PropertyName_Description);
+                    FirePropertyChanged(nameof(DisplayName));
                 }
             }
         }
@@ -56,10 +55,10 @@ namespace BeWo.ViewModel
                 if (_ParentEntry == null && _ParentOid != null)
                 {
                     _ParentEntry = Cache.GetInstance().GetValueListEntry(_ParentOid.Value);
-					if (_ParentEntry == null)
-					{
-						_ParentEntry = ServiceFacade.DoValueListServiceSync(s => s.GetValueListEntryByOid(_ParentOid.Value));
-					}
+                    if (_ParentEntry == null)
+                    {
+                        _ParentEntry = ServiceFacade.DoValueListServiceSync(s => s.GetValueListEntryByOid(_ParentOid.Value));
+                    }
                 }
 
                 return _ParentEntry;
@@ -98,44 +97,72 @@ namespace BeWo.ViewModel
             }
         }
 
-        private string _Notice;
         public string Notice
         {
             get => _Notice;
 
             set
             {
-                if(AreDifferent(_Notice, value))
+                if (AreDifferent(_Notice, value))
                 {
                     _Notice = value;
                     StoreDirtyInformation(AreDifferent(DataContract.Notice, value), nameof(Notice));
                     FirePropertyChanged(nameof(Notice));
+                    FirePropertyChanged(nameof(GotNotice));
                 }
             }
         }
         
+        public string Abbreviation
+        {
+            get => _Abbreviation;
+
+            set
+            {
+                if (AreDifferent(_Abbreviation, value))
+                {
+                    _Abbreviation = value;
+                    StoreDirtyInformation(AreDifferent(DataContract.Abbreviation, value), nameof(Abbreviation));
+                    FirePropertyChanged(nameof(Abbreviation));
+                    FirePropertyChanged(nameof(DisplayName));
+                }
+            }
+        }
+
         protected override void InitByDataContract(ValueListEntryDC pDataContract)
         {
             if (!IsNew)
             {
-                _Description  = pDataContract.TypeDescription;
-                _Type         = pDataContract.Type;
+                _Description = pDataContract.TypeDescription;
+                _Type = pDataContract.Type;
                 _IsDeleteable = !pDataContract.IsSystemEntry;
-                _ParentOid    = pDataContract.ParentOid;
-                _Notice       = pDataContract.Notice;
-                var tmp       = ParentEntry;
+                _ParentOid = pDataContract.ParentOid;
+                _Notice = pDataContract.Notice;
+                _Abbreviation = pDataContract.Abbreviation;
+                var tmp = ParentEntry;
             }
         }
 
         protected override ValueListEntryDC MapToDataContract(ValueListEntryDC pDataContract, bool doCommit)
         {
             pDataContract.TypeDescription = _Description;
-            pDataContract.Type            = _Type;
-            pDataContract.ParentOid       = _ParentOid;
-            pDataContract.Notice          = _Notice;
-            
+            pDataContract.Type = _Type;
+            pDataContract.ParentOid = _ParentOid;
+            pDataContract.Notice = _Notice;
+            pDataContract.Abbreviation = _Abbreviation;
             return pDataContract;
         }
 
+        public string DisplayName
+        {
+            get
+            {
+                if (string.IsNullOrEmpty(Abbreviation))
+                    return Description;
+                return Abbreviation + ": " + Description;
+            }
+        }
+
+        public Visibility GotNotice => string.IsNullOrEmpty(Notice) ? Visibility.Collapsed : Visibility.Visible;
     }
 }

Data/Data.csproj

@@ -128,6 +128,8 @@
     <Compile Include="Entities\Budget.cs" />
     <Compile Include="Entities\ContactHistory.cs" />
     <Compile Include="Entities\DeletionHistory.cs" />
+    <Compile Include="Entities\ReportTemplate.cs" />
+    <Compile Include="Entities\Icf.cs" />
     <Compile Include="Entities\EmployeeHistory.cs" />
     <Compile Include="Entities\FlexibleReportLayout.cs" />
     <Compile Include="Entities\HomeViewPanel.cs" />
@@ -285,7 +287,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Mappings\Employee.hbm.xml">
+    <EmbeddedResource Include="Mappings\Icf.hbm.xml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
@@ -586,10 +588,16 @@
     <EmbeddedResource Include="Mappings\HomeViewPanel.hbm.xml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Mappings\ReportTemplate.hbm.xml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <Content Include="Mappings\DeletionHistory.hbm.xml" />
     <EmbeddedResource Include="Mappings\FlexibleReportLayout.hbm.xml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Mappings\Employee.hbm.xml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <Content Include="Mappings\Timesheet2Mail.hbm.xml" />
     <EmbeddedResource Include="Mappings\ContactHistory.hbm.xml">
       <SubType>Designer</SubType>

Data/Entities/Icf.cs

@@ -0,0 +1,121 @@
+using System;
+using System.Collections.Generic;
+using BS.Shared;
+
+namespace BeWo.Data.Entities
+{
+	public class Icf : BeWoEntityBase
+	{
+        #region Constant Fields
+
+        #endregion
+
+        #region Fields
+        
+        private string _Code;
+        private string _Bezeichnung;
+        private string _Beschreibung;
+        private long? _ParentID;
+
+        #endregion
+
+        #region Constructors
+
+        public Icf()
+        {
+            _Tid = TableID.Employee;
+            _Version = 1;
+        }
+
+        #endregion
+
+        #region Finalizers
+
+        #endregion
+
+        #region Delegates
+
+        #endregion
+
+        #region Events
+
+        #endregion
+
+        #region InterfacesImplementations
+
+        #endregion
+
+        #region Properties
+
+        public virtual string Code
+        {
+            get => _Code;
+            set
+            {
+                if (AreDifferent(_Code, value))
+                {
+                    _Code = value;
+                }
+            }
+        }
+
+        public virtual string Bezeichnung
+        {
+            get => _Bezeichnung;
+            set
+            {
+                if (AreDifferent(_Bezeichnung, value))
+                {
+                    _Bezeichnung = value;
+                }
+            }
+        }
+
+        public virtual string Beschreibung
+        {
+            get => _Beschreibung;
+            set
+            {
+                if (AreDifferent(_Beschreibung, value))
+                {
+                    _Beschreibung = value;
+                }
+            }
+        }
+
+        public virtual long? ParentID
+        {
+            get => _ParentID;
+            set
+            {
+                if (AreDifferent(_ParentID, value))
+                {
+                    _ParentID = value;
+                }
+            }
+        }
+
+        #endregion
+
+        #region Indexers
+
+        #endregion
+
+        #region Methods
+
+        public override string ToString()
+        {
+            return "[B]:" + Beschreibung + " [O]:" + Oid + " [P]:" + ParentID;
+        }
+
+        #endregion
+
+        #region Structs
+
+        #endregion
+
+        #region Classes
+
+        #endregion
+    }
+}

Data/Entities/ReportTemplate.cs

@@ -0,0 +1,108 @@
+using System;
+using System.Collections.Generic;
+using BS.Shared;
+using BS.Shared.DataContracts;
+
+namespace BeWo.Data.Entities
+{
+	public class ReportTemplate : BeWoEntityBase
+	{
+        #region Constant Fields
+
+        #endregion
+
+        #region Fields
+        
+        private ReportTypes _ReportTemplateType;
+        private string _DisplayName;
+        private string _ReferenceClass;
+
+        #endregion
+
+        #region Constructors
+
+        public ReportTemplate()
+        {
+            _Tid = TableID.ReportTemplate;
+        }
+
+        #endregion
+
+        #region Finalizers
+
+        #endregion
+
+        #region Delegates
+
+        #endregion
+
+        #region Events
+
+        #endregion
+
+        #region InterfacesImplementations
+
+        #endregion
+
+        #region Properties
+
+        public virtual ReportTypes ReportTemplateType
+        {
+            get => _ReportTemplateType;
+            set
+            {
+                if (AreDifferent(_ReportTemplateType, value))
+                {
+                    _ReportTemplateType = value;
+                }
+            }
+        }
+
+        public virtual string DisplayName
+        {
+            get => _DisplayName;
+            set
+            {
+                if (AreDifferent(_DisplayName, value))
+                {
+                    _DisplayName = value;
+                }
+            }
+        }
+
+        public virtual string ReferenceClass
+        {
+            get => _ReferenceClass;
+            set
+            {
+                if (AreDifferent(_ReferenceClass, value))
+                {
+                    _ReferenceClass = value;
+                }
+            }
+        }
+
+        #endregion
+
+        #region Indexers
+
+        #endregion
+
+        #region Methods
+
+        public override string ToString()
+        {
+            return DisplayName;
+        }
+
+        #endregion
+
+        #region Structs
+
+        #endregion
+
+        #region Classes
+
+        #endregion
+    }
+}

Data/Mappings/Icf.hbm.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
+  <class name="BeWo.Data.Entities.Icf,BeWo.Data" table="Icf">
+    <id name="Oid" column="Oid" type="Int64" unsaved-value="null">
+      <generator class="identity" />
+    </id>
+    <property column="Code" type="String" name="Code" length="64" />
+    <property column="Bezeichnung" type="String" name="Bezeichnung" />
+    <property column="Beschreibung" type="String" name="Beschreibung" />
+    <property column="ParentID" type="Int64" name="ParentID" />
+  </class>
+</hibernate-mapping>

Data/Mappings/ReportTemplate.hbm.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
+  <class name="BeWo.Data.Entities.ReportTemplate,BeWo.Data" table="ReportTemplate">
+    <id name="Oid" column="Oid" type="Int64" unsaved-value="null">
+      <generator class="identity" />
+    </id>
+
+    <version  column="Version"                          type="Int64"                                   name="Version" />
+
+    <property column="Tid"                              type="BS.Shared.TableID, BS.Shared"            name="_Tid" access="field" />
+    <property column="IsActive"                         type="BS.Shared.ActivationTypeId, BS.Shared"   name="IsActive" />
+    <property column="Notice"                           type="String"                                  name="Notice" length="1024" />
+    <property column="InsTs"                            type="DateTime"                                name="InsTs" />
+    <property column="InsUser"                          type="String"                                  name="InsUser" length="256" />
+    <property column="UdpUser"                          type="String"                                  name="UdpUser" length="256" />
+    <property column="SystemEntryID"                    type="BS.Shared.SystemEntryID, BS.Shared"      name="SystemEntryID" />
+    <property column="DisplayName"                      type="string"                                  name="DisplayName" length="1024" />
+    <property column="ReportType"                       type="BS.Shared.DataContracts.ReportTypes, BS.Shared" name="ReportTemplateType" />
+    <property column="ReferenceClass"                   type="string"                                  name="ReferenceClass" length="1024" />
+  </class>
+</hibernate-mapping>

Host/Multitenancy/demo.config

@@ -15,6 +15,10 @@
                 NHibernate.Driver.MySqlDataDriver
             </property>
 
+          <!--<property name="connection.connection_string">
+            Server=localhost;Password=root;User ID=root; Initial Catalog=kette
+          </property>-->
+
           <property name="connection.connection_string">
             Server=localhost;Password=root;User ID=root; Initial Catalog=bewodemo
           </property>

Model/Changes_2019_08_14 HomeViewPanel ReportName zu Value geändert.txt

@@ -1,2 +1,2 @@
-ALTER TABLE `bewodemo`.`homeviewpanel` 
+ALTER TABLE `homeviewpanel` 
 CHANGE COLUMN `ReportName` `Value` VARCHAR(1024) NULL DEFAULT NULL ;

Model/Changes_2019_08_26 ReportTemplate hinzugefügt.txt

@@ -0,0 +1,15 @@
+CREATE TABLE `reporttemplate` (
+  `Oid` bigint(19) NOT NULL AUTO_INCREMENT,
+  `Tid` int(10) DEFAULT NULL,
+  `IsActive` tinyint(4) DEFAULT NULL,
+  `Notice` varchar(1024) DEFAULT NULL,
+  `InsTs` datetime DEFAULT NULL,
+  `InsUser` varchar(256) DEFAULT NULL,
+  `Version` bigint(19) DEFAULT NULL,
+  `UdpUser` varchar(256) DEFAULT NULL,
+  `SystemEntryID` int(10) DEFAULT NULL,
+  `DisplayName` varchar(1024) DEFAULT NULL,
+  `ReportType` int(10) DEFAULT NULL,
+  `ReferenceClass` varchar(1024) DEFAULT NULL,
+  PRIMARY KEY (`Oid`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1

Report/DefaultReportCreator.cs

@@ -7,6 +7,7 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Security;
+using System.Threading;
 using System.Web;
 using BeWo.Report.DefaultReports;
 using BS.Shared;
@@ -608,6 +609,11 @@ namespace BeWo.Report
 
         public override XtraReport CreateCustomReport(long employeeOid, String reportName)
         {
+            if (String.IsNullOrEmpty(reportName))
+            {
+                return new XtraReport();
+            }
+
             var report = FindReportImp<QueryRO>(null, reportName);
             if (report == null)
             {

Report/ReportObjects/FLSReportRO.cs

@@ -221,8 +221,8 @@ namespace BeWo.Report.ReportObjects
                         }
 
                         
-                        // reportSR.InsertedOn = sr.InsertedOn;
-                        // reportSR.InsUser = sr.InsUser;
+                        reportSR.InsertedOn = sr.InsertedOn;
+                        reportSR.InsUser = sr.InsUser;
 	                    reportSR.ServiceRecordOid = sr.ServiceRecordOid;
 	                    reportSR.DistanceInMeter = sr.DistanceInMeter;
                         reportSR.Notice = sr.Notice;

ReportImp/AlphaEv/Export/DiamantExporter.cs

@@ -50,13 +50,30 @@ namespace AlphaEv.Export
             sb.AppendLine("Klient;DebKonto;Datum;Kst;Text;Betrag;leer;leer;leer;Sachkonto");
             List<long> oidList = new List<long>();
             oidList.Add(1); // Fachleistung
-            oidList.Add(7); // Nicht-Fachkräfte
-            var s = GetMonatlicheAbrechnungStringForCats(date, oidList, "4016", null);
+            var s = GetMonatlicheAbrechnungStringForCats(date, oidList, "4016", null, true, false);
             if (!String.IsNullOrWhiteSpace(s))
             {
                 sb.Append(s);
             }
 
+            s = GetMonatlicheAbrechnungStringForCats(date, oidList, "4028", null, false, true);
+            if (!String.IsNullOrWhiteSpace(s))
+            {
+                if (sb.Length > 0)
+                    sb.AppendLine();
+                sb.Append(s);
+            }
+
+            oidList.Clear();
+            oidList.Add(7); // Nicht-Fachkräfte
+            s = GetMonatlicheAbrechnungStringForCats(date, oidList, "4016", null, true, true);
+            if (!String.IsNullOrWhiteSpace(s))
+            {
+                if (sb.Length > 0)
+                    sb.AppendLine();
+                sb.Append(s);
+            }
+
             
 
             //Assistenzstunden
@@ -68,7 +85,7 @@ namespace AlphaEv.Export
             oidList.Clear();
             oidList.Add(2);
 
-            s = GetMonatlicheAbrechnungStringForCats(date, oidList, "4019", costDict);
+            s = GetMonatlicheAbrechnungStringForCats(date, oidList, "4019", costDict, true, true);
             
             if (!String.IsNullOrWhiteSpace(s))
             {
@@ -80,7 +97,7 @@ namespace AlphaEv.Export
             oidList.Clear();
             oidList.Add(3);
 
-            s = GetMonatlicheAbrechnungStringForCats(date, oidList, "4019", costDict);
+            s = GetMonatlicheAbrechnungStringForCats(date, oidList, "4019", costDict, true, true);
 
             if (!String.IsNullOrWhiteSpace(s))
             {
@@ -101,7 +118,7 @@ namespace AlphaEv.Export
             oidList.Add(13);
             oidList.Add(14);
 
-            s = GetMonatlicheAbrechnungStringForCats(date, oidList, "4042", costDict);
+            s = GetMonatlicheAbrechnungStringForCats(date, oidList, "4042", costDict, true, true);
 
             if (!String.IsNullOrWhiteSpace(s))
             {
@@ -113,21 +130,10 @@ namespace AlphaEv.Export
             return sb.ToString();
         }
 
-        public static String GetMonatlicheAbrechnungStringForCats(DateTime date, IList<long> catOids, String sachkonto, Dictionary<long, decimal> costDict, bool nurGruppen, bool nurNichtGruppen)
+        public static String GetMonatlicheAbrechnungStringForCats(DateTime date, IList<long> catOids, String sachkonto, Dictionary<long, decimal> costDict, bool holeEinzel, bool holeGruppen)
         {
-            var sql = "";
+            var sql = GetMonatlicheAbrechnungStringForCatsSql(date, catOids, holeEinzel, holeGruppen);
 
-            if (nurGruppen && nurNichtGruppen)
-            {
-                sql = GetMonatlicheAbrechnungStringForCatsSql(date, catOids);
-            }
-            else
-            {
-                if (nurGruppen)
-                {
-                    sql = GetMonatlicheAbrechnungStringForCatsSqlMitGruppen(date, catOids);
-                }
-            }
             var dt = ExecuteQuery(sql, date);
 
 
@@ -218,7 +224,7 @@ namespace AlphaEv.Export
             return dict;
         }
 
-        private static String GetMonatlicheAbrechnungStringForCatsSql(DateTime date, IList<long> catOids)
+        private static String GetMonatlicheAbrechnungStringForCatsSql(DateTime date, IList<long> catOids, bool holeEinzel, bool holeGruppen)
         {
             StringBuilder oidList = new StringBuilder();
 
@@ -259,66 +265,32 @@ LEFT JOIN
 	(SELECT sr2.`CostBearer2SupportConceptOid`, SUM(sr2.`roundedduration` / IF(sr2.`GroupEmployeeCount` is null, 1, sr2.`GroupEmployeeCount`)) AS GeleisteteFLM, sc.Oid as CatOid FROM `servicerecord` sr2
     INNER JOIN `servicedescription` sd ON sr2.`ServiceDescriptionOid` = sd.`Oid`
     INNER JOIN `servicecategory` sc ON sd.`ServiceCategoryOid` = sc.`Oid`
-    WHERE sr2.`StartDate` >= ':Monat_Start' AND sr2.`StartDate` < ':Monat_End' AND sc.`Billable` = 1 AND sc.oid in (CATOIDLIST) GROUP BY sr2.`CostBearer2SupportConceptOid`)
+    WHERE sr2.`StartDate` >= ':Monat_Start' AND sr2.`StartDate` < ':Monat_End' AND sc.`Billable` = 1 AND sc.oid in (CATOIDLIST) :Gruppenfilter GROUP BY sr2.`CostBearer2SupportConceptOid`)
     AS sr ON sr.`CostBearer2SupportConceptOid` = cb2sc.`Oid`
 WHERE c.`IsActive` <> 0 AND sc.`IsActive` <> 0
 and (sr.`GeleisteteFLM` is not null)
 ORDER BY p.`LastName`, p.`FirstName`, cb2sc.`ApprovedStartDate`
 ";
 
-            return sql.Replace("CATOIDLIST", oidList.ToString());
-        }
 
-        private static String GetMonatlicheAbrechnungStringForCatsSqlGruppen(DateTime date, IList<long> catOids, bool gruppenHolen)
-        {
-            StringBuilder oidList = new StringBuilder();
+            String gruppenfilter = "";
 
-            foreach (var catOid in catOids)
+            if (!holeEinzel || !holeGruppen)
             {
-                if (oidList.Length > 0)
-                    oidList.Append(",");
-                oidList.Append(catOid);
+                if (holeGruppen)
+                {
+                    gruppenfilter = "AND sr2.GroupOid is not null";
+                }
+                else
+                {
+                    gruppenfilter = "AND sr2.GroupOid is null";
+                }
             }
-
-
-            String sql = @"
-SELECT
-CONCAT(p.Lastname, ', ', p.Firstname),
-c.DebitorNumber as 'DebKonto',
-DATE_FORMAT(DATE_ADD(':Monat_End',INTERVAL -1 DAY), '%d.%m.%Y') as 'Datum',
-c.`CostCenter` AS 'Kst', 
-ROUND(sr.`GeleisteteFLM` / 60, 2) as 'Text',
-IF(crpRateFactor.`CostRateValue` is null, 
-	ROUND(ROUND(sr.`GeleisteteFLM` / 60, 2) * (SELECT crp.`CostRateValue` FROM `costrateperiod` crp WHERE crp.`ObjectTid` = 22  AND crp.`CostRateType` = 0 AND crp.`ObjectOid` = cb2sc.`CostBearerOid` AND (crp.`EndDate` is null or crp.`EndDate` > ':Monat_Start') order by IF(crp.`EndDate` is null, MAKEDATE(9999,365),crp.`EndDate`) LIMIT 1 ), 2),
-	ROUND(ROUND((sr.`GeleisteteFLM` / 60) * ((100 + crpRateFactor.`CostRateValue`)/100), 2) * (SELECT crp.`CostRateValue` FROM `costrateperiod` crp WHERE crp.`ObjectTid` = 22  AND crp.`CostRateType` = 0 AND crp.`ObjectOid` = cb2sc.`CostBearerOid` AND (crp.`EndDate` is null or crp.`EndDate` > ':Monat_Start') order by IF(crp.`EndDate` is null, MAKEDATE(9999,365),crp.`EndDate`) LIMIT 1 ), 2)) AS 'Betrag',
-    '',
-    '',
-    '',
-sr.`GeleisteteFLM`,
-sr.CatOid
-FROM `supportconcept` sc 
-INNER JOIN `costbearer2supportconcept` cb2sc ON sc.`Oid` = cb2sc.`SupportConceptOid`
-INNER JOIN `costbearer` cb ON cb2sc.`CostBearerOid` = cb.`Oid`
-LEFT JOIN 
-	(SELECT crp.`ObjectOid`, crp.`CostRateValue` FROM `costrateperiod` crp 
-    WHERE crp.`ObjectTid` = 22  AND crp.`CostRateType` = 2 AND (crp.`EndDate` is null or crp.`EndDate` > NOW()))
-    AS crpRateFactor ON crpRateFactor.`ObjectOid` = cb.`Oid`
-INNER JOIN `organisation` org ON org.`CostBearerOid` = cb.`Oid`
-INNER JOIN `customer` c ON sc.`CustomerOid` = c.`Oid`
-INNER JOIN `person` p on c.`PersonOid` = p.`Oid` 
-LEFT JOIN 
-	(SELECT sr2.`CostBearer2SupportConceptOid`, SUM(sr2.`roundedduration` / IF(sr2.`GroupEmployeeCount` is null, 1, sr2.`GroupEmployeeCount`)) AS GeleisteteFLM, sc.Oid as CatOid FROM `servicerecord` sr2
-    INNER JOIN `servicedescription` sd ON sr2.`ServiceDescriptionOid` = sd.`Oid`
-    INNER JOIN `servicecategory` sc ON sd.`ServiceCategoryOid` = sc.`Oid`
-    WHERE sr2.`StartDate` >= ':Monat_Start' AND sr2.`StartDate` < ':Monat_End' AND sc.`Billable` = 1 AND sc.oid in (CATOIDLIST) GROUP BY sr2.`CostBearer2SupportConceptOid`)
-    AS sr ON sr.`CostBearer2SupportConceptOid` = cb2sc.`Oid`
-WHERE c.`IsActive` <> 0 AND sc.`IsActive` <> 0
-and (sr.`GeleisteteFLM` is not null)
-ORDER BY p.`LastName`, p.`FirstName`, cb2sc.`ApprovedStartDate`
-";
+            sql = sql.Replace(":Gruppenfilter", gruppenfilter);
 
             return sql.Replace("CATOIDLIST", oidList.ToString());
         }
+        
 
         private static String GetAbschlagszahlungenSql(DateTime date)
         {

ReportImp/BeWoColonia5Reports/ServicesOverviewReport.Designer.cs

@@ -1,5 +1,5 @@
 using BeWo.Report.ReportObjects;
-namespace BeWo.BeWoColonia5Reports
+namespace BeWoDreilichPastorDreilich
 {
     partial class Stundenzettel
     {
@@ -35,7 +35,7 @@ namespace BeWo.BeWoColonia5Reports
             this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.cellMinutenFLSHeader = new DevExpress.XtraReports.UI.XRTableCell();
             this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
             this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
             this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
@@ -43,7 +43,6 @@ namespace BeWo.BeWoColonia5Reports
             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.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
             this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
             this.xrLabel28 = new DevExpress.XtraReports.UI.XRLabel();
@@ -75,16 +74,17 @@ namespace BeWo.BeWoColonia5Reports
             this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
+            this.cellGesamtFaktor = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
+            this.cellGesamt = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
             this.fieldAbrechenbareMinuten = new DevExpress.XtraReports.UI.CalculatedField();
             this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField();
             this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField();
             this.fieldGroupHours = new DevExpress.XtraReports.UI.CalculatedField();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -122,7 +122,7 @@ namespace BeWo.BeWoColonia5Reports
             this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
             this.xrTableCell3,
             this.xrTableCell4,
-            this.xrTableCell11});
+            this.cellMinutenFLSHeader});
             this.xrTableRow2.Name = "xrTableRow2";
             this.xrTableRow2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
             this.xrTableRow2.StylePriority.UseTextAlignment = false;
@@ -147,15 +147,15 @@ namespace BeWo.BeWoColonia5Reports
             this.xrTableCell4.Text = "Uhrzeit";
             this.xrTableCell4.Weight = 0.45659584837553346D;
             // 
-            // xrTableCell11
+            // cellMinutenFLSHeader
             // 
-            this.xrTableCell11.Multiline = true;
-            this.xrTableCell11.Name = "xrTableCell11";
-            this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
-            this.xrTableCell11.StylePriority.UseFont = false;
-            this.xrTableCell11.StylePriority.UseTextAlignment = false;
-            this.xrTableCell11.Text = "Geleistete FLS";
-            this.xrTableCell11.Weight = 0.54791502162310768D;
+            this.cellMinutenFLSHeader.Multiline = true;
+            this.cellMinutenFLSHeader.Name = "cellMinutenFLSHeader";
+            this.cellMinutenFLSHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+            this.cellMinutenFLSHeader.StylePriority.UseFont = false;
+            this.cellMinutenFLSHeader.StylePriority.UseTextAlignment = false;
+            this.cellMinutenFLSHeader.Text = "Geleistete FLS";
+            this.cellMinutenFLSHeader.Weight = 0.54791502162310768D;
             // 
             // DetailReport
             // 
@@ -233,7 +233,7 @@ namespace BeWo.BeWoColonia5Reports
             // xrTableCell15
             // 
             this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.fieldGroupHours", "{0:0.##}")});
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Minutes", "{0:0.##}")});
             this.xrTableCell15.Name = "xrTableCell15";
             this.xrTableCell15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
             this.xrTableCell15.StylePriority.UseFont = false;
@@ -243,10 +243,6 @@ namespace BeWo.BeWoColonia5Reports
             this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
             this.xrTableCell15.Weight = 0.283693213636449D;
             // 
-            // bindingSource1
-            // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
-            // 
             // formattingRuleStartDate
             // 
             this.formattingRuleStartDate.Condition = "[StartDate2]  < [StartDate]";
@@ -576,11 +572,11 @@ namespace BeWo.BeWoColonia5Reports
             this.xrLabel17,
             this.xrLabel16,
             this.xrLabel5,
-            this.xrLabel11,
+            this.cellGesamtFaktor,
             this.xrLabel8,
             this.xrLabel7,
             this.xrLabel6,
-            this.xrLabel4,
+            this.cellGesamt,
             this.xrLabel3});
             this.ReportFooter.Font = new System.Drawing.Font("Times New Roman", 11F);
             this.ReportFooter.HeightF = 265.7499F;
@@ -608,7 +604,7 @@ namespace BeWo.BeWoColonia5Reports
             this.xrLabel17.Multiline = true;
             this.xrLabel17.Name = "xrLabel17";
             this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel17.SizeF = new System.Drawing.SizeF(248.96F, 134.1666F);
+            this.xrLabel17.SizeF = new System.Drawing.SizeF(248.96F, 112F);
             this.xrLabel17.StylePriority.UseFont = false;
             this.xrLabel17.StylePriority.UseTextAlignment = false;
             this.xrLabel17.Text = "Ambulant Betreutes Wohnen\r\nKalk-Mülheimer Str. 159\r\n51103 Köln\r\nTel.:  0221/16999" +
@@ -639,24 +635,23 @@ namespace BeWo.BeWoColonia5Reports
             this.xrLabel5.StylePriority.UseFont = false;
             this.xrLabel5.Text = "Datum:";
             // 
-            // xrLabel11
+            // cellGesamtFaktor
             // 
-            this.xrLabel11.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            this.cellGesamtFaktor.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrLabel11.BorderWidth = 2F;
-            this.xrLabel11.Font = new System.Drawing.Font("Times New Roman", 11F, System.Drawing.FontStyle.Bold);
-            this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(300F, 25F);
-            this.xrLabel11.Name = "xrLabel11";
-            this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
-            this.xrLabel11.SizeF = new System.Drawing.SizeF(180.0001F, 25F);
-            this.xrLabel11.StylePriority.UseBorders = false;
-            this.xrLabel11.StylePriority.UseBorderWidth = false;
-            this.xrLabel11.StylePriority.UseFont = false;
-            this.xrLabel11.StylePriority.UsePadding = false;
-            this.xrLabel11.StylePriority.UseTextAlignment = false;
-            this.xrLabel11.Text = "[fieldAbrechenbareFLS!0.##]";
-            this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.cellGesamtFaktor.BorderWidth = 2F;
+            this.cellGesamtFaktor.Font = new System.Drawing.Font("Times New Roman", 11F, System.Drawing.FontStyle.Bold);
+            this.cellGesamtFaktor.LocationFloat = new DevExpress.Utils.PointFloat(300F, 25F);
+            this.cellGesamtFaktor.Name = "cellGesamtFaktor";
+            this.cellGesamtFaktor.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
+            this.cellGesamtFaktor.SizeF = new System.Drawing.SizeF(180.0001F, 25F);
+            this.cellGesamtFaktor.StylePriority.UseBorders = false;
+            this.cellGesamtFaktor.StylePriority.UseBorderWidth = false;
+            this.cellGesamtFaktor.StylePriority.UseFont = false;
+            this.cellGesamtFaktor.StylePriority.UsePadding = false;
+            this.cellGesamtFaktor.StylePriority.UseTextAlignment = false;
+            this.cellGesamtFaktor.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
             // 
             // xrLabel8
             // 
@@ -692,24 +687,23 @@ namespace BeWo.BeWoColonia5Reports
             this.xrLabel6.StylePriority.UseFont = false;
             this.xrLabel6.Text = "Unterschrift Betreuer:";
             // 
-            // xrLabel4
+            // cellGesamt
             // 
-            this.xrLabel4.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            this.cellGesamt.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrLabel4.BorderWidth = 2F;
-            this.xrLabel4.Font = new System.Drawing.Font("Times New Roman", 11F, System.Drawing.FontStyle.Bold);
-            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(300F, 0F);
-            this.xrLabel4.Name = "xrLabel4";
-            this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
-            this.xrLabel4.SizeF = new System.Drawing.SizeF(180F, 25F);
-            this.xrLabel4.StylePriority.UseBorders = false;
-            this.xrLabel4.StylePriority.UseBorderWidth = false;
-            this.xrLabel4.StylePriority.UseFont = false;
-            this.xrLabel4.StylePriority.UsePadding = false;
-            this.xrLabel4.StylePriority.UseTextAlignment = false;
-            this.xrLabel4.Text = "[fieldBillableFLS!0.##]";
-            this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.cellGesamt.BorderWidth = 2F;
+            this.cellGesamt.Font = new System.Drawing.Font("Times New Roman", 11F, System.Drawing.FontStyle.Bold);
+            this.cellGesamt.LocationFloat = new DevExpress.Utils.PointFloat(300F, 0F);
+            this.cellGesamt.Name = "cellGesamt";
+            this.cellGesamt.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
+            this.cellGesamt.SizeF = new System.Drawing.SizeF(180F, 25F);
+            this.cellGesamt.StylePriority.UseBorders = false;
+            this.cellGesamt.StylePriority.UseBorderWidth = false;
+            this.cellGesamt.StylePriority.UseFont = false;
+            this.cellGesamt.StylePriority.UsePadding = false;
+            this.cellGesamt.StylePriority.UseTextAlignment = false;
+            this.cellGesamt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
             // 
             // xrLabel3
             // 
@@ -745,10 +739,13 @@ namespace BeWo.BeWoColonia5Reports
             // fieldGroupHours
             // 
             this.fieldGroupHours.DataMember = "Services";
-            this.fieldGroupHours.Expression = "[GroupMinutes] / 60";
             this.fieldGroupHours.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
             this.fieldGroupHours.Name = "fieldGroupHours";
             // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
+            // 
             // Stundenzettel
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -798,7 +795,7 @@ namespace BeWo.BeWoColonia5Reports
         private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
+        private DevExpress.XtraReports.UI.XRTableCell cellMinutenFLSHeader;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
         private DevExpress.XtraReports.UI.FormattingRule formattingRuleStartDate;
         private DevExpress.XtraReports.UI.FormattingRule formattingRuleServiceDesc;
@@ -823,13 +820,13 @@ namespace BeWo.BeWoColonia5Reports
         private DevExpress.XtraReports.UI.XRLabel xrLabel22;
         private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter;
         private DevExpress.XtraReports.UI.CalculatedField fieldAbrechenbareMinuten;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel4;
+        private DevExpress.XtraReports.UI.XRLabel cellGesamt;
         private DevExpress.XtraReports.UI.XRLabel xrLabel3;
         private DevExpress.XtraReports.UI.XRLabel xrLabel6;
         private DevExpress.XtraReports.UI.XRLabel xrLabel7;
         private DevExpress.XtraReports.UI.XRLabel xrLabel10;
         private DevExpress.XtraReports.UI.XRLabel xrLabel8;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel11;
+        private DevExpress.XtraReports.UI.XRLabel cellGesamtFaktor;
         private DevExpress.XtraReports.UI.CalculatedField fieldBillableFLS;
         private DevExpress.XtraReports.UI.CalculatedField fieldAbrechenbareFLS;
         private DevExpress.XtraReports.UI.CalculatedField fieldGroupHours;

ReportImp/BeWoColonia5Reports/ServicesOverviewReport.cs

@@ -6,7 +6,7 @@ using BeWo.Report.ReportObjects;
 using BeWo.Report;
 using System.Collections.Generic;
 
-namespace BeWo.BeWoColonia5Reports
+namespace BeWoDreilichPastorDreilich
 {
     public partial class Stundenzettel : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<ServicesOverviewRO>
     {
@@ -17,6 +17,11 @@ namespace BeWo.BeWoColonia5Reports
 
         public void SetReportDataSource(ServicesOverviewRO pRO)
         {
+            bool showMinutes = true;
+            if (pRO.StartDate < new DateTime(2019, 1, 1))
+            {
+                showMinutes = false;
+            }
             if (pRO.Services != null)
             {
                 List<ServicesOverviewRO.ServiceDetail> servicesBillable = new List<ServicesOverviewRO.ServiceDetail>();
@@ -24,12 +29,31 @@ namespace BeWo.BeWoColonia5Reports
                 foreach (ServicesOverviewRO.ServiceDetail s in pRO.Services)
                 {
                     if (s.IsBillable)
+                    {
+                        if (!showMinutes)
+                        {
+                            s.Minutes = s.Minutes / 60;
+                        }
                         servicesBillable.Add(s);
+                    }
                 }
 
                 pRO.Services = servicesBillable;
             }
 
+            if (showMinutes)
+            {
+                cellMinutenFLSHeader.Text = "Geleistete Minuten";
+
+                cellGesamt.Text = String.Format("{0:0.##}", pRO.TotalFLMBillable);
+                cellGesamtFaktor.Text = String.Format("{0:0.##}", pRO.TotalFLMBillable * 1.2);
+            }
+            else
+            {
+                cellGesamt.Text = String.Format("{0:0.##}", pRO.TotalFLMBillable / 60);
+                cellGesamtFaktor.Text = String.Format("{0:0.##}", (pRO.TotalFLMBillable / 60) * 1.2);
+            }
+
             this.bindingSource1.DataSource = pRO;
         }
     }

ReportImp/BeWoColoniaMitarbeiter2/ServicesOverviewReport.Designer.cs

@@ -1,5 +1,5 @@
 using BeWo.Report.ReportObjects;
-namespace BeWo.BeWoColonia5Reports
+namespace BeWoDreilichPastorMitarbeiter
 {
     partial class Stundenzettel
     {
@@ -35,7 +35,7 @@ namespace BeWo.BeWoColonia5Reports
             this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.cellMinutenFLSHeader = new DevExpress.XtraReports.UI.XRTableCell();
             this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
             this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
             this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
@@ -43,7 +43,6 @@ namespace BeWo.BeWoColonia5Reports
             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.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
             this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
             this.xrLabel28 = new DevExpress.XtraReports.UI.XRLabel();
@@ -75,16 +74,17 @@ namespace BeWo.BeWoColonia5Reports
             this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
+            this.cellGesamtFaktor = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
+            this.cellGesamt = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
             this.fieldAbrechenbareMinuten = new DevExpress.XtraReports.UI.CalculatedField();
             this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField();
             this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField();
             this.fieldGroupHours = new DevExpress.XtraReports.UI.CalculatedField();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -122,7 +122,7 @@ namespace BeWo.BeWoColonia5Reports
             this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
             this.xrTableCell3,
             this.xrTableCell4,
-            this.xrTableCell11});
+            this.cellMinutenFLSHeader});
             this.xrTableRow2.Name = "xrTableRow2";
             this.xrTableRow2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
             this.xrTableRow2.StylePriority.UseTextAlignment = false;
@@ -147,15 +147,15 @@ namespace BeWo.BeWoColonia5Reports
             this.xrTableCell4.Text = "Uhrzeit";
             this.xrTableCell4.Weight = 0.45659584837553346D;
             // 
-            // xrTableCell11
+            // cellMinutenFLSHeader
             // 
-            this.xrTableCell11.Multiline = true;
-            this.xrTableCell11.Name = "xrTableCell11";
-            this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
-            this.xrTableCell11.StylePriority.UseFont = false;
-            this.xrTableCell11.StylePriority.UseTextAlignment = false;
-            this.xrTableCell11.Text = "Geleistete FLS";
-            this.xrTableCell11.Weight = 0.54791502162310768D;
+            this.cellMinutenFLSHeader.Multiline = true;
+            this.cellMinutenFLSHeader.Name = "cellMinutenFLSHeader";
+            this.cellMinutenFLSHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+            this.cellMinutenFLSHeader.StylePriority.UseFont = false;
+            this.cellMinutenFLSHeader.StylePriority.UseTextAlignment = false;
+            this.cellMinutenFLSHeader.Text = "Geleistete FLS";
+            this.cellMinutenFLSHeader.Weight = 0.54791502162310768D;
             // 
             // DetailReport
             // 
@@ -233,7 +233,7 @@ namespace BeWo.BeWoColonia5Reports
             // xrTableCell15
             // 
             this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.fieldGroupHours", "{0:0.##}")});
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Minutes", "{0:0.##}")});
             this.xrTableCell15.Name = "xrTableCell15";
             this.xrTableCell15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
             this.xrTableCell15.StylePriority.UseFont = false;
@@ -243,10 +243,6 @@ namespace BeWo.BeWoColonia5Reports
             this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
             this.xrTableCell15.Weight = 0.283693213636449D;
             // 
-            // bindingSource1
-            // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
-            // 
             // formattingRuleStartDate
             // 
             this.formattingRuleStartDate.Condition = "[StartDate2]  < [StartDate]";
@@ -576,11 +572,11 @@ namespace BeWo.BeWoColonia5Reports
             this.xrLabel17,
             this.xrLabel16,
             this.xrLabel5,
-            this.xrLabel11,
+            this.cellGesamtFaktor,
             this.xrLabel8,
             this.xrLabel7,
             this.xrLabel6,
-            this.xrLabel4,
+            this.cellGesamt,
             this.xrLabel3});
             this.ReportFooter.Font = new System.Drawing.Font("Times New Roman", 11F);
             this.ReportFooter.HeightF = 265.7499F;
@@ -608,7 +604,7 @@ namespace BeWo.BeWoColonia5Reports
             this.xrLabel17.Multiline = true;
             this.xrLabel17.Name = "xrLabel17";
             this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel17.SizeF = new System.Drawing.SizeF(248.96F, 134.1666F);
+            this.xrLabel17.SizeF = new System.Drawing.SizeF(248.96F, 112F);
             this.xrLabel17.StylePriority.UseFont = false;
             this.xrLabel17.StylePriority.UseTextAlignment = false;
             this.xrLabel17.Text = "Ambulant Betreutes Wohnen\r\nKalk-Mülheimer Str. 159\r\n51103 Köln\r\nTel.:  0221/16999" +
@@ -639,24 +635,23 @@ namespace BeWo.BeWoColonia5Reports
             this.xrLabel5.StylePriority.UseFont = false;
             this.xrLabel5.Text = "Datum:";
             // 
-            // xrLabel11
+            // cellGesamtFaktor
             // 
-            this.xrLabel11.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            this.cellGesamtFaktor.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrLabel11.BorderWidth = 2F;
-            this.xrLabel11.Font = new System.Drawing.Font("Times New Roman", 11F, System.Drawing.FontStyle.Bold);
-            this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(300F, 25F);
-            this.xrLabel11.Name = "xrLabel11";
-            this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
-            this.xrLabel11.SizeF = new System.Drawing.SizeF(180.0001F, 25F);
-            this.xrLabel11.StylePriority.UseBorders = false;
-            this.xrLabel11.StylePriority.UseBorderWidth = false;
-            this.xrLabel11.StylePriority.UseFont = false;
-            this.xrLabel11.StylePriority.UsePadding = false;
-            this.xrLabel11.StylePriority.UseTextAlignment = false;
-            this.xrLabel11.Text = "[fieldAbrechenbareFLS!0.##]";
-            this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.cellGesamtFaktor.BorderWidth = 2F;
+            this.cellGesamtFaktor.Font = new System.Drawing.Font("Times New Roman", 11F, System.Drawing.FontStyle.Bold);
+            this.cellGesamtFaktor.LocationFloat = new DevExpress.Utils.PointFloat(300F, 25F);
+            this.cellGesamtFaktor.Name = "cellGesamtFaktor";
+            this.cellGesamtFaktor.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
+            this.cellGesamtFaktor.SizeF = new System.Drawing.SizeF(180.0001F, 25F);
+            this.cellGesamtFaktor.StylePriority.UseBorders = false;
+            this.cellGesamtFaktor.StylePriority.UseBorderWidth = false;
+            this.cellGesamtFaktor.StylePriority.UseFont = false;
+            this.cellGesamtFaktor.StylePriority.UsePadding = false;
+            this.cellGesamtFaktor.StylePriority.UseTextAlignment = false;
+            this.cellGesamtFaktor.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
             // 
             // xrLabel8
             // 
@@ -692,24 +687,23 @@ namespace BeWo.BeWoColonia5Reports
             this.xrLabel6.StylePriority.UseFont = false;
             this.xrLabel6.Text = "Unterschrift Betreuer:";
             // 
-            // xrLabel4
+            // cellGesamt
             // 
-            this.xrLabel4.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            this.cellGesamt.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrLabel4.BorderWidth = 2F;
-            this.xrLabel4.Font = new System.Drawing.Font("Times New Roman", 11F, System.Drawing.FontStyle.Bold);
-            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(300F, 0F);
-            this.xrLabel4.Name = "xrLabel4";
-            this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
-            this.xrLabel4.SizeF = new System.Drawing.SizeF(180F, 25F);
-            this.xrLabel4.StylePriority.UseBorders = false;
-            this.xrLabel4.StylePriority.UseBorderWidth = false;
-            this.xrLabel4.StylePriority.UseFont = false;
-            this.xrLabel4.StylePriority.UsePadding = false;
-            this.xrLabel4.StylePriority.UseTextAlignment = false;
-            this.xrLabel4.Text = "[fieldBillableFLS!0.##]";
-            this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.cellGesamt.BorderWidth = 2F;
+            this.cellGesamt.Font = new System.Drawing.Font("Times New Roman", 11F, System.Drawing.FontStyle.Bold);
+            this.cellGesamt.LocationFloat = new DevExpress.Utils.PointFloat(300F, 0F);
+            this.cellGesamt.Name = "cellGesamt";
+            this.cellGesamt.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
+            this.cellGesamt.SizeF = new System.Drawing.SizeF(180F, 25F);
+            this.cellGesamt.StylePriority.UseBorders = false;
+            this.cellGesamt.StylePriority.UseBorderWidth = false;
+            this.cellGesamt.StylePriority.UseFont = false;
+            this.cellGesamt.StylePriority.UsePadding = false;
+            this.cellGesamt.StylePriority.UseTextAlignment = false;
+            this.cellGesamt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
             // 
             // xrLabel3
             // 
@@ -745,10 +739,13 @@ namespace BeWo.BeWoColonia5Reports
             // fieldGroupHours
             // 
             this.fieldGroupHours.DataMember = "Services";
-            this.fieldGroupHours.Expression = "[GroupMinutes] / 60";
             this.fieldGroupHours.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
             this.fieldGroupHours.Name = "fieldGroupHours";
             // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
+            // 
             // Stundenzettel
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -798,7 +795,7 @@ namespace BeWo.BeWoColonia5Reports
         private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
+        private DevExpress.XtraReports.UI.XRTableCell cellMinutenFLSHeader;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
         private DevExpress.XtraReports.UI.FormattingRule formattingRuleStartDate;
         private DevExpress.XtraReports.UI.FormattingRule formattingRuleServiceDesc;
@@ -823,13 +820,13 @@ namespace BeWo.BeWoColonia5Reports
         private DevExpress.XtraReports.UI.XRLabel xrLabel22;
         private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter;
         private DevExpress.XtraReports.UI.CalculatedField fieldAbrechenbareMinuten;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel4;
+        private DevExpress.XtraReports.UI.XRLabel cellGesamt;
         private DevExpress.XtraReports.UI.XRLabel xrLabel3;
         private DevExpress.XtraReports.UI.XRLabel xrLabel6;
         private DevExpress.XtraReports.UI.XRLabel xrLabel7;
         private DevExpress.XtraReports.UI.XRLabel xrLabel10;
         private DevExpress.XtraReports.UI.XRLabel xrLabel8;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel11;
+        private DevExpress.XtraReports.UI.XRLabel cellGesamtFaktor;
         private DevExpress.XtraReports.UI.CalculatedField fieldBillableFLS;
         private DevExpress.XtraReports.UI.CalculatedField fieldAbrechenbareFLS;
         private DevExpress.XtraReports.UI.CalculatedField fieldGroupHours;

ReportImp/BeWoColoniaMitarbeiter2/ServicesOverviewReport.cs

@@ -6,7 +6,7 @@ using BeWo.Report.ReportObjects;
 using BeWo.Report;
 using System.Collections.Generic;
 
-namespace BeWo.BeWoColonia5Reports
+namespace BeWoDreilichPastorMitarbeiter
 {
     public partial class Stundenzettel : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<ServicesOverviewRO>
     {
@@ -17,6 +17,11 @@ namespace BeWo.BeWoColonia5Reports
 
         public void SetReportDataSource(ServicesOverviewRO pRO)
         {
+            bool showMinutes = true;
+            if (pRO.StartDate < new DateTime(2019, 1, 1))
+            {
+                showMinutes = false;
+            }
             if (pRO.Services != null)
             {
                 List<ServicesOverviewRO.ServiceDetail> servicesBillable = new List<ServicesOverviewRO.ServiceDetail>();
@@ -24,12 +29,31 @@ namespace BeWo.BeWoColonia5Reports
                 foreach (ServicesOverviewRO.ServiceDetail s in pRO.Services)
                 {
                     if (s.IsBillable)
+                    {
+                        if (!showMinutes)
+                        {
+                            s.Minutes = s.Minutes / 60;
+                        }
                         servicesBillable.Add(s);
+                    }
                 }
 
                 pRO.Services = servicesBillable;
             }
 
+            if (showMinutes)
+            {
+                cellMinutenFLSHeader.Text = "Geleistete Minuten";
+
+                cellGesamt.Text = String.Format("{0:0.##}", pRO.TotalFLMBillable);
+                cellGesamtFaktor.Text = String.Format("{0:0.##}", pRO.TotalFLMBillable * 1.2);
+            }
+            else
+            {
+                cellGesamt.Text = String.Format("{0:0.##}", pRO.TotalFLMBillable / 60);
+                cellGesamtFaktor.Text = String.Format("{0:0.##}", (pRO.TotalFLMBillable / 60) * 1.2);
+            }
+
             this.bindingSource1.DataSource = pRO;
         }
     }

ReportImp/BetreuwoWesel/Invoicing/CustomInvoiceFactory.cs

@@ -40,6 +40,10 @@ namespace BetreuWoWesel.Invoicing
 		                {
 		                    return new HdInvoiceCreation();
 		                }
+		                if (sr.CostBearer.Name.Contains("LWL HD"))
+		                {
+		                    return new HdInvoiceCreation();
+		                }
                     }
                 }
                 
@@ -51,7 +55,11 @@ namespace BetreuWoWesel.Invoicing
 		        {
 		            return new HdInvoiceCreation();
                 }
-		    }
+		        if (!String.IsNullOrEmpty(key.CostBearer) && key.CostBearer.Contains("LWL HD"))
+		        {
+		            return new HdInvoiceCreation();
+		        }
+            }
 
             return new InvoiceCreation();
 			

ReportImp/FreundeskreisSuchthilfe/ServiceInvoiceReport.Designer.cs

@@ -393,6 +393,7 @@ namespace FreundeskreisSuchthilfe
             // 
             this.lblGesamtStunden.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "NetClaim")});
+            this.lblGesamtStunden.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
             this.lblGesamtStunden.LocationFloat = new DevExpress.Utils.PointFloat(286.4599F, 90.00002F);
             this.lblGesamtStunden.Multiline = true;
             this.lblGesamtStunden.Name = "lblGesamtStunden";
@@ -421,6 +422,7 @@ namespace FreundeskreisSuchthilfe
             // 
             this.lblForderung.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim")});
+            this.lblForderung.Font = new System.Drawing.Font("Arial", 10F);
             this.lblForderung.LocationFloat = new DevExpress.Utils.PointFloat(286.4599F, 18.00003F);
             this.lblForderung.Multiline = true;
             this.lblForderung.Name = "lblForderung";
@@ -437,19 +439,20 @@ namespace FreundeskreisSuchthilfe
             this.lblZahlungsziel.Multiline = true;
             this.lblZahlungsziel.Name = "lblZahlungsziel";
             this.lblZahlungsziel.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.lblZahlungsziel.SizeF = new System.Drawing.SizeF(520.6248F, 146.0415F);
+            this.lblZahlungsziel.SizeF = new System.Drawing.SizeF(498.6252F, 146.0415F);
             this.lblZahlungsziel.StylePriority.UseFont = false;
             this.lblZahlungsziel.Text = resources.GetString("lblZahlungsziel.Text");
             // 
             // xrLabel5
             // 
+            this.xrLabel5.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
             this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 90F);
             this.xrLabel5.Multiline = true;
             this.xrLabel5.Name = "xrLabel5";
             this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel5.SizeF = new System.Drawing.SizeF(286.46F, 18F);
             this.xrLabel5.StylePriority.UseFont = false;
-            this.xrLabel5.Text = "Forderung";
+            this.xrLabel5.Text = "Summe:";
             // 
             // xrLabel3
             // 
@@ -463,6 +466,7 @@ namespace FreundeskreisSuchthilfe
             // 
             // xrLabel1
             // 
+            this.xrLabel1.Font = new System.Drawing.Font("Arial", 10F);
             this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 18F);
             this.xrLabel1.Multiline = true;
             this.xrLabel1.Name = "xrLabel1";

ReportImp/FreundeskreisSuchthilfe/ServiceInvoiceReport.resx

@@ -118,14 +118,14 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="lblZahlungsziel.Text" xml:space="preserve">
-    <value>Als Anlage fügen wir den unterschriebenen Leistungsnachweis in Kopie bei.
+    <value>Als Anlage fügen wir den/ die unterschriebenen Leistungsnachweis(e) in Kopie bei.
 
 Wir bitten um Überweisung bis zum {Datum} auf unser Konto bei
 der Bank für Sozialwirtschaft.
 
 Mit freundlichen Grüßen
 
-i.A. Jeanette Freudenstein</value>
+i. A. Jeanette Freudenstein</value>
   </data>
   <metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>

ReportImp/FreundeskreisSuchthilfe/SettlementReport.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 using BeWo.Data.Access;
 using BeWo.Data.Entities;
@@ -51,7 +52,7 @@ namespace FreundeskreisSuchthilfe.Alt
                 lblHatAbwesenheitenJa.Text = "x";
             }
 
-            if (pRO.HasGroupRecords)
+            if (HatGruppen(pRO)) // pRO.HasGroupRecords)
             {
                 lblGruppenJa.Text = "x";
             }
@@ -121,7 +122,19 @@ namespace FreundeskreisSuchthilfe.Alt
 	        this.bindingSource1.DataSource = pRO;
         }
 
-	    private String GetCustomerId(SettlementRO pRO)
+        private bool HatGruppen(SettlementRO pRO)
+        {
+            if (pRO.CostBearer2SupportConceptOid > 0)
+            {
+                var cb2sc = DAOFactory.GenericDAO.LoadByID<CostBearer2SupportConcept>(pRO.CostBearer2SupportConceptOid);
+
+                return cb2sc.ServiceRecords.Any(s => s.GroupOid.HasValue && s.GroupOid.Value > 0);
+            }
+
+            return false;
+        }
+
+        private String GetCustomerId(SettlementRO pRO)
 	    {
 		    var cb2sc = DAOFactory.GenericDAO.LoadByID<CostBearer2SupportConcept>(pRO.CostBearer2SupportConceptOid);
 		    return cb2sc.CostBearer.ID;

ReportImp/FreundeskreisSuchthilfe/SettlementReport2.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 using BeWo.Data.Access;
 using BeWo.Data.Entities;
@@ -44,14 +45,14 @@ namespace FreundeskreisSuchthilfe
 
             if (String.IsNullOrWhiteSpace(pRO.AbsenceTimes))
             {
-                lblHatAbwesenheitenNein.Text = "X";
+                lblHatAbwesenheitenNein.Text = "x";
             }
             else
             {
-                lblHatAbwesenheitenJa.Text = "X";
+                lblHatAbwesenheitenJa.Text = "x";
             }
 
-            if (pRO.HasGroupRecords)
+            if (HatGruppen(pRO)) // pRO.HasGroupRecords)
             {
                 lblGruppenJa.Text = "x";
             }
@@ -82,141 +83,19 @@ namespace FreundeskreisSuchthilfe
 	        this.bindingSource1.DataSource = pRO;
         }
 
-	    private String GetCustomerId(SettlementRO pRO)
-	    {
-		    var cb2sc = DAOFactory.GenericDAO.LoadByID<CostBearer2SupportConcept>(pRO.CostBearer2SupportConceptOid);
-		    return cb2sc.CostBearer.ID;
-	    }
+        private bool HatGruppen(Settlement2RO pRO)
+        {
+            if (pRO.InvoiceBaseOid.HasValue)
+            {
+                var ib = DAOFactory.GenericDAO.LoadByID<InvoiceBase>(pRO.InvoiceBaseOid.Value);
+                var cb2sc = ib.CostBearer2SupportConcept;
 
-		private IList<InvoiceItemDC> CreateDefaultSpitzabrechnungInvoiceItems(SettlementRO pRO)
-		{
-			IList<InvoiceItemDC> itemList = new List<InvoiceItemDC>();
-			if (pRO.DifferentHourlyRateCount == 3)
-			{
-				itemList.Add(new InvoiceItemDC
-				{
-					ItemDescription = String.Format("{0} - {1}:\n{2:0.##} FLS {3}x {4:c}", 
-						pRO.AccountingStartDateString, pRO.HourlyRate3EndDateString, 
-						pRO.GeleisteteFLSMitStundensatz3, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRate3),
+                return cb2sc.ServiceRecords.Any(s => s.GroupOid.HasValue && s.GroupOid.Value > 0);
+            }
 
-					GrossAmountTotal = pRO.GeleisteteFLSMitStundensatz3 * pRO.RateFactor * pRO.HourlyRate3
-				});
+            return false;
+        }
 
-				itemList.Add(new InvoiceItemDC
-				{
-					ItemDescription = String.Format("{0} - {1}:\n{2:0.##} FLS {3}x {4:c}",
-						pRO.HourlyRateOldStartDateString, pRO.HourlyRateOldEndDateString,
-						pRO.GeleisteteFLSMitStundensatzAlt, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateOld),
-
-					GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAlt * pRO.RateFactor * pRO.HourlyRateOld
-				});
-
-				itemList.Add(new InvoiceItemDC
-				{
-					ItemDescription = String.Format("{0} - {1}:\n{2:0.##} FLS {3}x {4:c}",
-						pRO.HourlyRateNewStartDateString, pRO.AccountingEndDateString,
-						pRO.GeleisteteFLSMitStundensatzAktuell, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateNew),
-
-					GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAktuell * pRO.RateFactor * pRO.HourlyRateNew
-				});
-
-			}
-			else if (pRO.DifferentHourlyRateCount == 2)
-			{
-				itemList.Add(new InvoiceItemDC
-				{
-					ItemDescription = String.Format("{0} - {1}:\n{2:0.##} FLS {3}x {4:c}",
-						pRO.AccountingStartDateString, pRO.HourlyRateOldEndDateString,
-						pRO.GeleisteteFLSMitStundensatzAlt, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateOld),
-
-					GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAlt * (decimal)pRO.RateFactor * pRO.HourlyRateOld
-				});
-
-				itemList.Add(new InvoiceItemDC
-				{
-					ItemDescription = String.Format("{0} - {1}:\n{2:0.##} FLS {3}x {4:c}",
-						pRO.HourlyRateNewStartDateString, pRO.AccountingEndDateString,
-						pRO.GeleisteteFLSMitStundensatzAktuell, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateNew),
-
-					GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAktuell * pRO.RateFactor * pRO.HourlyRateNew
-				});
-
-			}
-			else
-			{
-				itemList.Add(new InvoiceItemDC
-				{
-					ItemDescription = String.Format("{0} - {1}:\n{2:0.##} FLS {3}x {4:c}",
-						pRO.AccountingStartDateString, pRO.AccountingEndDateString,
-						pRO.GeleisteteFLSMitStundensatzAktuell, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateNew),
-
-					GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAktuell * pRO.RateFactor * pRO.HourlyRateNew
-				});
-
-			}
-
-			return itemList;
-		}
-
-		private void UpdateAbrechnungsFelder(SettlementRO pRO)
-		{
-			if (pRO.DifferentHourlyRateCount == 3)
-			{
-				//Erbrachte Leistungen (FLS) - bis [HourlyRateOldEndDateString] à [HourlyRateOldString] €
-
-				pRO.Abrechnungstext1 = String.Format("{0} bis {1}",
-					pRO.AccountingStartDateString, pRO.HourlyRate3EndDateString);
-
-				pRO.Abrechnungstext1 += String.Format(": {0:0.##} FLS {1}x {2:c}",
-					pRO.GeleisteteFLSMitStundensatz3, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRate3);
-
-				//[AccountingStartDateString] - [HourlyRate3EndDateString] sind [RecordedFLSWithHourlyRate3String] Std. x [HourlyRate3String] € =";
-
-				pRO.Betrag1 = String.Format("{0:c}", pRO.GeleisteteFLSMitStundensatz3 * (decimal)pRO.RateFactor * pRO.HourlyRate3);
-
-
-				pRO.Abrechnungstext2 = String.Format("{0} bis {1}",
-					pRO.HourlyRateOldStartDateString, pRO.HourlyRateOldEndDateString);
-				pRO.Abrechnungstext2 += String.Format(": {0:0.##} FLS {1}x {2:c}",
-					pRO.GeleisteteFLSMitStundensatzAlt, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateOld);
-
-				pRO.Betrag2 = String.Format("{0:c}", pRO.GeleisteteFLSMitStundensatzAlt * (decimal)pRO.RateFactor * pRO.HourlyRateOld);
-
-
-				pRO.Abrechnungstext3 = String.Format("{0} bis {1}",
-					pRO.HourlyRateNewStartDateString, pRO.AccountingEndDateString);
-				pRO.Abrechnungstext3 += String.Format(": {0:0.##} FLS {1}x {2:c}",
-					pRO.GeleisteteFLSMitStundensatzAktuell, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateNew);
-
-				pRO.Betrag3 = String.Format("{0:c}", pRO.GeleisteteFLSMitStundensatzAktuell * (decimal)pRO.RateFactor * pRO.HourlyRateNew);
-			}
-			else if (pRO.DifferentHourlyRateCount == 2)
-			{
-
-				pRO.Abrechnungstext2 = String.Format("{0} bis {1}",
-					pRO.AccountingStartDateString, pRO.HourlyRateOldEndDateString);
-				pRO.Abrechnungstext2 += String.Format(": {0:0.##} FLS {1}x {2:c}",
-					pRO.GeleisteteFLSMitStundensatzAlt, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateOld);
-
-				pRO.Betrag2 = String.Format("{0:c}", pRO.GeleisteteFLSMitStundensatzAlt * (decimal)pRO.RateFactor * pRO.HourlyRateOld);
-
-
-				pRO.Abrechnungstext3 = String.Format("{0} bis {1}",
-					pRO.HourlyRateNewStartDateString, pRO.AccountingEndDateString);
-				pRO.Abrechnungstext3 += String.Format(": {0:0.##} FLS {1}x {2:c}",
-					pRO.GeleisteteFLSMitStundensatzAktuell, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateNew);
-
-				pRO.Betrag3 = String.Format("{0:c}", pRO.GeleisteteFLSMitStundensatzAktuell * (decimal)pRO.RateFactor * pRO.HourlyRateNew);
-			}
-			else
-			{
-				pRO.Abrechnungstext3 = String.Format("{0} bis {1}",
-					pRO.AccountingStartDateString, pRO.AccountingEndDateString);
-				pRO.Abrechnungstext3 += String.Format(": {0:0.##} FLS {1}x {2:c}",
-					pRO.GeleisteteFLSMitStundensatzAktuell, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateNew);
-
-				pRO.Betrag3 = String.Format("{0:c}", pRO.GeleisteteFLSMitStundensatzAktuell * (decimal)pRO.RateFactor * pRO.HourlyRateNew);
-			}
-		}
+        
     }
 }

ReportImp/KetteReports/Export/CustomDataExporter.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using BeWo.Service.Core;
+using BeWo.Service.Plugins;
+using BS.Shared.Core;
+using BS.Shared.DataContracts;
+using Utils = BS.Shared.Core.Utils;
+
+namespace KetteReports.Export
+{
+    public class CustomDataExporter : DataExporter
+    {
+        public override string CreateExportString(string pFileID, string[] pHeaderCaption, string[][] pContent)
+        {
+
+            if (pHeaderCaption != null && pHeaderCaption.Length > 0 && pHeaderCaption[0].Contains("Sage"))
+            {
+                return DiamantExporter.CreateExportString(pHeaderCaption, pContent);
+            }
+            return base.CreateExportString(pFileID, pHeaderCaption, pContent);
+
+        }
+
+        public override QueryDC CreateQuery(QueryDC query)
+        {
+            return DatevExporter.CreateQuery(query);
+        }
+    }
+}

ReportImp/KetteReports/Export/DatevExporter.cs

@@ -0,0 +1,426 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Text;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+using BeWo.Service.DCEntityMapper;
+using BS.Shared;
+using BS.Shared.DataContracts;
+using BS.Shared.Extensions;
+
+namespace KetteReports.Export
+{
+    public class DatevExporter
+    {
+
+        public static QueryDC CreateQuery(QueryDC query)
+        {
+            DateTime dt = DateTime.Now;
+            DateTime.TryParse(query.Parameter[0].Value.ToString(), out dt);
+
+            query.FileName = String.Format("DatevListe{0:yyyyMM}.csv", dt);
+            query.QueryResult = GetAbrechnungenString(dt);
+            
+            
+            return query;
+        }
+        public static string CreateExportString(string[] pHeaderCaption, string[][] pContent)
+        {
+            if (pHeaderCaption != null && pHeaderCaption.Length > 1 && pHeaderCaption[0].Contains("DatevListe"))
+            {
+                DateTime dt = DateTime.Now;
+
+                DateTime.TryParse(pHeaderCaption[1], out dt);
+
+                return GetAbrechnungenString(dt);
+                
+            }
+
+                
+            return null;
+        }
+
+        
+
+        public static String GetAbrechnungenString(DateTime date)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.AppendLine("Debitoren Nr.;Kostenstelle;Name;Kostenträger;FLS;Forderung;Belegnr.;Stundensatz;Pauschaler Faktor in %;Gegenkonto");
+
+            //5   Fachleistungsstunde LVR
+            //7   Sozialdienst allgemein
+            //8   Sozialdienst Geronto
+            //9   Ergänzungskräfte(sonstige Kostenträger)
+            //10  Ergänzungskräfte LVR(Fachleistungsstunde)
+            //12  Fachleistungsstunde Jugendamt
+            //13  Gruppe LVR(Fachleistungsstunde)
+            //15  Indirekte Betreuungsleistung
+            //16  Fachleistungsstunde Selbstzahler
+            //17  Wohngruppe
+            //23  Tagesstätte
+            //24  Jugendberatung
+            //25  Fachleistungsstunde Jugend BeWo
+            //26  Ergänzungskräfte LVR(Assistenz)
+            //27  LT15
+
+            List<long> oidList = new List<long>();
+            oidList.Add(5); // Fachleistung
+            var s = GetMonatlicheAbrechnungStringForCats(date, oidList, null, "8000", null, true, true);
+            if (!String.IsNullOrWhiteSpace(s))
+            {
+                sb.Append(s);
+            }
+            
+
+            oidList.Clear();
+            oidList.Add(16); // Fachleistungsstunde Selbstzahler
+            s = GetMonatlicheAbrechnungStringForCats(date, oidList, null, "8001", null, true, true);
+            if (!String.IsNullOrWhiteSpace(s))
+            {
+                if (sb.Length > 0)
+                    sb.AppendLine();
+                sb.Append(s);
+            }
+
+            oidList.Clear();
+            oidList.Add(9); // Ergänzungskräfte(sonstige Kostenträger)
+            s = GetMonatlicheAbrechnungStringForCats(date, oidList, null, "8005", null, true, true);
+            if (!String.IsNullOrWhiteSpace(s))
+            {
+                if (sb.Length > 0)
+                    sb.AppendLine();
+                sb.Append(s);
+            }
+
+            oidList.Clear();
+            oidList.Add(25); // Fachleistungsstunde Jugend BeWo
+            oidList.Add(12); // Fachleistungsstunde Jugendamt
+            s = GetMonatlicheAbrechnungStringForCats(date, oidList, null, "8010", null, true, true);
+            if (!String.IsNullOrWhiteSpace(s))
+            {
+                if (sb.Length > 0)
+                    sb.AppendLine();
+                sb.Append(s);
+            }
+
+            //Alle anderen
+            oidList.Clear();
+            oidList.Add(5);
+            oidList.Add(16);
+            oidList.Add(9);
+            oidList.Add(25);
+            oidList.Add(12);
+            //var costDict = CreateHourlyRateDict(oidList, date);
+
+            
+            s = GetMonatlicheAbrechnungStringForCats(date, null, oidList, "", null, true, true);
+            
+            if (!String.IsNullOrWhiteSpace(s))
+            {
+                if (sb.Length > 0)
+                    sb.AppendLine();
+                sb.Append(s);
+            }
+
+           
+            return sb.ToString();
+        }
+
+        public static String GetMonatlicheAbrechnungStringForCats(DateTime date, IList<long> includeCatOids, IList<long> excludeCatOids, String sachkonto, Dictionary<long, decimal> costDict, bool holeEinzel, bool holeGruppen)
+        {
+            var sql = GetMonatlicheAbrechnungStringForCatsSql(date, includeCatOids, excludeCatOids, holeEinzel, holeGruppen);
+
+            var dt = ExecuteQuery(sql, date);
+
+
+            StringBuilder sb = new StringBuilder();
+            foreach (DataRow row in dt.Rows)
+            {
+                if (sb.Length > 0)
+                {
+                    sb.AppendLine();
+                }
+                for (int i = 0; i < row.ItemArray.Length; i++)
+                {
+
+                    if (i < 999)
+                    {
+                        if (i > 0)
+                        {
+                            sb.Append(";");
+                        }
+
+                        var item = row[i];
+
+                        
+                        //if (i == 5 && row[5] != null)
+                        //{
+                        //    decimal betrag = 0;
+                        //    Decimal.TryParse(row[5].ToString(), out betrag);
+                        //    //var betrag = (decimal) row[4];
+
+                        //    if (row[9] != null && row[10] != null && costDict != null)
+                        //    {
+                        //        var minuten = (decimal) row[9];
+
+                        //        var catOid = (long) row[10];
+
+                        //        if (costDict.ContainsKey(catOid))
+                        //        {
+                        //            var stundensatz = costDict[catOid];
+
+                        //            betrag =
+                        //                Math.Round(
+                        //                    stundensatz * Math.Round(minuten / 60, 2, MidpointRounding.AwayFromZero), 2,
+                        //                    MidpointRounding.AwayFromZero);
+                        //        }
+                        //    }
+
+                        //    sb.Append(betrag);
+
+                        //}
+                        //else
+                        //{
+                            sb.Append(item);
+                        //}
+
+                        //if (i == 4)
+                        //{
+                        //    sb.Append(" Std");
+                        //}
+                    }
+
+                }
+
+                sb.Append(";");
+                sb.Append(sachkonto);
+            }
+
+            return sb.ToString();
+        }
+
+        private static Dictionary<long, decimal> CreateHourlyRateDict(List<long> catOids, DateTime date)
+        {
+            Dictionary<long, decimal> dict = new Dictionary<long, decimal>();
+
+            foreach (var oid in catOids)
+            {
+                var cat = DAOFactory.GenericDAO.LoadByID<ServiceCategory>(oid);
+
+                var crps = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(cat.CostRatePeriods);
+
+                var cp = crps.GetCostRatePeriodForDate(CostRatePeriodType.AmountOfMoney, date);
+
+                if (cp != null && cp.CostRateValue.HasValue)
+                {
+                    dict.Add(oid, cp.CostRateValue.Value);
+                }
+            }
+            
+            return dict;
+        }
+
+        private static String GetMonatlicheAbrechnungStringForCatsSql(DateTime date, IList<long> includeCatOids, IList<long> excludeOids, bool holeEinzel, bool holeGruppen)
+        {
+            
+            String sql = @"
+SELECT distinct 
+c.`DebitorNumber` AS 'Debitoren Nr.', 
+c.`CostCenter` AS 'Kostenstelle', 
+CONCAT(p.`LastName`, ', ', p.`FirstName`) as Name, 
+org.`Name` as 'Kostentraeger', 
+ROUND(sr.`GeleisteteFLM` / 60, 2) as 'FLS', 
+	IF(crpRateFactor.`CostRateValue` is null, ROUND((sr.`GeleisteteFLM` / 60) * crpHourlyRate.`CostRateValue`, 2),ROUND(ROUND((sr.`GeleisteteFLM` / 60), 2) * crpHourlyRate.`CostRateValue` * ((100 + crpRateFactor.`CostRateValue`)/100), 2)) AS 'Forderung', 
+':Monat_MM' AS 'Belegnr.',
+ROUND(crpHourlyRate.`CostRateValue`,2) as 'Stundensatz', ROUND(crpRateFactor.`CostRateValue`,2) as 'Pauschaler Faktor in %'
+FROM `supportconcept` sc 
+INNER JOIN `costbearer2supportconcept` cb2sc ON sc.`Oid` = cb2sc.`SupportConceptOid`
+INNER JOIN `costbearer` cb ON cb2sc.`CostBearerOid` = cb.`Oid`
+INNER JOIN 
+	(SELECT crp.`ObjectOid`, crp.costratetype, crp.`CostRateValue`, If(crp.Enddate is null, '9999-01-01', crp.enddate) as aenddatum, crptemp.enddatum FROM `costrateperiod` crp 
+	inner join (SELECT crpi.`ObjectOid`, Min(If(crpi.Enddate is null, '9999-01-01', crpi.enddate)) as enddatum FROM `costrateperiod` crpi
+    WHERE crpi.`ObjectTid` = 22  AND crpi.`CostRateType` = 0 AND (crpi.`EndDate` is null or crpi.`EndDate` > ':Monat_Start')
+    group by crpi.objectoid) as crptemp on crptemp.objectoid = crp.objectoid 
+	WHERE crp.`ObjectTid` = 22  and crp.costratetype = 0 
+	having aenddatum = crptemp.enddatum)
+    AS crpHourlyRate ON crpHourlyRate.`ObjectOid` = cb.`Oid`
+LEFT JOIN 
+	(SELECT crp.`ObjectOid`, crp.costratetype, crp.`CostRateValue`, If(crp.Enddate is null, '9999-01-01', crp.enddate) as aenddatum, crptemp.enddatum FROM `costrateperiod` crp 
+	inner join (SELECT crpi.`ObjectOid`, Min(If(crpi.Enddate is null, '9999-01-01', crpi.enddate)) as enddatum FROM `costrateperiod` crpi
+    WHERE crpi.`ObjectTid` = 22  AND crpi.`CostRateType` = 2 AND (crpi.`EndDate` is null or crpi.`EndDate` > ':Monat_Start')
+    group by crpi.objectoid) as crptemp on crptemp.objectoid = crp.objectoid 
+	WHERE crp.`ObjectTid` = 22  and crp.costratetype = 2
+	having aenddatum = crptemp.enddatum)
+    AS crpRateFactor ON crpRateFactor.`ObjectOid` = cb.`Oid`
+INNER JOIN `organisation` org ON org.`CostBearerOid` = cb.`Oid`
+INNER JOIN `customer` c ON sc.`CustomerOid` = c.`Oid`
+INNER JOIN `person` p on c.`PersonOid` = p.`Oid` 
+INNER JOIN
+	(SELECT 
+		v2o.`ObjectOid`,
+        v2o.`ValueListEntryOid`
+	 FROM `valuelistentry2object` v2o
+     WHERE v2o.`ValueListEntryOid` in (12,13,14) ) as vle2o ON vle2o.`ObjectOid` = c.`Oid`
+INNER JOIN `valuelistentry` vle on vle.`Oid` = vle2o.`ValueListEntryOid`
+INNER JOIN 
+	(SELECT sr2.`CostBearer2SupportConceptOid`, SUM(sr2.`roundedduration` / IF(sr2.`GroupEmployeeCount` is null, 1, sr2.`GroupEmployeeCount`)) AS GeleisteteFLM FROM `servicerecord` sr2
+    INNER JOIN `servicedescription` sd ON sr2.`ServiceDescriptionOid` = sd.`Oid`
+    INNER JOIN `servicecategory` sc ON sd.`ServiceCategoryOid` = sc.`Oid`
+    WHERE sr2.`StartDate` >= ':Monat_Start' AND sr2.`StartDate` < ':Monat_End' AND sc.`Billable` = 1:IncludeCatOidList:ExcludeCatOidList GROUP BY sr2.`CostBearer2SupportConceptOid`)
+    AS sr ON sr.`CostBearer2SupportConceptOid` = cb2sc.`Oid`
+WHERE c.`IsActive` <> 0 AND sc.`IsActive` <> 0 and
+((If (cb2sc.`ApprovedStartDate` is null, cb2sc.`RequestedStartDate`, cb2sc.`ApprovedStartDate`) < ':Monat_End' and
+If (cb2sc.`ApprovedEndDate` is null, cb2sc.`RequestedEndDate`, cb2sc.`ApprovedEndDate`) >= ':Monat_Start'
+and GeleisteteFLM is null) or GeleisteteFLM is not null)
+ORDER BY p.`LastName`
+";
+
+String sqlalt = @"
+            SELECT
+CONCAT(p.Lastname, ', ', p.Firstname),
+c.DebitorNumber as 'DebKonto',
+DATE_FORMAT(DATE_ADD(':Monat_End',INTERVAL -1 DAY), '%d.%m.%Y') as 'Datum',
+c.`CostCenter` AS 'Kst', 
+ROUND(sr.`GeleisteteFLM` / 60, 2) as 'Text',
+IF(crpRateFactor.`CostRateValue` is null, 
+	ROUND(ROUND(sr.`GeleisteteFLM` / 60, 2) * (SELECT crp.`CostRateValue` FROM `costrateperiod` crp WHERE crp.`ObjectTid` = 22  AND crp.`CostRateType` = 0 AND crp.`ObjectOid` = cb2sc.`CostBearerOid` AND (crp.`EndDate` is null or crp.`EndDate` > ':Monat_Start') order by IF(crp.`EndDate` is null, MAKEDATE(9999,365),crp.`EndDate`) LIMIT 1 ), 2),
+	ROUND(ROUND((sr.`GeleisteteFLM` / 60) * ((100 + crpRateFactor.`CostRateValue`)/100), 2) * (SELECT crp.`CostRateValue` FROM `costrateperiod` crp WHERE crp.`ObjectTid` = 22  AND crp.`CostRateType` = 0 AND crp.`ObjectOid` = cb2sc.`CostBearerOid` AND (crp.`EndDate` is null or crp.`EndDate` > ':Monat_Start') order by IF(crp.`EndDate` is null, MAKEDATE(9999,365),crp.`EndDate`) LIMIT 1 ), 2)) AS 'Betrag',
+    '',
+    '',
+    '',
+sr.`GeleisteteFLM`,
+sr.CatOid
+FROM `supportconcept` sc 
+INNER JOIN `costbearer2supportconcept` cb2sc ON sc.`Oid` = cb2sc.`SupportConceptOid`
+INNER JOIN `costbearer` cb ON cb2sc.`CostBearerOid` = cb.`Oid`
+LEFT JOIN 
+	(SELECT crp.`ObjectOid`, crp.`CostRateValue` FROM `costrateperiod` crp 
+    WHERE crp.`ObjectTid` = 22  AND crp.`CostRateType` = 2 AND (crp.`EndDate` is null or crp.`EndDate` > NOW()))
+    AS crpRateFactor ON crpRateFactor.`ObjectOid` = cb.`Oid`
+INNER JOIN `organisation` org ON org.`CostBearerOid` = cb.`Oid`
+INNER JOIN `customer` c ON sc.`CustomerOid` = c.`Oid`
+INNER JOIN `person` p on c.`PersonOid` = p.`Oid` 
+LEFT JOIN 
+	(SELECT sr2.`CostBearer2SupportConceptOid`, SUM(sr2.`roundedduration` / IF(sr2.`GroupEmployeeCount` is null, 1, sr2.`GroupEmployeeCount`)) AS GeleisteteFLM, sc.Oid as CatOid FROM `servicerecord` sr2
+    INNER JOIN `servicedescription` sd ON sr2.`ServiceDescriptionOid` = sd.`Oid`
+    INNER JOIN `servicecategory` sc ON sd.`ServiceCategoryOid` = sc.`Oid`
+    WHERE sr2.`StartDate` >= ':Monat_Start' AND sr2.`StartDate` < ':Monat_End' AND sc.`Billable` = 1 AND sc.oid in (CATOIDLIST) :Gruppenfilter GROUP BY sr2.`CostBearer2SupportConceptOid`)
+    AS sr ON sr.`CostBearer2SupportConceptOid` = cb2sc.`Oid`
+WHERE c.`IsActive` <> 0 AND sc.`IsActive` <> 0
+and (sr.`GeleisteteFLM` is not null)
+ORDER BY p.`LastName`, p.`FirstName`, cb2sc.`ApprovedStartDate`
+";
+
+            String includeString = "";
+            String excludeString = "";
+            if (includeCatOids != null && includeCatOids.Count > 0)
+            {
+                StringBuilder oidList = new StringBuilder();
+
+                foreach (var catOid in includeCatOids)
+                {
+                    if (oidList.Length > 0)
+                        oidList.Append(",");
+                    oidList.Append(catOid);
+                }
+
+                includeString = String.Format(" AND sc.oid in ({0})", oidList.ToString());
+            }
+
+            if (excludeOids != null && excludeOids.Count > 0)
+            {
+                StringBuilder notoidList = new StringBuilder();
+
+                foreach (var catOid in excludeOids)
+                {
+                    if (notoidList.Length > 0)
+                        notoidList.Append(",");
+                    notoidList.Append(catOid);
+                }
+                excludeString = String.Format(" AND sc.oid not in ({0})", notoidList.ToString());
+            }
+
+            String gruppenfilter = "";
+
+            if (!holeEinzel || !holeGruppen)
+            {
+                if (holeGruppen)
+                {
+                    gruppenfilter = "AND sr2.GroupOid is not null";
+                }
+                else
+                {
+                    gruppenfilter = "AND sr2.GroupOid is null";
+                }
+            }
+            sql = sql.Replace(":Gruppenfilter", gruppenfilter);
+            sql = sql.Replace(":IncludeCatOidList", includeString);
+            sql = sql.Replace(":ExcludeCatOidList", excludeString);
+            return sql;
+        }
+        
+
+        private static String GetAbschlagszahlungenSql(DateTime date)
+        {
+            String sql = @"
+SELECT
+date_format(at.BookingDate, '%d.%m.%Y') as 'Belegdatum',
+':Belegnr',
+'S13690' as 'Konto Soll',
+'' as 'Kostenstelle Soll',
+c.DebitorNumber as 'Konto Haben',
+'' as 'Kostenstelle Haben',
+Round(at.Amount, 2) as 'Betrag',
+CONCAT('Abschlagszahlung,', p.FirstName, ' ', p.LastName) as 'Buchungstext'
+from accountingtransaction at
+join costbearer2supportconcept c2s on c2s.oid = at.costbearer2supportconceptoid
+join supportconcept sc on sc.oid = c2s.supportconceptoid
+join customer c on sc.customeroid = c.oid
+join person p on c.personoid = p.oid
+WHERE at.`BookingDate` >= ':Monat_Start' AND at.`BookingDate` < ':Monat_End' and c.`IsActive` <> 0 AND sc.`IsActive` <> 0
+ORDER BY p.`LastName`, p.`FirstName`
+";
+            return sql;
+        }
+
+        private static String GetSelbstzahlerSql(DateTime date)
+        {
+            String sql = @"
+SELECT
+date_format(ib.InvoiceDate, '%d.%m.%Y') as 'Belegdatum',
+ib.InvoiceNumber as 'Belegnummer',
+c.DebitorNumber as 'Konto Soll',
+'' as 'Kostenstelle Soll',
+'S86400' as 'Konto Haben',
+c.CostCenter as 'Kostenstelle Haben',
+Round(ii.AmountTotal, 2) as 'Betrag',
+CONCAT('Eigenanteil, ', p.`FirstName`, ' ', p.`LastName`) as 'Buchungstext'
+from invoicebase ib
+join invoiceitem ii on ii.invoicebaseoid = ib.oid
+join customer c on c.oid = ib.recipientcustomeroid
+join `person` p on c.`PersonOid` = p.`Oid` 
+where ib.`InvoiceDate` >= ':Monat_Start' AND ib.`InvoiceDate` < ':Monat_End'
+and ib.type = 0 and ib.isactive = 1 and c.isactive <> 0
+";
+
+            return sql;
+        }
+
+        public static DataTable ExecuteQuery(String sql, DateTime dt)
+        {
+            var newsql = sql;
+            newsql = newsql.Replace(":Abrechnungsmonat", String.Format("{0:dd.MM.yyyy}", dt));
+            newsql = newsql.Replace(":Belegnr", String.Format("{0:yyMM}", dt));
+            newsql = newsql.Replace(":Monat_MM", String.Format("{0:MM}", dt));
+            newsql = newsql.Replace(":Monat_Start", String.Format("{0:yyyy-MM}-01", dt));
+            dt = dt.AddMonths(1);
+            newsql = newsql.Replace(":Monat_End", String.Format("{0:yyyy-MM}-01", dt));
+
+            return DAOFactory.AdoDAO.ExecuteQuery(newsql).Tables[0];
+        }
+        
+
+    }
+}

ReportImp/KetteReports/InvoiceCustomerReport.Designer.cs

@@ -30,6 +30,7 @@ namespace BeWo.KetteReports
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(InvoiceCustomerReport));
             this.Detail = new DevExpress.XtraReports.UI.DetailBand();
             this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
             this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -40,8 +41,9 @@ namespace BeWo.KetteReports
             this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
             this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
-            this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
+            this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel();
             this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
             this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -57,6 +59,7 @@ namespace BeWo.KetteReports
             this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
             this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
             this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
+            this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
             this.lblNotice = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
@@ -64,14 +67,18 @@ namespace BeWo.KetteReports
             this.xrTableRow11 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
             this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
+            this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
             this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+            this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
+            this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
             this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
             this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
-            this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
             this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
             // 
@@ -84,7 +91,6 @@ namespace BeWo.KetteReports
             // 
             // xrTable1
             // 
-            this.xrTable1.Font = new System.Drawing.Font("Verdana", 9.75F);
             this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
             this.xrTable1.Name = "xrTable1";
             this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
@@ -197,47 +203,57 @@ namespace BeWo.KetteReports
             // ReportHeader
             // 
             this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
-            this.xrLabel1,
-            this.xrLabel9,
+            this.xrLabel13,
+            this.xrRichText2,
+            this.lblAdresse,
             this.xrTable3,
             this.xrLabel6,
             this.xrLabel5,
             this.lblDebitor,
             this.xrLabel3,
             this.xrLabel2});
-            this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F);
-            this.ReportHeader.HeightF = 497F;
+            this.ReportHeader.HeightF = 435.0208F;
             this.ReportHeader.Name = "ReportHeader";
             this.ReportHeader.StylePriority.UseFont = false;
             // 
-            // xrLabel1
+            // xrLabel13
             // 
-            this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")});
-            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(448.9583F, 276.0417F);
-            this.xrLabel1.Name = "xrLabel1";
-            this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel1.SizeF = new System.Drawing.SizeF(208.0414F, 23.95834F);
-            this.xrLabel1.StylePriority.UseTextAlignment = false;
-            this.xrLabel1.Text = "xrLabel1";
-            this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            this.xrLabel13.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+            this.xrLabel13.Font = new System.Drawing.Font("Arial", 7.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrLabel13.Name = "xrLabel13";
+            this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel13.SizeF = new System.Drawing.SizeF(329.5F, 17.00003F);
+            this.xrLabel13.StylePriority.UseBorders = false;
+            this.xrLabel13.StylePriority.UseFont = false;
+            this.xrLabel13.StylePriority.UseTextAlignment = false;
+            this.xrLabel13.Text = "Die Kette e. V.  · Paffrather Str. 70 · 51465 Bergisch Gladbach";
+            this.xrLabel13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
             // 
-            // xrLabel9
+            // xrRichText2
             // 
-            this.xrLabel9.Font = new System.Drawing.Font("Verdana", 10F);
-            this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 108F);
-            this.xrLabel9.Multiline = true;
-            this.xrLabel9.Name = "xrLabel9";
-            this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel9.SizeF = new System.Drawing.SizeF(386.7917F, 131F);
-            this.xrLabel9.StylePriority.UseFont = false;
-            this.xrLabel9.Text = "[RecipientOrganisation]\r\n[RecipientDivision]\r\n[RecipientSalutationAddressField] [" +
+            this.xrRichText2.Font = new System.Drawing.Font("Arial", 8F);
+            this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(518.278F, 0F);
+            this.xrRichText2.Name = "xrRichText2";
+            this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
+            this.xrRichText2.SizeF = new System.Drawing.SizeF(183.7219F, 190.9722F);
+            this.xrRichText2.StylePriority.UseFont = false;
+            // 
+            // lblAdresse
+            // 
+            this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 35F);
+            this.lblAdresse.Multiline = true;
+            this.lblAdresse.Name = "lblAdresse";
+            this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblAdresse.SizeF = new System.Drawing.SizeF(386.7917F, 131F);
+            this.lblAdresse.StylePriority.UseFont = false;
+            this.lblAdresse.Text = "[RecipientOrganisation]\r\n[RecipientDivision]\r\n[RecipientSalutationAddressField] [" +
     "RecipientFirstName] [RecipientLastName]\r\n[RecipientStreet]\r\n[RecipientPostCode] " +
     "[RecipientTown]";
             // 
             // xrTable3
             // 
-            this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 472F);
+            this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 410.0208F);
             this.xrTable3.Name = "xrTable3";
             this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.xrTableRow10});
@@ -342,8 +358,7 @@ namespace BeWo.KetteReports
             // 
             // xrLabel6
             // 
-            this.xrLabel6.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 425F);
+            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 363.0208F);
             this.xrLabel6.Multiline = true;
             this.xrLabel6.Name = "xrLabel6";
             this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -354,8 +369,7 @@ namespace BeWo.KetteReports
             // 
             // xrLabel5
             // 
-            this.xrLabel5.Font = new System.Drawing.Font("Verdana", 10F);
-            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 392F);
+            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 330.0208F);
             this.xrLabel5.Multiline = true;
             this.xrLabel5.Name = "xrLabel5";
             this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -368,7 +382,7 @@ namespace BeWo.KetteReports
             this.lblDebitor.BackColor = System.Drawing.Color.Transparent;
             this.lblDebitor.CanShrink = true;
             this.lblDebitor.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblDebitor.LocationFloat = new DevExpress.Utils.PointFloat(0F, 342F);
+            this.lblDebitor.LocationFloat = new DevExpress.Utils.PointFloat(0F, 280.0208F);
             this.lblDebitor.Multiline = true;
             this.lblDebitor.Name = "lblDebitor";
             this.lblDebitor.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -381,8 +395,8 @@ namespace BeWo.KetteReports
             // 
             this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
             this.xrLabel3.CanShrink = true;
-            this.xrLabel3.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 325F);
+            this.xrLabel3.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 263.0208F);
             this.xrLabel3.Name = "xrLabel3";
             this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel3.SizeF = new System.Drawing.SizeF(650F, 16F);
@@ -395,14 +409,14 @@ namespace BeWo.KetteReports
             // 
             this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
             this.xrLabel2.CanShrink = true;
-            this.xrLabel2.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 300F);
+            this.xrLabel2.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 238.0208F);
             this.xrLabel2.Name = "xrLabel2";
             this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel2.SizeF = new System.Drawing.SizeF(650F, 17F);
             this.xrLabel2.StylePriority.UseBackColor = false;
             this.xrLabel2.StylePriority.UseFont = false;
-            this.xrLabel2.Text = "Rechnung Nr. [InvoiceNumber]";
+            this.xrLabel2.Text = "Rechnung Nr. [InvoiceNumber], GP-Nummer: [CustomerReferenceNumber]";
             this.xrLabel2.WordWrap = false;
             // 
             // ruleRateFactorNull
@@ -423,10 +437,20 @@ namespace BeWo.KetteReports
             this.ReportFooter.KeepTogether = true;
             this.ReportFooter.Name = "ReportFooter";
             // 
+            // xrLabel8
+            // 
+            this.xrLabel8.CanShrink = true;
+            this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 146.1667F);
+            this.xrLabel8.Multiline = true;
+            this.xrLabel8.Name = "xrLabel8";
+            this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel8.SizeF = new System.Drawing.SizeF(656.9997F, 23.25F);
+            this.xrLabel8.StylePriority.UseFont = false;
+            this.xrLabel8.Text = "Die abgerechneten Leistungen sind gemäß §4 Nr. 16 UStG. umsatzsteuerbefreit.";
+            // 
             // xrLabel4
             // 
             this.xrLabel4.CanShrink = true;
-            this.xrLabel4.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 35F);
             this.xrLabel4.Multiline = true;
             this.xrLabel4.Name = "xrLabel4";
@@ -437,8 +461,8 @@ namespace BeWo.KetteReports
             // 
             // lblNotice
             // 
-            this.lblNotice.Font = new System.Drawing.Font("Verdana", 10F);
             this.lblNotice.LocationFloat = new DevExpress.Utils.PointFloat(0F, 94.79166F);
+            this.lblNotice.Multiline = true;
             this.lblNotice.Name = "lblNotice";
             this.lblNotice.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.lblNotice.SizeF = new System.Drawing.SizeF(656.9997F, 51.37501F);
@@ -446,7 +470,7 @@ namespace BeWo.KetteReports
             // 
             // xrLabel7
             // 
-            this.xrLabel7.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Italic);
+            this.xrLabel7.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 67.37499F);
             this.xrLabel7.Name = "xrLabel7";
             this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -475,7 +499,7 @@ namespace BeWo.KetteReports
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell23.BorderWidth = 2F;
-            this.xrTableCell23.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold);
+            this.xrTableCell23.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.xrTableCell23.Name = "xrTableCell23";
             this.xrTableCell23.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
             this.xrTableCell23.StylePriority.UseBorders = false;
@@ -489,14 +513,46 @@ namespace BeWo.KetteReports
             // 
             // topMarginBand1
             // 
-            this.topMarginBand1.HeightF = 100F;
+            this.topMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrPictureBox1});
+            this.topMarginBand1.HeightF = 210F;
             this.topMarginBand1.Name = "topMarginBand1";
             // 
+            // xrPictureBox1
+            // 
+            this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
+            this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(518.278F, 54.89585F);
+            this.xrPictureBox1.Name = "xrPictureBox1";
+            this.xrPictureBox1.SizeF = new System.Drawing.SizeF(183.7219F, 145.1042F);
+            this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
+            // 
             // bottomMarginBand1
             // 
-            this.bottomMarginBand1.HeightF = 100F;
+            this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrRichText1,
+            this.xrLabel1});
+            this.bottomMarginBand1.HeightF = 70F;
             this.bottomMarginBand1.Name = "bottomMarginBand1";
             // 
+            // xrRichText1
+            // 
+            this.xrRichText1.Font = new System.Drawing.Font("Arial", 8F);
+            this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 9.999974F);
+            this.xrRichText1.Name = "xrRichText1";
+            this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
+            this.xrRichText1.SizeF = new System.Drawing.SizeF(702F, 58F);
+            this.xrRichText1.StylePriority.UseFont = false;
+            // 
+            // xrLabel1
+            // 
+            this.xrLabel1.Borders = DevExpress.XtraPrinting.BorderSide.Top;
+            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrLabel1.Name = "xrLabel1";
+            this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel1.SizeF = new System.Drawing.SizeF(702F, 10F);
+            this.xrLabel1.StylePriority.UseBorders = false;
+            this.xrLabel1.StylePriority.UseFont = false;
+            // 
             // DetailReport
             // 
             this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -513,18 +569,6 @@ namespace BeWo.KetteReports
             this.Detail1.HeightF = 25F;
             this.Detail1.Name = "Detail1";
             // 
-            // xrLabel8
-            // 
-            this.xrLabel8.CanShrink = true;
-            this.xrLabel8.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 146.1667F);
-            this.xrLabel8.Multiline = true;
-            this.xrLabel8.Name = "xrLabel8";
-            this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel8.SizeF = new System.Drawing.SizeF(656.9997F, 23.25F);
-            this.xrLabel8.StylePriority.UseFont = false;
-            this.xrLabel8.Text = "Die abgerechneten Leistungen sind gemäß §4 Nr. 16 UStG. umsatzsteuerbefreit.";
-            // 
             // bindingSource1
             // 
             this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.InvoiceCustomerRO);
@@ -540,16 +584,19 @@ namespace BeWo.KetteReports
             this.DetailReport});
             this.DataSource = this.bindingSource1;
             this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
+            this.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
             this.ruleRateFactorNull});
-            this.Margins = new System.Drawing.Printing.Margins(75, 75, 100, 100);
+            this.Margins = new System.Drawing.Printing.Margins(75, 50, 210, 70);
             this.PageHeight = 1169;
             this.PageWidth = 827;
             this.PaperKind = System.Drawing.Printing.PaperKind.A4;
             this.Version = "17.1";
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
 
@@ -591,10 +638,14 @@ namespace BeWo.KetteReports
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell23;
         private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
         private DevExpress.XtraReports.UI.DetailBand Detail1;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel9;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel1;
+        private DevExpress.XtraReports.UI.XRLabel lblAdresse;
         private DevExpress.XtraReports.UI.XRLabel lblNotice;
         private DevExpress.XtraReports.UI.XRLabel xrLabel4;
         private DevExpress.XtraReports.UI.XRLabel xrLabel8;
+        private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
+        private DevExpress.XtraReports.UI.XRRichText xrRichText2;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel13;
+        private DevExpress.XtraReports.UI.XRRichText xrRichText1;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel1;
     }
 }

ReportImp/KetteReports/InvoiceCustomerReport.cs

@@ -2,6 +2,7 @@ using System;
 using System.Drawing;
 using System.Collections;
 using System.ComponentModel;
+using System.Text;
 using DevExpress.XtraReports.UI;
 using BeWo.Report.ReportObjects;
 using BeWo.Report;
@@ -17,9 +18,53 @@ namespace BeWo.KetteReports
 
         public void SetReportDataSource(InvoiceCustomerRO pRO)
         {
+            
+            if (!String.IsNullOrEmpty(pRO.SenderPhone))
+            {
+                pRO.SenderPhone = pRO.SenderPhone.Replace("Tel.:", "").Trim();
+            }
+            if (!String.IsNullOrEmpty(pRO.SenderFax))
+            {
+                pRO.SenderFax = pRO.SenderFax.Replace("Fax:", "").Trim();
+            }
+            
+            StringBuilder sb = new StringBuilder();
+
+            if (!String.IsNullOrEmpty(pRO.RecipientOrganisation))
+            {
+                sb.AppendLine(pRO.RecipientOrganisation);
+            }
+            if (!String.IsNullOrEmpty(pRO.RecipientDivision))
+            {
+                sb.AppendLine(pRO.RecipientDivision);
+            }
+            if (!String.IsNullOrEmpty(pRO.RecipientSalutationAddressField))
+            {
+                sb.AppendLine(pRO.RecipientSalutationAddressField);
+            }
+            if (!String.IsNullOrEmpty(pRO.RecipientFirstName) || !String.IsNullOrEmpty(pRO.RecipientLastName))
+            {
+                sb.AppendLine(String.Format("{0} {1}", pRO.RecipientFirstName, pRO.RecipientLastName).Trim());
+            }
+            if (!String.IsNullOrEmpty(pRO.RecipientStreet))
+            {
+                sb.AppendLine(pRO.RecipientStreet);
+            }
+            if (!String.IsNullOrEmpty(pRO.RecipientPostCode) || !String.IsNullOrEmpty(pRO.RecipientTown))
+            {
+                sb.AppendLine(String.Format("{0} {1}", pRO.RecipientPostCode, pRO.RecipientTown).Trim());
+            }
+            
+            lblAdresse.Text = sb.ToString();
+
+
             lblNotice.Text = String.Format("Bitte überweisen Sie den geforderten Betrag bis zum {0:dd.MM.yyyy} auf die unten aufgeführte Bankverbindung.", pRO.InvoiceDateTime.AddDays(21));
-            
-            
+
+            lblNotice.Text +=
+                "\nSollten Sie dem Lastschriftverfahren zugestimmt haben, wird der Rechnungsbetrag in den nächsten Tagen von ihrem Konto eingezogen.\nUm Ihre Überweisung besser zuordnen zu können bitten wir sie um die Angabe des Leistungsmonats, der GP-Nr. und der Rechnungsnummer.";
+
+
+
             lblDebitor.Text = "";
 
             if (!String.IsNullOrEmpty(pRO.CustomerReferenceNumber) && pRO.CustomerReferenceNumber.Trim().Length > 0)

ReportImp/KetteReports/Invoicing/CustomInvoiceNumberGenerator.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using BeWo.Data.Entities;
+using BeWo.Service.Invoicing;
+using BeWo.Service.Plugins;
+using BS.Shared;
+using BS.Shared.Core;
+using BS.Shared.DataContracts;
+using BS.Shared.Services;
+
+namespace KetteReports.Invoicing
+{
+	internal class CustomInvoiceNumberGenerator : InvoiceNumberGenerator
+	{
+		public override string GetNextInvoiceNumber(int increment, InvoiceBase invoiceBase)
+		{
+			if (invoiceBase == null || invoiceBase.Type == InvoiceType.Settlement)
+			{
+				return null;
+			}
+			return base.GetNextInvoiceNumber(increment, invoiceBase);
+		}
+
+	}
+}

ReportImp/KetteReports/KetteReports.csproj

@@ -111,15 +111,30 @@
     <Compile Include="AuswertungSozialpsychiatrie.Designer.cs">
       <DependentUpon>AuswertungSozialpsychiatrie.cs</DependentUpon>
     </Compile>
+    <Compile Include="Export\CustomDataExporter.cs" />
+    <Compile Include="Export\DatevExporter.cs" />
     <Compile Include="Import\Abschlagszahlung.cs" />
     <Compile Include="Import\AbschlagszahlungImport.cs" />
     <Compile Include="Import\HilfeplanInfo.cs" />
+    <Compile Include="Invoicing\CustomInvoiceNumberGenerator.cs" />
+    <Compile Include="ServiceInvoiceReport.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ServiceInvoiceReport.Designer.cs">
+      <DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
+    </Compile>
     <Compile Include="ServiceRecordListReport.cs">
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="ServiceRecordListReport.Designer.cs">
       <DependentUpon>ServiceRecordListReport.cs</DependentUpon>
     </Compile>
+    <Compile Include="SettlementReport2.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SettlementReport2.designer.cs">
+      <DependentUpon>SettlementReport2.cs</DependentUpon>
+    </Compile>
     <Compile Include="SozPsychErfassungBeratungRO.cs" />
     <Compile Include="InvoiceCustomerReport.cs">
       <SubType>Component</SubType>
@@ -158,6 +173,10 @@
     <EmbeddedResource Include="QueryListReport.resx">
       <DependentUpon>QueryListReport.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="ServiceInvoiceReport.resx">
+      <DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="ServiceRecordListReport.resx">
       <DependentUpon>ServiceRecordListReport.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -165,6 +184,9 @@
     <EmbeddedResource Include="ServicesOverviewReport.resx">
       <DependentUpon>ServicesOverviewReport.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="SettlementReport2.resx">
+      <DependentUpon>SettlementReport2.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="SettlementReport.resx">
       <DependentUpon>SettlementReport.cs</DependentUpon>
     </EmbeddedResource>

ReportImp/KetteReports/ServiceInvoiceReport.Designer.cs

@@ -0,0 +1,796 @@
+using BeWo.Report.ReportObjects;
+namespace KetteReports
+{
+    partial class ServiceInvoiceReport
+    {
+        /// <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);
+        }
+
+        	
+        /// <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();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ServiceInvoiceReport));
+            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.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
+            this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+            this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
+            this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
+            this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+            this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
+            this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblAbrechnungszeitraum = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel15 = 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.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
+            this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
+            this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
+            this.xrTable5 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow23 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.DetailReport2 = new DevExpress.XtraReports.UI.DetailReportBand();
+            this.Detail3 = new DevExpress.XtraReports.UI.DetailBand();
+            this.xrTable6 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow25 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell42 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell46 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
+            this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).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;
+            // 
+            // ReportHeader
+            // 
+            this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F);
+            this.ReportHeader.HeightF = 0F;
+            this.ReportHeader.Name = "ReportHeader";
+            this.ReportHeader.StylePriority.UseFont = false;
+            // 
+            // ruleRateFactorNull
+            // 
+            this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?";
+            this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
+            this.ruleRateFactorNull.Name = "ruleRateFactorNull";
+            // 
+            // topMarginBand1
+            // 
+            this.topMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrPictureBox1});
+            this.topMarginBand1.HeightF = 210F;
+            this.topMarginBand1.Name = "topMarginBand1";
+            // 
+            // xrPictureBox1
+            // 
+            this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
+            this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(518.278F, 54.89585F);
+            this.xrPictureBox1.Name = "xrPictureBox1";
+            this.xrPictureBox1.SizeF = new System.Drawing.SizeF(183.7219F, 145.1042F);
+            this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
+            // 
+            // bottomMarginBand1
+            // 
+            this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrRichText1,
+            this.xrLabel6});
+            this.bottomMarginBand1.HeightF = 70F;
+            this.bottomMarginBand1.Name = "bottomMarginBand1";
+            // 
+            // xrRichText1
+            // 
+            this.xrRichText1.Font = new System.Drawing.Font("Arial", 8F);
+            this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 9.999974F);
+            this.xrRichText1.Name = "xrRichText1";
+            this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
+            this.xrRichText1.SizeF = new System.Drawing.SizeF(702F, 58F);
+            this.xrRichText1.StylePriority.UseFont = false;
+            // 
+            // xrLabel6
+            // 
+            this.xrLabel6.Borders = DevExpress.XtraPrinting.BorderSide.Top;
+            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrLabel6.Name = "xrLabel6";
+            this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel6.SizeF = new System.Drawing.SizeF(702F, 10F);
+            this.xrLabel6.StylePriority.UseBorders = false;
+            this.xrLabel6.StylePriority.UseFont = false;
+            // 
+            // Page1
+            // 
+            this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel7,
+            this.xrLabel13,
+            this.xrRichText2,
+            this.lblAdresse,
+            this.xrLabel4,
+            this.xrLabel3,
+            this.xrLabel2,
+            this.xrLabel5,
+            this.lblAbrechnungszeitraum});
+            this.Page1.HeightF = 400.4375F;
+            this.Page1.Name = "Page1";
+            this.Page1.StylePriority.UseFont = false;
+            // 
+            // xrLabel7
+            // 
+            this.xrLabel7.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel7.CanShrink = true;
+            this.xrLabel7.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
+            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 301.3541F);
+            this.xrLabel7.Multiline = true;
+            this.xrLabel7.Name = "xrLabel7";
+            this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel7.SizeF = new System.Drawing.SizeF(650F, 20F);
+            this.xrLabel7.StylePriority.UseBackColor = false;
+            this.xrLabel7.StylePriority.UseFont = false;
+            this.xrLabel7.Text = "Kundennummer: [DebitorNumber]";
+            this.xrLabel7.WordWrap = false;
+            // 
+            // xrLabel13
+            // 
+            this.xrLabel13.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+            this.xrLabel13.Font = new System.Drawing.Font("Arial", 7.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrLabel13.Name = "xrLabel13";
+            this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel13.SizeF = new System.Drawing.SizeF(329.5F, 17.00003F);
+            this.xrLabel13.StylePriority.UseBorders = false;
+            this.xrLabel13.StylePriority.UseFont = false;
+            this.xrLabel13.StylePriority.UseTextAlignment = false;
+            this.xrLabel13.Text = "Die Kette e. V.  · Paffrather Str. 70 · 51465 Bergisch Gladbach";
+            this.xrLabel13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrRichText2
+            // 
+            this.xrRichText2.Font = new System.Drawing.Font("Arial", 8F);
+            this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(518.278F, 0F);
+            this.xrRichText2.Name = "xrRichText2";
+            this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
+            this.xrRichText2.SizeF = new System.Drawing.SizeF(183.7219F, 190.9722F);
+            this.xrRichText2.StylePriority.UseFont = false;
+            // 
+            // lblAdresse
+            // 
+            this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 35F);
+            this.lblAdresse.Multiline = true;
+            this.lblAdresse.Name = "lblAdresse";
+            this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblAdresse.SizeF = new System.Drawing.SizeF(317F, 111.5F);
+            this.lblAdresse.StylePriority.UseFont = false;
+            this.lblAdresse.Text = "[RecipientOrganisation]\r\n[RecipientContactPerson]\r\n[RecipientDivision]\r\n[Recipien" +
+    "tStreet]\r\n[RecipientPostCodeAndTown]";
+            // 
+            // xrLabel4
+            // 
+            this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel4.CanShrink = true;
+            this.xrLabel4.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
+            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 281.3541F);
+            this.xrLabel4.Multiline = true;
+            this.xrLabel4.Name = "xrLabel4";
+            this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel4.SizeF = new System.Drawing.SizeF(650F, 20F);
+            this.xrLabel4.StylePriority.UseBackColor = false;
+            this.xrLabel4.StylePriority.UseFont = false;
+            this.xrLabel4.Text = "[CustomerReferenceNumber]";
+            this.xrLabel4.WordWrap = false;
+            // 
+            // xrLabel3
+            // 
+            this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel3.CanShrink = true;
+            this.xrLabel3.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
+            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 261.3542F);
+            this.xrLabel3.Name = "xrLabel3";
+            this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel3.SizeF = new System.Drawing.SizeF(650F, 20F);
+            this.xrLabel3.StylePriority.UseBackColor = false;
+            this.xrLabel3.StylePriority.UseFont = false;
+            this.xrLabel3.Text = "Abrechnung Betreuungsleistungen für [CustomerSalutation] [CustomerName]";
+            this.xrLabel3.WordWrap = false;
+            // 
+            // xrLabel2
+            // 
+            this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel2.CanShrink = true;
+            this.xrLabel2.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
+            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 241.3542F);
+            this.xrLabel2.Name = "xrLabel2";
+            this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel2.SizeF = new System.Drawing.SizeF(650F, 20F);
+            this.xrLabel2.StylePriority.UseBackColor = false;
+            this.xrLabel2.StylePriority.UseFont = false;
+            this.xrLabel2.Text = "Rechnung Nr. [InvoiceNumber]";
+            this.xrLabel2.WordWrap = false;
+            // 
+            // xrLabel5
+            // 
+            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 343.8541F);
+            this.xrLabel5.Name = "xrLabel5";
+            this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel5.SizeF = new System.Drawing.SizeF(317F, 17F);
+            this.xrLabel5.StylePriority.UseFont = false;
+            this.xrLabel5.Text = "Sehr geehrte Damen und Herren,";
+            // 
+            // lblAbrechnungszeitraum
+            // 
+            this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 368.8541F);
+            this.lblAbrechnungszeitraum.Multiline = true;
+            this.lblAbrechnungszeitraum.Name = "lblAbrechnungszeitraum";
+            this.lblAbrechnungszeitraum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblAbrechnungszeitraum.SizeF = new System.Drawing.SizeF(642F, 31.58334F);
+            this.lblAbrechnungszeitraum.StylePriority.UseFont = false;
+            this.lblAbrechnungszeitraum.Text = "hiermit berechnen wir für den ... folgende erbrachte Tätigkeiten:";
+            // 
+            // xrLabel15
+            // 
+            this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 140.625F);
+            this.xrLabel15.Name = "xrLabel15";
+            this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel15.SizeF = new System.Drawing.SizeF(175F, 17F);
+            this.xrLabel15.StylePriority.UseFont = false;
+            this.xrLabel15.Text = "Mit freundlichen Grüßen";
+            // 
+            // 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(650F, 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.Multiline = true;
+            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;
+            // 
+            // xrLabel14
+            // 
+            this.xrLabel14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "CreatorName")});
+            this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 189.5833F);
+            this.xrLabel14.Name = "xrLabel14";
+            this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel14.SizeF = new System.Drawing.SizeF(225F, 17F);
+            this.xrLabel14.StylePriority.UseFont = false;
+            this.xrLabel14.Text = "[CreatorName]";
+            // 
+            // xrLabel9
+            // 
+            this.xrLabel9.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Italic);
+            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.StylePriority.UseFont = false;
+            this.xrLabel9.Text = "Abschließende Bemerkungen:";
+            // 
+            // DetailReport
+            // 
+            this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail1,
+            this.DetailReport2});
+            this.DetailReport.DataMember = "ServiceInvoicePeriods";
+            this.DetailReport.DataSource = this.bindingSource1;
+            this.DetailReport.Level = 0;
+            this.DetailReport.Name = "DetailReport";
+            // 
+            // Detail1
+            // 
+            this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable5});
+            this.Detail1.HeightF = 25F;
+            this.Detail1.Name = "Detail1";
+            // 
+            // xrTable5
+            // 
+            this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTable5.Name = "xrTable5";
+            this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow23});
+            this.xrTable5.SizeF = new System.Drawing.SizeF(677F, 25F);
+            // 
+            // xrTableRow23
+            // 
+            this.xrTableRow23.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell32,
+            this.xrTableCell37,
+            this.xrTableCell35,
+            this.xrTableCell33,
+            this.xrTableCell36,
+            this.xrTableCell38,
+            this.xrTableCell34});
+            this.xrTableRow23.Name = "xrTableRow23";
+            this.xrTableRow23.Weight = 1D;
+            // 
+            // xrTableCell32
+            // 
+            this.xrTableCell32.BackColor = System.Drawing.Color.Gainsboro;
+            this.xrTableCell32.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell32.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell32.Name = "xrTableCell32";
+            this.xrTableCell32.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell32.StylePriority.UseBackColor = false;
+            this.xrTableCell32.StylePriority.UseBorderColor = false;
+            this.xrTableCell32.StylePriority.UseBorders = false;
+            this.xrTableCell32.StylePriority.UsePadding = false;
+            this.xrTableCell32.StylePriority.UseTextAlignment = false;
+            this.xrTableCell32.Text = "Zeitraum";
+            this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell32.Weight = 0.62463077449375981D;
+            // 
+            // xrTableCell37
+            // 
+            this.xrTableCell37.BackColor = System.Drawing.Color.Gainsboro;
+            this.xrTableCell37.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell37.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell37.Name = "xrTableCell37";
+            this.xrTableCell37.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell37.StylePriority.UseBackColor = false;
+            this.xrTableCell37.StylePriority.UseBorderColor = false;
+            this.xrTableCell37.StylePriority.UseBorders = false;
+            this.xrTableCell37.StylePriority.UsePadding = false;
+            this.xrTableCell37.StylePriority.UseTextAlignment = false;
+            this.xrTableCell37.Text = "Leistung";
+            this.xrTableCell37.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell37.Weight = 0.85081236260328186D;
+            // 
+            // xrTableCell35
+            // 
+            this.xrTableCell35.BackColor = System.Drawing.Color.Gainsboro;
+            this.xrTableCell35.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell35.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell35.Name = "xrTableCell35";
+            this.xrTableCell35.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell35.StylePriority.UseBackColor = false;
+            this.xrTableCell35.StylePriority.UseBorderColor = false;
+            this.xrTableCell35.StylePriority.UseBorders = false;
+            this.xrTableCell35.StylePriority.UsePadding = false;
+            this.xrTableCell35.StylePriority.UseTextAlignment = false;
+            this.xrTableCell35.Text = "Satz";
+            this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell35.Weight = 0.23245943032832414D;
+            // 
+            // xrTableCell33
+            // 
+            this.xrTableCell33.BackColor = System.Drawing.Color.Gainsboro;
+            this.xrTableCell33.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell33.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell33.Name = "xrTableCell33";
+            this.xrTableCell33.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell33.StylePriority.UseBackColor = false;
+            this.xrTableCell33.StylePriority.UseBorderColor = false;
+            this.xrTableCell33.StylePriority.UseBorders = false;
+            this.xrTableCell33.StylePriority.UsePadding = false;
+            this.xrTableCell33.StylePriority.UseTextAlignment = false;
+            this.xrTableCell33.Text = "Stunden";
+            this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell33.Weight = 0.2893277257020575D;
+            // 
+            // xrTableCell36
+            // 
+            this.xrTableCell36.BackColor = System.Drawing.Color.Gainsboro;
+            this.xrTableCell36.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell36.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell36.Name = "xrTableCell36";
+            this.xrTableCell36.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell36.StylePriority.UseBackColor = false;
+            this.xrTableCell36.StylePriority.UseBorderColor = false;
+            this.xrTableCell36.StylePriority.UseBorders = false;
+            this.xrTableCell36.StylePriority.UsePadding = false;
+            this.xrTableCell36.StylePriority.UseTextAlignment = false;
+            this.xrTableCell36.Text = "Betrag";
+            this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell36.Weight = 0.26310971709438763D;
+            // 
+            // xrTableCell38
+            // 
+            this.xrTableCell38.BackColor = System.Drawing.Color.Gainsboro;
+            this.xrTableCell38.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell38.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell38.Name = "xrTableCell38";
+            this.xrTableCell38.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell38.StylePriority.UseBackColor = false;
+            this.xrTableCell38.StylePriority.UseBorderColor = false;
+            this.xrTableCell38.StylePriority.UseBorders = false;
+            this.xrTableCell38.StylePriority.UsePadding = false;
+            this.xrTableCell38.StylePriority.UseTextAlignment = false;
+            this.xrTableCell38.Text = "pausch Fakt.";
+            this.xrTableCell38.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell38.Weight = 0.42042083402151886D;
+            // 
+            // xrTableCell34
+            // 
+            this.xrTableCell34.BackColor = System.Drawing.Color.Gainsboro;
+            this.xrTableCell34.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell34.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell34.Name = "xrTableCell34";
+            this.xrTableCell34.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell34.StylePriority.UseBackColor = false;
+            this.xrTableCell34.StylePriority.UseBorderColor = false;
+            this.xrTableCell34.StylePriority.UseBorders = false;
+            this.xrTableCell34.StylePriority.UsePadding = false;
+            this.xrTableCell34.StylePriority.UseTextAlignment = false;
+            this.xrTableCell34.Text = "Gesamt";
+            this.xrTableCell34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell34.Weight = 0.31923915575667006D;
+            // 
+            // DetailReport2
+            // 
+            this.DetailReport2.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail3,
+            this.GroupFooter1});
+            this.DetailReport2.DataMember = "ServiceInvoicePeriods.ServiceInvoiceItems";
+            this.DetailReport2.DataSource = this.bindingSource1;
+            this.DetailReport2.Level = 0;
+            this.DetailReport2.Name = "DetailReport2";
+            this.DetailReport2.PageBreak = DevExpress.XtraReports.UI.PageBreak.AfterBand;
+            // 
+            // Detail3
+            // 
+            this.Detail3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable6});
+            this.Detail3.HeightF = 25F;
+            this.Detail3.Name = "Detail3";
+            // 
+            // xrTable6
+            // 
+            this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTable6.Name = "xrTable6";
+            this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow25});
+            this.xrTable6.SizeF = new System.Drawing.SizeF(677F, 25F);
+            this.xrTable6.StylePriority.UseFont = false;
+            // 
+            // xrTableRow25
+            // 
+            this.xrTableRow25.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell40,
+            this.xrTableCell42,
+            this.xrTableCell43,
+            this.xrTableCell44,
+            this.xrTableCell45,
+            this.xrTableCell46,
+            this.xrTableCell47});
+            this.xrTableRow25.Name = "xrTableRow25";
+            this.xrTableRow25.Weight = 1D;
+            // 
+            // xrTableCell40
+            // 
+            this.xrTableCell40.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell40.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell40.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.Duration")});
+            this.xrTableCell40.Name = "xrTableCell40";
+            this.xrTableCell40.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell40.StylePriority.UseBorderColor = false;
+            this.xrTableCell40.StylePriority.UseBorders = false;
+            this.xrTableCell40.StylePriority.UsePadding = false;
+            this.xrTableCell40.StylePriority.UseTextAlignment = false;
+            this.xrTableCell40.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell40.Weight = 0.62463084211025488D;
+            // 
+            // 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.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.UsePadding = false;
+            this.xrTableCell42.StylePriority.UseTextAlignment = false;
+            this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell42.Weight = 0.85081229498678679D;
+            // 
+            // 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}")});
+            this.xrTableCell43.Name = "xrTableCell43";
+            this.xrTableCell43.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 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;
+            // 
+            // 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.##}")});
+            this.xrTableCell44.Name = "xrTableCell44";
+            this.xrTableCell44.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell44.StylePriority.UseBorderColor = false;
+            this.xrTableCell44.StylePriority.UseBorders = false;
+            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;
+            // 
+            // 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.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell45.Weight = 0.26310971709438763D;
+            // 
+            // 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")});
+            this.xrTableCell46.Name = "xrTableCell46";
+            this.xrTableCell46.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell46.StylePriority.UseBorderColor = false;
+            this.xrTableCell46.StylePriority.UseBorders = false;
+            this.xrTableCell46.StylePriority.UsePadding = false;
+            this.xrTableCell46.StylePriority.UseTextAlignment = false;
+            this.xrTableCell46.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell46.Weight = 0.42042083402151886D;
+            // 
+            // 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.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.UsePadding = false;
+            this.xrTableCell47.StylePriority.UseTextAlignment = false;
+            this.xrTableCell47.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell47.Weight = 0.31923915575667006D;
+            // 
+            // GroupFooter1
+            // 
+            this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel8,
+            this.xrLabel1,
+            this.xrLabel9,
+            this.xrTable4,
+            this.xrLabel14,
+            this.xrLabel15});
+            this.GroupFooter1.HeightF = 206.5833F;
+            this.GroupFooter1.Name = "GroupFooter1";
+            // 
+            // xrLabel8
+            // 
+            this.xrLabel8.CanShrink = true;
+            this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 105.7292F);
+            this.xrLabel8.Multiline = true;
+            this.xrLabel8.Name = "xrLabel8";
+            this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel8.SizeF = new System.Drawing.SizeF(656.9997F, 23.25F);
+            this.xrLabel8.StylePriority.UseFont = false;
+            this.xrLabel8.Text = "Die abgerechneten Leistungen sind gemäß §4 Nr. 16 UStG umsatzsteuerbefreit.";
+            // 
+            // xrLabel1
+            // 
+            this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim", "Gesamtsumme: {0}")});
+            this.xrLabel1.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
+            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(420.9999F, 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.StylePriority.UseFont = false;
+            this.xrLabel1.StylePriority.UsePadding = false;
+            this.xrLabel1.StylePriority.UseTextAlignment = false;
+            this.xrLabel1.Text = "xrLabel1";
+            this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
+            // 
+            // ServiceInvoiceReport
+            // 
+            this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail,
+            this.ReportHeader,
+            this.topMarginBand1,
+            this.bottomMarginBand1,
+            this.Page1,
+            this.DetailReport});
+            this.DataSource = this.bindingSource1;
+            this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
+            this.Font = new System.Drawing.Font("Arial", 11F);
+            this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
+            this.ruleRateFactorNull});
+            this.Margins = new System.Drawing.Printing.Margins(75, 50, 210, 70);
+            this.PageHeight = 1169;
+            this.PageWidth = 827;
+            this.PaperKind = System.Drawing.Printing.PaperKind.A4;
+            this.Version = "17.1";
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
+
+        }
+
+        
+        private DevExpress.XtraReports.UI.DetailBand Detail;
+        private System.Windows.Forms.BindingSource bindingSource1;
+        private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
+        private DevExpress.XtraReports.UI.FormattingRule ruleRateFactorNull;
+        private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
+		private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
+        private DevExpress.XtraReports.UI.GroupHeaderBand Page1;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel4;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel3;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel2;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel5;
+        private DevExpress.XtraReports.UI.XRLabel lblAbrechnungszeitraum;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel15;
+        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 xrLabel14;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel9;
+        private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
+		private DevExpress.XtraReports.UI.DetailBand Detail1;
+        private DevExpress.XtraReports.UI.XRTable xrTable5;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow23;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell32;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell37;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell35;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell33;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell36;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell38;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell34;
+        private DevExpress.XtraReports.UI.DetailReportBand DetailReport2;
+        private DevExpress.XtraReports.UI.DetailBand Detail3;
+        private DevExpress.XtraReports.UI.XRTable xrTable6;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow25;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell40;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell42;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell43;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell44;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell45;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell46;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell47;
+        private DevExpress.XtraReports.UI.XRLabel lblAdresse;
+		private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
+		private DevExpress.XtraReports.UI.XRLabel xrLabel1;
+        private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
+        private DevExpress.XtraReports.UI.XRRichText xrRichText2;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel13;
+        private DevExpress.XtraReports.UI.XRRichText xrRichText1;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel6;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel7;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel8;
+    }
+}

ReportImp/KetteReports/ServiceInvoiceReport.cs

@@ -0,0 +1,127 @@
+using System;
+using System.Text;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+using BeWo.Report;
+using BeWo.Report.ReportObjects;
+
+using DevExpress.XtraReports.UI;
+
+namespace KetteReports
+{
+    public partial class ServiceInvoiceReport : XtraReport, IBeWoReport<ServiceInvoiceRO>
+    {
+        public ServiceInvoiceReport()
+        {
+            this.InitializeComponent();
+        }
+
+        public void SetReportDataSource(ServiceInvoiceRO pRO)
+        {
+            if (!String.IsNullOrEmpty(pRO.SenderContactPersonMail))
+            {
+                pRO.SenderContactPersonMail = pRO.SenderContactPersonMail.Replace("E-Mail:", "").Trim();
+            }
+            if (!String.IsNullOrEmpty(pRO.SenderContactPersonPhone))
+            {
+                pRO.SenderContactPersonPhone = pRO.SenderContactPersonPhone.Replace("Tel.:", "").Trim();
+            }
+            if (!String.IsNullOrEmpty(pRO.SenderContactPersonFax))
+            {
+                pRO.SenderContactPersonFax = pRO.SenderContactPersonFax.Replace("Fax:", "").Trim();
+            }
+
+            SetzeAdresse(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);
+			}
+
+            String notice = String.Format("Bitte überweisen Sie den geforderten Betrag bis zum {0:dd.MM.yyyy} auf die unten aufgeführte Bankverbindung.", pRO.InvoiceDateTime.Value.AddDays(21));
+
+            notice +=
+                "\nSollten Sie dem Lastschriftverfahren zugestimmt haben, wird der Rechnungsbetrag in den nächsten Tagen von ihrem Konto eingezogen.\nUm Ihre Überweisung besser zuordnen zu können bitten wir sie um die Angabe des Leistungsmonats, der Kundennummer und der Rechnungsnummer.";
+
+            if (String.IsNullOrEmpty(pRO.Notice))
+            {
+                pRO.Notice = notice;
+            }
+            else
+            {
+                pRO.Notice += "\n\n" + notice;
+            }
+
+            this.bindingSource1.DataSource = pRO;
+        }
+
+        private void SetzeAdresse(ServiceInvoiceRO pRO)
+        {
+            if (pRO.CustomerOid.HasValue)
+            {
+                Customer c = DAOFactory.GenericDAO.LoadByID<Customer>(pRO.CustomerOid.Value);
+
+                if (c.Person.InvoiceAddress != null)
+                {
+                    StringBuilder sb = new StringBuilder();
+
+                    if (!String.IsNullOrEmpty(c.Person.InvoiceAddress.AddressLine1))
+                    {
+                        sb.AppendLine(c.Person.InvoiceAddress.AddressLine1);
+                    }
+                    if (!String.IsNullOrEmpty(c.Person.InvoiceAddress.AddressLine2))
+                    {
+                        sb.AppendLine(c.Person.InvoiceAddress.AddressLine2);
+                    }
+                    if (!String.IsNullOrEmpty(c.Person.InvoiceAddress.Street))
+                    {
+                        sb.AppendLine(c.Person.InvoiceAddress.Street);
+                    }
+                    if (!String.IsNullOrEmpty(c.Person.InvoiceAddress.PostalCode) || !String.IsNullOrEmpty(c.Person.InvoiceAddress.Town))
+                    {
+                        sb.AppendLine(String.Format("{0} {1}", c.Person.InvoiceAddress.PostalCode, c.Person.InvoiceAddress.Town).Trim());
+                    }
+                    
+                    lblAdresse.Text = sb.ToString();
+                    return;
+                }
+            }
+            
+            SetzeDefaultAdresse(pRO);
+        }
+
+        private void SetzeDefaultAdresse(ServiceInvoiceRO pRO)
+        {
+            StringBuilder sb = new StringBuilder();
+
+            if (!String.IsNullOrEmpty(pRO.RecipientOrganisation))
+            {
+                sb.AppendLine(pRO.RecipientOrganisation);
+            }
+            if (!String.IsNullOrEmpty(pRO.RecipientContactPerson))
+            {
+                sb.AppendLine(pRO.RecipientContactPerson);
+            }
+            if (!String.IsNullOrEmpty(pRO.RecipientDivision))
+            {
+                sb.AppendLine(pRO.RecipientDivision);
+            }
+            if (!String.IsNullOrEmpty(pRO.RecipientStreet))
+            {
+                sb.AppendLine(pRO.RecipientStreet);
+            }
+            if (!String.IsNullOrEmpty(pRO.RecipientPostCodeAndTown))
+            {
+                sb.AppendLine(pRO.RecipientPostCodeAndTown);
+            }
+            lblAdresse.Text = sb.ToString();
+        }
+    }
+}

ReportImp/KetteReports/SettlementReport.Designer.cs

@@ -33,8 +33,10 @@ namespace BeWo.KetteReports
             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.lblAdresse = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
             this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
             this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -66,6 +68,9 @@ namespace BeWo.KetteReports
             this.xrTableRow12 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableRow18 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableRow17 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -75,12 +80,6 @@ namespace BeWo.KetteReports
             this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
-            this.RecipientPostCodeAndTown = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel_RecipientStreet = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel_RecipientDivision = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel_RecipientContactPerson = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
             this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
             this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
@@ -98,13 +97,15 @@ namespace BeWo.KetteReports
             this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
             this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
+            this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
             this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+            this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
             this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
-            this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
             // 
@@ -118,30 +119,60 @@ namespace BeWo.KetteReports
             // ReportHeader
             // 
             this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.lblAdresse,
+            this.xrLabel13,
+            this.xrRichText2,
             this.xrLabel9,
-            this.xrLabel8,
             this.xrTable1,
             this.xrLabel6,
             this.xrLabel5,
             this.xrLabel4,
-            this.xrLabel3,
-            this.xrLabel2,
-            this.RecipientPostCodeAndTown,
-            this.xrLabel_RecipientStreet,
-            this.xrLabel_RecipientDivision,
-            this.xrLabel_RecipientContactPerson,
-            this.xrLabel1});
-            this.ReportHeader.Font = new System.Drawing.Font("Times New Roman", 9.75F);
-            this.ReportHeader.HeightF = 751F;
+            this.xrLabel3});
+            this.ReportHeader.HeightF = 654.6459F;
             this.ReportHeader.Name = "ReportHeader";
             this.ReportHeader.StylePriority.UseFont = false;
             // 
+            // lblAdresse
+            // 
+            this.lblAdresse.CanGrow = false;
+            this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 35F);
+            this.lblAdresse.Multiline = true;
+            this.lblAdresse.Name = "lblAdresse";
+            this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblAdresse.SizeF = new System.Drawing.SizeF(383.3334F, 128.7292F);
+            this.lblAdresse.StylePriority.UseFont = false;
+            this.lblAdresse.Text = "[RecipientOrganisation]\r\n[RecipientContactPerson]\r\n[RecipientDivision]\r\n[Recipien" +
+    "tStreet]\r\n[RecipientPostCodeAndTown]";
+            // 
+            // xrLabel13
+            // 
+            this.xrLabel13.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+            this.xrLabel13.Font = new System.Drawing.Font("Arial", 7.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrLabel13.Name = "xrLabel13";
+            this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel13.SizeF = new System.Drawing.SizeF(329.5F, 17.00003F);
+            this.xrLabel13.StylePriority.UseBorders = false;
+            this.xrLabel13.StylePriority.UseFont = false;
+            this.xrLabel13.StylePriority.UseTextAlignment = false;
+            this.xrLabel13.Text = "Die Kette e. V.  · Paffrather Str. 70 · 51465 Bergisch Gladbach";
+            this.xrLabel13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrRichText2
+            // 
+            this.xrRichText2.Font = new System.Drawing.Font("Arial", 8F);
+            this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(518.278F, 0F);
+            this.xrRichText2.Name = "xrRichText2";
+            this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
+            this.xrRichText2.SizeF = new System.Drawing.SizeF(183.7219F, 190.9722F);
+            this.xrRichText2.StylePriority.UseFont = false;
+            // 
             // xrLabel9
             // 
             this.xrLabel9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "DebitorNumber", "Debitor: {0}")});
-            this.xrLabel9.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold);
-            this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(432.9999F, 341F);
+            this.xrLabel9.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(432.9997F, 244.6458F);
             this.xrLabel9.Name = "xrLabel9";
             this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel9.SizeF = new System.Drawing.SizeF(217F, 25F);
@@ -150,24 +181,9 @@ namespace BeWo.KetteReports
             this.xrLabel9.Text = "xrLabel9";
             this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
             // 
-            // xrLabel8
-            // 
-            this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")});
-            this.xrLabel8.Font = new System.Drawing.Font("Verdana", 9.75F);
-            this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(432.9999F, 300F);
-            this.xrLabel8.Name = "xrLabel8";
-            this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel8.SizeF = new System.Drawing.SizeF(217F, 25F);
-            this.xrLabel8.StylePriority.UseFont = false;
-            this.xrLabel8.StylePriority.UseTextAlignment = false;
-            this.xrLabel8.Text = "xrLabel8";
-            this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-            // 
             // xrTable1
             // 
-            this.xrTable1.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 500F);
+            this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 403.6458F);
             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[] {
@@ -202,7 +218,6 @@ namespace BeWo.KetteReports
             this.xrTableCell19.BorderColor = System.Drawing.SystemColors.ControlLight;
             this.xrTableCell19.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right)));
-            this.xrTableCell19.Font = new System.Drawing.Font("Verdana", 10F);
             this.xrTableCell19.Name = "xrTableCell19";
             this.xrTableCell19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrTableCell19.StylePriority.UseBorderColor = false;
@@ -216,7 +231,6 @@ namespace BeWo.KetteReports
             this.xrTableCell6.BorderColor = System.Drawing.SystemColors.ControlLight;
             this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right)));
-            this.xrTableCell6.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold);
             this.xrTableCell6.Name = "xrTableCell6";
             this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrTableCell6.StylePriority.UseBorderColor = false;
@@ -241,7 +255,6 @@ namespace BeWo.KetteReports
             this.xrTableCell20.BorderColor = System.Drawing.SystemColors.ControlLight;
             this.xrTableCell20.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)));
             this.xrTableCell20.CanShrink = true;
-            this.xrTableCell20.Font = new System.Drawing.Font("Verdana", 10F);
             this.xrTableCell20.FormattingRules.Add(this.ruleRateFactorNull);
             this.xrTableCell20.Name = "xrTableCell20";
             this.xrTableCell20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -262,7 +275,6 @@ namespace BeWo.KetteReports
             this.xrTableCell7.BorderColor = System.Drawing.SystemColors.ControlLight;
             this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)));
             this.xrTableCell7.CanShrink = true;
-            this.xrTableCell7.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold);
             this.xrTableCell7.FormattingRules.Add(this.ruleRateFactorNull);
             this.xrTableCell7.Name = "xrTableCell7";
             this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -304,7 +316,6 @@ namespace BeWo.KetteReports
             this.xrTableCell22.BorderColor = System.Drawing.SystemColors.ControlLight;
             this.xrTableCell22.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell22.Font = new System.Drawing.Font("Verdana", 10F);
             this.xrTableCell22.Name = "xrTableCell22";
             this.xrTableCell22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrTableCell22.StylePriority.UseBorderColor = false;
@@ -497,7 +508,6 @@ namespace BeWo.KetteReports
             // 
             this.xrTableCell24.BorderColor = System.Drawing.SystemColors.ControlLight;
             this.xrTableCell24.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell24.Font = new System.Drawing.Font("Verdana", 10F);
             this.xrTableCell24.Name = "xrTableCell24";
             this.xrTableCell24.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrTableCell24.StylePriority.UseBorderColor = false;
@@ -511,7 +521,6 @@ namespace BeWo.KetteReports
             this.xrTableCell10.BorderColor = System.Drawing.SystemColors.ControlLight;
             this.xrTableCell10.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell10.Font = new System.Drawing.Font("Verdana", 10F);
             this.xrTableCell10.Name = "xrTableCell10";
             this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrTableCell10.StylePriority.UseBorderColor = false;
@@ -522,6 +531,44 @@ namespace BeWo.KetteReports
             this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
             this.xrTableCell10.Weight = 0.23076923076923078D;
             // 
+            // xrTableRow6
+            // 
+            this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell13,
+            this.xrTableCell14});
+            this.xrTableRow6.Name = "xrTableRow6";
+            this.xrTableRow6.Weight = 0.085D;
+            // 
+            // xrTableCell13
+            // 
+            this.xrTableCell13.BorderColor = System.Drawing.SystemColors.ControlLight;
+            this.xrTableCell13.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell13.Name = "xrTableCell13";
+            this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell13.StylePriority.UseBorderColor = false;
+            this.xrTableCell13.StylePriority.UseBorders = false;
+            this.xrTableCell13.StylePriority.UseFont = false;
+            this.xrTableCell13.StylePriority.UsePadding = false;
+            this.xrTableCell13.Text = "abzüglich Eigenanteil:";
+            this.xrTableCell13.Weight = 0.76923076923076927D;
+            // 
+            // xrTableCell14
+            // 
+            this.xrTableCell14.BorderColor = System.Drawing.SystemColors.ControlLight;
+            this.xrTableCell14.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Eigenbeteiligung", "{0:c}")});
+            this.xrTableCell14.Name = "xrTableCell14";
+            this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell14.StylePriority.UseBorderColor = false;
+            this.xrTableCell14.StylePriority.UseBorders = false;
+            this.xrTableCell14.StylePriority.UseFont = false;
+            this.xrTableCell14.StylePriority.UsePadding = false;
+            this.xrTableCell14.StylePriority.UseTextAlignment = false;
+            this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            this.xrTableCell14.Weight = 0.23076923076923078D;
+            // 
             // xrTableRow18
             // 
             this.xrTableRow18.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
@@ -552,7 +599,6 @@ namespace BeWo.KetteReports
             // 
             this.xrTableCell28.BorderColor = System.Drawing.SystemColors.ControlLight;
             this.xrTableCell28.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell28.Font = new System.Drawing.Font("Verdana", 10F);
             this.xrTableCell28.Name = "xrTableCell28";
             this.xrTableCell28.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrTableCell28.StylePriority.UseBorderColor = false;
@@ -566,7 +612,7 @@ namespace BeWo.KetteReports
             this.xrTableCell17.BorderColor = System.Drawing.SystemColors.ControlLight;
             this.xrTableCell17.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell17.Font = new System.Drawing.Font("Verdana", 10F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))));
+            this.xrTableCell17.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.xrTableCell17.Name = "xrTableCell17";
             this.xrTableCell17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrTableCell17.StylePriority.UseBorderColor = false;
@@ -579,8 +625,7 @@ namespace BeWo.KetteReports
             // 
             // xrLabel6
             // 
-            this.xrLabel6.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 425F);
+            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 328.6458F);
             this.xrLabel6.Multiline = true;
             this.xrLabel6.Name = "xrLabel6";
             this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -590,8 +635,7 @@ namespace BeWo.KetteReports
             // 
             // xrLabel5
             // 
-            this.xrLabel5.Font = new System.Drawing.Font("Verdana", 10F);
-            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 392F);
+            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 295.6458F);
             this.xrLabel5.Name = "xrLabel5";
             this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel5.SizeF = new System.Drawing.SizeF(329.5F, 17.00003F);
@@ -602,8 +646,8 @@ namespace BeWo.KetteReports
             // 
             this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
             this.xrLabel4.CanShrink = true;
-            this.xrLabel4.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 342F);
+            this.xrLabel4.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 245.6458F);
             this.xrLabel4.Multiline = true;
             this.xrLabel4.Name = "xrLabel4";
             this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -617,8 +661,8 @@ namespace BeWo.KetteReports
             // 
             this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
             this.xrLabel3.CanShrink = true;
-            this.xrLabel3.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 325F);
+            this.xrLabel3.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 228.6458F);
             this.xrLabel3.Name = "xrLabel3";
             this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel3.SizeF = new System.Drawing.SizeF(650F, 16F);
@@ -627,80 +671,6 @@ namespace BeWo.KetteReports
             this.xrLabel3.Text = "Abrechnung Betreuungsleistungen für [Salutation2] [CustomerName]";
             this.xrLabel3.WordWrap = false;
             // 
-            // xrLabel2
-            // 
-            this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
-            this.xrLabel2.CanShrink = true;
-            this.xrLabel2.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 300F);
-            this.xrLabel2.Name = "xrLabel2";
-            this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel2.SizeF = new System.Drawing.SizeF(300F, 17F);
-            this.xrLabel2.StylePriority.UseBackColor = false;
-            this.xrLabel2.StylePriority.UseFont = false;
-            this.xrLabel2.Text = "Rechnung Nr. [InvoiceNumber]";
-            this.xrLabel2.WordWrap = false;
-            // 
-            // RecipientPostCodeAndTown
-            // 
-            this.RecipientPostCodeAndTown.CanShrink = true;
-            this.RecipientPostCodeAndTown.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.RecipientPostCodeAndTown.LocationFloat = new DevExpress.Utils.PointFloat(0F, 176F);
-            this.RecipientPostCodeAndTown.Name = "RecipientPostCodeAndTown";
-            this.RecipientPostCodeAndTown.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.RecipientPostCodeAndTown.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
-            this.RecipientPostCodeAndTown.SizeF = new System.Drawing.SizeF(292F, 17F);
-            this.RecipientPostCodeAndTown.StylePriority.UseFont = false;
-            this.RecipientPostCodeAndTown.Text = "[RecipientPostCodeAndTown]";
-            // 
-            // xrLabel_RecipientStreet
-            // 
-            this.xrLabel_RecipientStreet.CanShrink = true;
-            this.xrLabel_RecipientStreet.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel_RecipientStreet.LocationFloat = new DevExpress.Utils.PointFloat(0F, 159F);
-            this.xrLabel_RecipientStreet.Name = "xrLabel_RecipientStreet";
-            this.xrLabel_RecipientStreet.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel_RecipientStreet.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
-            this.xrLabel_RecipientStreet.SizeF = new System.Drawing.SizeF(292F, 17F);
-            this.xrLabel_RecipientStreet.StylePriority.UseFont = false;
-            this.xrLabel_RecipientStreet.Text = "[RecipientStreet]";
-            // 
-            // xrLabel_RecipientDivision
-            // 
-            this.xrLabel_RecipientDivision.CanShrink = true;
-            this.xrLabel_RecipientDivision.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel_RecipientDivision.LocationFloat = new DevExpress.Utils.PointFloat(0F, 142F);
-            this.xrLabel_RecipientDivision.Name = "xrLabel_RecipientDivision";
-            this.xrLabel_RecipientDivision.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel_RecipientDivision.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
-            this.xrLabel_RecipientDivision.SizeF = new System.Drawing.SizeF(292F, 17F);
-            this.xrLabel_RecipientDivision.StylePriority.UseFont = false;
-            this.xrLabel_RecipientDivision.Text = "[RecipientDivision]";
-            // 
-            // xrLabel_RecipientContactPerson
-            // 
-            this.xrLabel_RecipientContactPerson.CanShrink = true;
-            this.xrLabel_RecipientContactPerson.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel_RecipientContactPerson.LocationFloat = new DevExpress.Utils.PointFloat(0F, 125F);
-            this.xrLabel_RecipientContactPerson.Name = "xrLabel_RecipientContactPerson";
-            this.xrLabel_RecipientContactPerson.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel_RecipientContactPerson.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
-            this.xrLabel_RecipientContactPerson.SizeF = new System.Drawing.SizeF(292F, 17F);
-            this.xrLabel_RecipientContactPerson.StylePriority.UseFont = false;
-            this.xrLabel_RecipientContactPerson.Text = "[RecipientContactPerson]";
-            // 
-            // xrLabel1
-            // 
-            this.xrLabel1.CanShrink = true;
-            this.xrLabel1.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 108F);
-            this.xrLabel1.Name = "xrLabel1";
-            this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel1.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
-            this.xrLabel1.SizeF = new System.Drawing.SizeF(292F, 17F);
-            this.xrLabel1.StylePriority.UseFont = false;
-            this.xrLabel1.Text = "[RecipientOrganisation]";
-            // 
             // ReportFooter
             // 
             this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -709,13 +679,12 @@ namespace BeWo.KetteReports
             this.xrLabel12,
             this.xrLabel11,
             this.xrLabel7});
-            this.ReportFooter.HeightF = 209F;
+            this.ReportFooter.HeightF = 186.08F;
             this.ReportFooter.KeepTogether = true;
             this.ReportFooter.Name = "ReportFooter";
             // 
             // xrLabel10
             // 
-            this.xrLabel10.Font = new System.Drawing.Font("Verdana", 10F);
             this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 117F);
             this.xrLabel10.Name = "xrLabel10";
             this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -725,7 +694,6 @@ namespace BeWo.KetteReports
             // 
             // xrTable3
             // 
-            this.xrTable3.Font = new System.Drawing.Font("Verdana", 10F);
             this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 33F);
             this.xrTable3.Name = "xrTable3";
             this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
@@ -814,8 +782,7 @@ namespace BeWo.KetteReports
             // 
             // xrLabel12
             // 
-            this.xrLabel12.Font = new System.Drawing.Font("Verdana", 10F);
-            this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 192F);
+            this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 169.08F);
             this.xrLabel12.Name = "xrLabel12";
             this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel12.SizeF = new System.Drawing.SizeF(225F, 17F);
@@ -824,7 +791,6 @@ namespace BeWo.KetteReports
             // 
             // xrLabel11
             // 
-            this.xrLabel11.Font = new System.Drawing.Font("Verdana", 10F);
             this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(583F, 117F);
             this.xrLabel11.Name = "xrLabel11";
             this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -836,7 +802,7 @@ namespace BeWo.KetteReports
             // 
             // xrLabel7
             // 
-            this.xrLabel7.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Italic);
+            this.xrLabel7.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 8F);
             this.xrLabel7.Name = "xrLabel7";
             this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -846,58 +812,50 @@ namespace BeWo.KetteReports
             // 
             // topMarginBand1
             // 
-            this.topMarginBand1.HeightF = 100F;
+            this.topMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrPictureBox1});
+            this.topMarginBand1.HeightF = 210F;
             this.topMarginBand1.Name = "topMarginBand1";
             // 
+            // xrPictureBox1
+            // 
+            this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
+            this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(518.278F, 54.89585F);
+            this.xrPictureBox1.Name = "xrPictureBox1";
+            this.xrPictureBox1.SizeF = new System.Drawing.SizeF(183.7219F, 145.1042F);
+            this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
+            // 
             // bottomMarginBand1
             // 
-            this.bottomMarginBand1.HeightF = 50F;
+            this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel1,
+            this.xrRichText1});
+            this.bottomMarginBand1.HeightF = 70F;
             this.bottomMarginBand1.Name = "bottomMarginBand1";
             // 
+            // xrLabel1
+            // 
+            this.xrLabel1.Borders = DevExpress.XtraPrinting.BorderSide.Top;
+            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrLabel1.Name = "xrLabel1";
+            this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel1.SizeF = new System.Drawing.SizeF(702F, 10F);
+            this.xrLabel1.StylePriority.UseBorders = false;
+            this.xrLabel1.StylePriority.UseFont = false;
+            // 
+            // xrRichText1
+            // 
+            this.xrRichText1.Font = new System.Drawing.Font("Arial", 8F);
+            this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 9.999974F);
+            this.xrRichText1.Name = "xrRichText1";
+            this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
+            this.xrRichText1.SizeF = new System.Drawing.SizeF(702F, 58F);
+            this.xrRichText1.StylePriority.UseFont = false;
+            // 
             // bindingSource1
             // 
             this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
             // 
-            // xrTableRow6
-            // 
-            this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell13,
-            this.xrTableCell14});
-            this.xrTableRow6.Name = "xrTableRow6";
-            this.xrTableRow6.Weight = 0.085D;
-            // 
-            // xrTableCell13
-            // 
-            this.xrTableCell13.BorderColor = System.Drawing.SystemColors.ControlLight;
-            this.xrTableCell13.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell13.Font = new System.Drawing.Font("Verdana", 10F);
-            this.xrTableCell13.Name = "xrTableCell13";
-            this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell13.StylePriority.UseBorderColor = false;
-            this.xrTableCell13.StylePriority.UseBorders = false;
-            this.xrTableCell13.StylePriority.UseFont = false;
-            this.xrTableCell13.StylePriority.UsePadding = false;
-            this.xrTableCell13.Text = "abzüglich Eigenanteil:";
-            this.xrTableCell13.Weight = 0.76923076923076927D;
-            // 
-            // xrTableCell14
-            // 
-            this.xrTableCell14.BorderColor = System.Drawing.SystemColors.ControlLight;
-            this.xrTableCell14.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Eigenbeteiligung", "{0:c}")});
-            this.xrTableCell14.Font = new System.Drawing.Font("Verdana", 10F);
-            this.xrTableCell14.Name = "xrTableCell14";
-            this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell14.StylePriority.UseBorderColor = false;
-            this.xrTableCell14.StylePriority.UseBorders = false;
-            this.xrTableCell14.StylePriority.UseFont = false;
-            this.xrTableCell14.StylePriority.UsePadding = false;
-            this.xrTableCell14.StylePriority.UseTextAlignment = false;
-            this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-            this.xrTableCell14.Weight = 0.23076923076923078D;
-            // 
             // Spitzabrechnung
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -908,15 +866,18 @@ namespace BeWo.KetteReports
             this.bottomMarginBand1});
             this.DataSource = this.bindingSource1;
             this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
+            this.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
             this.ruleRateFactorNull});
-            this.Margins = new System.Drawing.Printing.Margins(75, 75, 100, 50);
+            this.Margins = new System.Drawing.Printing.Margins(75, 50, 210, 70);
             this.PageHeight = 1169;
             this.PageWidth = 827;
             this.PaperKind = System.Drawing.Printing.PaperKind.A4;
             this.Version = "17.1";
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
 
@@ -931,12 +892,6 @@ namespace BeWo.KetteReports
         private DevExpress.XtraReports.UI.XRLabel xrLabel5;
         private DevExpress.XtraReports.UI.XRLabel xrLabel4;
         private DevExpress.XtraReports.UI.XRLabel xrLabel3;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel2;
-        private DevExpress.XtraReports.UI.XRLabel RecipientPostCodeAndTown;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientStreet;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientDivision;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientContactPerson;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel1;
         private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter;
         private DevExpress.XtraReports.UI.XRLabel xrLabel7;
         private DevExpress.XtraReports.UI.XRLabel xrLabel12;
@@ -975,7 +930,6 @@ namespace BeWo.KetteReports
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell31;
         private DevExpress.XtraReports.UI.XRLabel xrLabel10;
         private DevExpress.XtraReports.UI.FormattingRule ruleRateFactorNull;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel8;
         private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
         private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
         private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
@@ -996,5 +950,11 @@ namespace BeWo.KetteReports
         private DevExpress.XtraReports.UI.XRTableRow xrTableRow6;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
+        private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
+        private DevExpress.XtraReports.UI.XRRichText xrRichText2;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel13;
+        private DevExpress.XtraReports.UI.XRLabel lblAdresse;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel1;
+        private DevExpress.XtraReports.UI.XRRichText xrRichText1;
     }
 }

ReportImp/KetteReports/SettlementReport.cs

@@ -2,6 +2,7 @@ using System;
 using System.Drawing;
 using System.Collections;
 using System.ComponentModel;
+using System.Text;
 using DevExpress.XtraReports.UI;
 using BeWo.Report.ReportObjects;
 using BeWo.Report;
@@ -17,6 +18,44 @@ namespace BeWo.KetteReports
 
         public void SetReportDataSource(SettlementRO pRO)
         {
+            if (!String.IsNullOrEmpty(pRO.SenderContactPersonMail))
+            {
+                pRO.SenderContactPersonMail = pRO.SenderContactPersonMail.Replace("E-Mail:", "").Trim();
+            }
+            if (!String.IsNullOrEmpty(pRO.SenderContactPersonPhone))
+            {
+                pRO.SenderContactPersonPhone = pRO.SenderContactPersonPhone.Replace("Tel.:", "").Trim();
+            }
+            if (!String.IsNullOrEmpty(pRO.SenderContactPersonFax))
+            {
+                pRO.SenderContactPersonFax = pRO.SenderContactPersonFax.Replace("Fax:", "").Trim();
+            }
+
+
+            StringBuilder sb = new StringBuilder();
+
+            if (!String.IsNullOrEmpty(pRO.RecipientOrganisation))
+            {
+                sb.AppendLine(pRO.RecipientOrganisation);
+            }
+            if (!String.IsNullOrEmpty(pRO.RecipientContactPerson))
+            {
+                sb.AppendLine(pRO.RecipientContactPerson);
+            }
+            if (!String.IsNullOrEmpty(pRO.RecipientDivision))
+            {
+                sb.AppendLine(pRO.RecipientDivision);
+            }
+            if (!String.IsNullOrEmpty(pRO.RecipientStreet))
+            {
+                sb.AppendLine(pRO.RecipientStreet);
+            }
+            if (!String.IsNullOrEmpty(pRO.RecipientPostCodeAndTown))
+            {
+                sb.AppendLine(pRO.RecipientPostCodeAndTown);
+            }
+            lblAdresse.Text = sb.ToString();
+
             if (pRO.DifferentHourlyRateCount == 3)
             {
                 //Erbrachte Leistungen (FLS) - bis [HourlyRateOldEndDateString] à [HourlyRateOldString] €

ReportImp/KetteReports/SettlementReport2.cs

@@ -0,0 +1,84 @@
+using System;
+using System.Drawing;
+using System.Collections;
+using System.ComponentModel;
+using System.Text;
+using DevExpress.XtraReports.UI;
+using BeWo.Report.ReportObjects;
+using BeWo.Report;
+
+namespace BeWo.KetteReports.Neu
+{
+    public partial class Spitzabrechnung : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<Settlement2RO>
+    {
+        public Spitzabrechnung()
+        {
+            InitializeComponent();
+        }
+
+        public void SetReportDataSource(Settlement2RO pRO)
+        {
+          
+            if (!String.IsNullOrEmpty(pRO.SenderContactPersonMail))
+            {
+                pRO.SenderContactPersonMail = pRO.SenderContactPersonMail.Replace("Email:", "").Trim();
+            }
+            if (!String.IsNullOrEmpty(pRO.SenderContactPersonPhone))
+            {
+                pRO.SenderContactPersonPhone = pRO.SenderContactPersonPhone.Replace("Tel.:", "").Trim();
+            }
+            if (!String.IsNullOrEmpty(pRO.SenderContactPersonFax))
+            {
+                pRO.SenderContactPersonFax = pRO.SenderContactPersonFax.Replace("Fax:", "").Trim();
+            }
+
+
+            StringBuilder sb = new StringBuilder();
+
+            if (!String.IsNullOrEmpty(pRO.RecipientOrganisation))
+            {
+                sb.AppendLine(pRO.RecipientOrganisation);
+            }
+            if (!String.IsNullOrEmpty(pRO.RecipientContactPerson))
+            {
+                sb.AppendLine(pRO.RecipientContactPerson);
+            }
+            if (!String.IsNullOrEmpty(pRO.RecipientDivision))
+            {
+                sb.AppendLine(pRO.RecipientDivision);
+            }
+            if (!String.IsNullOrEmpty(pRO.RecipientStreet))
+            {
+                sb.AppendLine(pRO.RecipientStreet);
+            }
+            if (!String.IsNullOrEmpty(pRO.RecipientPostCodeAndTown))
+            {
+                sb.AppendLine(pRO.RecipientPostCodeAndTown);
+            }
+            lblAdresse.Text = sb.ToString();
+
+            bool hasRatefactor = false;
+
+            if (!String.IsNullOrWhiteSpace(pRO.RateFactorText2))
+            {
+                hasRatefactor = true;
+                if (pRO.RateFactorText2 == "1,2")
+                {
+                    pRO.RateFactorText2 = "1,20";
+                }
+            }
+
+            if (pRO.InvoiceItems != null)
+            {
+                foreach (var ii in pRO.InvoiceItems)
+                {
+                    ii.ItemDescription = String.Format("{0:dd.MM.yyyy} bis {1:dd.MM.yyyy}: {2:0.##} FLS {3}x {4:c}",
+                        ii.PeriodStartDate, ii.PeriodEndDate,
+                        ii.UnitCount, !hasRatefactor ? "" : "x " + pRO.RateFactorText2 + " ",
+                        ii.AmountPerUnit);
+                }
+            }
+            this.bindingSource1.DataSource = pRO;
+        }
+    }
+}

ReportImp/KetteReports/SettlementReport2.designer.cs

@@ -0,0 +1,937 @@
+using BeWo.Report.ReportObjects;
+namespace BeWo.KetteReports.Neu
+{
+    partial class Spitzabrechnung
+    {
+        /// <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();
+            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.lblAdresse = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
+            this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
+            this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow11 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow14 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
+            this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
+            this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow20 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow21 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow22 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow23 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow24 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
+            this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
+            this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
+            this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+            this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
+            this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
+            this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
+            this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow19 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow41 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell64 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow42 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell65 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell66 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow43 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell67 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow44 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell68 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell69 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow45 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell70 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell71 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow46 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell72 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow47 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell73 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell74 = new DevExpress.XtraReports.UI.XRTableCell();
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).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;
+            // 
+            // ReportHeader
+            // 
+            this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.lblAdresse,
+            this.xrLabel13,
+            this.xrRichText2,
+            this.xrLabel9,
+            this.xrTable1,
+            this.xrLabel6,
+            this.xrLabel5,
+            this.xrLabel4,
+            this.xrLabel3});
+            this.ReportHeader.HeightF = 471.6458F;
+            this.ReportHeader.Name = "ReportHeader";
+            this.ReportHeader.StylePriority.UseFont = false;
+            // 
+            // lblAdresse
+            // 
+            this.lblAdresse.CanGrow = false;
+            this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 35F);
+            this.lblAdresse.Multiline = true;
+            this.lblAdresse.Name = "lblAdresse";
+            this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblAdresse.SizeF = new System.Drawing.SizeF(383.3334F, 128.7292F);
+            this.lblAdresse.StylePriority.UseFont = false;
+            this.lblAdresse.Text = "[RecipientOrganisation]\r\n[RecipientContactPerson]\r\n[RecipientDivision]\r\n[Recipien" +
+    "tStreet]\r\n[RecipientPostCodeAndTown]";
+            // 
+            // xrLabel13
+            // 
+            this.xrLabel13.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+            this.xrLabel13.Font = new System.Drawing.Font("Arial", 7.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrLabel13.Name = "xrLabel13";
+            this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel13.SizeF = new System.Drawing.SizeF(329.5F, 17.00003F);
+            this.xrLabel13.StylePriority.UseBorders = false;
+            this.xrLabel13.StylePriority.UseFont = false;
+            this.xrLabel13.StylePriority.UseTextAlignment = false;
+            this.xrLabel13.Text = "Die Kette e. V.  · Paffrather Str. 70 · 51465 Bergisch Gladbach";
+            this.xrLabel13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrRichText2
+            // 
+            this.xrRichText2.Font = new System.Drawing.Font("Arial", 8F);
+            this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(518.278F, 0F);
+            this.xrRichText2.Name = "xrRichText2";
+            this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
+            this.xrRichText2.SizeF = new System.Drawing.SizeF(183.7219F, 190.9722F);
+            this.xrRichText2.StylePriority.UseFont = false;
+            // 
+            // xrLabel9
+            // 
+            this.xrLabel9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "DebitorNumber", "Debitor: {0}")});
+            this.xrLabel9.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(432.9997F, 244.6458F);
+            this.xrLabel9.Name = "xrLabel9";
+            this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel9.SizeF = new System.Drawing.SizeF(217F, 25F);
+            this.xrLabel9.StylePriority.UseFont = false;
+            this.xrLabel9.StylePriority.UseTextAlignment = false;
+            this.xrLabel9.Text = "xrLabel9";
+            this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            // 
+            // xrTable1
+            // 
+            this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 403.6458F);
+            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.xrTableRow9,
+            this.xrTableRow10,
+            this.xrTableRow11,
+            this.xrTableRow14});
+            this.xrTable1.SizeF = new System.Drawing.SizeF(650F, 68F);
+            this.xrTable1.StylePriority.UseFont = false;
+            this.xrTable1.StylePriority.UsePadding = false;
+            // 
+            // xrTableRow9
+            // 
+            this.xrTableRow9.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell19,
+            this.xrTableCell6});
+            this.xrTableRow9.Name = "xrTableRow9";
+            this.xrTableRow9.Weight = 0.085D;
+            // 
+            // xrTableCell19
+            // 
+            this.xrTableCell19.BorderColor = System.Drawing.SystemColors.ControlLight;
+            this.xrTableCell19.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right)));
+            this.xrTableCell19.Name = "xrTableCell19";
+            this.xrTableCell19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell19.StylePriority.UseBorderColor = false;
+            this.xrTableCell19.StylePriority.UseBorders = false;
+            this.xrTableCell19.StylePriority.UseFont = false;
+            this.xrTableCell19.Text = "Bewilligte Fachleistungsstunden (FLS) gesamt:";
+            this.xrTableCell19.Weight = 0.76923076923076927D;
+            // 
+            // xrTableCell6
+            // 
+            this.xrTableCell6.BorderColor = System.Drawing.SystemColors.ControlLight;
+            this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right)));
+            this.xrTableCell6.Name = "xrTableCell6";
+            this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell6.StylePriority.UseBorderColor = false;
+            this.xrTableCell6.StylePriority.UseBorders = false;
+            this.xrTableCell6.StylePriority.UseFont = false;
+            this.xrTableCell6.StylePriority.UseTextAlignment = false;
+            this.xrTableCell6.Text = "[ApprovedFLS]";
+            this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            this.xrTableCell6.Weight = 0.23076923076923075D;
+            // 
+            // xrTableRow10
+            // 
+            this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell20,
+            this.xrTableCell7});
+            this.xrTableRow10.FormattingRules.Add(this.ruleRateFactorNull);
+            this.xrTableRow10.Name = "xrTableRow10";
+            this.xrTableRow10.Weight = 0.085D;
+            // 
+            // xrTableCell20
+            // 
+            this.xrTableCell20.BorderColor = System.Drawing.SystemColors.ControlLight;
+            this.xrTableCell20.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)));
+            this.xrTableCell20.CanShrink = true;
+            this.xrTableCell20.FormattingRules.Add(this.ruleRateFactorNull);
+            this.xrTableCell20.Name = "xrTableCell20";
+            this.xrTableCell20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell20.StylePriority.UseBorderColor = false;
+            this.xrTableCell20.StylePriority.UseBorders = false;
+            this.xrTableCell20.StylePriority.UseFont = false;
+            this.xrTableCell20.Text = "- zzgl. Faktor [RateFactorText2]:";
+            this.xrTableCell20.Weight = 0.76923076923076927D;
+            // 
+            // ruleRateFactorNull
+            // 
+            this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?";
+            this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
+            this.ruleRateFactorNull.Name = "ruleRateFactorNull";
+            // 
+            // xrTableCell7
+            // 
+            this.xrTableCell7.BorderColor = System.Drawing.SystemColors.ControlLight;
+            this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)));
+            this.xrTableCell7.CanShrink = true;
+            this.xrTableCell7.FormattingRules.Add(this.ruleRateFactorNull);
+            this.xrTableCell7.Name = "xrTableCell7";
+            this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell7.StylePriority.UseBorderColor = false;
+            this.xrTableCell7.StylePriority.UseBorders = false;
+            this.xrTableCell7.StylePriority.UseFont = false;
+            this.xrTableCell7.StylePriority.UseTextAlignment = false;
+            this.xrTableCell7.Text = "[ApprovedFLSWithFactor]";
+            this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            this.xrTableCell7.Weight = 0.23076923076923078D;
+            // 
+            // xrTableRow11
+            // 
+            this.xrTableRow11.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell21});
+            this.xrTableRow11.Name = "xrTableRow11";
+            this.xrTableRow11.Weight = 0.085D;
+            // 
+            // xrTableCell21
+            // 
+            this.xrTableCell21.BorderColor = System.Drawing.SystemColors.ControlLight;
+            this.xrTableCell21.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right)));
+            this.xrTableCell21.Name = "xrTableCell21";
+            this.xrTableCell21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell21.StylePriority.UseBorderColor = false;
+            this.xrTableCell21.StylePriority.UseBorders = false;
+            this.xrTableCell21.Weight = 1D;
+            // 
+            // xrTableRow14
+            // 
+            this.xrTableRow14.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell22});
+            this.xrTableRow14.Name = "xrTableRow14";
+            this.xrTableRow14.Weight = 0.085D;
+            // 
+            // xrTableCell22
+            // 
+            this.xrTableCell22.BorderColor = System.Drawing.SystemColors.ControlLight;
+            this.xrTableCell22.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell22.Name = "xrTableCell22";
+            this.xrTableCell22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell22.StylePriority.UseBorderColor = false;
+            this.xrTableCell22.StylePriority.UseBorders = false;
+            this.xrTableCell22.StylePriority.UseFont = false;
+            this.xrTableCell22.Text = "Erbrachte Leistungen:";
+            this.xrTableCell22.Weight = 1D;
+            // 
+            // xrLabel6
+            // 
+            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 328.6458F);
+            this.xrLabel6.Multiline = true;
+            this.xrLabel6.Name = "xrLabel6";
+            this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel6.SizeF = new System.Drawing.SizeF(642F, 67F);
+            this.xrLabel6.StylePriority.UseFont = false;
+            this.xrLabel6.Text = resources.GetString("xrLabel6.Text");
+            // 
+            // xrLabel5
+            // 
+            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 295.6458F);
+            this.xrLabel5.Name = "xrLabel5";
+            this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel5.SizeF = new System.Drawing.SizeF(329.5F, 17.00003F);
+            this.xrLabel5.StylePriority.UseFont = false;
+            this.xrLabel5.Text = "Sehr geehrte Damen und Herren,";
+            // 
+            // xrLabel4
+            // 
+            this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel4.CanShrink = true;
+            this.xrLabel4.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 245.6458F);
+            this.xrLabel4.Multiline = true;
+            this.xrLabel4.Name = "xrLabel4";
+            this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel4.SizeF = new System.Drawing.SizeF(425F, 17F);
+            this.xrLabel4.StylePriority.UseBackColor = false;
+            this.xrLabel4.StylePriority.UseFont = false;
+            this.xrLabel4.Text = "[CustomerReferenceNumberAndDate]";
+            this.xrLabel4.WordWrap = false;
+            // 
+            // xrLabel3
+            // 
+            this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel3.CanShrink = true;
+            this.xrLabel3.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 228.6458F);
+            this.xrLabel3.Name = "xrLabel3";
+            this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            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] [CustomerLa" +
+    "stName]";
+            this.xrLabel3.WordWrap = false;
+            // 
+            // ReportFooter
+            // 
+            this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel10,
+            this.xrTable3,
+            this.xrLabel12,
+            this.xrLabel11,
+            this.xrLabel7});
+            this.ReportFooter.HeightF = 186.0834F;
+            this.ReportFooter.KeepTogether = true;
+            this.ReportFooter.Name = "ReportFooter";
+            // 
+            // xrLabel10
+            // 
+            this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 117F);
+            this.xrLabel10.Name = "xrLabel10";
+            this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel10.SizeF = new System.Drawing.SizeF(175F, 17F);
+            this.xrLabel10.StylePriority.UseFont = false;
+            this.xrLabel10.Text = "Mit freundlichen Grüßen";
+            // 
+            // xrTable3
+            // 
+            this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 33F);
+            this.xrTable3.Name = "xrTable3";
+            this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow20,
+            this.xrTableRow21,
+            this.xrTableRow22,
+            this.xrTableRow23,
+            this.xrTableRow24});
+            this.xrTable3.SizeF = new System.Drawing.SizeF(650F, 68F);
+            this.xrTable3.StylePriority.UseFont = false;
+            // 
+            // xrTableRow20
+            // 
+            this.xrTableRow20.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell16});
+            this.xrTableRow20.Name = "xrTableRow20";
+            this.xrTableRow20.Weight = 0.38095238095238093D;
+            // 
+            // xrTableCell16
+            // 
+            this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Notice")});
+            this.xrTableCell16.Name = "xrTableCell16";
+            this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell16.StylePriority.UsePadding = false;
+            this.xrTableCell16.Text = "xrTableCell1";
+            this.xrTableCell16.Weight = 3D;
+            // 
+            // xrTableRow21
+            // 
+            this.xrTableRow21.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell18});
+            this.xrTableRow21.Name = "xrTableRow21";
+            this.xrTableRow21.Weight = 0.23809523809523808D;
+            // 
+            // xrTableCell18
+            // 
+            this.xrTableCell18.Name = "xrTableCell18";
+            this.xrTableCell18.Weight = 3D;
+            // 
+            // xrTableRow22
+            // 
+            this.xrTableRow22.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell29});
+            this.xrTableRow22.Name = "xrTableRow22";
+            this.xrTableRow22.Weight = 0.38095238095238088D;
+            // 
+            // xrTableCell29
+            // 
+            this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "AbsenceTimes")});
+            this.xrTableCell29.Name = "xrTableCell29";
+            this.xrTableCell29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell29.StylePriority.UsePadding = false;
+            this.xrTableCell29.Text = "xrTableCell4";
+            this.xrTableCell29.Weight = 3D;
+            // 
+            // xrTableRow23
+            // 
+            this.xrTableRow23.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell30});
+            this.xrTableRow23.Name = "xrTableRow23";
+            this.xrTableRow23.Weight = 0.23809523809523803D;
+            // 
+            // xrTableCell30
+            // 
+            this.xrTableCell30.Name = "xrTableCell30";
+            this.xrTableCell30.Weight = 3D;
+            // 
+            // xrTableRow24
+            // 
+            this.xrTableRow24.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell31});
+            this.xrTableRow24.Name = "xrTableRow24";
+            this.xrTableRow24.Weight = 0.38095238095238093D;
+            // 
+            // xrTableCell31
+            // 
+            this.xrTableCell31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "FinalSentence")});
+            this.xrTableCell31.Name = "xrTableCell31";
+            this.xrTableCell31.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell31.StylePriority.UsePadding = false;
+            this.xrTableCell31.Text = "xrTableCell8";
+            this.xrTableCell31.Weight = 3D;
+            // 
+            // xrLabel12
+            // 
+            this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 169.0834F);
+            this.xrLabel12.Name = "xrLabel12";
+            this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel12.SizeF = new System.Drawing.SizeF(225F, 17F);
+            this.xrLabel12.StylePriority.UseFont = false;
+            this.xrLabel12.Text = "[CreatorName]";
+            // 
+            // xrLabel11
+            // 
+            this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(583F, 117F);
+            this.xrLabel11.Name = "xrLabel11";
+            this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel11.SizeF = new System.Drawing.SizeF(67F, 17F);
+            this.xrLabel11.StylePriority.UseFont = false;
+            this.xrLabel11.StylePriority.UseTextAlignment = false;
+            this.xrLabel11.Text = "Anlage";
+            this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            // 
+            // xrLabel7
+            // 
+            this.xrLabel7.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 8F);
+            this.xrLabel7.Name = "xrLabel7";
+            this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel7.SizeF = new System.Drawing.SizeF(250F, 17F);
+            this.xrLabel7.StylePriority.UseFont = false;
+            this.xrLabel7.Text = "Abschließende Bemerkungen:";
+            // 
+            // topMarginBand1
+            // 
+            this.topMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrPictureBox1});
+            this.topMarginBand1.HeightF = 210F;
+            this.topMarginBand1.Name = "topMarginBand1";
+            // 
+            // xrPictureBox1
+            // 
+            this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
+            this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(518.278F, 54.89585F);
+            this.xrPictureBox1.Name = "xrPictureBox1";
+            this.xrPictureBox1.SizeF = new System.Drawing.SizeF(183.7219F, 145.1042F);
+            this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
+            // 
+            // bottomMarginBand1
+            // 
+            this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel1,
+            this.xrRichText1});
+            this.bottomMarginBand1.HeightF = 70F;
+            this.bottomMarginBand1.Name = "bottomMarginBand1";
+            // 
+            // xrLabel1
+            // 
+            this.xrLabel1.Borders = DevExpress.XtraPrinting.BorderSide.Top;
+            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrLabel1.Name = "xrLabel1";
+            this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel1.SizeF = new System.Drawing.SizeF(702F, 10F);
+            this.xrLabel1.StylePriority.UseBorders = false;
+            this.xrLabel1.StylePriority.UseFont = false;
+            // 
+            // xrRichText1
+            // 
+            this.xrRichText1.Font = new System.Drawing.Font("Arial", 8F);
+            this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 9.999974F);
+            this.xrRichText1.Name = "xrRichText1";
+            this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
+            this.xrRichText1.SizeF = new System.Drawing.SizeF(702F, 58F);
+            this.xrRichText1.StylePriority.UseFont = false;
+            // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
+            // 
+            // DetailReport
+            // 
+            this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail1});
+            this.DetailReport.DataMember = "InvoiceItems";
+            this.DetailReport.DataSource = this.bindingSource1;
+            this.DetailReport.Level = 0;
+            this.DetailReport.Name = "DetailReport";
+            // 
+            // Detail1
+            // 
+            this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable2});
+            this.Detail1.HeightF = 17F;
+            this.Detail1.Name = "Detail1";
+            // 
+            // GroupFooter1
+            // 
+            this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable4});
+            this.GroupFooter1.HeightF = 132F;
+            this.GroupFooter1.Name = "GroupFooter1";
+            // 
+            // xrTable2
+            // 
+            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.xrTableRow19});
+            this.xrTable2.SizeF = new System.Drawing.SizeF(650F, 17F);
+            this.xrTable2.StylePriority.UseFont = false;
+            this.xrTable2.StylePriority.UsePadding = false;
+            // 
+            // xrTableRow19
+            // 
+            this.xrTableRow19.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell35,
+            this.xrTableCell36});
+            this.xrTableRow19.Name = "xrTableRow19";
+            this.xrTableRow19.Weight = 0.085D;
+            // 
+            // xrTableCell35
+            // 
+            this.xrTableCell35.BorderColor = System.Drawing.SystemColors.ControlLight;
+            this.xrTableCell35.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell35.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.ItemDescription")});
+            this.xrTableCell35.Name = "xrTableCell35";
+            this.xrTableCell35.StylePriority.UseBorderColor = false;
+            this.xrTableCell35.StylePriority.UseBorders = false;
+            this.xrTableCell35.Text = "xrTableCell5";
+            this.xrTableCell35.Weight = 0.76923076923076927D;
+            // 
+            // xrTableCell36
+            // 
+            this.xrTableCell36.BorderColor = System.Drawing.SystemColors.ControlLight;
+            this.xrTableCell36.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell36.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.GrossAmountTotal", "{0:c}")});
+            this.xrTableCell36.Name = "xrTableCell36";
+            this.xrTableCell36.StylePriority.UseBorderColor = false;
+            this.xrTableCell36.StylePriority.UseBorders = false;
+            this.xrTableCell36.StylePriority.UseTextAlignment = false;
+            this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            this.xrTableCell36.Weight = 0.23076923076923078D;
+            // 
+            // xrTable4
+            // 
+            this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTable4.Name = "xrTable4";
+            this.xrTable4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow41,
+            this.xrTableRow42,
+            this.xrTableRow43,
+            this.xrTableRow44,
+            this.xrTableRow45,
+            this.xrTableRow46,
+            this.xrTableRow47});
+            this.xrTable4.SizeF = new System.Drawing.SizeF(650F, 132F);
+            this.xrTable4.StylePriority.UseFont = false;
+            this.xrTable4.StylePriority.UsePadding = false;
+            // 
+            // xrTableRow41
+            // 
+            this.xrTableRow41.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell64});
+            this.xrTableRow41.Name = "xrTableRow41";
+            this.xrTableRow41.Weight = 0.085D;
+            // 
+            // xrTableCell64
+            // 
+            this.xrTableCell64.BorderColor = System.Drawing.SystemColors.ControlLight;
+            this.xrTableCell64.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell64.Name = "xrTableCell64";
+            this.xrTableCell64.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell64.StylePriority.UseBorderColor = false;
+            this.xrTableCell64.StylePriority.UseBorders = false;
+            this.xrTableCell64.Weight = 1D;
+            // 
+            // xrTableRow42
+            // 
+            this.xrTableRow42.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell65,
+            this.xrTableCell66});
+            this.xrTableRow42.Name = "xrTableRow42";
+            this.xrTableRow42.Weight = 0.085D;
+            // 
+            // xrTableCell65
+            // 
+            this.xrTableCell65.BorderColor = System.Drawing.SystemColors.ControlLight;
+            this.xrTableCell65.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell65.Name = "xrTableCell65";
+            this.xrTableCell65.StylePriority.UseBorderColor = false;
+            this.xrTableCell65.StylePriority.UseBorders = false;
+            this.xrTableCell65.Text = "Gesamtforderung:";
+            this.xrTableCell65.Weight = 0.76923076923076916D;
+            // 
+            // xrTableCell66
+            // 
+            this.xrTableCell66.BorderColor = System.Drawing.SystemColors.ControlLight;
+            this.xrTableCell66.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell66.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "AmountBillableTotal", "{0:c}")});
+            this.xrTableCell66.Name = "xrTableCell66";
+            this.xrTableCell66.StylePriority.UseBorderColor = false;
+            this.xrTableCell66.StylePriority.UseBorders = false;
+            this.xrTableCell66.StylePriority.UseTextAlignment = false;
+            this.xrTableCell66.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            this.xrTableCell66.Weight = 0.23076923076923078D;
+            // 
+            // xrTableRow43
+            // 
+            this.xrTableRow43.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell67});
+            this.xrTableRow43.Name = "xrTableRow43";
+            this.xrTableRow43.Weight = 0.085D;
+            // 
+            // xrTableCell67
+            // 
+            this.xrTableCell67.BorderColor = System.Drawing.SystemColors.ControlLight;
+            this.xrTableCell67.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell67.Name = "xrTableCell67";
+            this.xrTableCell67.StylePriority.UseBorderColor = false;
+            this.xrTableCell67.StylePriority.UseBorders = false;
+            this.xrTableCell67.Weight = 1D;
+            // 
+            // xrTableRow44
+            // 
+            this.xrTableRow44.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell68,
+            this.xrTableCell69});
+            this.xrTableRow44.Name = "xrTableRow44";
+            this.xrTableRow44.Weight = 0.085D;
+            // 
+            // xrTableCell68
+            // 
+            this.xrTableCell68.BorderColor = System.Drawing.SystemColors.ControlLight;
+            this.xrTableCell68.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell68.Name = "xrTableCell68";
+            this.xrTableCell68.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell68.StylePriority.UseBorderColor = false;
+            this.xrTableCell68.StylePriority.UseBorders = false;
+            this.xrTableCell68.StylePriority.UseFont = false;
+            this.xrTableCell68.Text = "Summe der bereits gezahlten Leistungsvergütungen:";
+            this.xrTableCell68.Weight = 0.76923076923076927D;
+            // 
+            // xrTableCell69
+            // 
+            this.xrTableCell69.BorderColor = System.Drawing.SystemColors.ControlLight;
+            this.xrTableCell69.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell69.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "AmountAdvancedPayments", "{0:c}")});
+            this.xrTableCell69.Name = "xrTableCell69";
+            this.xrTableCell69.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell69.StylePriority.UseBorderColor = false;
+            this.xrTableCell69.StylePriority.UseBorders = false;
+            this.xrTableCell69.StylePriority.UseFont = false;
+            this.xrTableCell69.StylePriority.UseTextAlignment = false;
+            this.xrTableCell69.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            this.xrTableCell69.Weight = 0.23076923076923078D;
+            // 
+            // xrTableRow45
+            // 
+            this.xrTableRow45.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell70,
+            this.xrTableCell71});
+            this.xrTableRow45.Name = "xrTableRow45";
+            this.xrTableRow45.Weight = 0.085D;
+            // 
+            // xrTableCell70
+            // 
+            this.xrTableCell70.BorderColor = System.Drawing.SystemColors.ControlLight;
+            this.xrTableCell70.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell70.Name = "xrTableCell70";
+            this.xrTableCell70.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell70.StylePriority.UseBorderColor = false;
+            this.xrTableCell70.StylePriority.UseBorders = false;
+            this.xrTableCell70.StylePriority.UseFont = false;
+            this.xrTableCell70.StylePriority.UsePadding = false;
+            this.xrTableCell70.Text = "abzüglich Eigenanteil:";
+            this.xrTableCell70.Weight = 0.76923076923076927D;
+            // 
+            // xrTableCell71
+            // 
+            this.xrTableCell71.BorderColor = System.Drawing.SystemColors.ControlLight;
+            this.xrTableCell71.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell71.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Eigenbeteiligung", "{0:c}")});
+            this.xrTableCell71.Name = "xrTableCell71";
+            this.xrTableCell71.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell71.StylePriority.UseBorderColor = false;
+            this.xrTableCell71.StylePriority.UseBorders = false;
+            this.xrTableCell71.StylePriority.UseFont = false;
+            this.xrTableCell71.StylePriority.UsePadding = false;
+            this.xrTableCell71.StylePriority.UseTextAlignment = false;
+            this.xrTableCell71.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            this.xrTableCell71.Weight = 0.23076923076923078D;
+            // 
+            // xrTableRow46
+            // 
+            this.xrTableRow46.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell72});
+            this.xrTableRow46.Name = "xrTableRow46";
+            this.xrTableRow46.Weight = 0.085D;
+            // 
+            // xrTableCell72
+            // 
+            this.xrTableCell72.BorderColor = System.Drawing.SystemColors.ControlLight;
+            this.xrTableCell72.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell72.Name = "xrTableCell72";
+            this.xrTableCell72.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell72.StylePriority.UseBorderColor = false;
+            this.xrTableCell72.StylePriority.UseBorders = false;
+            this.xrTableCell72.Weight = 1D;
+            // 
+            // xrTableRow47
+            // 
+            this.xrTableRow47.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell73,
+            this.xrTableCell74});
+            this.xrTableRow47.Name = "xrTableRow47";
+            this.xrTableRow47.Weight = 0.15D;
+            // 
+            // xrTableCell73
+            // 
+            this.xrTableCell73.BorderColor = System.Drawing.SystemColors.ControlLight;
+            this.xrTableCell73.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell73.Name = "xrTableCell73";
+            this.xrTableCell73.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell73.StylePriority.UseBorderColor = false;
+            this.xrTableCell73.StylePriority.UseBorders = false;
+            this.xrTableCell73.StylePriority.UseFont = false;
+            this.xrTableCell73.Text = "Restforderung:";
+            this.xrTableCell73.Weight = 0.76923076923076927D;
+            // 
+            // xrTableCell74
+            // 
+            this.xrTableCell74.BorderColor = System.Drawing.SystemColors.ControlLight;
+            this.xrTableCell74.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell74.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Claim", "{0:c}")});
+            this.xrTableCell74.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell74.Name = "xrTableCell74";
+            this.xrTableCell74.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell74.StylePriority.UseBorderColor = false;
+            this.xrTableCell74.StylePriority.UseBorders = false;
+            this.xrTableCell74.StylePriority.UseFont = false;
+            this.xrTableCell74.StylePriority.UseTextAlignment = false;
+            this.xrTableCell74.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            this.xrTableCell74.Weight = 0.23076923076923078D;
+            // 
+            // Spitzabrechnung
+            // 
+            this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail,
+            this.ReportHeader,
+            this.ReportFooter,
+            this.topMarginBand1,
+            this.bottomMarginBand1,
+            this.DetailReport,
+            this.GroupFooter1});
+            this.DataSource = this.bindingSource1;
+            this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
+            this.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
+            this.ruleRateFactorNull});
+            this.Margins = new System.Drawing.Printing.Margins(75, 50, 210, 70);
+            this.PageHeight = 1169;
+            this.PageWidth = 827;
+            this.PaperKind = System.Drawing.Printing.PaperKind.A4;
+            this.Version = "17.1";
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
+
+        }
+
+        #endregion
+
+        private DevExpress.XtraReports.UI.DetailBand Detail;
+        private System.Windows.Forms.BindingSource bindingSource1;
+        private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel6;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel5;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel4;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel3;
+        private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel7;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel12;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel11;
+        private DevExpress.XtraReports.UI.XRTable xrTable1;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow9;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow10;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow11;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow14;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
+        private DevExpress.XtraReports.UI.XRTable xrTable3;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow20;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow21;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell18;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow22;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell29;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow23;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell30;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow24;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell31;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel10;
+        private DevExpress.XtraReports.UI.FormattingRule ruleRateFactorNull;
+        private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
+        private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel9;
+        private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
+        private DevExpress.XtraReports.UI.XRRichText xrRichText2;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel13;
+        private DevExpress.XtraReports.UI.XRLabel lblAdresse;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel1;
+        private DevExpress.XtraReports.UI.XRRichText xrRichText1;
+        private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
+        private DevExpress.XtraReports.UI.DetailBand Detail1;
+        private DevExpress.XtraReports.UI.XRTable xrTable2;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow19;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell35;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell36;
+        private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
+        private DevExpress.XtraReports.UI.XRTable xrTable4;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow41;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell64;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow42;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell65;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell66;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow43;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell67;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow44;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell68;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell69;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow45;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell70;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell71;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow46;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell72;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow47;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell73;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell74;
+    }
+}

ReportImp/LebenshilfeAhrweiler/Sammelrechnung.Designer.cs

@@ -596,7 +596,7 @@ namespace LebenshilfeAhrweiler
             // xrTableCell16
             // 
             this.xrTableCell16.Name = "xrTableCell16";
-            this.xrTableCell16.Text = "Volksbank Koblenz Mittelrhein eG";
+            this.xrTableCell16.Text = "Volksbank RheinAhrEifel eG";
             this.xrTableCell16.Weight = 1.8181817077661129D;
             // 
             // xrTableRow4
@@ -623,13 +623,13 @@ namespace LebenshilfeAhrweiler
             // xrTableCell19
             // 
             this.xrTableCell19.Name = "xrTableCell19";
-            this.xrTableCell19.Text = "BIC";
+            this.xrTableCell19.Text = "IBAN";
             this.xrTableCell19.Weight = 0.47846886685128809D;
             // 
             // xrTableCell20
             // 
             this.xrTableCell20.Name = "xrTableCell20";
-            this.xrTableCell20.Text = "GENODE51KOB";
+            this.xrTableCell20.Text = "DE17 5776 1591 0712 6909 00";
             this.xrTableCell20.Weight = 1.3397128409148249D;
             // 
             // xrTableRow5
@@ -656,13 +656,13 @@ namespace LebenshilfeAhrweiler
             // xrTableCell23
             // 
             this.xrTableCell23.Name = "xrTableCell23";
-            this.xrTableCell23.Text = "IBAN";
+            this.xrTableCell23.Text = "BIC";
             this.xrTableCell23.Weight = 0.47846886685128809D;
             // 
             // xrTableCell24
             // 
             this.xrTableCell24.Name = "xrTableCell24";
-            this.xrTableCell24.Text = "DE09 5709 0000 7126 9090 00";
+            this.xrTableCell24.Text = "GENODED1BNA";
             this.xrTableCell24.Weight = 1.3397128409148249D;
             // 
             // bindingSource1

ReportImp/SpektrumReports/SettlementReport.cs

@@ -2,6 +2,9 @@ using System;
 using System.Drawing;
 using System.Collections;
 using System.ComponentModel;
+using System.Linq;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
 using BS.Shared.Services;
 using DevExpress.XtraReports.UI;
 using BeWo.Report.ReportObjects;
@@ -97,21 +100,36 @@ namespace BeWo.SpektrumReports.Alt
                 pRO.Betrag3 = String.Format("{0:c}", pRO.GeleisteteFLSMitStundensatzAktuell * (decimal)pRO.RateFactor * pRO.HourlyRateNew);
             }
 
-            if (pRO.HasGroupRecords)
+            if (String.IsNullOrEmpty(pRO.AbsenceTimes))
             {
-                if (!String.IsNullOrEmpty(pRO.AbsenceTimes))
-                {
-                    pRO.AbsenceTimes += "\n\n";
-                }
-                else
-                {
-                    pRO.AbsenceTimes = "";
-                }
-
-                pRO.AbsenceTimes += "Es haben Gruppenbuchungen stattgefunden.";
+                pRO.AbsenceTimes = "Es gab keine Krankenhausaufenthalte im Abrechnungszeitraum.";
             }
 
+            String gruppenStr = "Es haben keine Gruppenbuchungen stattgefunden.";
+
+            if (HatGruppen(pRO)) // pRO.HasGroupRecords)
+            {
+                gruppenStr = "Es haben Gruppenbuchungen stattgefunden.";
+            }
+
+            pRO.AbsenceTimes += "\n\n";
+                
+            pRO.AbsenceTimes += gruppenStr;
+            
+
             this.bindingSource1.DataSource = pRO;
         }
+
+        private bool HatGruppen(SettlementRO pRO)
+        {
+            if (pRO.CostBearer2SupportConceptOid > 0)
+            {
+                var cb2sc = DAOFactory.GenericDAO.LoadByID<CostBearer2SupportConcept>(pRO.CostBearer2SupportConceptOid);
+
+                return cb2sc.ServiceRecords.Any(s => s.GroupOid.HasValue && s.GroupOid.Value > 0);
+            }
+
+            return false;
+        }
     }
 }

ReportImp/SpektrumReports/SettlementReport2.cs

@@ -2,6 +2,9 @@ using System;
 using System.Drawing;
 using System.Collections;
 using System.ComponentModel;
+using System.Linq;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
 using DevExpress.XtraReports.UI;
 using BeWo.Report.ReportObjects;
 using BeWo.Report;
@@ -37,20 +40,36 @@ namespace BeWo.SpektrumReports
 				pRO.FinalSentence = "Wir bitten um Verrechnung.";
 			}
 
-            if (pRO.HasGroupRecords)
+            if (String.IsNullOrEmpty(pRO.AbsenceTimes))
             {
-                if (!String.IsNullOrEmpty(pRO.AbsenceTimes))
-                {
-                    pRO.AbsenceTimes += "\n\n";
-                }
-                else
-                {
-                    pRO.AbsenceTimes = "";
-                }
-
-                pRO.AbsenceTimes += "Es haben Gruppenbuchungen stattgefunden.";
+                pRO.AbsenceTimes = "Es gab keine Krankenhausaufenthalte im Abrechnungszeitraum.";
             }
+
+            String gruppenStr = "Es haben keine Gruppenbuchungen stattgefunden.";
+
+            if (HatGruppen(pRO)) // pRO.HasGroupRecords)
+            {
+                gruppenStr = "Es haben Gruppenbuchungen stattgefunden.";
+            }
+
+            pRO.AbsenceTimes += "\n\n";
+
+            pRO.AbsenceTimes += gruppenStr;
+            
             this.bindingSource1.DataSource = pRO;
         }
+
+        private bool HatGruppen(Settlement2RO pRO)
+        {
+            if (pRO.InvoiceBaseOid.HasValue)
+            {
+                var ib = DAOFactory.GenericDAO.LoadByID<InvoiceBase>(pRO.InvoiceBaseOid.Value);
+                var cb2sc = ib.CostBearer2SupportConcept;
+
+                return cb2sc.ServiceRecords.Any(s => s.GroupOid.HasValue && s.GroupOid.Value > 0);
+            }
+
+            return false;
+        }
     }
 }

ReportImp/TranskulturellesBBPastor/ServicesOverviewReport.Designer.cs

@@ -35,7 +35,7 @@ namespace BeWo.TranskulturellesBBPastor
             this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.cellMinutenFLSHeader = new DevExpress.XtraReports.UI.XRTableCell();
             this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
             this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
             this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
@@ -43,7 +43,6 @@ namespace BeWo.TranskulturellesBBPastor
             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.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
             this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
             this.xrLabel28 = new DevExpress.XtraReports.UI.XRLabel();
@@ -75,16 +74,17 @@ namespace BeWo.TranskulturellesBBPastor
             this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
+            this.cellGesamtFaktor = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
+            this.cellGesamt = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
             this.fieldAbrechenbareMinuten = new DevExpress.XtraReports.UI.CalculatedField();
             this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField();
             this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField();
             this.fieldGroupHours = new DevExpress.XtraReports.UI.CalculatedField();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -122,7 +122,7 @@ namespace BeWo.TranskulturellesBBPastor
             this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
             this.xrTableCell3,
             this.xrTableCell4,
-            this.xrTableCell11});
+            this.cellMinutenFLSHeader});
             this.xrTableRow2.Name = "xrTableRow2";
             this.xrTableRow2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
             this.xrTableRow2.StylePriority.UseTextAlignment = false;
@@ -147,15 +147,15 @@ namespace BeWo.TranskulturellesBBPastor
             this.xrTableCell4.Text = "Uhrzeit";
             this.xrTableCell4.Weight = 0.45659584837553346D;
             // 
-            // xrTableCell11
+            // cellMinutenFLSHeader
             // 
-            this.xrTableCell11.Multiline = true;
-            this.xrTableCell11.Name = "xrTableCell11";
-            this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
-            this.xrTableCell11.StylePriority.UseFont = false;
-            this.xrTableCell11.StylePriority.UseTextAlignment = false;
-            this.xrTableCell11.Text = "Geleistete FLS";
-            this.xrTableCell11.Weight = 0.54791502162310768D;
+            this.cellMinutenFLSHeader.Multiline = true;
+            this.cellMinutenFLSHeader.Name = "cellMinutenFLSHeader";
+            this.cellMinutenFLSHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+            this.cellMinutenFLSHeader.StylePriority.UseFont = false;
+            this.cellMinutenFLSHeader.StylePriority.UseTextAlignment = false;
+            this.cellMinutenFLSHeader.Text = "Geleistete FLS";
+            this.cellMinutenFLSHeader.Weight = 0.54791502162310768D;
             // 
             // DetailReport
             // 
@@ -233,7 +233,7 @@ namespace BeWo.TranskulturellesBBPastor
             // xrTableCell15
             // 
             this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.fieldGroupHours", "{0:0.##}")});
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Minutes", "{0:0.##}")});
             this.xrTableCell15.Name = "xrTableCell15";
             this.xrTableCell15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
             this.xrTableCell15.StylePriority.UseFont = false;
@@ -243,10 +243,6 @@ namespace BeWo.TranskulturellesBBPastor
             this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
             this.xrTableCell15.Weight = 0.283693213636449D;
             // 
-            // bindingSource1
-            // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
-            // 
             // formattingRuleStartDate
             // 
             this.formattingRuleStartDate.Condition = "[StartDate2]  < [StartDate]";
@@ -576,11 +572,11 @@ namespace BeWo.TranskulturellesBBPastor
             this.xrLabel17,
             this.xrLabel16,
             this.xrLabel5,
-            this.xrLabel11,
+            this.cellGesamtFaktor,
             this.xrLabel8,
             this.xrLabel7,
             this.xrLabel6,
-            this.xrLabel4,
+            this.cellGesamt,
             this.xrLabel3});
             this.ReportFooter.Font = new System.Drawing.Font("Times New Roman", 11F);
             this.ReportFooter.HeightF = 265.7499F;
@@ -639,24 +635,23 @@ namespace BeWo.TranskulturellesBBPastor
             this.xrLabel5.StylePriority.UseFont = false;
             this.xrLabel5.Text = "Datum:";
             // 
-            // xrLabel11
+            // cellGesamtFaktor
             // 
-            this.xrLabel11.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            this.cellGesamtFaktor.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrLabel11.BorderWidth = 2F;
-            this.xrLabel11.Font = new System.Drawing.Font("Times New Roman", 11F, System.Drawing.FontStyle.Bold);
-            this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(300F, 25F);
-            this.xrLabel11.Name = "xrLabel11";
-            this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
-            this.xrLabel11.SizeF = new System.Drawing.SizeF(180.0001F, 25F);
-            this.xrLabel11.StylePriority.UseBorders = false;
-            this.xrLabel11.StylePriority.UseBorderWidth = false;
-            this.xrLabel11.StylePriority.UseFont = false;
-            this.xrLabel11.StylePriority.UsePadding = false;
-            this.xrLabel11.StylePriority.UseTextAlignment = false;
-            this.xrLabel11.Text = "[fieldAbrechenbareFLS!0.##]";
-            this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.cellGesamtFaktor.BorderWidth = 2F;
+            this.cellGesamtFaktor.Font = new System.Drawing.Font("Times New Roman", 11F, System.Drawing.FontStyle.Bold);
+            this.cellGesamtFaktor.LocationFloat = new DevExpress.Utils.PointFloat(300F, 25F);
+            this.cellGesamtFaktor.Name = "cellGesamtFaktor";
+            this.cellGesamtFaktor.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
+            this.cellGesamtFaktor.SizeF = new System.Drawing.SizeF(180.0001F, 25F);
+            this.cellGesamtFaktor.StylePriority.UseBorders = false;
+            this.cellGesamtFaktor.StylePriority.UseBorderWidth = false;
+            this.cellGesamtFaktor.StylePriority.UseFont = false;
+            this.cellGesamtFaktor.StylePriority.UsePadding = false;
+            this.cellGesamtFaktor.StylePriority.UseTextAlignment = false;
+            this.cellGesamtFaktor.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
             // 
             // xrLabel8
             // 
@@ -692,24 +687,23 @@ namespace BeWo.TranskulturellesBBPastor
             this.xrLabel6.StylePriority.UseFont = false;
             this.xrLabel6.Text = "Unterschrift Betreuer:";
             // 
-            // xrLabel4
+            // cellGesamt
             // 
-            this.xrLabel4.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            this.cellGesamt.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrLabel4.BorderWidth = 2F;
-            this.xrLabel4.Font = new System.Drawing.Font("Times New Roman", 11F, System.Drawing.FontStyle.Bold);
-            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(300F, 0F);
-            this.xrLabel4.Name = "xrLabel4";
-            this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
-            this.xrLabel4.SizeF = new System.Drawing.SizeF(180F, 25F);
-            this.xrLabel4.StylePriority.UseBorders = false;
-            this.xrLabel4.StylePriority.UseBorderWidth = false;
-            this.xrLabel4.StylePriority.UseFont = false;
-            this.xrLabel4.StylePriority.UsePadding = false;
-            this.xrLabel4.StylePriority.UseTextAlignment = false;
-            this.xrLabel4.Text = "[fieldBillableFLS!0.##]";
-            this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.cellGesamt.BorderWidth = 2F;
+            this.cellGesamt.Font = new System.Drawing.Font("Times New Roman", 11F, System.Drawing.FontStyle.Bold);
+            this.cellGesamt.LocationFloat = new DevExpress.Utils.PointFloat(300F, 0F);
+            this.cellGesamt.Name = "cellGesamt";
+            this.cellGesamt.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
+            this.cellGesamt.SizeF = new System.Drawing.SizeF(180F, 25F);
+            this.cellGesamt.StylePriority.UseBorders = false;
+            this.cellGesamt.StylePriority.UseBorderWidth = false;
+            this.cellGesamt.StylePriority.UseFont = false;
+            this.cellGesamt.StylePriority.UsePadding = false;
+            this.cellGesamt.StylePriority.UseTextAlignment = false;
+            this.cellGesamt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
             // 
             // xrLabel3
             // 
@@ -745,10 +739,13 @@ namespace BeWo.TranskulturellesBBPastor
             // fieldGroupHours
             // 
             this.fieldGroupHours.DataMember = "Services";
-            this.fieldGroupHours.Expression = "[GroupMinutes] / 60";
             this.fieldGroupHours.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
             this.fieldGroupHours.Name = "fieldGroupHours";
             // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
+            // 
             // Stundenzettel
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -798,7 +795,7 @@ namespace BeWo.TranskulturellesBBPastor
         private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
+        private DevExpress.XtraReports.UI.XRTableCell cellMinutenFLSHeader;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
         private DevExpress.XtraReports.UI.FormattingRule formattingRuleStartDate;
         private DevExpress.XtraReports.UI.FormattingRule formattingRuleServiceDesc;
@@ -823,13 +820,13 @@ namespace BeWo.TranskulturellesBBPastor
         private DevExpress.XtraReports.UI.XRLabel xrLabel22;
         private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter;
         private DevExpress.XtraReports.UI.CalculatedField fieldAbrechenbareMinuten;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel4;
+        private DevExpress.XtraReports.UI.XRLabel cellGesamt;
         private DevExpress.XtraReports.UI.XRLabel xrLabel3;
         private DevExpress.XtraReports.UI.XRLabel xrLabel6;
         private DevExpress.XtraReports.UI.XRLabel xrLabel7;
         private DevExpress.XtraReports.UI.XRLabel xrLabel10;
         private DevExpress.XtraReports.UI.XRLabel xrLabel8;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel11;
+        private DevExpress.XtraReports.UI.XRLabel cellGesamtFaktor;
         private DevExpress.XtraReports.UI.CalculatedField fieldBillableFLS;
         private DevExpress.XtraReports.UI.CalculatedField fieldAbrechenbareFLS;
         private DevExpress.XtraReports.UI.CalculatedField fieldGroupHours;

ReportImp/TranskulturellesBBPastor/ServicesOverviewReport.cs

@@ -17,6 +17,11 @@ namespace BeWo.TranskulturellesBBPastor
 
         public void SetReportDataSource(ServicesOverviewRO pRO)
         {
+            bool showMinutes = true;
+            if (pRO.StartDate < new DateTime(2019, 1, 1))
+            {
+                showMinutes = false;
+            }
             if (pRO.Services != null)
             {
                 List<ServicesOverviewRO.ServiceDetail> servicesBillable = new List<ServicesOverviewRO.ServiceDetail>();
@@ -24,12 +29,31 @@ namespace BeWo.TranskulturellesBBPastor
                 foreach (ServicesOverviewRO.ServiceDetail s in pRO.Services)
                 {
                     if (s.IsBillable)
+                    {
+                        if (!showMinutes)
+                        {
+                            s.Minutes = s.Minutes / 60;
+                        }
                         servicesBillable.Add(s);
+                    }
                 }
 
                 pRO.Services = servicesBillable;
             }
 
+            if (showMinutes)
+            {
+                cellMinutenFLSHeader.Text = "Geleistete Minuten";
+
+                cellGesamt.Text = String.Format("{0:0.##}", pRO.TotalFLMBillable);
+                cellGesamtFaktor.Text = String.Format("{0:0.##}", pRO.TotalFLMBillable * 1.2);
+            }
+            else
+            {
+                cellGesamt.Text = String.Format("{0:0.##}", pRO.TotalFLMBillable / 60);
+                cellGesamtFaktor.Text = String.Format("{0:0.##}", (pRO.TotalFLMBillable / 60) * 1.2);
+            }
+
             this.bindingSource1.DataSource = pRO;
         }
     }

ReportImp/VkmHamm/Finanzauswertung.cs

@@ -0,0 +1,74 @@
+using System;
+using System.Linq;
+using BS.Shared;
+using BeWo.Report;
+using BeWo.Report.ReportObjects;
+using BeWo.Data.Entities;
+using BeWo.Data.Access;
+using System.Collections.Generic;
+using BS.Shared.Core;
+using BS.Shared.Services;
+using BS.Shared.DataContracts;
+using BeWo.Service.DCEntityMapper;
+using BeWo.Service.ServiceImplementations;
+
+namespace VkmHamm
+{
+	public partial class Finanzauswertung : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<FinanceRO>
+    {
+        public Finanzauswertung()
+        {
+            InitializeComponent();
+        }
+
+		public void SetReportDataSource(FinanceRO pRO)
+        {
+            pRO.CalculateBillableAmountInReportTimeSpan();
+            pRO.CalculatePaidAmountInReportTimeSpan();
+
+            if (pRO.ReportStartDate.HasValue && pRO.ReportEndDate.HasValue)
+			{
+				DateTime start = pRO.ReportStartDate.Value;
+				DateTime end = pRO.ReportEndDate.Value;
+
+				if (start.Year == end.Year && start.Month == end.Month && start.Day == 1 &&
+				    end.Day == DateTime.DaysInMonth(end.Year, end.Month))
+				{
+					lblTitel.Text = String.Format("Finanzauswertung {0:MMMM yyyy}", start);
+					cellBewilligtImZeitraumHeader.Text = String.Format("bewilligte FLS {0:MMMM}", start);
+					cellGeleistetImZeitraumHeader.Text = String.Format("geleistete Std. {0:MMMM}", start);
+					
+				}
+				else
+				{
+					lblTitel.Text = String.Format("Finanzauswertung {0:dd.MM.yyyy}-{1:dd.MM.yyyy}", start, end);
+					cellBewilligtImZeitraumHeader.Text = String.Format("bewilligte FLS {0:dd.MM.yyyy}-{1:dd.MM.yyyy}", start, end);
+					cellGeleistetImZeitraumHeader.Text = String.Format("geleistete Std. {0:dd.MM.yyyy}-{1:dd.MM.yyyy}", start, end);
+					
+				}
+				if (pRO.RateFactor.HasValue)
+				{
+					cellRateFactorHeader.Text = String.Format("geleistete Std. x {0:0.##}", pRO.RateFactor);
+				}
+				else
+				{
+					cellRateFactorHeader.Visible = false;
+					cellRateFactor.Visible = false;
+				}
+				
+			}
+			else
+			{
+				cellBewilligtImZeitraumHeader.Visible = false;
+				cellBewilligteFLSImBereich.Visible = false;
+				cellGeleistetImBereich.Visible = false;
+				cellGeleistetImZeitraumHeader.Visible = false;
+				cellRateFactorHeader.Visible = false;
+				cellRateFactor.Visible = false;
+			}
+            this.bindingSource1.DataSource = pRO;
+        }
+
+    }
+
+}

ReportImp/VkmHamm/Finanzauswertung.designer.cs

@@ -0,0 +1,735 @@
+using BeWo.Report.ReportObjects;
+namespace VkmHamm
+{
+    partial class Finanzauswertung
+    {
+        /// <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();
+            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 xrSummary4 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary5 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary6 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary7 = new DevExpress.XtraReports.UI.XRSummary();
+            this.Detail = new DevExpress.XtraReports.UI.DetailBand();
+            this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
+            this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.cellBewilligteFLSImBereich = new DevExpress.XtraReports.UI.XRTableCell();
+            this.cellGeleistetImBereich = new DevExpress.XtraReports.UI.XRTableCell();
+            this.cellRateFactor = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.lblTitel = new DevExpress.XtraReports.UI.XRLabel();
+            this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
+            this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
+            this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+            this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.cellBewilligtImZeitraumHeader = new DevExpress.XtraReports.UI.XRTableCell();
+            this.cellGeleistetImZeitraumHeader = new DevExpress.XtraReports.UI.XRTableCell();
+            this.cellRateFactorHeader = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand();
+            this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell16 = 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.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
+            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();
+            this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
+            this.TESTPARAMTER = new DevExpress.XtraReports.Parameters.Parameter();
+            this.parameter1 = new DevExpress.XtraReports.Parameters.Parameter();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
+            // 
+            // Detail
+            // 
+            this.Detail.Expanded = false;
+            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;
+            // 
+            // Detail1
+            // 
+            this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable2});
+            this.Detail1.Font = new System.Drawing.Font("Arial", 9F);
+            this.Detail1.HeightF = 25F;
+            this.Detail1.KeepTogetherWithDetailReports = true;
+            this.Detail1.Name = "Detail1";
+            this.Detail1.StylePriority.UseFont = false;
+            // 
+            // xrTable2
+            // 
+            this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTable2.Name = "xrTable2";
+            this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
+            this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow2});
+            this.xrTable2.SizeF = new System.Drawing.SizeF(1045F, 25F);
+            this.xrTable2.StylePriority.UseBorders = false;
+            this.xrTable2.StylePriority.UseFont = false;
+            this.xrTable2.StylePriority.UsePadding = false;
+            this.xrTable2.StylePriority.UseTextAlignment = false;
+            this.xrTable2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrTableRow2
+            // 
+            this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell6,
+            this.xrTableCell7,
+            this.xrTableCell14,
+            this.xrTableCell12,
+            this.cellBewilligteFLSImBereich,
+            this.cellGeleistetImBereich,
+            this.cellRateFactor,
+            this.xrTableCell26,
+            this.xrTableCell29});
+            this.xrTableRow2.Name = "xrTableRow2";
+            this.xrTableRow2.Weight = 1D;
+            // 
+            // xrTableCell6
+            // 
+            this.xrTableCell6.Multiline = true;
+            this.xrTableCell6.Name = "xrTableCell6";
+            this.xrTableCell6.Text = "[CustomerName]\r\n[SupportConceptTimeSpanString]";
+            this.xrTableCell6.Weight = 0.77548005330891345D;
+            // 
+            // xrTableCell7
+            // 
+            this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.CostBearerName")});
+            this.xrTableCell7.Name = "xrTableCell7";
+            this.xrTableCell7.StylePriority.UseTextAlignment = false;
+            this.xrTableCell7.Text = "Mitarbeiter/in";
+            this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell7.Weight = 0.53175775292681982D;
+            // 
+            // xrTableCell14
+            // 
+            this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHours", "{0:0.00}")});
+            this.xrTableCell14.Name = "xrTableCell14";
+            this.xrTableCell14.StylePriority.UseTextAlignment = false;
+            this.xrTableCell14.Text = "xrTableCell14";
+            this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell14.Weight = 1.3293943943935551D;
+            // 
+            // xrTableCell12
+            // 
+            this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHours", "{0:0.00}")});
+            this.xrTableCell12.Name = "xrTableCell12";
+            this.xrTableCell12.StylePriority.UseTextAlignment = false;
+            this.xrTableCell12.Text = "xrTableCell12";
+            this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell12.Weight = 0.33234859687786877D;
+            // 
+            // cellBewilligteFLSImBereich
+            // 
+            this.cellBewilligteFLSImBereich.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHoursInReportTimeSpan", "{0:0.00}")});
+            this.cellBewilligteFLSImBereich.Name = "cellBewilligteFLSImBereich";
+            this.cellBewilligteFLSImBereich.StylePriority.UseTextAlignment = false;
+            this.cellBewilligteFLSImBereich.Text = "cellBewilligteFLSImBereich";
+            this.cellBewilligteFLSImBereich.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.cellBewilligteFLSImBereich.Weight = 0.33234859681404305D;
+            // 
+            // cellGeleistetImBereich
+            // 
+            this.cellGeleistetImBereich.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHoursInReportTimeSpan", "{0:0.00}")});
+            this.cellGeleistetImBereich.Name = "cellGeleistetImBereich";
+            this.cellGeleistetImBereich.StylePriority.UseTextAlignment = false;
+            this.cellGeleistetImBereich.Text = "cellGeleistetImBereich";
+            this.cellGeleistetImBereich.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.cellGeleistetImBereich.Weight = 0.33234859678213013D;
+            // 
+            // cellRateFactor
+            // 
+            this.cellRateFactor.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHoursInReportTimeSpanWithFactor", "{0:0.00}")});
+            this.cellRateFactor.Name = "cellRateFactor";
+            this.cellRateFactor.StylePriority.UseTextAlignment = false;
+            this.cellRateFactor.Text = "cellRateFactor";
+            this.cellRateFactor.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.cellRateFactor.Weight = 0.33234859678213019D;
+            // 
+            // xrTableCell26
+            // 
+            this.xrTableCell26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableAmountInReportTimeSpan", "{0:c}")});
+            this.xrTableCell26.Name = "xrTableCell26";
+            this.xrTableCell26.StylePriority.UseTextAlignment = false;
+            this.xrTableCell26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell26.Weight = 0.33234859678213008D;
+            // 
+            // xrTableCell29
+            // 
+            this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.AmountPaidInReportTimeSpan", "{0:c}")});
+            this.xrTableCell29.Name = "xrTableCell29";
+            this.xrTableCell29.StylePriority.UseTextAlignment = false;
+            this.xrTableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell29.Weight = 0.33234859678213008D;
+            // 
+            // lblTitel
+            // 
+            this.lblTitel.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
+            this.lblTitel.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00001F);
+            this.lblTitel.Name = "lblTitel";
+            this.lblTitel.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblTitel.SizeF = new System.Drawing.SizeF(1030F, 23F);
+            this.lblTitel.StylePriority.UseFont = false;
+            this.lblTitel.Text = "Finanzauswertung";
+            // 
+            // DetailReport
+            // 
+            this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail1,
+            this.GroupFooter1,
+            this.GroupHeader2,
+            this.GroupFooter2});
+            this.DetailReport.DataMember = "SupportConceptFinanceList";
+            this.DetailReport.DataSource = this.bindingSource1;
+            this.DetailReport.Level = 0;
+            this.DetailReport.Name = "DetailReport";
+            // 
+            // GroupFooter1
+            // 
+            this.GroupFooter1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+            this.GroupFooter1.HeightF = 0F;
+            this.GroupFooter1.Name = "GroupFooter1";
+            this.GroupFooter1.StylePriority.UseFont = false;
+            // 
+            // GroupHeader2
+            // 
+            this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable1});
+            this.GroupHeader2.HeightF = 50F;
+            this.GroupHeader2.Name = "GroupHeader2";
+            this.GroupHeader2.RepeatEveryPage = true;
+            // 
+            // xrTable1
+            // 
+            this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTable1.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
+            this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTable1.Name = "xrTable1";
+            this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
+            this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow1});
+            this.xrTable1.SizeF = new System.Drawing.SizeF(1045F, 50F);
+            this.xrTable1.StylePriority.UseBorders = false;
+            this.xrTable1.StylePriority.UseFont = false;
+            this.xrTable1.StylePriority.UsePadding = false;
+            this.xrTable1.StylePriority.UseTextAlignment = false;
+            this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrTableRow1
+            // 
+            this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell1,
+            this.xrTableCell2,
+            this.xrTableCell13,
+            this.xrTableCell11,
+            this.cellBewilligtImZeitraumHeader,
+            this.cellGeleistetImZeitraumHeader,
+            this.cellRateFactorHeader,
+            this.xrTableCell25,
+            this.xrTableCell28});
+            this.xrTableRow1.Name = "xrTableRow1";
+            this.xrTableRow1.Weight = 1.3953493323567705D;
+            // 
+            // xrTableCell1
+            // 
+            this.xrTableCell1.Name = "xrTableCell1";
+            this.xrTableCell1.Text = "KlientIn/Hilfeplan";
+            this.xrTableCell1.Weight = 0.77548005330891345D;
+            // 
+            // xrTableCell2
+            // 
+            this.xrTableCell2.Name = "xrTableCell2";
+            this.xrTableCell2.StylePriority.UseTextAlignment = false;
+            this.xrTableCell2.Text = "Kostenträger";
+            this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell2.Weight = 0.53175775292681959D;
+            // 
+            // xrTableCell13
+            // 
+            this.xrTableCell13.Name = "xrTableCell13";
+            this.xrTableCell13.StylePriority.UseTextAlignment = false;
+            this.xrTableCell13.Text = "Bis dato bewilligte FLS";
+            this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell13.Weight = 1.3293943943935549D;
+            // 
+            // xrTableCell11
+            // 
+            this.xrTableCell11.Name = "xrTableCell11";
+            this.xrTableCell11.StylePriority.UseTextAlignment = false;
+            this.xrTableCell11.Text = "Bis dato geleistete FLS";
+            this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell11.Weight = 0.33234859687786883D;
+            // 
+            // cellBewilligtImZeitraumHeader
+            // 
+            this.cellBewilligtImZeitraumHeader.Name = "cellBewilligtImZeitraumHeader";
+            this.cellBewilligtImZeitraumHeader.StylePriority.UseTextAlignment = false;
+            this.cellBewilligtImZeitraumHeader.Text = "bewilligte FLS";
+            this.cellBewilligtImZeitraumHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.cellBewilligtImZeitraumHeader.Weight = 0.332348596814043D;
+            // 
+            // cellGeleistetImZeitraumHeader
+            // 
+            this.cellGeleistetImZeitraumHeader.Name = "cellGeleistetImZeitraumHeader";
+            this.cellGeleistetImZeitraumHeader.StylePriority.UseTextAlignment = false;
+            this.cellGeleistetImZeitraumHeader.Text = "geleistete FLS";
+            this.cellGeleistetImZeitraumHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.cellGeleistetImZeitraumHeader.Weight = 0.33234859678213D;
+            // 
+            // cellRateFactorHeader
+            // 
+            this.cellRateFactorHeader.Name = "cellRateFactorHeader";
+            this.cellRateFactorHeader.StylePriority.UseTextAlignment = false;
+            this.cellRateFactorHeader.Text = "geleistete Std. x 1,2";
+            this.cellRateFactorHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.cellRateFactorHeader.Weight = 0.33234859678213019D;
+            // 
+            // xrTableCell25
+            // 
+            this.xrTableCell25.Multiline = true;
+            this.xrTableCell25.Name = "xrTableCell25";
+            this.xrTableCell25.StylePriority.UseTextAlignment = false;
+            this.xrTableCell25.Text = "zu erwartende\r\nAbschläge";
+            this.xrTableCell25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell25.Weight = 0.33234859678213019D;
+            // 
+            // xrTableCell28
+            // 
+            this.xrTableCell28.Name = "xrTableCell28";
+            this.xrTableCell28.StylePriority.UseTextAlignment = false;
+            this.xrTableCell28.Text = "Bezahlt";
+            this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell28.Weight = 0.33234859678213019D;
+            // 
+            // GroupFooter2
+            // 
+            this.GroupFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable3});
+            this.GroupFooter2.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
+            this.GroupFooter2.HeightF = 25F;
+            this.GroupFooter2.Level = 1;
+            this.GroupFooter2.Name = "GroupFooter2";
+            this.GroupFooter2.StylePriority.UseFont = false;
+            // 
+            // xrTable3
+            // 
+            this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTable3.Name = "xrTable3";
+            this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
+            this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow3});
+            this.xrTable3.SizeF = new System.Drawing.SizeF(1045F, 25F);
+            this.xrTable3.StylePriority.UseBorders = false;
+            this.xrTable3.StylePriority.UseFont = false;
+            this.xrTable3.StylePriority.UsePadding = false;
+            this.xrTable3.StylePriority.UseTextAlignment = false;
+            this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrTableRow3
+            // 
+            this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell15,
+            this.xrTableCell16,
+            this.xrTableCell20,
+            this.xrTableCell21,
+            this.xrTableCell22,
+            this.xrTableCell23,
+            this.xrTableCell24,
+            this.xrTableCell27,
+            this.xrTableCell30});
+            this.xrTableRow3.Name = "xrTableRow3";
+            this.xrTableRow3.Weight = 1D;
+            // 
+            // xrTableCell15
+            // 
+            this.xrTableCell15.CanGrow = false;
+            this.xrTableCell15.Multiline = true;
+            this.xrTableCell15.Name = "xrTableCell15";
+            this.xrTableCell15.Weight = 0.77548005330891345D;
+            // 
+            // xrTableCell16
+            // 
+            this.xrTableCell16.CanGrow = false;
+            this.xrTableCell16.Name = "xrTableCell16";
+            this.xrTableCell16.StylePriority.UseTextAlignment = false;
+            this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell16.Weight = 0.53175775292681982D;
+            // 
+            // xrTableCell20
+            // 
+            this.xrTableCell20.CanGrow = false;
+            this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHours")});
+            this.xrTableCell20.Name = "xrTableCell20";
+            this.xrTableCell20.StylePriority.UseTextAlignment = false;
+            xrSummary1.FormatString = "{0:0.00}";
+            xrSummary1.IgnoreNullValues = true;
+            xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell20.Summary = xrSummary1;
+            this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell20.Weight = 1.3293943943935551D;
+            // 
+            // xrTableCell21
+            // 
+            this.xrTableCell21.CanGrow = false;
+            this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHours")});
+            this.xrTableCell21.Name = "xrTableCell21";
+            this.xrTableCell21.StylePriority.UseTextAlignment = false;
+            xrSummary2.FormatString = "{0:0.00}";
+            xrSummary2.IgnoreNullValues = true;
+            xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell21.Summary = xrSummary2;
+            this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell21.Weight = 0.33234859687786888D;
+            // 
+            // xrTableCell22
+            // 
+            this.xrTableCell22.CanGrow = false;
+            this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHoursInReportTimeSpan")});
+            this.xrTableCell22.Name = "xrTableCell22";
+            this.xrTableCell22.StylePriority.UseTextAlignment = false;
+            xrSummary3.FormatString = "{0:0.00}";
+            xrSummary3.IgnoreNullValues = true;
+            xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell22.Summary = xrSummary3;
+            this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell22.Weight = 0.33234859681404305D;
+            // 
+            // xrTableCell23
+            // 
+            this.xrTableCell23.CanGrow = false;
+            this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHoursInReportTimeSpan")});
+            this.xrTableCell23.Name = "xrTableCell23";
+            this.xrTableCell23.StylePriority.UseTextAlignment = false;
+            xrSummary4.FormatString = "{0:0.00}";
+            xrSummary4.IgnoreNullValues = true;
+            xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell23.Summary = xrSummary4;
+            this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell23.Weight = 0.33234859678213013D;
+            // 
+            // xrTableCell24
+            // 
+            this.xrTableCell24.CanGrow = false;
+            this.xrTableCell24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHoursInReportTimeSpanWithFactor")});
+            this.xrTableCell24.Name = "xrTableCell24";
+            this.xrTableCell24.StylePriority.UseTextAlignment = false;
+            xrSummary5.FormatString = "{0:0.00}";
+            xrSummary5.IgnoreNullValues = true;
+            xrSummary5.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell24.Summary = xrSummary5;
+            this.xrTableCell24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell24.Weight = 0.33234859678213019D;
+            // 
+            // xrTableCell27
+            // 
+            this.xrTableCell27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableAmountInReportTimeSpan")});
+            this.xrTableCell27.Name = "xrTableCell27";
+            this.xrTableCell27.StylePriority.UseTextAlignment = false;
+            xrSummary6.FormatString = "{0:c}";
+            xrSummary6.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell27.Summary = xrSummary6;
+            this.xrTableCell27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell27.Weight = 0.33234859678213019D;
+            // 
+            // xrTableCell30
+            // 
+            this.xrTableCell30.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.AmountPaidInReportTimeSpan")});
+            this.xrTableCell30.Name = "xrTableCell30";
+            this.xrTableCell30.StylePriority.UseTextAlignment = false;
+            xrSummary7.FormatString = "{0:c}";
+            xrSummary7.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell30.Summary = xrSummary7;
+            this.xrTableCell30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell30.Weight = 0.33234859678213019D;
+            // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.FinanceRO);
+            // 
+            // ReportHeader
+            // 
+            this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.lblTitel});
+            this.ReportHeader.HeightF = 52.08333F;
+            this.ReportHeader.Name = "ReportHeader";
+            // 
+            // 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 System.Drawing.Font("Arial", 8F);
+            this.xrPageInfo2.Format = "Seite {0} von {1}";
+            this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(969.9999F, 25F);
+            this.xrPageInfo2.Name = "xrPageInfo2";
+            this.xrPageInfo2.SizeF = new System.Drawing.SizeF(75.00006F, 23F);
+            this.xrPageInfo2.StyleName = "PageInfo";
+            this.xrPageInfo2.StylePriority.UseFont = false;
+            this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            // 
+            // xrPageInfo1
+            // 
+            this.xrPageInfo1.Font = new System.Drawing.Font("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(294.9999F, 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 System.Drawing.Font("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 System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.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 System.Drawing.Font("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 System.Drawing.Font("Times New Roman", 8F);
+            this.DataField.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.DataField.Name = "DataField";
+            // 
+            // fieldFLS
+            // 
+            this.fieldFLS.DataMember = "FLSReportGroups";
+            this.fieldFLS.DataSource = this.bindingSource1;
+            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 = 30F;
+            this.bottomMarginBand1.Name = "bottomMarginBand1";
+            // 
+            // ReportFooter
+            // 
+            this.ReportFooter.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.ReportFooter.HeightF = 31.25F;
+            this.ReportFooter.Name = "ReportFooter";
+            this.ReportFooter.StylePriority.UseFont = false;
+            // 
+            // TESTPARAMTER
+            // 
+            this.TESTPARAMTER.Description = "zrdz";
+            this.TESTPARAMTER.Name = "TESTPARAMTER";
+            this.TESTPARAMTER.ValueInfo = "blabla standard";
+            // 
+            // parameter1
+            // 
+            this.parameter1.Description = "Parameter1";
+            this.parameter1.Name = "parameter1";
+            this.parameter1.Type = typeof(bool);
+            this.parameter1.ValueInfo = "False";
+            // 
+            // Finanzauswertung
+            // 
+            this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail,
+            this.DetailReport,
+            this.ReportHeader,
+            this.pageFooterBand1,
+            this.topMarginBand1,
+            this.bottomMarginBand1,
+            this.ReportFooter});
+            this.DataSource = this.bindingSource1;
+            this.Landscape = true;
+            this.Margins = new System.Drawing.Printing.Margins(60, 55, 50, 30);
+            this.PageHeight = 827;
+            this.PageWidth = 1169;
+            this.PaperKind = System.Drawing.Printing.PaperKind.A4;
+            this.Parameters.AddRange(new DevExpress.XtraReports.Parameters.Parameter[] {
+            this.TESTPARAMTER,
+            this.parameter1});
+            this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] {
+            this.Title,
+            this.FieldCaption,
+            this.PageInfo,
+            this.DataField});
+            this.Version = "17.1";
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
+
+        }
+
+        #endregion
+
+        private DevExpress.XtraReports.UI.DetailBand Detail;
+        private System.Windows.Forms.BindingSource bindingSource1;
+        private DevExpress.XtraReports.UI.DetailBand Detail1;
+        private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
+        private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
+        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.CalculatedField fieldFLS;
+        private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
+        private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
+        private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
+        private DevExpress.XtraReports.UI.XRLabel lblTitel;
+        private DevExpress.XtraReports.UI.XRTable xrTable2;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
+        private DevExpress.XtraReports.UI.XRTable xrTable1;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
+        private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
+        private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
+		private DevExpress.XtraReports.UI.XRTableCell cellBewilligteFLSImBereich;
+		private DevExpress.XtraReports.UI.XRTableCell cellGeleistetImBereich;
+		private DevExpress.XtraReports.UI.XRTableCell cellBewilligtImZeitraumHeader;
+		private DevExpress.XtraReports.UI.XRTableCell cellGeleistetImZeitraumHeader;
+		private DevExpress.XtraReports.Parameters.Parameter TESTPARAMTER;
+		private DevExpress.XtraReports.Parameters.Parameter parameter1;
+		private DevExpress.XtraReports.UI.XRTableCell cellRateFactorHeader;
+		private DevExpress.XtraReports.UI.XRTableCell cellRateFactor;
+		private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter2;
+		private DevExpress.XtraReports.UI.XRTable xrTable3;
+		private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell23;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell24;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell25;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell26;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell27;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell29;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell28;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell30;
+    }
+}

ReportImp/VkmHamm/Finanzauswertung.resx

@@ -0,0 +1,123 @@
+<?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>
+  <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/VkmHamm/Mitarbeiterstunden.cs

@@ -50,7 +50,13 @@ namespace VkmHamm
 								{
 									foreach (var sd in rd.ServiceRecords)
 									{
-										rg.ServiceRecords.Add(sd);
+									    if (sd.ServiceRecordOid.HasValue && sd.ServiceRecordOid.Value > 0)
+									    {
+									        var sr = DAOFactory.GenericDAO.LoadByID<ServiceRecord>(sd.ServiceRecordOid.Value);
+									        sd.CustomValue1 = String.Format("{0:dd.MM.yyyy}", sr.InsTs);
+									    }
+                                        
+                                        rg.ServiceRecords.Add(sd);
 									}
 								}
 							}
@@ -58,7 +64,20 @@ namespace VkmHamm
 
 						rg.ServiceRecords.Sort((s1, s2) => Comparer.Default.Compare(s1.Start, s2.Start));
 					}
+					else
+					{
+					    foreach (var sd in rg.ServiceRecords)
+					    {
+					        if (sd.ServiceRecordOid.HasValue && sd.ServiceRecordOid.Value > 0)
+					        {
+					            var sr = DAOFactory.GenericDAO.LoadByID<ServiceRecord>(sd.ServiceRecordOid.Value);
+					            sd.CustomValue1 = String.Format("{0:dd.MM.yyyy}", sr.InsTs);
+					        }
+                        }
+					}
+                    
 				}
+                
 			}
 		}
 

ReportImp/VkmHamm/VkmHamm.csproj

@@ -63,6 +63,12 @@
   <ItemGroup>
     <Compile Include="CustomerMitarbeiterstundenkontoBerechnung.cs" />
     <Compile Include="Calculation\CustomGroupDurationCalculator.cs" />
+    <Compile Include="Finanzauswertung.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Finanzauswertung.designer.cs">
+      <DependentUpon>Finanzauswertung.cs</DependentUpon>
+    </Compile>
     <Compile Include="FLSGroupReport.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -139,6 +145,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="Finanzauswertung.resx">
+      <DependentUpon>Finanzauswertung.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="FLSGroupReport.resx">
       <DependentUpon>FLSGroupReport.cs</DependentUpon>
       <SubType>Designer</SubType>

Service/DCEntityMapper/ReportTemplateDC_ReportTemplate.cs

@@ -0,0 +1,54 @@
+using System.Linq;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+
+using BS.Shared;
+using BS.Shared.DataContracts;
+using System.Collections.Generic;
+using BS.Shared.Core;
+
+namespace BeWo.Service.DCEntityMapper
+{
+	public class ReportTemplateDC_ReportTemplate : AbstractIDCEntityMapper<ReportTemplate, ReportTemplateDC>
+    {
+        public override ReportTemplateDC MergeWithDC(ReportTemplate pEntity, ReportTemplateDC pDataContract)
+        {
+            pDataContract.Oid = pEntity.Oid;
+            pDataContract.IsActive = pEntity.IsActive;
+            pDataContract.Notice = pEntity.Notice;
+            pDataContract.InsTs = pEntity.InsTs;
+            pDataContract.InsUser = pEntity.InsUser;
+            pDataContract.Version = pEntity.Version;
+            pDataContract.UdpUser = pEntity.UdpUser;
+            pDataContract.SystemEntryID = pEntity.SystemEntryID;
+
+            pDataContract.DisplayName = pEntity.DisplayName;
+            pDataContract.ReportTemplateType = pEntity.ReportTemplateType;
+            pDataContract.ReferenceClass = pEntity.ReferenceClass;
+
+            return pDataContract;
+        }
+
+        public override ReportTemplate MergeWithEntity(ReportTemplateDC pDataContract, ReportTemplate pEntity)
+        {
+            this.ConcurrencyCheck(pDataContract.Version, pEntity);
+
+            pEntity.Oid = pDataContract.Oid;
+            pEntity.Notice = pDataContract.Notice;
+            pEntity.SystemEntryID = pDataContract.SystemEntryID;
+
+            pEntity.DisplayName = pDataContract.DisplayName;
+            pEntity.ReportTemplateType = pDataContract.ReportTemplateType;
+            pEntity.ReferenceClass = pDataContract.ReferenceClass;
+
+            return pEntity;
+        }
+
+        protected override bool AreDCAndEntityEqual(ReportTemplateDC pDC, ReportTemplate pEntity)
+        {
+            if (pDC.Oid == null)
+                return false;
+            return pDC.Oid == pEntity.Oid;
+        }
+    }
+}

Service/Plugins/PluginLoader.cs

@@ -97,7 +97,7 @@ namespace BeWo.Service.Plugins
                 //t = "3830114427"; // FiZ Familie im Zentrum Hof
                 //t = "7138297573"; // Tagwerk betreutes wohnen
                 //t = "1008896531"; // BeWo Auxilio
-                //t = "9383760246"; // Die Kette
+                t = "9383760246"; // Die Kette
                 //t = "5915565037"; // LH Remscheid
                 //t = "3350425974"; // BeWo Rückenwind
                 //t = "9447917179"; // LH Rodenkirchen
@@ -171,7 +171,7 @@ namespace BeWo.Service.Plugins
                 //t = "6586058528"; // Freundeskreis Suchtkrankenhilfe e.V.
                 //t = "2632162696"; // Pro BeWo Düren
                 //t = "6340891020"; // Caritas Ahlen
-                t = "3659854106"; // alpha e.V.
+                //t = "3659854106"; // alpha e.V.
                 //t = "5809130435"; // Lebenshilfe Kusel
                 //t = "3367947706"; // PaS Mönchengladbach
                 //t = "2331203795"; // BeWo für dich
@@ -211,10 +211,12 @@ namespace BeWo.Service.Plugins
 			    //t = "4290816992"; // BeWo Imflow
 			    //t = "7584236951"; // Aachener Betreuungsbüro Kirschbaum und Manz GbR
 			    //t = "3678599942"; // VKM Rietberg
+			    //t = "4069072369"; // BeWo Dreilich&Pastor (Pastor)
+                //t = "4160851689"; // BeWo Dreilich&Pastor (Dreilich)
 
                 return t;
 #else
-				if (MultitenancyOperationContextExt.Current != null)
+                if (MultitenancyOperationContextExt.Current != null)
 					return MultitenancyOperationContextExt.Current.Tenant;
 
 				return SessionFacade.Tenant;

Service/Plugins/StundenuebersichtAuswertung.cs

@@ -675,7 +675,8 @@ namespace BeWo.Service.Plugins
             srDC.Notice3 = sr.Notice3;
             srDC.Notice4 = sr.Notice4;
             srDC.Notice5 = sr.Notice5;
-
+            srDC.InsertedOn = sr.InsTs;
+            srDC.InsUser = sr.InsUser;
             if (useRoundedDuration)
             {
                 srDC.RoundedDuration = sr.RoundedDuration;

Service/Service.csproj

@@ -165,6 +165,7 @@
     <Compile Include="Core\ServiceLogic.cs" />
     <Compile Include="Core\SettingsLogic.cs" />
     <Compile Include="Core\Utils.cs" />
+    <Compile Include="DCEntityMapper\ReportTemplateDC_ReportTemplate.cs" />
     <Compile Include="DCEntityMapper\HomeViewPanelDC_HomeViewPanel.cs" />
     <Compile Include="DCEntityMapper\FlexibleReportLayoutDC_FlexibleReportLayout.cs" />
     <Compile Include="DCEntityMapper\NotizenKategorieDC_NotizenKategorie.cs" />

Service/ServiceContracts/IOperationsService.cs

@@ -537,7 +537,7 @@ namespace BeWo.Service.ServiceContracts
         [FaultContract(typeof (BeWoFault))]
         [OperationContract]
         ChatMessageDC CreateNewChatMessagesDC(long senderOid, long empfängerOid, string message, bool isDeliverd, long teamid, string messageid);
-
+        
         [FaultContract(typeof(BeWoFault))]
         [OperationContract]
         void UpdateIsChatActiveCustomerAPPCodeDC(long customerOid, int activeType);
@@ -839,5 +839,13 @@ namespace BeWo.Service.ServiceContracts
         [FaultContract(typeof(BeWoFault))]
         [OperationContract]
         bool CheckForOverlappingAbsenceTimes(DateTime startDate, DateTime endDate, long? employeeOid, long? customerOid);
+
+        [FaultContract(typeof(BeWoFault))]
+        [OperationContract]
+        IList<ValueListEntryDC> GetIcf();
+
+        [FaultContract(typeof(BeWoFault))]
+        [OperationContract]
+        IList<ReportTemplateDC> GetReportTemplates(string url);
     }
 }

Service/ServiceImplementations/AnalysisServiceImp.cs

@@ -687,7 +687,8 @@ namespace BeWo.Service.ServiceImplementations
             srDC.Notice3 = sr.Notice3;
             srDC.Notice4 = sr.Notice4;
             srDC.Notice5 = sr.Notice5;
-
+            srDC.InsertedOn = sr.InsTs;
+            srDC.InsUser = sr.InsUser;
             if (useRoundedDuration)
 	        {
 		        srDC.RoundedDuration = sr.RoundedDuration;

Service/ServiceImplementations/OperationsServiceImp.cs

@@ -37,14 +37,11 @@ namespace BeWo.Service.ServiceImplementations
     [ServiceBehavior(InstanceContextMode = InstanceContextMode.PerCall, ConcurrencyMode = ConcurrencyMode.Single)]
     public class OperationsServiceImp : IOperationsService
     {
-
         public Mandator GetMandatorEntity()
         {
             return AppSettings.GetMandatorEntity();
         }
-
-
-
+        
         public void DeactivateInvoices(List<InvoiceDC> pInvoices)
         {
             try
@@ -5763,9 +5760,9 @@ namespace BeWo.Service.ServiceImplementations
             {
                 return DAOFactory.SearchDAO.CheckForOverlappingSubstitutions(employeeOid, customerOid, startDate, endDate, substitutionOid);
             }
-            catch(Exception exception)
+            catch (Exception e)
             {
-                throw Utils.CreateBeWoFaultException(exception);
+                throw Utils.CreateBeWoFaultException(e);
             }
         }
 
@@ -5788,9 +5785,59 @@ namespace BeWo.Service.ServiceImplementations
             {
                 return DAOFactory.SearchDAO.CheckForOverlappingAbsenceTimes(startDate, endDate, employeeOid, customerOid);
             }
-            catch(Exception exception)
+            catch (Exception e)
             {
-                throw Utils.CreateBeWoFaultException(exception);
+                throw Utils.CreateBeWoFaultException(e);
+            }
+        }
+        
+        public IList<ValueListEntryDC> GetIcf()
+        {
+            try
+            {
+                var rawList = DAOFactory.GenericDAO.GetAll<Icf>().ToList();
+
+                var icfs = new List<ValueListEntryDC>
+                {
+                    new ValueListEntryDC() {ParentOid = -1, TypeDescription = "ICF"}
+                };
+
+                icfs.AddRange(rawList.Select(x => new ValueListEntryDC()
+                {
+                    ValueListEntryOid = x.Oid,
+                    ParentOid = x.ParentID,
+                    TypeDescription = x.Bezeichnung,
+                    Abbreviation = x.Code,
+                    Notice = x.Beschreibung
+                }));
+
+                return icfs;
+            }
+            catch (Exception e)
+            {
+                throw Utils.CreateBeWoFaultException(e);
+            }
+        }
+
+        public IList<ReportTemplateDC> GetReportTemplates(string url)
+        {
+            try
+            {
+                if (url.IsNullOrEmpty())
+                    return null;
+
+                var index = url.IndexOf("type=") + 5;
+                var typeString = url.Substring(index);
+
+                if (!Enum.TryParse(typeString, out ReportTypes reportType))
+                    return null;
+                
+                return MapperFactory.ReportTemplateDC_ReportTemplate.MapToNewDCs(DAOFactory.GenericDAO
+                    .GetAllActive<ReportTemplate>().Where(x => x.ReportTemplateType == reportType));
+            }
+            catch (Exception e)
+            {
+                throw Utils.CreateBeWoFaultException(e);
             }
         }
     }

Shared/BeWoEntityEnums.cs

@@ -144,6 +144,7 @@ namespace BS.Shared
         FlexibleReportLayout                      = 137,
         Team2Customer                             = 138,
         HomeViewPanel                             = 139,
+        ReportTemplate                            = 140,
     }
 
     public enum SystemEntryID
@@ -1020,13 +1021,13 @@ namespace BS.Shared
 
     public enum HomeViewPanelType
     {
-        TasksPanel,
-        ExpiringSupportConceptsPanel,
-        ConferenceDatesPanel,
-        BirthdatesPanel,
-        InternalNewsPanel,
-        BeWoNewsPanel,
-        CustomReportPanel,
-        CustomXamlPanel
+        TasksPanel = 0, // PanelTasks
+        ExpiringSupportConceptsPanel = 1, // PanelExpiringSupportConcepts
+        ConferenceDatesPanel = 2, // PanelConferenceDates
+        BirthdatesPanel = 3, // PanelBirthdates
+        InternalNewsPanel = 4, // PanelInternalNews
+        BeWoNewsPanel = 5, // PanelBeWoNews
+        CustomReportPanel = 6,
+        CustomXamlPanel = 7
     }
 }

Shared/DataContracts/ClientPartials/SupportConceptGoalDC.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 using System.Windows.Media;
@@ -29,19 +30,18 @@ namespace BS.Shared.DataContracts.ClientPartials
             set { _GoalEntryDC = value; }
         }
 
-        public bool HasParent
-        {
-            get { return ParentGoal != null; }
-        }
+        public bool HasParent => ParentGoal != null;
+
+        public bool HasNotice => GoalEntryDC != null && !string.IsNullOrEmpty(GoalEntryDC.Notice);
 
         public bool IsChecked
         {
-            get { return _IsChecked; }
+            get => _IsChecked;
 
             set
             {
                 _IsChecked = value;
-                foreach (var item in Children.Where(w => !w.GoalEntryDC.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalCategoryType) || !w.GoalEntryDC.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalType)))
+                foreach (var item in Children)
                 {
                     item.IsChecked = value;
                 }
@@ -52,7 +52,7 @@ namespace BS.Shared.DataContracts.ClientPartials
 
         public bool IsExpanded
         {
-            get { return _IsExpanded; }
+            get => _IsExpanded;
 
             set
             {
@@ -61,33 +61,26 @@ namespace BS.Shared.DataContracts.ClientPartials
             }
         }
 
-        public string Name
-        {
-            get
-            {
-                if (_GoalEntryDC != null)
-                {
-                    return _GoalEntryDC.TypeDescription;
-                }
+        public string Name => DetailDescription;
 
-                return null;
-            }
-        }
+        
 
         public SupportConceptGoalDC ParentGoal { get; set; }
 
         public event PropertyChangedEventHandler PropertyChanged;
 
-        public SolidColorBrush FilterableBrush { get { return new SolidColorBrush(Colors.Transparent); } }
+        public SolidColorBrush FilterableBrush => new SolidColorBrush(Colors.Transparent);
 
         protected void RaisePropertyChanged(string propertyName)
         {
-            PropertyChangedEventHandler propertyChanged = PropertyChanged;
+            var propertyChanged = PropertyChanged;
 
-            if (propertyChanged != null)
-            {
-                propertyChanged(this, new PropertyChangedEventArgs(propertyName));
-            }
+            propertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+
+        public override string ToString()
+        {
+            return GoalEntryDC == null ? "-" : GoalEntryDC.TypeDescription;
         }
 
         #region IFilterableDC Members
@@ -99,7 +92,7 @@ namespace BS.Shared.DataContracts.ClientPartials
 
         public string DetailDescription
         {
-            get { return Name; }
+            get { return GoalEntryDC.DisplayName; }
         }
 
         public string FilterRelevants

Shared/DataContracts/ReportTemplateDC.cs

@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+
+using BS.Shared.Core;
+
+namespace BS.Shared.DataContracts
+{
+	public class ReportTemplateDC : IDataContract
+	{
+		[DataMember]
+		public long? Oid { get; set; }
+
+		[DataMember]
+		public ActivationTypeId IsActive { get; set; }
+
+		[DataMember]
+		public string Notice { get; set; }
+
+		[DataMember]
+		public DateTime? InsTs { get; set; }
+
+		[DataMember]
+		public string InsUser { get; set; }
+
+		[DataMember]
+		public long? Version { get; set; }
+
+		[DataMember]
+		public string UdpUser { get; set; }
+
+		[DataMember]
+		public SystemEntryID? SystemEntryID { get; set; }
+
+		[DataMember]
+		public string DisplayName { get; set; }
+
+		[DataMember]
+		public ReportTypes ReportTemplateType { get; set; }
+
+        [DataMember]
+        public string ReferenceClass { get; set; }
+
+        public override string ToString()
+        {
+            return DisplayName;
+        }
+
+        //public override bool Equals(object obj)
+        //{
+        //    if (obj is ReportTemplateDC reportTemplate)
+        //    {
+        //        return ReportTemplateOid == reportTemplate.ReportTemplateOid;
+        //    }
+
+        //    return false;
+        //}
+
+        //public override int GetHashCode()
+        //{
+        //    return GetType().Name.GetHashCode() ^ ReportTemplateOid.GetHashCode();
+        //}
+    }
+}

Shared/DataContracts/ServiceRecordFLSOverviewDC.cs

@@ -64,6 +64,9 @@ namespace BS.Shared.DataContracts
 		public int? DistanceInMeter { get; set; }
 
 		[DataMember]
-		public int? Relevance { get; set; }
+        public string InsUser { get; set; }
+
+        [DataMember]
+        public DateTime? InsertedOn { get; set; }
     }
 }

Shared/DataContracts/ValueListEntryDC.cs

@@ -32,5 +32,7 @@ namespace BS.Shared.DataContracts
         
         [DataMember]
         public string Notice { get; set; }
+
+        public string DisplayName => string.IsNullOrEmpty(Abbreviation) ? TypeDescription : Abbreviation + ": " + TypeDescription;
     }
 }

Shared/Shared.csproj

@@ -150,6 +150,7 @@
     <Compile Include="DataContracts\AdditionalServiceGroupOfPeopleDC.cs" />
     <Compile Include="DataContracts\AdditionalServiceGroupOfPeopleRelationDC.cs" />
     <Compile Include="DataContracts\AdditionalServiceRegionDC.cs" />
+    <Compile Include="DataContracts\ReportTemplateDC.cs" />
     <Compile Include="DataContracts\BudgetDC.cs" />
     <Compile Include="DataContracts\HomeViewPanelDC.cs" />
     <Compile Include="DataContracts\FerienDC.cs" />