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

BeWo/BeWo.csproj

@@ -1062,6 +1062,9 @@
     <Compile Include="View\Detail\DebugMessageLogView.xaml.cs">
       <DependentUpon>DebugMessageLogView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="View\Detail\MassnahmenHistoryRecord.cs" />
+    <Compile Include="View\Detail\MassnahmenHistory.cs" />
+    <Compile Include="View\Detail\MassnahmenTreeTrimmer.cs" />
     <Compile Include="View\Detail\Zeiterfassung\ServiceRecordCreationView.xaml.cs">
       <DependentUpon>ServiceRecordCreationView.xaml</DependentUpon>
     </Compile>
@@ -3057,6 +3060,9 @@
     <Resource Include="Ressources\Icons\imassnahme.png" />
     <Resource Include="Ressources\Icons\iziel.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Ressources\Icons\Copy24.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>

BeWo/Core/SupportConceptGoalTreeItem.cs

@@ -1,19 +1,20 @@
-using System.ComponentModel;
-
+using BeWo.ViewModel;
 using BS.Shared;
-
-using BeWo.ViewModel;
 using BS.Shared.DataContracts.ClientPartials;
-using BS.Shared.Extensions;
+using System.ComponentModel;
+using System.Diagnostics;
 
 namespace BeWo.Core
 {
+    [DebuggerDisplay("{GoalEntryVM.Abbreviation}: {GoalEntryVM.Description}")]
     public class SupportConceptGoalTreeItem : SupportConceptGoalDC
     {
         private ValueListEntryVM _GoalEntryVM;
         private BindingList<SupportConceptGoalTreeItem> _Children;
         private bool _ShowNotice;
 
+        public SupportConceptGoalTreeItem() { }
+
         public ValueListEntryVM GoalEntryVM
         {
             get => _GoalEntryVM;
@@ -56,7 +57,7 @@ namespace BeWo.Core
                 return IsOfType(ValueListEntryType.SupportConceptIndividualGoalType);
             }
         }
-        
+
         public bool IsOfType(ValueListEntryType t)
         {
 

BeWo/SchulbegleitenderDienst/SBDUtils/SBDUtils.cs

@@ -16,7 +16,12 @@ namespace BeWo.SchulbegleitenderDienst.SBDUtils
             
             foreach (var viewModel  in viewModels)
             {
-                if(viewModel.VertretungsStatus != VertretungsStatus.KlientKrank)
+                if (viewModel.Customer != null && viewModel.Customer.LastName == "Dau" || viewModel.Customer.LastName == "Sawan")
+                {
+                    int tet = 0;
+                }
+
+                if (viewModel.VertretungsStatus != VertretungsStatus.KlientKrank)
                 {
                     var substitutionStartingDayCountCondition = SubstitutionStartingDayCountCondition(viewModel);
 
@@ -64,6 +69,10 @@ namespace BeWo.SchulbegleitenderDienst.SBDUtils
 
             foreach (var viewModel in viewModels)
             {
+                if (viewModel.Customer != null && viewModel.Customer.LastName == "Dau" || viewModel.Customer.LastName == "Sawan")
+                {
+                    int tet = 0;
+                }
                 var isCustomerAbsenceWeekView = viewModel.WeekDayDictionary.Where(w => w.Value != null).All(a => a.Value.VertretungsStatus == VertretungsStatus.KlientKrank);
 
                 var isSubstitutionUnwanted = viewModel.WeekDayDictionary.Where(w => w.Value != null).All(a => SubstitutionStartingDayCountCondition(a.Value) || a.Value.Vertretung?.VertretenderMitarbeiterOid != null || a.Value.Customer != null && a.Value.Customer.SubstitutionNeed == SubstitutionNeed.NoSubstitutionWanted);
@@ -83,7 +92,7 @@ namespace BeWo.SchulbegleitenderDienst.SBDUtils
                 }
             }
 
-            return new WeeklySubstitutionListObject(employeeSubstitutionList, customerSubstitutionList, customerSubstitutionList);
+            return new WeeklySubstitutionListObject(employeeSubstitutionList, customerSubstitutionList, unwantedSubstitutionList);
         }
     }
 

BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstCustomerView.xaml

@@ -22,7 +22,7 @@
 		            <RowDefinition Height="Auto" />
 		            <RowDefinition Height="*" />
 		        </Grid.RowDefinitions>
-            <GroupBox Grid.ColumnSpan="2" Padding="5" Style="{StaticResource ObjectEditGroupBox}" Header="Schulbegleitender Dienst">
+            <GroupBox Grid.ColumnSpan="3" Padding="5" Style="{StaticResource ObjectEditGroupBox}" Header="Schulbegleitender Dienst">
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto" />

BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstEmployeeView.xaml

@@ -27,7 +27,7 @@
 		        <RowDefinition Height="Auto" />
 		        <RowDefinition Height="*" />
 		    </Grid.RowDefinitions>
-    <GroupBox Grid.ColumnSpan="2" Padding="5" Style="{StaticResource ObjectEditGroupBox}" Header="Schulbegleitender Dienst">
+    <GroupBox Grid.ColumnSpan="3" Padding="5" Style="{StaticResource ObjectEditGroupBox}" Header="Schulbegleitender Dienst">
       <Grid>
         <Grid.ColumnDefinitions>
           <ColumnDefinition Width="Auto" />

BeWo/SchulbegleitenderDienst/VertretungsMainViewV2.xaml

@@ -843,7 +843,7 @@
                                             </dxg:GridColumn>
                                         </dxg:GridControl.Columns>
                                         <dxg:GridControl.View>
-                                            <dxg:TableView AllowPerPixelScrolling="True" ShowTotalSummary="False" AutoWidth="True" AllowBestFit="True" BestFitMode="AllRows" ShowGroupPanel="False" CellValueChanged="AbsentEmployeesWeekViewDataGrid_OnCellValueChanged" MouseMove="TableView_MouseMove_Wochenansicht">
+                                            <dxg:TableView AllowPerPixelScrolling="True" ShowTotalSummary="False" AutoWidth="True" AllowBestFit="True" BestFitMode="AllRows" ShowGroupPanel="False" CellValueChanged="AbsentEmployeesWeekViewDataGrid_OnCellValueChanged" MouseMove="TableView_MouseMove_Wochenansicht" ShowGridMenu="GridDataControlWochenansichtMitarbeiter_OnShowGridMenu">
 
                                             </dxg:TableView>
                                         </dxg:GridControl.View>

BeWo/SchulbegleitenderDienst/VertretungsMainViewV2.xaml.cs

@@ -640,15 +640,42 @@ namespace BeWo.SchulbegleitenderDienst
             }
         }
 
+        private void GridDataControlWochenansichtMitarbeiter_OnShowGridMenu(object sender, GridMenuEventArgs e)
+        {
+            
+            var barButtonItem2 = new BarButtonItem { Content = "Steckbrief anzeigen" };
+            barButtonItem2.ItemClick += ShowCharacteristics;
+            e.Customizations.Add(barButtonItem2);
+
+            //var selectedViewModel = (TagesansichtVM)GridDataControlWochenansichtMitarbeiter.SelectedItem;
+
+            
+        }
+
         private void ShowCharacteristics(object sender, RoutedEventArgs e)
         {
-            var selectedItem = GridControlTagesansichtMitarbeiter.SelectedItem;
+            CompactCustomerDC selectedCustomer = null;
 
-            if(selectedItem != null)
+            if (ScrollViewerTagesansicht.Visibility == Visibility.Visible)
             {
-                var selectedTagesansichtVM = (TagesansichtVM) selectedItem;
-
-                var url = $"{BeWoApp.SiteOfOrigin}/ReportView.aspx?type={ReportTypes.SBDCharacteristics}&customerOid={selectedTagesansichtVM.Customer.CustomerOid}";
+                TagesansichtVM selectedItem = GridControlTagesansichtMitarbeiter.SelectedItem as TagesansichtVM;
+                if (selectedItem != null)
+                {
+                    selectedCustomer = selectedItem.Customer;
+                }
+            }
+            else if (ScrollViewerWochenansicht.Visibility == Visibility.Visible)
+            {
+                WochenansichtVM selectedItem = GridDataControlWochenansichtMitarbeiter.SelectedItem as WochenansichtVM;
+                if (selectedItem != null)
+                {
+                    selectedCustomer = selectedItem.Customer;
+                }
+            }
+            if(selectedCustomer != null)
+            {
+                
+                var url = $"{BeWoApp.SiteOfOrigin}/ReportView.aspx?type={ReportTypes.SBDCharacteristics}&customerOid={selectedCustomer.CustomerOid}";
 
                 //var tempToken = string.Empty;
 

BeWo/SchulbegleitenderDienst/VertretungsSearchView.xaml.cs

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

BeWo/ServiceProxy/Generated.cs

@@ -1668,6 +1668,7 @@ namespace BeWo.ServiceProxy
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Employee2SchedulerAppointmentDC))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<BS.Shared.DataContracts.ValueListEntryDC, System.Collections.Generic.List<BS.Shared.DataContracts.ResourceDC>>))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<System.DateTime, System.Collections.Generic.List<BS.Shared.Core.DateTimeSpan>>))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<string, System.Collections.Generic.List<string>>))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<BS.Shared.SignatureType, System.Collections.Generic.List<long>>))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<System.Collections.Generic.Dictionary<int, long>>))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<int, long>))]
@@ -4909,6 +4910,13 @@ namespace BeWo.ServiceProxy
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IResourceService/GetAllActiveEmployeeAbsenceTimesInIntervalBeW" +
             "oFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         System.Collections.Generic.List<BS.Shared.DataContracts.AbsenceTimeDC> GetAllActiveEmployeeAbsenceTimesInInterval(System.DateTime start, System.DateTime end, long employeeOid, System.Collections.Generic.List<long> selectedEmployeeOids);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IResourceService/CheckResourceAvailabilityWithEmployeeInformat" +
+            "ion", ReplyAction="http://tempuri.org/IResourceService/CheckResourceAvailabilityWithEmployeeInformat" +
+            "ionResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IResourceService/CheckResourceAvailabilityWithEmployeeInformat" +
+            "ionBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.Dictionary<string, System.Collections.Generic.List<string>> CheckResourceAvailabilityWithEmployeeInformation(System.DateTime start, System.DateTime end, System.Collections.Generic.List<long> resourceOids, System.Nullable<long> selectedAppointmentOid, System.Nullable<System.Guid> recurrenceId, int occurrenceIndex, bool shouldSkipResourceAvailability);
     }
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
@@ -5234,6 +5242,11 @@ namespace BeWo.ServiceProxy
         {
             return base.Channel.GetAllActiveEmployeeAbsenceTimesInInterval(start, end, employeeOid, selectedEmployeeOids);
         }
+        
+        public System.Collections.Generic.Dictionary<string, System.Collections.Generic.List<string>> CheckResourceAvailabilityWithEmployeeInformation(System.DateTime start, System.DateTime end, System.Collections.Generic.List<long> resourceOids, System.Nullable<long> selectedAppointmentOid, System.Nullable<System.Guid> recurrenceId, int occurrenceIndex, bool shouldSkipResourceAvailability)
+        {
+            return base.Channel.CheckResourceAvailabilityWithEmployeeInformation(start, end, resourceOids, selectedAppointmentOid, recurrenceId, occurrenceIndex, shouldSkipResourceAvailability);
+        }
     }
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
@@ -5518,6 +5531,17 @@ namespace BeWo.ServiceProxy
             "ult", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         System.Collections.Generic.Dictionary<string, string> GetDiagiosisStringsForICD10Codes(System.Collections.Generic.List<string> icd10Codes);
         
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DeleteSignature", ReplyAction="http://tempuri.org/IOperationsService/DeleteSignatureResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DeleteSignatureBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        void DeleteSignature(long signatureOid, long serviceRecordOid);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/CheckForConfirmationReceiptSignatureForServ" +
+            "iceRecord", ReplyAction="http://tempuri.org/IOperationsService/CheckForConfirmationReceiptSignatureForServ" +
+            "iceRecordResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/CheckForConfirmationReceiptSignatureForServ" +
+            "iceRecordBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        bool CheckForConfirmationReceiptSignatureForServiceRecord(long serviceRecordOid, BS.Shared.SignatureType signatureType);
+        
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/VertretungsMitarbeiterListeWoechentlich", ReplyAction="http://tempuri.org/IOperationsService/VertretungsMitarbeiterListeWoechentlichResp" +
             "onse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/VertretungsMitarbeiterListeWoechentlichBeWo" +
@@ -6968,6 +6992,16 @@ namespace BeWo.ServiceProxy
             return base.Channel.GetDiagiosisStringsForICD10Codes(icd10Codes);
         }
         
+        public void DeleteSignature(long signatureOid, long serviceRecordOid)
+        {
+            base.Channel.DeleteSignature(signatureOid, serviceRecordOid);
+        }
+        
+        public bool CheckForConfirmationReceiptSignatureForServiceRecord(long serviceRecordOid, BS.Shared.SignatureType signatureType)
+        {
+            return base.Channel.CheckForConfirmationReceiptSignatureForServiceRecord(serviceRecordOid, signatureType);
+        }
+        
         public System.Collections.Generic.List<BS.Shared.DataContracts.VertretungsListeMitarbeiterItemsDC> VertretungsMitarbeiterListeWoechentlich(System.DateTime start, System.DateTime ende)
         {
             return base.Channel.VertretungsMitarbeiterListeWoechentlich(start, ende);
@@ -8993,6 +9027,10 @@ namespace BeWo.ServiceProxy
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IReportService/CreateKalenderReportWithAbsenceTimesBeWoFaultFa" +
             "ult", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         System.IO.MemoryStream CreateKalenderReportWithAbsenceTimes(System.Collections.Generic.List<long> appointmentOids, System.Nullable<long> employeeOid, System.Collections.Generic.List<BS.Shared.DataContracts.SchedulerAppointmentDC> serientermine, System.Collections.Generic.List<System.DateTime> selectedDates, System.Collections.Generic.List<BS.Shared.DataContracts.SchedulerAppointmentDC> mehrtaegigeTermine, System.Collections.Generic.List<long> absenceTimeOids);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IReportService/CreateInvoiceListReport", ReplyAction="http://tempuri.org/IReportService/CreateInvoiceListReportResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IReportService/CreateInvoiceListReportBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.IO.MemoryStream CreateInvoiceListReport(System.Collections.Generic.List<long> invoiceBaseOids);
     }
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
@@ -9108,6 +9146,11 @@ namespace BeWo.ServiceProxy
         {
             return base.Channel.CreateKalenderReportWithAbsenceTimes(appointmentOids, employeeOid, serientermine, selectedDates, mehrtaegigeTermine, absenceTimeOids);
         }
+        
+        public System.IO.MemoryStream CreateInvoiceListReport(System.Collections.Generic.List<long> invoiceBaseOids)
+        {
+            return base.Channel.CreateInvoiceListReport(invoiceBaseOids);
+        }
     }
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]

BeWo/View/Controls/ComboBoxTreeViewControl.xaml

@@ -31,7 +31,7 @@
 							<ColumnDefinition Width="*" />
 						</Grid.ColumnDefinitions>
 						<Label x:Name="SearchFieldLabel" Grid.Column="0" Content="Suche" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Left" />
-						<TextBox x:Name="cbtv_search" Grid.Column="1" Margin="3" Height="23" Template="{StaticResource SearchTextBoxTemplate}" HorizontalAlignment="Stretch" />
+						<TextBox x:Name="cbtv_search" Grid.Column="1" Margin="3" Height="23" Template="{StaticResource SearchTextBoxTemplate}" HorizontalAlignment="Stretch" TextChanged="cbtv_search_TextChanged" />
 					</Grid>
 					<TreeView x:Name="Tree1" Margin="0" Grid.Row="1"
 					          ItemTemplate="{DynamicResource treeitemtemplate}"
@@ -39,14 +39,14 @@
 					          BorderThickness="0" Background="White"
 					          Loaded="Tree1_OnLoaded"
 					          dx:ThemeManager.ThemeName="None">
-						<TreeView.ItemsSource>
+						<!--<TreeView.ItemsSource>
 							<MultiBinding Converter="{StaticResource FilterDCConverter}">
 								<MultiBinding.Bindings>
 									<Binding Path="TreeViewSourceList" />
 									<Binding ElementName="cbtv_search" Path="Text" />
 								</MultiBinding.Bindings>
 							</MultiBinding>
-						</TreeView.ItemsSource>
+						</TreeView.ItemsSource>-->
 						<TreeView.Resources>
 							<Style x:Key="servicecat_treeitemstyle" TargetType="{x:Type TreeViewItem}">
 								<Setter Property="IsExpanded" Value="{Binding Path=IsExpanded, Mode=TwoWay}" />

BeWo/View/Controls/ComboBoxTreeViewControl.xaml.cs

@@ -48,6 +48,7 @@ namespace BeWo.View.Controls
             {
                 SetValue(ListProperty, value);
                 ShowCheckedValues();
+                Tree1.ItemsSource = value;
             }
         }
 
@@ -360,5 +361,125 @@ namespace BeWo.View.Controls
             }
             RatingPopup.IsOpen = false;
         }
+
+        private void cbtv_search_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            FilterTreeItems();
+        }
+
+        private void FilterTreeItems()
+        {
+            String searchtext = cbtv_search.Text;
+            
+            foreach (var goal in Tree1.Items)
+            {
+                SetTreeItemVisibility(Tree1.ItemContainerGenerator, goal as SupportConceptGoalDC, searchtext);
+
+
+                //if (ig.Status != GeneratorStatus.ContainersGenerated)
+                //{
+                //    return;
+                //}
+
+                //var n = ig.ContainerFromIndex(this.treeview_individualServiceAccountings.Items.Count - 1) as TreeViewItem;
+                //if (n != null)
+                //{
+                //    n.IsSelected = true;
+
+                //    new DispatcherTimer(
+                //        TimeSpan.FromMilliseconds(200),
+                //        DispatcherPriority.Background,
+                //        (s1, e1) =>
+                //            {
+                //                ServiceCategoryTreeItem item = ig.ItemFromContainer(n) as ServiceCategoryTreeItem;
+                //                this.EditItem(this.treeview_individualServiceAccountings, null, item);
+                //                ((DispatcherTimer)s1).Stop();
+                //        },
+                //        this.Dispatcher).Start();
+                //}
+                //this.treeview_individualServiceAccountings.ItemContainerGenerator.StatusChanged -= this.ItemContainerGenerator_StatusChanged;
+            }
+        }
+
+        private void SetTreeItemVisibility(ItemContainerGenerator ig, SupportConceptGoalDC goal, string searchtext)
+        {
+
+            var item = ig.ContainerFromItem(goal) as TreeViewItem;
+
+            if (item == null)
+            {
+                Tree1.UpdateLayout();
+                item = ig.ContainerFromItem(goal) as TreeViewItem;
+            }
+
+            if (item == null)
+                return;
+            
+            if (goal.Children == null || goal.Children.Count == 0)
+            {
+                if (IsTreeItemVisible(goal, searchtext))
+                {
+                    item.Visibility = Visibility.Visible;
+                }
+                else
+                {
+                    item.Visibility = Visibility.Collapsed;
+                }
+
+            }
+            else
+            {
+                foreach (var child in goal.Children)
+                {
+                    SetTreeItemVisibility(item.ItemContainerGenerator, child, searchtext);
+                }
+
+
+                if (IsAtLeastOneChildVisible(goal.Children, searchtext))
+                {
+                    item.Visibility = Visibility.Visible;
+                }
+                else
+                {
+                    if (IsTreeItemVisible(goal, searchtext))
+                    {
+                        item.Visibility = Visibility.Visible;
+                    }
+                    else
+                    {
+                        item.Visibility = Visibility.Collapsed;
+                    }
+                }
+            }
+
+        }
+
+        private bool IsTreeItemVisible(SupportConceptGoalDC goal, string searchtext)
+        {
+
+            if (!String.IsNullOrEmpty(searchtext) && (String.IsNullOrEmpty(goal.DetailDescription) || !goal.DetailDescription.ToLower().Contains(searchtext.ToLower())))
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        private bool IsAtLeastOneChildVisible(List<SupportConceptGoalDC> children, string searchtext)
+        {
+
+            foreach (var child in children)
+            {
+                bool visible = IsTreeItemVisible(child, searchtext) || IsAtLeastOneChildVisible(child.Children, searchtext);
+                if (visible)
+                {
+                    return true;
+                }
+
+            }
+
+            return false;
+        }
+
     }
 }

BeWo/View/Controls/ValueListEntryEditControl.xaml.cs

@@ -56,7 +56,6 @@ namespace BeWo.View.Controls
         private void UpdateControls()
         {
             bool zeigeKatalogAuswahl = RBtnKatalog.IsChecked.HasValue && RBtnKatalog.IsChecked.Value;
-
             
             LabelKatalog.Visibility = zeigeKatalogAuswahl ? Visibility.Visible : Visibility.Collapsed;
             CboCatalog.Visibility = zeigeKatalogAuswahl ? Visibility.Visible : Visibility.Collapsed;

BeWo/View/Detail/Accounting/InvoiceOverview.xaml

@@ -12,6 +12,7 @@
 				<Grid.RowDefinitions>
 					<RowDefinition Height="Auto" />
 					<RowDefinition Height="*" />
+                    <RowDefinition Height="Auto" />
 				</Grid.RowDefinitions>
 
 				<localView:YearMonthFilter Margin="3 0 0 3" VerticalAlignment="Bottom" HorizontalAlignment="Left" Grid.Column="0" x:Name="yearMonthFilter" FilterSpanChanged="YearMonthFilter_FilterSpanChanged" />
@@ -25,8 +26,8 @@
 				
 				<dxg:GridControl Margin="3" Grid.ColumnSpan="3" Grid.Row="1" DataSource="{Binding VMList}" x:Name="datagrid_invoices" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
 					<dxg:GridControl.Columns>
-
-						<dxg:GridColumn x:Name="ColumnButtons"  AllowEditing="False" MinWidth="90" FieldName="ReportLink" Header=" ">
+                        <dxg:GridColumn x:Name="ColumnChecked" FieldName="IsChecked" Header=" " MinWidth="30"></dxg:GridColumn>
+                        <dxg:GridColumn x:Name="ColumnButtons"  AllowEditing="False" MinWidth="90" FieldName="ReportLink" Header=" ">
 							<dxg:GridColumn.DisplayTemplate>
 								<ControlTemplate>
 									<StackPanel Orientation="Horizontal">
@@ -96,7 +97,19 @@
 
 
 				</Grid>
-			</Grid>
+                <StackPanel Grid.Row="2" Orientation="Horizontal">
+                    <Button Margin="10 3 0 0"
+                                              Name="button_checkAllLeistungen" Click="button_checkAll_Click"
+                                              HorizontalAlignment="Left">Alle auswählen</Button>
+                    <Button Margin="10 3 0 0"
+                                              Name="button_uncheckAllLeistungen" Click="button_uncheckAll_Click"
+                                              HorizontalAlignment="Left">Alle abwählen</Button>
+                    <Button Margin="10 3 0 0"
+                                              Name="button_aufklappenAllLeistungen" Click="button_printInvoices_Click"
+                                              HorizontalAlignment="Left">Alle ausgewählten Rechnungen drucken</Button>
+                    
+                </StackPanel>
+            </Grid>
 		</GroupBox>
 	</Grid>
 

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

@@ -371,6 +371,77 @@ namespace BeWo.View.Detail.Accounting
 
             //var data = srGridControl.rowhan
         }
+
+        private void button_checkAll_Click(object sender, RoutedEventArgs e)
+        {
+            var visible = GetVisibleVMs();
+            foreach (var item in visible)
+            {
+                item.IsChecked = true;
+            }
+        }
+
+        private void button_uncheckAll_Click(object sender, RoutedEventArgs e)
+        {
+            var visible = GetVisibleVMs();
+            foreach (var item in visible)
+            {
+                item.IsChecked = false;
+            }
+        }
+
+        private void button_printInvoices_Click(object sender, RoutedEventArgs e)
+        {
+            var list = new List<InvoiceBaseVM>();
+
+            var items = datagrid_invoices.ItemsSource as IList<InvoiceBaseVM>;
+
+            if (items != null)
+            {
+                for (int i = 0; i < items.Count; i++)
+                {
+                    var vm = datagrid_invoices.GetRow(i) as InvoiceBaseVM;
+                    if (vm != null && vm.IsChecked)
+                    {
+                        list.Add(vm);
+                    }
+                }
+            }
+
+            PrintInvoices(list);
+        }
+
+        private void PrintInvoices(List<InvoiceBaseVM> list)
+        {
+            var oidList = list.Select(i => i.DataContract.InvoiceBaseOid.Value).ToList();
+            
+            ServiceFacade.DoReportServiceAsync(s => s.CreateInvoiceListReport(oidList), ms => BeWoApp.MainControl.Dispatch(() => BeWoUtils.ShowReportWindow(ms, "Rechnungen")));
+
+        }
+
+        private IList<InvoiceBaseVM> GetVisibleVMs()
+        {
+            var list = new List<InvoiceBaseVM>();
+
+            var items = datagrid_invoices.ItemsSource as IList<InvoiceBaseVM>;
+
+            if (items != null)
+            {
+                for (int i = 0; i < items.Count; i++)
+                {
+                    if (datagrid_invoices.IsRowVisible(i))
+                    {
+                        var vm = datagrid_invoices.GetRow(i) as InvoiceBaseVM;
+                        if (vm != null)
+                        {
+                            list.Add(vm);
+                        }
+                    }
+                }
+            }
+
+            return list;
+        }
     }
 
 }

BeWo/View/Detail/CustomerView.xaml

@@ -185,7 +185,9 @@
           </dxg:GridColumn>
           <dxg:GridColumn AllowEditing="False" FieldName="Employee.SimpleDescription" Header="{markup:Translate Betreuer(in)}" Width="150" SortOrder="Ascending"/>
           <dxg:GridColumn x:Name="gridcolumn_employeerole" FieldName="Role" Header="Rolle" Width="200" />
-          <dxg:GridColumn FieldName="Notice" Header="Erläuterung" Width="250" />
+                    <dxg:GridColumn FieldName="StartDate" Header="{markup:Translate Startdatum}" Width="200" />
+                    <dxg:GridColumn FieldName="EndDate" Header="{markup:Translate Enddatum}" Width="200" />
+                    <dxg:GridColumn FieldName="Notice" Header="Erläuterung" Width="250" />
         </dxg:GridControl.Columns>
         <dxg:GridControl.View>
           <dxg:TableView AutoWidth="true" ShowGroupPanel="False" ShowGroupedColumns="false" ShowTotalSummary="False" NavigationStyle="Cell" RowDoubleClick="TableView_OnRowDoubleClick" />

BeWo/View/Detail/MassnahmenHistory.cs

@@ -0,0 +1,136 @@
+using BeWo.Core;
+using BeWo.ViewModel.ListViewModel;
+using BS.Shared.Core;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using static BeWo.View.Detail.MassnahmenHistoryRecord;
+
+namespace BeWo.View.Detail
+{
+    //public class MassnahmenTreeViewHistoryManager
+    //{
+    //    public MassnahmenTreeViewHistoryManager()
+    //    {
+    //        History = new Stack<MassnahmenActionParameters>();
+    //    }
+
+    //    public Stack<MassnahmenActionParameters> History { get; set; }
+
+    //    internal void RecordAction(MassnahmenActionParameters param)
+    //    {
+    //        History.Push(param);
+    //    }
+
+    //    internal void UndoAction()
+    //    {
+
+    //    }
+
+    //    internal void UndoAddAction()
+    //    {
+
+    //    }
+
+    //    internal void UndoDeleteAction()
+    //    {
+
+    //    }
+
+    //    internal void UndoMoveAction()
+    //    {
+
+    //    }
+
+    //    internal void UndoCopyAction()
+    //    {
+
+    //    }
+    //}
+
+    public class MassnahmenHistory
+    {
+        public Action RefreshTree { get; set; }
+        public Action RefreshButton { get; set; }
+
+        public MassnahmenHistoryRecordOrigin Origin { get; set; }
+        public LinkedList<MassnahmenHistoryRecord> History { get; set; }
+        public LinkedListNode<MassnahmenHistoryRecord> LastChange { get; set; }
+
+        public MassnahmenTreeTrimmer TreeTrimmer { get; set; }
+        
+        public MassnahmenHistory(MassnahmenTreeTrimmer trimmer, Action refresh, Action button)
+        {
+            Origin = new MassnahmenHistoryRecordOrigin();
+            History = new LinkedList<MassnahmenHistoryRecord>();
+            History.AddLast(Origin);
+
+            LastChange = History.Last;
+
+            TreeTrimmer = trimmer;
+            RefreshTree = refresh;
+            RefreshButton = button;
+        }
+
+        public bool GotPrevAction => LastChange is object && LastChange.Value != Origin;
+        public bool GotNextAction => LastChange is object && LastChange.Next is object;
+        public bool GotChanges => LastChange is object && (GotNextAction || GotPrevAction);
+        
+        public void RecordAdd(NodeRelation param) => RecordAction(new MassnahmenHistoryRecordAdd(param));
+        public void RecordMove(MassnahmenHistoryRecordMove move) => RecordAction(move);
+        public void RecordImport(List<NodeRelation> param) => RecordAction(new MassnahmenHistoryRecordImport(param));
+        public void RecordDelete(MassnahmenHistoryRecordDelete del) => RecordAction(del);
+        public void RecordCopy(NodeRelation root, List<NodeRelation> param) => RecordAction(new MassnahmenHistoryRecordCopy(root, param));
+        public void RecordEdit(MassnahmenHistoryRecordEdit edit) => RecordAction(edit);
+
+        private void RecordAction(MassnahmenHistoryRecord val)
+        {
+            while (LastChange != History.Last)
+            {
+                History.RemoveLast();
+            }
+
+            History.AddLast(val);
+
+            LastChange = History.Last;
+
+            RefreshTree();
+            RefreshButton();
+        }
+
+        public void ClearHistory()
+        {
+            while(History.Last != History.First)
+            {
+                History.RemoveLast();
+            }
+
+            LastChange = History.Last;
+
+            RefreshButton();
+        }
+
+        public void UndoPrevAction()
+        {
+            var action = LastChange.Value;
+
+            TreeTrimmer.UndoAction(action);
+            
+            LastChange = LastChange.Previous;
+            RefreshButton();
+            RefreshTree();
+        }
+        public void RedoNextAction()
+        {
+            var action = LastChange.Next.Value;
+
+            TreeTrimmer.RedoAction(action);
+
+            LastChange = LastChange.Next;
+            RefreshButton();
+            RefreshTree();
+        }
+    }
+}

BeWo/View/Detail/MassnahmenHistoryRecord.cs

@@ -0,0 +1,129 @@
+using BeWo.Core;
+using BeWo.ViewModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BeWo.View.Detail
+{
+    public abstract class MassnahmenHistoryRecord
+    {
+        public struct NodeRelation
+        {
+            public SupportConceptGoalTreeItem Current { get; set; }
+            public SupportConceptGoalTreeItem Parent { get; set; }
+
+            public NodeRelation(SupportConceptGoalTreeItem newitem, SupportConceptGoalTreeItem parent)
+            {
+                Current = newitem;
+                Parent = parent;
+            }
+            public NodeRelation(SupportConceptGoalTreeItem newitem)
+            {
+                Current = newitem;
+                Parent = newitem.ParentGoal as SupportConceptGoalTreeItem;
+            }
+        }
+
+        public struct NodeEditInformation
+        {
+            public string Abbreviation { get; set; }
+            public string Description { get; set; }
+            public string Notice { get; set; }
+        }
+    }
+
+    public class MassnahmenHistoryRecordOrigin : MassnahmenHistoryRecord
+    {
+
+    }
+    
+    public class MassnahmenHistoryRecordAdd : MassnahmenHistoryRecord
+    {
+        public NodeRelation Parameter { get; set; }
+
+        public MassnahmenHistoryRecordAdd(SupportConceptGoalTreeItem newitem, SupportConceptGoalTreeItem parent)
+        {
+            Parameter = new NodeRelation(newitem, parent);
+        }
+        public MassnahmenHistoryRecordAdd(NodeRelation param)
+        {
+            Parameter = param;
+        }
+    }
+    
+    public class MassnahmenHistoryRecordImport : MassnahmenHistoryRecord
+    {
+        public List<NodeRelation> Parameters { get; set; }
+        public List<NodeRelation> ParametersReversed { get; set; }
+
+        public MassnahmenHistoryRecordImport(List<NodeRelation> list)
+        {
+            Parameters = list;
+            ParametersReversed = new Stack<NodeRelation>(list).ToList();
+        }
+    }
+
+    public class MassnahmenHistoryRecordDelete : MassnahmenHistoryRecord
+    {
+        public NodeRelation ExNode { get; set; }
+        public List<NodeRelation> Parameters { get; set; }
+
+        public MassnahmenHistoryRecordDelete(NodeRelation exnode, List<NodeRelation> list)
+        {
+            Parameters = list;
+            ExNode = exnode;
+        }
+    }
+
+    public class MassnahmenHistoryRecordMove : MassnahmenHistoryRecord
+    {
+        public SupportConceptGoalTreeItem Child { get; set; }
+        public SupportConceptGoalTreeItem ExParent { get; set; }
+        public SupportConceptGoalTreeItem Parent { get; set; }
+
+        public MassnahmenHistoryRecordMove(SupportConceptGoalTreeItem child, SupportConceptGoalTreeItem exparent, SupportConceptGoalTreeItem parent)
+        {
+            Child = child;
+            ExParent = exparent;
+            Parent = parent;
+        }
+    }
+
+    public class MassnahmenHistoryRecordCopy : MassnahmenHistoryRecord
+    {
+        public NodeRelation CurrentNode { get; set; }
+        public List<NodeRelation> Parameters { get; set; }
+
+        public MassnahmenHistoryRecordCopy(NodeRelation root, List<NodeRelation> list)
+        {
+            Parameters = list;
+            CurrentNode = root;
+        }
+    }
+
+    public class MassnahmenHistoryRecordEdit : MassnahmenHistoryRecord
+    {
+        public ValueListEntryVM VM { get; set; }
+
+        public NodeEditInformation Before { get; set; }
+        public NodeEditInformation After { get; set; }
+        
+        public MassnahmenHistoryRecordEdit(ValueListEntryVM vm, NodeEditInformation b, NodeEditInformation a)
+        {
+            Before = b;
+            After = a;
+            VM = vm;
+        }
+
+        public void SetVM(NodeEditInformation info)
+        {
+            VM.Abbreviation = info.Abbreviation;
+            VM.Description = info.Description;
+            VM.Notice = info.Notice;
+            VM.CommitToDataContract();
+        }
+    }
+}

BeWo/View/Detail/MassnahmenTreeTrimmer.cs

@@ -0,0 +1,342 @@
+using BeWo.Core;
+using BeWo.ViewModel;
+using BeWo.ViewModel.ListViewModel;
+using BS.Shared;
+using BS.Shared.Core;
+using BS.Shared.DataContracts;
+using BS.Shared.DataContracts.ClientPartials;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using static BeWo.View.Detail.MassnahmenHistoryRecord;
+
+namespace BeWo.View.Detail
+{
+    public class MassnahmenTreeTrimmer
+    {
+        public Dictionary<Type, Tuple<Action<MassnahmenHistoryRecord>, Action<MassnahmenHistoryRecord>>> Type2Actions { get; set; }
+
+        public MassnahmenTreeViewView View { get; set; }
+
+        public GenericValueListEntryListVM ViewModel => View.ViewModel;
+        public ObservableSortCollection<SupportConceptGoalTreeItem> GoalTree => View.GoalTree;
+
+        public MassnahmenTreeTrimmer(MassnahmenTreeViewView view)
+        {
+            View = view;
+
+            Type2Actions = new Dictionary<Type, Tuple<Action<MassnahmenHistoryRecord>, Action<MassnahmenHistoryRecord>>>
+            {
+                { typeof(MassnahmenHistoryRecordAdd), GetTuple<MassnahmenHistoryRecordAdd>(UndoAddAction, RedoAddAction) },
+                { typeof(MassnahmenHistoryRecordCopy), GetTuple<MassnahmenHistoryRecordCopy>(UndoCopyAction, RedoCopyAction) },
+                { typeof(MassnahmenHistoryRecordDelete), GetTuple<MassnahmenHistoryRecordDelete>(UndoDeleteAction, RedoDeleteAction) },
+                { typeof(MassnahmenHistoryRecordImport), GetTuple<MassnahmenHistoryRecordImport>(UndoImportAction, RedoImportAction) },
+                { typeof(MassnahmenHistoryRecordMove), GetTuple<MassnahmenHistoryRecordMove>(UndoMoveAction, RedoMoveAction) },
+                { typeof(MassnahmenHistoryRecordEdit), GetTuple<MassnahmenHistoryRecordEdit>(UndoEditAction, RedoEditAction) },
+            };
+        }
+
+        public void UndoAction(MassnahmenHistoryRecord action)
+        {
+            Type2Actions[action.GetType()].Item1(action);
+        }
+        public void RedoAction(MassnahmenHistoryRecord action)
+        {
+            Type2Actions[action.GetType()].Item2(action);
+        }
+        
+        public NodeRelation DoAddAction(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;
+
+            if (description is object) vm.Description = description;
+            if (abbreviation is object) vm.Abbreviation = abbreviation;
+            if (notice is object) vm.Notice = notice;
+
+            var newItem = new SupportConceptGoalTreeItem
+            {
+                GoalEntryVM = vm,
+                GoalEntryDC = vm.CommitToDataContract(),
+                ParentGoal = parent
+            };
+
+            var rtn = new NodeRelation(newItem, parent);
+
+            ViewModel.AddNewVMToList();
+
+            if (parent == null)
+            {
+                GoalTree.Add(newItem);
+                return rtn;
+            }
+                
+
+            vm.ParentEntry = parent.GoalEntryDC ?? parent.GoalEntryVM.CommitToDataContract();
+
+            parent.Items.Add(newItem);
+            parent.IsExpanded = true;
+
+            return rtn;
+        }
+        private void UndoAddAction(MassnahmenHistoryRecordAdd record)
+        {
+            DeactivateNode(record.Parameter);
+        }
+        private void RedoAddAction(MassnahmenHistoryRecordAdd param) => RedoAddAction(param.Parameter);
+        private void RedoAddAction(NodeRelation addParam)
+        {
+            ActivateNode(addParam);
+        }
+
+        public List<NodeRelation> DoCopyAction(SupportConceptGoalTreeItem parent, SupportConceptGoalTreeItem source, 
+            MassnahmenTreeCopyType copyType, bool force_deep_copy, 
+            out NodeRelation current, Stack<NodeRelation> records = null)
+        {
+            if (records is null)
+                records = new Stack<NodeRelation>();
+
+            if (source == null || parent == null)
+                throw new NotImplementedException("#43298467891364987");
+
+            var wm = source.GoalEntryVM;
+            var childs = source.Items.ToList();
+            var param = DoAddAction(parent, wm.Type, wm.Description, wm.Abbreviation, wm.Notice);
+            var node = param.Current;
+            var parameter = new NodeRelation(node, parent);
+
+            current = parameter;
+
+            records.Push(parameter);
+
+            if (copyType == MassnahmenTreeCopyType.Subtree || force_deep_copy)
+            {
+                foreach (var child in childs)
+                {
+                    DoCopyAction(node, child, copyType, force_deep_copy, out var item, records);
+                }
+            }
+
+            return records.ToList();
+        }
+        private void UndoCopyAction(MassnahmenHistoryRecordCopy record)
+        {
+            DeactivateSubtree(record.CurrentNode, record.Parameters);
+        }
+        private void RedoCopyAction(MassnahmenHistoryRecordCopy record)
+        {
+            ActivateSubtree(record.CurrentNode, record.Parameters);
+        }
+
+        public MassnahmenHistoryRecordDelete DoDeleteAction(NodeRelation param)
+        {
+            // Delete Full Subtree
+            var stack = new Stack<NodeRelation>();
+            var queue = new Queue<NodeRelation>();
+
+            DoDeleteActionRec(param.Current, ref stack, ref queue);
+
+            // Queue löschen
+            DeactivateSubtree(param, queue);
+            
+            //var list = stack.Select(x => new MassnahmenHistoryNodeParameter(x, View.GetParent(x))).ToList();
+            var node = new NodeRelation(param.Current, param.Parent);
+
+            return new MassnahmenHistoryRecordDelete(node, stack.ToList());
+        }
+        public void DoDeleteActionRec(SupportConceptGoalTreeItem item, ref Stack<NodeRelation> stack, ref Queue<NodeRelation> queue)
+        {
+            foreach (var child in item.Items)
+            {
+                DoDeleteActionRec(child, ref stack, ref queue);
+            }
+
+            var param = new NodeRelation(item);
+            stack.Push(param);
+            queue.Enqueue(param);
+        }
+        private void UndoDeleteAction(MassnahmenHistoryRecordDelete param)
+        {
+            ActivateSubtree(param.ExNode, param.Parameters);
+        }
+        private void RedoDeleteAction(MassnahmenHistoryRecordDelete param)
+        {
+            DeactivateSubtree(param.ExNode, param.Parameters);
+        }
+
+        public List<NodeRelation> DoImportAction(SupportConceptGoalDC goal, List<NodeRelation> records = null)
+        {
+            if (goal == null)
+                return null;
+
+            if (records == null)
+                records = new List<NodeRelation>();
+
+            goal.Children?.ForEach(x => DoImportAction(x, records));
+
+            if (goal.IsChecked)
+                AddIcf(goal, records);
+
+            return records;
+        }
+        private void UndoImportAction(MassnahmenHistoryRecordImport param)
+        {
+            foreach (var item in param.ParametersReversed)
+            {
+                DeactivateNode(item);
+            }
+        }
+        private void RedoImportAction(MassnahmenHistoryRecordImport param)
+        {
+            foreach (var item in param.Parameters)
+            {
+                ActivateNode(item);
+            }
+        }
+
+        public MassnahmenHistoryRecordMove DoMoveAction(SupportConceptGoalTreeItem child, SupportConceptGoalTreeItem ex_parent, SupportConceptGoalTreeItem parent)
+        {
+            // Entferne child aus Ex-Parent
+            if (ex_parent is object)
+                ex_parent.Items.Remove(child); 
+            else
+                GoalTree.Remove(child);
+
+            // Füge child parent hinzu
+            if (parent is object)
+                parent.Items.Add(child);
+            else
+                GoalTree.Add(child);
+
+            // Setze child Parent Entry
+            child.GoalEntryVM.ParentEntry = parent?.GoalEntryDC;
+            child.ParentGoal = parent;
+
+            return new MassnahmenHistoryRecordMove(child, ex_parent, parent);
+        }
+        private void UndoMoveAction(MassnahmenHistoryRecordMove move)
+        {
+            DoMoveAction(move.Child, move.Parent, move.ExParent);
+        }
+        private void RedoMoveAction(MassnahmenHistoryRecordMove move)
+        {
+            DoMoveAction(move.Child, move.ExParent, move.Parent);
+        }
+
+        public MassnahmenHistoryRecordEdit DoEditAction(ValueListEntryDC b, ValueListEntryVM a)
+        {
+            var before = new NodeEditInformation { Abbreviation = b.Abbreviation, Description = b.TypeDescription, Notice = b.Notice };
+            var after = new NodeEditInformation { Abbreviation = a.Abbreviation, Description = a.Description, Notice = a.Notice };
+            
+            return new MassnahmenHistoryRecordEdit(a, before, after);
+        }
+        private void UndoEditAction(MassnahmenHistoryRecordEdit edit)
+        {
+            edit.SetVM(edit.Before);
+        }
+        private void RedoEditAction(MassnahmenHistoryRecordEdit edit)
+        {
+            edit.SetVM(edit.After);
+        }
+
+        private Tuple<Action<MassnahmenHistoryRecord>, Action<MassnahmenHistoryRecord>> GetTuple<T1>(Action<T1> a, Action<T1> b) where T1 : MassnahmenHistoryRecord
+            => new Tuple<Action<MassnahmenHistoryRecord>, Action<MassnahmenHistoryRecord>>(x => a(x as T1), x => b(x as T1));
+        private SupportConceptGoalTreeItem AddIcf(SupportConceptGoalDC goal, List<NodeRelation> records)
+        {
+            if (goal == null) return null;
+
+            // Schaut, ob das Child bereits existiert
+            var similarGoal = GoalTree.FirstOrDefault(x => MassnahmenTreeViewView.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)
+            {
+                // Ist Root Element
+                var record = DoAddAction(null, ValueListEntryType.SupportConceptGoalCategoryType,
+                    goal.GoalEntryDC.TypeDescription, goal.GoalEntryDC.Abbreviation, goal.GoalEntryDC.Notice);
+
+                records.Add(record);
+
+                //GoalTree.Sort((x, y) => x.GoalEntryVM?.DisplayName?.CompareTo(y.GoalEntryVM?.DisplayName) ?? string.Compare(string.Empty, y.GoalEntryVM?.DisplayName, StringComparison.Ordinal));
+
+                return record.Current;
+            }
+
+            // Schaut, ob das ParentGoal bereits existiert
+            foreach (var goalTreeItem in GoalTree)
+            {
+                var similarParentGoal = MassnahmenTreeViewView.SearchGoalTreeItem(goalTreeItem, goal.ParentGoal.GoalEntryDC.TypeDescription, goal.ParentGoal.GoalEntryDC.Abbreviation, goal.ParentGoal.GoalEntryDC.Notice);
+                if (similarParentGoal == null)
+                    continue;
+
+                var record = DoAddAction(similarParentGoal, ValueListEntryType.SupportConceptGoalCategoryType, goal.GoalEntryDC.TypeDescription, goal.GoalEntryDC.Abbreviation, goal.GoalEntryDC.Notice);
+                records.Add(record);
+                return record.Current;
+            }
+
+            // Fügt den Parent hinzu
+            var parent = AddIcf(goal.ParentGoal, records);
+            var record2 = DoAddAction(parent, ValueListEntryType.SupportConceptGoalCategoryType,
+                goal.GoalEntryDC.TypeDescription, goal.GoalEntryDC.Abbreviation, goal.GoalEntryDC.Notice);
+            records.Add(record2);
+            return record2.Current;
+        }
+
+        private void ActivateSubtree(NodeRelation currentNode, List<NodeRelation> param)
+        {
+            foreach (var item in param)
+            {
+                ViewModel.VMList.Add(item.Current.GoalEntryVM);
+            }
+
+            if (currentNode.Parent is object)
+                currentNode.Parent.Items.Add(currentNode.Current);
+            else
+                GoalTree.Add(currentNode.Current);
+        }
+        private void ActivateNode(NodeRelation currentNode)
+        {
+            var newItem = currentNode.Current;
+            var parent = currentNode.Parent;
+
+            ViewModel.VMList.Add(newItem.GoalEntryVM);
+
+            if (parent != null)
+                parent.Items.Add(newItem);
+            else
+                GoalTree.Add(newItem);
+        }
+
+        private void DeactivateSubtree(NodeRelation currentNode, IEnumerable<NodeRelation> param)
+        {
+            foreach (var item in param)
+            {
+                ViewModel.VMList.Remove(item.Current.GoalEntryVM);
+            }
+
+            if (currentNode.Parent is object)
+                currentNode.Parent.Items.Remove(currentNode.Current);
+            else
+                GoalTree.Remove(currentNode.Current);
+        }
+        private void DeactivateNode(NodeRelation currentNode)
+        {
+            var newItem = currentNode.Current;
+            var parent = currentNode.Parent;
+
+            ViewModel.VMList.Remove(newItem.GoalEntryVM);
+
+            if (parent != null)
+                parent.Items.Remove(newItem);
+            else
+                GoalTree.Remove(newItem);
+        }
+    }
+}

BeWo/View/Detail/MassnahmenTreeViewView.xaml

@@ -11,7 +11,7 @@
             <view:ValueListEntryTypeToFontWeightConverter x:Key="ValueListEntryTypeToFontWeightConverter" />
         </ResourceDictionary>
     </localView:BeWoView.Resources>
-    <GroupBox Name="groupbox_root" Header="Ziele und Maßnahmen" Style="{StaticResource ObjectEditGroupBox}">
+    <GroupBox Name="groupbox_root" Header="Ziele und Maßnahmen" Style="{StaticResource ObjectEditGroupBox}" KeyDown="Groupbox_root_KeyDown">
         <GroupBox.Resources>
             <ContextMenu x:Key="cmGoals" MenuItem.Click="ContextMenuGoals_Click" Opened="ContextMenuGoals_Opened">
                 <MenuItem Header="Neue Maßnahme">
@@ -29,6 +29,22 @@
                         <Image Source="..\..\Ressources\Icons\Rename24.png"/>
                     </MenuItem.Icon>
                 </MenuItem>
+                <Separator />
+                <MenuItem Header="Einzelnes Element kopieren">
+                    <MenuItem.Icon>
+                        <Image Source="..\..\Ressources\Icons\Copy24.png"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Header="Elementbaum kopieren">
+                    <MenuItem.Icon>
+                        <Image Source="..\..\Ressources\Icons\Copy24.png"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Header="Einfügen">
+                    <MenuItem.Icon>
+                        <Image Source="..\..\Ressources\Icons\Paste24.png"/>
+                    </MenuItem.Icon>
+                </MenuItem>
                 <!--<MenuItem Header="Umbenennen">
                     <MenuItem.Icon>
                         <Image Source="..\..\Ressources\Icons\Rename24.png"/>
@@ -53,19 +69,33 @@
                     <ColumnDefinition Width="*" />
                     <ColumnDefinition Width="Auto" />
                     <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
                 </Grid.ColumnDefinitions>
-
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                
                 <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" />
+                <Button Grid.Column="2" Height="25" Content="Hinzufügen" Margin="3" Click="ZielHinzufuegenButton_Click" />
+                <Button Grid.Column="3" Height="25" Content="Icf Importieren" Margin="3" Click="IcfImport_Click" />
+                <ToggleButton Grid.Column="4" Height="25" Content="Bearbeiten" Margin="3" Checked="ToggleButton_Checked" Unchecked="ToggleButton_Unchecked" />
+                <StackPanel Orientation="Horizontal" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="10" HorizontalAlignment="Right">
+                    <Button x:Name="PrevButton" Height="25" Content="Prev" Margin="3" Click="PrevButton_Click" />
+                    <Button x:Name="NextButton" Height="25" Content="Next" Margin="3" Click="NextButton_Click" />
+                </StackPanel>
+                    
             </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}" >
+						      ItemsSource="{Binding IndividualGoalTree, UpdateSourceTrigger=PropertyChanged}" 
+                          MouseDown="TreeView_MouseDown" MouseMove="TreeView_MouseMove" 
+                           AllowDrop="True" PreviewDragOver="TreeView_PreviewDragOver" PreviewDrop="TreeView_PreviewDrop"  >
                     <TreeView.Resources>
                         <Style x:Key="igoal_treeitemstyle" TargetType="TreeViewItem">
                             <Setter Property="IsExpanded" Value="{Binding Path=IsExpanded, Mode=TwoWay}" />
@@ -84,7 +114,7 @@
                                 <TextBox Margin="0,0,0,0" Cursor="Arrow" Background="Transparent" Height="21" Padding="0,3,0,0" VerticalAlignment="Center" 
 								           LostFocus="TextBox_LostFocus" KeyDown="TextBox_KeyDown" BorderThickness="0" 
 								           IsReadOnly="True" Text="{Binding Path=GoalEntryVM.DisplayName, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}"
-								           FontWeight="{Binding Path=IsGoal, Converter={StaticResource ValueListEntryTypeToFontWeightConverter}}" ToolTipService.ShowDuration="100000">
+								           FontWeight="{Binding Path=IsGoal, Converter={StaticResource ValueListEntryTypeToFontWeightConverter}}" ToolTipService.ShowDuration="100000" Focusable="False">
                                     <TextBox.ToolTip>
                                         <StackPanel Orientation="Vertical">
                                             <Label FontWeight="Bold" Content="{Binding Path=GoalEntryVM.DisplayName, Mode=OneWay}"/>
@@ -96,7 +126,7 @@
                                         </StackPanel>
                                     </TextBox.ToolTip>
                                 </TextBox>
-                                
+
                             </Grid>
                         </HierarchicalDataTemplate>
                     </TreeView.Resources>

BeWo/View/Detail/MassnahmenTreeViewView.xaml.cs

@@ -1,6 +1,17 @@
-using System;
+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;
+using BS.Shared;
+using BS.Shared.Core;
+using BS.Shared.DataContracts;
+using BS.Shared.DataContracts.ClientPartials;
+using BS.Shared.Extensions;
+using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
 using System.Windows;
@@ -11,30 +22,29 @@ using System.Windows.Input;
 using System.Windows.Media;
 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;
-
-using BS.Shared;
-using BS.Shared.Core;
-using BS.Shared.DataContracts;
-using BS.Shared.DataContracts.ClientPartials;
-using BS.Shared.Extensions;
-
 namespace BeWo.View.Detail
 {
+    public enum MassnahmenTreeCopyType
+    {
+        Node, Subtree
+    }
+
     public partial class MassnahmenTreeViewView
     {
+        private bool _Bearbeitungsmodus;
 
         private TreeViewItem _SelectedGoalTreeNode;
         private GenericValueListEntryListVM _ViewModel;
-        private List<ValueListEntryDC> _Children2Delete;
         private List<SupportConceptGoalTreeItem> _TreeViewItemsList;
-        
+
+        private MassnahmenTreeCopyType _CopyType;
+        private SupportConceptGoalTreeItem _CopyItem;
+        private Point _lastMouseDown;
+        private SupportConceptGoalTreeItem _draggedItem;
+        private SupportConceptGoalTreeItem _parent;
+
+        private MassnahmenHistory _History;
+        private MassnahmenTreeTrimmer _TreeTrimmer;
 
         public MassnahmenTreeViewView(GenericValueListEntryListVM pViewModel)
         {
@@ -43,8 +53,56 @@ namespace BeWo.View.Detail
             ViewModel = pViewModel;
 
             DataContext = this;
+
+            Bearbeitungsmodus = false;
+
+            InitHistoryMode();
+        }
+
+        public void InitHistoryMode()
+        {
+            _TreeTrimmer = new MassnahmenTreeTrimmer(this);
+            _History = new MassnahmenHistory(_TreeTrimmer, SortGoalTree, UpdateHistoryButton);
+            UpdateHistoryButton();
+        }
+
+        public void UpdateHistoryButton()
+        {
+            PrevButton.Visibility = _History.GotPrevAction ? Visibility.Visible : Visibility.Hidden;
+            NextButton.Visibility = _History.GotNextAction ? Visibility.Visible : Visibility.Hidden;
+        }
+
+        public ObservableSortCollection<SupportConceptGoalTreeItem> GoalTree { get; private set; }
+        public override bool IsDirty => ViewModel != null && ViewModel.IsDirty || (_History?.GotChanges ?? false);
+        public static bool IsAllowedToEditGoals => BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConcept_AllowEditGoals);
+
+        public GenericValueListEntryListVM ViewModel
+        {
+            get => _ViewModel;
+            set
+            {
+                _ViewModel = value;
+                InitGoalCategoriesTreeView();
+                TreeView.ItemsSource = GoalTree;
+            }
+        }
+        public bool Bearbeitungsmodus
+        {
+            get
+            {
+                return _Bearbeitungsmodus;
+            }
+            set
+            {
+                // Wenn True aber keine Rechte
+                if (value && !IsAllowedToEditGoals)
+                    return;
+
+                _Bearbeitungsmodus = value;
+
+                TreeView.AllowDrop = _Bearbeitungsmodus;
+            }
         }
-        
 
         private void GoalTreeViewItem_PreviewMouseRightButtonDown(object sender, MouseButtonEventArgs e)
         {
@@ -63,13 +121,16 @@ namespace BeWo.View.Detail
             {
                 _SelectedGoalTreeNode = null;
             }
-        }
 
+            if (e.ChangedButton == MouseButton.Left)
+            {
+                _lastMouseDown = e.GetPosition(TreeView);
+            }
+        }
         private void TextBox_LostFocus(object sender, RoutedEventArgs e)
         {
             UpdateSelectedTreeItemText((TextBox)sender);
         }
-
         private void TextBox_KeyDown(object sender, KeyEventArgs e)
         {
             if (e.Key == Key.Return)
@@ -77,7 +138,6 @@ namespace BeWo.View.Detail
                 UpdateSelectedTreeItemText((TextBox)sender);
             }
         }
-
         private void ContextMenuGoals_Click(object sender, RoutedEventArgs e)
         {
             if (!(e.OriginalSource is MenuItem twi)) return;
@@ -108,17 +168,42 @@ namespace BeWo.View.Detail
                                             "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);
+                            DeleteTreeItem(selectedItem);
                         }
                     }
                     break;
                 case "Bearbeiten":
                     if (selectedItem != null)
-                        EditTreeItem(selectedItem.GoalEntryVM);
+                        StartEditTreeItem(selectedItem.GoalEntryVM);
+                    break;
+                case "Einzelnes Element kopieren":
+                    if (selectedItem != null)
+                    {
+                        _CopyItem = selectedItem;
+                        _CopyType = MassnahmenTreeCopyType.Node;
+                    }
+                    break;
+                case "Elementbaum kopieren":
+                    if (selectedItem != null)
+                    {
+                        _CopyItem = selectedItem;
+                        _CopyType = MassnahmenTreeCopyType.Subtree;
+                    }
+                    break;
+                case "Einfügen":
+                    if (!_Bearbeitungsmodus)
+                    {
+                        MessageBox.Show("Bearbeitungsmodus deaktiviert", "Aktion nicht möglich");
+                    }
+                    else
+                    {
+                        if (selectedItem != null)
+                            StartCopyItem(selectedItem, _CopyItem);
+                    }
+
                     break;
             }
         }
-
         private void ContextMenuGoals_Opened(object sender, RoutedEventArgs e)
         {
             if (e.OriginalSource is ContextMenu menu)
@@ -127,6 +212,8 @@ namespace BeWo.View.Detail
 
                 foreach (var menuitem in menu.Items.OfType<MenuItem>().Select(item => item))
                 {
+                    menuitem.IsEnabled = goal != null;
+
                     if (menuitem.Header.Equals("Neue Maßnahme"))
                     {
                         menuitem.IsEnabled = goal != null && !goal.IsGoal;
@@ -139,12 +226,23 @@ namespace BeWo.View.Detail
                     {
                         menuitem.IsEnabled = goal != null; // && goal.IsGoal;
                     }
+                    else if (menuitem.Header.Equals("Einfügen"))
+                    {
+                        menuitem.IsEnabled = goal != null && !goal.IsGoal && Bearbeitungsmodus && _CopyItem != null && (_CopyType == MassnahmenTreeCopyType.Node || !ContainsTreeItem(_CopyItem, goal));
+                    }
+                    else if (menuitem.Header.Equals("Elementbaum kopieren"))
+                    {
+                        menuitem.IsEnabled = goal != null && !goal.IsGoal && Bearbeitungsmodus;
+                    }
+                    else if (menuitem.Header.Equals("Einzelnes Element kopieren"))
+                    {
+                        menuitem.IsEnabled = goal != null && Bearbeitungsmodus;
+                    }
 
                     menuitem.IsEnabled = menuitem.IsEnabled && IsAllowedToEditGoals;
                 }
             }
         }
-
         private void GoalTreeItemContainerGenerator_StatusChanged(object sender, EventArgs e)
         {
             var ig = (ItemContainerGenerator)sender;
@@ -172,21 +270,10 @@ namespace BeWo.View.Detail
 
             _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));
+            AddTreeItem(null, ValueListEntryType.SupportConceptGoalCategoryType);
         }
-
         private void IcfImport_Click(object sender, RoutedEventArgs e)
         {
             var vorhandeneZiele = new List<ValueListEntryDC>();
@@ -196,7 +283,7 @@ namespace BeWo.View.Detail
                 vorhandeneZiele.AddRange(GetAllChildren(item, null));
             }
 
-//#if DEBUG                                                                                       
+            //#if DEBUG                                                                                       
             var control2 = new IcfImportControl(ServiceFacade.DoOperationsServiceSync(x => x.GetWholeIcfOhneImportierte(vorhandeneZiele)));
 
             var beWoWindow2 = new BeWoWindow
@@ -211,7 +298,8 @@ namespace BeWo.View.Detail
 
             control2.ButtonImportClicked += () =>
             {
-                ImportIcf(control2.TreeViewGoalItem);
+                ImportTreeItem(control2.TreeViewGoalItem);
+
                 beWoWindow2.Close();
             };
 
@@ -223,7 +311,7 @@ namespace BeWo.View.Detail
             beWoWindow2.ShowDialog();
 
             return;
-//#endif
+            //#endif
             //var control = new IcfImportControl(ServiceFacade.DoOperationsServiceSync(x => x.GetWholeIcf()));
 
             //var beWoWindow = new BeWoWindow
@@ -250,6 +338,166 @@ namespace BeWo.View.Detail
             //beWoWindow.ShowDialog();
         }
 
+        private void ToggleButton_Checked(object sender, RoutedEventArgs e)
+        {
+            Bearbeitungsmodus = true;
+        }
+        private void ToggleButton_Unchecked(object sender, RoutedEventArgs e)
+        {
+            Bearbeitungsmodus = false;
+        }
+
+        private void StartCopyItem(SupportConceptGoalTreeItem _item, SupportConceptGoalTreeItem _copy)
+        {
+            if (ContainsTreeItem(_copy, _item))
+                MessageBox.Show("Kopieren in tiefere Ziele/Maßnamhen nicht möglich!");
+            else
+            {
+                CopyTreeItem(_item, _copy, false);
+            }
+        }
+        private void StartMoveItem(SupportConceptGoalTreeItem _draggedItem, SupportConceptGoalTreeItem _parent)
+        {
+            if (ContainsTreeItem(_draggedItem, _parent))
+                MessageBox.Show("Kopieren in tiefere Ziele/Maßnamhen nicht möglich!");
+            else
+                MoveTreeItem(_draggedItem, _parent);
+        }
+        private void TreeView_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            if (e.ChangedButton == MouseButton.Left && Bearbeitungsmodus)
+            {
+                _lastMouseDown = e.GetPosition(TreeView);
+            }
+        }
+        private void TreeView_MouseMove(object sender, MouseEventArgs e)
+        {
+            try
+            {
+                if (e.LeftButton == MouseButtonState.Pressed && Bearbeitungsmodus)
+                {
+                    Point currentPosition = e.GetPosition(TreeView);
+
+                    if ((Math.Abs(currentPosition.X - _lastMouseDown.X) > 10.0) ||
+                        (Math.Abs(currentPosition.Y - _lastMouseDown.Y) > 10.0))
+                    {
+                        _draggedItem = (SupportConceptGoalTreeItem)TreeView.SelectedItem;
+                        if (_draggedItem != null)
+                        {
+                            DragDropEffects finalDropEffect = DragDrop.DoDragDrop(TreeView, _SelectedGoalTreeNode, DragDropEffects.Move);
+                            //Checking target is not null and item is
+                            //dragging(moving)
+                            if ((finalDropEffect == DragDropEffects.Move) && (_parent != null) && _parent != _draggedItem)
+                            {
+                                StartMoveItem(_draggedItem, _parent);
+
+
+                                //var origin_parent = _draggedItem.ParentGoal as SupportConceptGoalTreeItem;
+                                //var parent = _parent;
+                                //var child = _draggedItem;
+
+                                //origin_parent.Items.Remove(child);
+                                //child.GoalEntryVM.ParentEntry = parent.GoalEntryDC ?? parent.GoalEntryVM.CommitToDataContract();
+                                //parent.Items.Add(_draggedItem);
+                                //parent.IsExpanded = true;
+                                //TreeView.RefreshUI();                                
+                            }
+                        }
+                    }
+                }
+            }
+            catch (Exception)
+            {
+            }
+        }
+        private void TreeView_PreviewDragOver(object sender, DragEventArgs e)
+        {
+            try
+            {
+                Point currentPosition = e.GetPosition(TreeView);
+
+                e.Effects = DragDropEffects.None;
+
+                if ((Math.Abs(currentPosition.X - _lastMouseDown.X) > 10.0) ||
+                   (Math.Abs(currentPosition.Y - _lastMouseDown.Y) > 10.0))
+                {
+                    // Verify that this is a valid drop and then store the drop target
+                    var item = GetNearestContainer(e.OriginalSource as UIElement);
+                    if (CheckDropTarget(_draggedItem, item))
+                    {
+                        e.Effects = DragDropEffects.Move;
+                    }
+                    else
+                    {
+                        e.Effects = DragDropEffects.None;
+                    }
+                }
+                e.Handled = true;
+            }
+            catch (Exception ex)
+            {
+
+            }
+        }
+        private void TreeView_PreviewDrop(object sender, DragEventArgs e)
+        {
+            try
+            {
+                e.Effects = DragDropEffects.None;
+                e.Handled = true;
+
+                // Verify that this is a valid drop and then store the drop target
+                var target = GetNearestContainer(e.OriginalSource as UIElement);
+                if (target != null && _draggedItem != null)
+                {
+                    _parent = target;
+                    e.Effects = DragDropEffects.Move;
+                }
+            }
+            catch (Exception ex)
+            {
+
+            }
+        }
+
+        private void SortGoalTree()
+        {
+            foreach (var item in GoalTree)
+            {
+                SortRec(item);
+            }
+
+            GoalTree.Sort(CompareToCustom);
+            //GoalTree.Sort((x, y) => x.GoalEntryVM?.DisplayName?.CompareTo(y.GoalEntryVM?.DisplayName) ?? string.Compare(string.Empty, y.GoalEntryVM?.DisplayName, StringComparison.Ordinal));
+        }
+        private void SortRec(SupportConceptGoalTreeItem item)
+        {
+            if (item is object && item.Items is object && item.Items.Any())
+            {
+                foreach (var child in item.Items)
+                {
+                    SortRec(child);
+                }
+
+                item.Items.Sort(CompareToCustom);
+
+                //item.Items.Sort((x, y) => x.GoalEntryVM?.DisplayName?.CompareTo(y.GoalEntryVM?.DisplayName) ?? string.Compare(string.Empty, y.GoalEntryVM?.DisplayName, StringComparison.Ordinal));
+            }
+        }
+        private int CompareToCustom(SupportConceptGoalTreeItem a, SupportConceptGoalTreeItem b)
+        {
+            var res = a.GoalEntryVM?.DisplayName?.CompareTo(b.GoalEntryVM?.DisplayName);
+
+            if (res.HasValue && res.Value != 0)
+                return res.Value;
+
+            if (a.Items is object && b.Items is object)
+            {
+                return a.Items.Count.CompareTo(b.Items.Count);
+            }
+
+            return string.Compare(string.Empty, b.GoalEntryVM?.DisplayName, StringComparison.Ordinal);
+        }
 
         public List<ValueListEntryDC> GetAllChildren(SupportConceptGoalTreeItem treeItem, SupportConceptGoalDC dcItem)
         {
@@ -258,7 +506,7 @@ namespace BeWo.View.Detail
             if (dcItem == null)
             {
                 returnThis.Add(treeItem.GoalEntryDC);
-         
+
                 if (treeItem.Children.Count > 0)
                 {
                     foreach (var child in treeItem.Children)
@@ -282,104 +530,6 @@ namespace BeWo.View.Detail
 
             return returnThis;
         }
-
-        
-        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;
-        
-        
-        public void AddTreeItemWithControl(SupportConceptGoalTreeItem parent, ValueListEntryType valueListEntryType, string viewHeader)
-        {
-            var control = new ValueListEntryEditControl(new ValueListEntryVM(new ValueListEntryDC()), null);
-
-            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>>();
@@ -393,7 +543,6 @@ namespace BeWo.View.Detail
             {
                 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);
@@ -410,8 +559,10 @@ namespace BeWo.View.Detail
 
             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);
+                var ent = ViewModel.GetRemoved();
+                //var entfernte = _Children2Delete.Where(w => w.ValueListEntryOid != null).ToList();
+                //var entfernteDic = entfernte.ToDictionary(k => k.ValueListEntryOid.Value, v => v.ValueListEntryVersion.Value);
+                var entfernteDic = ent.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));
@@ -420,9 +571,10 @@ namespace BeWo.View.Detail
             ServiceFacade.DoMultipleValueListServicesAsync(lToDos, ReloadViewModel);
 
             Cache.GetInstance().ClearAllValueListEntries();
-        }
 
-        private static void EditTreeItem(ValueListEntryVM valueListEntry)
+            _History.ClearHistory();
+        }
+        private void StartEditTreeItem(ValueListEntryVM valueListEntry)
         {
             if (valueListEntry == null) return;
             if (valueListEntry.IsNew)
@@ -443,7 +595,14 @@ namespace BeWo.View.Detail
                 beWoWindow.Close();
             };
 
-            control.SaveButtonClicked += () => beWoWindow.Close();
+            control.SaveButtonClicked += () =>
+            {
+                EditTreeItem(valueListEntry);
+                
+                valueListEntry.CommitToDataContract();
+
+                beWoWindow.Close();
+            };
 
             beWoWindow.Height = 200;
             beWoWindow.Width = 500;
@@ -453,7 +612,6 @@ namespace BeWo.View.Detail
             beWoWindow.rootGroupBox.Header = "Bearbeiten";
             beWoWindow.ShowDialog();
         }
-
         private static void EditItem(TreeView tv, TreeViewItem tvi, object item, bool isNoticeTextBox = false)
         {
             if (item != null)
@@ -483,7 +641,6 @@ namespace BeWo.View.Detail
                 }
             }
         }
-
         private static void UpdateSelectedTreeItemText(TextBoxBase textBox)
         {
             if (!textBox.IsReadOnly)
@@ -494,8 +651,7 @@ namespace BeWo.View.Detail
                 textBox.Padding = new Thickness(1, 3, 1, 3);
             }
         }
-
-        private static SupportConceptGoalTreeItem SearchGoalTreeItem(SupportConceptGoalTreeItem supportConceptGoalTreeItem,
+        public static SupportConceptGoalTreeItem SearchGoalTreeItem(SupportConceptGoalTreeItem supportConceptGoalTreeItem,
             string description, string abbreviation, string notice)
         {
             if (supportConceptGoalTreeItem?.GoalEntryVM == null) return null;
@@ -524,7 +680,6 @@ namespace BeWo.View.Detail
                 ViewModel = vm;
             }));
         }
-
         private void InitGoalCategoriesTreeView()
         {
             var categoriesWithParent = new List<SupportConceptGoalTreeItem>();
@@ -541,6 +696,7 @@ namespace BeWo.View.Detail
                     GoalEntryVM = ViewModel.VMList.FirstOrDefault(f => f.DataContract.ValueListEntryOid.Value == category.GoalEntryDC.ValueListEntryOid.Value),
                     IsExpanded = true,
                     ParentGoal = category.ParentGoal
+
                 };
                 if (item.GoalEntryDC.ParentOid == null)
                 {
@@ -579,7 +735,7 @@ namespace BeWo.View.Detail
 
             foreach (var goal in ViewModel.VMList.Where(w => w.Type.Equals(ValueListEntryType.SupportConceptGoalType)))
             {
-                
+
                 var item = new SupportConceptGoalTreeItem { GoalEntryVM = goal };
 
                 if (goal.ParentEntry == null || !goal.ParentEntry.ValueListEntryOid.HasValue || !dictOid2TreeItem.ContainsKey(goal.ParentEntry.ValueListEntryOid.Value))
@@ -597,26 +753,14 @@ namespace BeWo.View.Detail
             GoalTree = iGoalList;
         }
 
-        private void TraverseCollection(SupportConceptGoalTreeItem item)
-        {
-            var result = new List<ValueListEntryDC> { item.GoalEntryDC ?? item.GoalEntryVM.CommitToDataContract() };
-
-            foreach (var child in item.Items)
-            {
-                TraverseCollection(child);
-            }
-
-            _Children2Delete.AddRange(result);
-        }
-
         private void GetAllTreeViewItems()
         {
+            _TreeViewItemsList = new List<SupportConceptGoalTreeItem>();
             foreach (var parent in GoalTree)
             {
                 TraverseTreeViewItem(parent);
             }
         }
-
         private void TraverseTreeViewItem(SupportConceptGoalTreeItem item)
         {
             _TreeViewItemsList.Add(item);
@@ -626,75 +770,188 @@ namespace BeWo.View.Detail
             }
         }
 
-        private void ImportIcf(SupportConceptGoalDC goal)
+        public void AddTreeItemWithControl(SupportConceptGoalTreeItem parent, ValueListEntryType valueListEntryType, string viewHeader)
         {
-            if (goal == null) return;
+            var control = new ValueListEntryEditControl(new ValueListEntryVM(new ValueListEntryDC()), null);
 
-            goal.Children?.ForEach(ImportIcf);
+            var beWoWindow = new BeWoWindow();
 
-            if (goal.IsChecked)
-                AddIcf(goal);
+            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 SupportConceptGoalTreeItem AddIcf(SupportConceptGoalDC goal)
+        private void AddTreeItem(SupportConceptGoalTreeItem parent, ValueListEntryType valueListEntryType, string description = null, string abbreviation = null, string notice = null)
         {
-            if (goal == null) return null;
+            var param = _TreeTrimmer.DoAddAction(parent, valueListEntryType, description, abbreviation, notice);
 
-            // 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);
+            _History.RecordAdd(param);
         }
-        
-        
-
-        private bool IstGleichesZiel(ValueListEntryVM ziel1, ValueListEntryVM ziel2)
+        private void ImportTreeItem(SupportConceptGoalDC goal)
         {
-            if (ziel1.DataContract.ValueListEntryOid.HasValue && ziel2.DataContract.ValueListEntryOid.HasValue)
+            var param = _TreeTrimmer.DoImportAction(goal);
+
+            _History.RecordImport(param);
+        }
+        private void DeleteTreeItem(SupportConceptGoalTreeItem selectedItem)
+        {
+            var del = _TreeTrimmer.DoDeleteAction(new MassnahmenHistoryRecord.NodeRelation(selectedItem));
+
+            _History.RecordDelete(del);
+        }
+        private void CopyTreeItem(SupportConceptGoalTreeItem parent, SupportConceptGoalTreeItem source, bool force_deep_copy)
+        {
+            var param = _TreeTrimmer.DoCopyAction(parent, source, _CopyType, force_deep_copy, out var current);
+
+            _History.RecordCopy(current, param);
+        }
+        private void MoveTreeItem(SupportConceptGoalTreeItem child, SupportConceptGoalTreeItem parent)
+        {
+            var ex_parent = GetParent(child);
+
+            if (ex_parent == parent)
+                return;
+
+            var record = _TreeTrimmer.DoMoveAction(child, ex_parent, parent);
+
+            _History.RecordMove(record);
+        }
+        private void EditTreeItem(ValueListEntryVM valueListEntry)
+        {
+            var param = _TreeTrimmer.DoEditAction(valueListEntry.DataContract, valueListEntry);
+
+            _History.RecordEdit(param);
+        }
+
+        private SupportConceptGoalTreeItem GetNearestContainer(UIElement element)
+        {
+            TreeViewItem container = element as TreeViewItem;
+            while ((container == null) && (element != null))
             {
-                return ziel1.DataContract.ValueListEntryOid.Value == ziel2.DataContract.ValueListEntryOid.Value;
+                element = VisualTreeHelper.GetParent(element) as UIElement;
+                container = element as TreeViewItem;
             }
-            else if (!ziel1.DataContract.ValueListEntryOid.HasValue && !ziel2.DataContract.ValueListEntryOid.HasValue)
-            {
-                if (ziel1.ParentEntry != null && ziel2.ParentEntry != null && ziel1.ParentEntry.Equals(ziel1.ParentEntry))
+            return container?.DataContext as SupportConceptGoalTreeItem;
+        }
+        private bool CheckDropTarget(SupportConceptGoalTreeItem _sourceItem, SupportConceptGoalTreeItem _targetItem)
+        {
+            if (_sourceItem == null || _targetItem == null)
+                return false;
+
+            if (_targetItem.Items.Contains(_sourceItem))
+                return false;
+
+            if (FindAncestor(_sourceItem, _targetItem))
+                return false;
+
+            return _sourceItem != _targetItem;
+        }
+        private bool ContainsTreeItem(SupportConceptGoalTreeItem root, SupportConceptGoalTreeItem item)
+        {
+            if (root == item)
+                return true;
+
+            if (root.Items is object && root.Items.Any())
+                foreach (var child in root.Items)
                 {
-                    bool test = ziel1.Equals(ziel2);
-                    return ziel1.Description == ziel2.Description;
+                    if (ContainsTreeItem(child, item))
+                        return true;
                 }
-                else if (ziel1.ParentEntry == null && ziel2.ParentEntry == null)
-                {
-                    return ziel1.Description == ziel2.Description;
-                }
-            }
+
             return false;
         }
+
+        private bool FindAncestor(SupportConceptGoalTreeItem ancestor, SupportConceptGoalTreeItem child)
+        {
+            if (child == null || ancestor == null)
+                return false;
+
+            var parent = GetParent(child);
+
+            if (parent is object)
+                return parent == ancestor || FindAncestor(ancestor, parent);
+
+            return false;
+        }
+        public SupportConceptGoalTreeItem GetParent(SupportConceptGoalTreeItem lostchild)
+        {
+            if (lostchild.ParentGoal is SupportConceptGoalTreeItem item)
+                return item;
+
+            return null;
+
+            throw new IndexOutOfRangeException("#3432432431a4 - Parent Support Goal Tree Item not found");
+        }
+        private bool FindParent(SupportConceptGoalTreeItem parent, SupportConceptGoalTreeItem current, SupportConceptGoalTreeItem lostchild, out SupportConceptGoalTreeItem foundchild)
+        {
+            if (current == lostchild)
+            {
+                foundchild = parent;
+                return true;
+            }
+
+            foreach (var current_child in current.Items)
+            {
+                if (FindParent(current, current_child, lostchild, out foundchild))
+                {
+                    return true;
+                }
+            }
+
+            foundchild = null;
+            return false;
+        }
+
+        private void PrevButton_Click(object sender, RoutedEventArgs e)
+        {
+            if (!_History.GotPrevAction)
+                return;
+
+            _History.UndoPrevAction();
+        }
+        private void NextButton_Click(object sender, RoutedEventArgs e)
+        {
+            if (!_History.GotNextAction)
+                return;
+
+            _History.RedoNextAction();
+        }
+
+        private void Groupbox_root_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Right)
+            {
+                NextButton_Click(this, new RoutedEventArgs());
+            }
+            else if (e.Key == Key.Left)
+            {
+                PrevButton_Click(this, new RoutedEventArgs());
+            }
+        }
     }
 
     public class ValueListEntryTypeToFontWeightConverter : IValueConverter

BeWo/View/StundenplanView.xaml

@@ -74,7 +74,7 @@
                                                     <RowDefinition Height="23" />
                                                     <RowDefinition Height="*" />
                                                 </Grid.RowDefinitions>
-                                                <TextBlock Text="Details" Margin="0 1" Grid.Row="1" Name="Details" VerticalAlignment="Bottom" TextElement.FontSize="16" TextElement.Foreground="{StaticResource TabItemHotTextBrush}" TextElement.FontFamily="Microsoft Sans Serif" />  
+                                                
                                                 <Grid Margin="0" Grid.Row="0" Grid.ColumnSpan="2" Grid.Column="0">
                                                     <Grid.ColumnDefinitions>
                                                         <ColumnDefinition Width="Auto" />
@@ -163,7 +163,8 @@
                                                         </Border>
                                                     </controls:PopupNonTopmost>
                                                 </Grid>
-                                            </Grid>
+                                                        <TextBlock Text="{Binding Path=DetailText}" Margin="0 1" Grid.Row="1" Name="Details" VerticalAlignment="Bottom" TextElement.FontSize="16" TextElement.Foreground="{StaticResource TabItemHotTextBrush}" TextElement.FontFamily="Microsoft Sans Serif" />
+                                                    </Grid>
                                         </GroupBox.Header>
                                         <dxg:GridControl Name="grid_Arbeitszeiten" Tag="{Binding}" ItemsSource="{Binding Path=ArbeitszeitEintraege.VMList, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" CustomColumnSort="GridControl_OnCustomColumnSort">
                                             <dxg:GridControl.Columns>

BeWo/View/StundenplanView.xaml.cs

@@ -10,6 +10,7 @@ using BS.Shared.Extensions;
 using BS.Shared.Core;
 using BS.Shared.DataContracts.Compact;
 using DevExpress.Xpf.Grid;
+using System;
 
 namespace BeWo.View
 {
@@ -60,8 +61,11 @@ namespace BeWo.View
             {
                 tabcontrol_Arbeitszeit.SelectedIndex = tabcontrol_Arbeitszeit.Items.Count - 1;
             }
+
+            
         }
-        
+
+
         private void ButtonOpenAndAddArbeitszeitClick(object sender, RoutedEventArgs e)
         {
             ViewModel.AddNewVMToList();

BeWo/ViewModel/ArbeitszeitVM.cs

@@ -36,7 +36,15 @@ namespace BeWo.ViewModel
         {
         }
 
-        public override bool IsDirty => base.IsDirty || ArbeitszeitEintraege != null && ArbeitszeitEintraege.IsDirty;
+        public override bool IsDirty
+        {
+            get
+            {
+                FirePropertyChanged(nameof(DetailText)); // Hack um die Aktualisierung des Textes zu erzwingen
+                return base.IsDirty || ArbeitszeitEintraege != null && ArbeitszeitEintraege.IsDirty;
+            }
+            
+        }
 
         public CompactCustomerDC Customer
         {
@@ -134,6 +142,30 @@ namespace BeWo.ViewModel
             }
         }
 
+        public String DetailText
+        { 
+            get
+            {
+                decimal stunden = 0;
+                foreach (var ae in ArbeitszeitEintraege.VMList)
+                {
+                    String dateStr1 = String.Format("{0:dd.MM.yyyy} {1}", DateTime.Now, ae.UhrzeitVon);
+                    String dateStr2 = String.Format("{0:dd.MM.yyyy} {1}", DateTime.Now, ae.UhrzeitBis);
+
+                    DateTime date1;
+                    DateTime date2;
+
+                    if (DateTime.TryParse(dateStr1, out date1) && DateTime.TryParse(dateStr2, out date2))
+                    {
+
+                        stunden += (decimal)date2.Subtract(date1).TotalHours;
+                    }
+                }
+
+                return String.Format("Gesamtstunden: {0:0.00}", stunden);
+            }
+        }
+
         public ArbeitszeitEintragListVM ArbeitszeitEintraege
         {
             get => _ArbeitszeitEintraege;

BeWo/ViewModel/CustomerEmployeeRelationVM.cs

@@ -3,6 +3,7 @@
 using BS.Shared.DataContracts;
 using BS.Shared.DataContracts.Compact;
 using BS.Shared.Extensions;
+using System;
 
 namespace BeWo.ViewModel
 {
@@ -22,6 +23,10 @@ namespace BeWo.ViewModel
 
         public static string PropertyName_Chatpartner = "Chatpartner";
 
+        public static string PropertyName_StartDate = "StartDate";
+
+        public static string PropertyName_EndDate = "EndDate";
+
         private CompactCustomerDC _Customer;
 
         private CompactEmployeeDC _Employee;
@@ -32,6 +37,10 @@ namespace BeWo.ViewModel
 
         private bool _Chatpartner;
 
+        private DateTime? _StartDate;
+
+        private DateTime? _EndDate;
+
         public CustomerEmployeeRelationVM(CustomerEmployeeRelationDC pDC) : base(pDC, pDC.Employee2CustomerOid == null)
         {
         }
@@ -113,6 +122,34 @@ namespace BeWo.ViewModel
             }
         }
 
+        public DateTime? StartDate
+        {
+            get { return _StartDate; }
+            set
+            {
+                if (this.AreDifferent(this._StartDate, value))
+                {
+                    _StartDate = value;
+                    this.StoreDirtyInformation(this.AreDifferent(this.DataContract.StartDate, value), PropertyName_StartDate);
+                    this.FirePropertyChanged(PropertyName_StartDate);
+                }
+            }
+        }
+
+        public DateTime? EndDate
+        {
+            get { return _EndDate; }
+            set
+            {
+                if (this.AreDifferent(this._EndDate, value))
+                {
+                    _EndDate = value;
+                    this.StoreDirtyInformation(this.AreDifferent(this.DataContract.EndDate, value), PropertyName_EndDate);
+                    this.FirePropertyChanged(PropertyName_EndDate);
+                }
+            }
+        }
+
         [Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
         public ValueListEntryDC Role
         {
@@ -138,6 +175,8 @@ namespace BeWo.ViewModel
                 this._Role = pDataContract.RelationRole;
                 this._Notice = pDataContract.Notice;
                 _Chatpartner = pDataContract.Chatpartner;
+                _StartDate = pDataContract.StartDate;
+                _EndDate = pDataContract.EndDate;
             }
         }
 
@@ -148,6 +187,8 @@ namespace BeWo.ViewModel
             pDataContract.RelationRole = this._Role;
             pDataContract.Notice = this._Notice;
             pDataContract.Chatpartner = _Chatpartner;
+            pDataContract.StartDate = _StartDate;
+            pDataContract.EndDate = _EndDate;
 
             return pDataContract;
         }

BeWo/ViewModel/InvoiceBaseVM.cs

@@ -128,6 +128,8 @@ namespace BeWo.ViewModel
         private string _InvoiceTitle = string.Empty;
         internal bool _IsPaid;
 
+        internal bool _IsChecked;
+
         private string _Notice = string.Empty;
 
         private long? _RecipientCostBearerOid;
@@ -185,6 +187,20 @@ namespace BeWo.ViewModel
 
         #region Properties
 
+        public bool IsChecked
+        {
+            get { return _IsChecked; }
+
+            set
+            {
+                if (AreDifferent(_IsChecked, value))
+                {
+                    _IsChecked = value;
+                    FirePropertyChanged("IsChecked");
+                }
+            }
+        }
+
         [Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
         public DateTime? AccountingPeriodEnd
         {

BeWo/ViewModel/ListViewModel/ServiceRecordListVM.cs

@@ -1702,12 +1702,9 @@ namespace BeWo.ViewModel.ListViewModel
                 if (BeWoApp.AppSettings.FilterGroupServiceCategories)
                 {
                     var serviceAccountings = ErstelleServiceCategorySchnittmenge(allInfos);
-                    PrototypeVM.UpdateServiceAccountings(serviceAccountings, _Category2Services, false);
+                    PrototypeVM.UpdateServiceAccountings(serviceAccountings, _Category2Services, true);
                 }
 
-                
-                
-                
             }
         }
 
@@ -1759,11 +1756,15 @@ namespace BeWo.ViewModel.ListViewModel
             {
                 if (info.ServiceAccountings != null && info.ServiceAccountings.Count == 0 && _Category2Services != null)
                 {
-                    foreach (var descList in _Category2Services.Values)
+                    foreach (var cat in _Category2Services.Keys)
                     {
-                        foreach (var desc in descList)
+                        if (cat.OhneHilfeplan.HasValue && cat.OhneHilfeplan.Value != AccountingvisibilityType.NichtKlientenbezogen)
                         {
-                            info.ServiceAccountings.Add(new ServiceAccountingDC { ServiceDescription = desc });
+                            var descList = _Category2Services[cat];
+                            foreach (var desc in descList)
+                            {
+                                info.ServiceAccountings.Add(new ServiceAccountingDC { ServiceDescription = desc });
+                            }
                         }
                     }
                 }

BeWoPlanerMobil/BeWoPlanerMobil.csproj.user

@@ -8,7 +8,7 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <ProjectView>ShowAllFiles</ProjectView>
     <WebStackScaffolding_ViewDialogWidth>600</WebStackScaffolding_ViewDialogWidth>
     <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>

Data/Entities/Employee2Customer.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 
 using BS.Shared;
 
@@ -144,5 +145,9 @@ namespace BeWo.Data.Entities
                 }
             }
         }
+
+        public virtual DateTime? StartDate { get; set; }
+
+        public virtual DateTime? EndDate { get; set; }
     }
 }

Data/Entities/Mandator.cs

@@ -414,6 +414,8 @@ namespace BeWo.Data.Entities
 
 		public virtual bool IsMedicationAllowed { get; set; }
 
+        public virtual string LastModules { get; set; }
+
         public virtual string Apikey
         {
             get

Data/ICF/ICFDAO.cs

@@ -22,18 +22,13 @@ namespace BeWo.Data.ICF
         {
             try
             {
-                string file = ConfigurationManager.AppSettings.Get("ICFFile");
-                if (String.IsNullOrEmpty(file) ||
-                    !File.Exists(BS.Shared.Core.Utils.CreateSavePath(AppDomain.CurrentDomain.BaseDirectory, @"bin\ICF\" + file)))
-                {
-                    file = "icf.xml";
-                }
+                var filename = GetFileName();
 
                 var baseDirectory = AppDomain.CurrentDomain.BaseDirectory;
 
-                file = BS.Shared.Core.Utils.CreateSavePath(AppDomain.CurrentDomain.BaseDirectory, @"bin\ICF\" + file);
+                var filepath = BS.Shared.Core.Utils.CreateSavePath(AppDomain.CurrentDomain.BaseDirectory, @"bin\ICF\" + filename);
                 //file = @"D:\Projects\beyondSoft\BeWoPlaner\BeWo\Data\ICF\icf.xml";
-                _File = XDocument.Load(file);
+                _File = XDocument.Load(filepath);
   
                 Debug.WriteLine("Dokument geladen");
                 _Root = _File.Descendants("Class").Where(x => x.Attribute("code")?.Value == "d" /*|| x.Attribute("code")?.Value == "s" ||
@@ -54,6 +49,21 @@ namespace BeWo.Data.ICF
             }
         }
 
+        public static string GetFileName()
+        {
+            string filename = ConfigurationManager.AppSettings.Get("ICFFile");
+
+            if (String.IsNullOrEmpty(filename))
+                return "icf.xml";
+
+            string path = BS.Shared.Core.Utils.CreateSavePath(AppDomain.CurrentDomain.BaseDirectory, @"bin\ICF\" + filename);
+
+            if (File.Exists(path))
+                return filename;
+
+            return "icf.xml";
+        }
+
         public static IList<ValueListEntryDC> GetIcf()
         {
             if (_Root == null) 

Data/Mappings/Employee2Customer.hbm.xml

@@ -18,6 +18,8 @@
     <property column="EmployeeOid" type="Int64" name="EmployeeOid" update="false" insert="false" />
     <property column="CustomerOid" type="Int64" name="CustomerOid" update="false" insert="false" />
     <property column="Chatpartner" name="Chatpartner" />
+	<property name="StartDate" />
+	<property name="EndDate" />
     
     <many-to-one name="Employee" column="EmployeeOid" class="BeWo.Data.Entities.Employee,BeWo.Data" cascade="none" />
     <many-to-one name="Customer" column="CustomerOid" class="BeWo.Data.Entities.Customer,BeWo.Data" cascade="none" />

Data/Mappings/Mandator.hbm.xml

@@ -25,7 +25,9 @@
 		<property column="SystemEntryID" type="BS.Shared.SystemEntryID, BS.Shared" name="SystemEntryID" />
 		<property name="IsSchedulerAllowed" />
 		<property name="IsMedicationAllowed" />
-    <property column="ApiKey" type="String" name="Apikey" length="256" />
+		<property name="LastModules" />
+		
+		<property column="ApiKey" type="String" name="Apikey" length="256" />
 		
 	</class>
 </hibernate-mapping>

Model/Changes_2023_09_07_Mandator_E2C.txt

@@ -0,0 +1,6 @@
+
+ALTER TABLE `Employee2Customer` ADD COLUMN `StartDate` datetime NULL;
+
+ALTER TABLE `Employee2Customer` ADD COLUMN `EndDate` datetime NULL;
+
+ALTER TABLE `Mandator` ADD COLUMN `LastModules` MEDIUMTEXT NULL;

Model/Changes_alle_fuer_neue_db.txt

@@ -953,3 +953,9 @@ ADD COLUMN `LicenseType` VARCHAR(128) NULL DEFAULT NULL;
 
 ALTER TABLE `invoicebase` 
 ADD COLUMN `StornoInvoiceBaseOid` BIGINT NULL DEFAULT NULL;
+
+ALTER TABLE `Employee2Customer` ADD COLUMN `StartDate` datetime NULL;
+
+ALTER TABLE `Employee2Customer` ADD COLUMN `EndDate` datetime NULL;
+
+ALTER TABLE `Mandator` ADD COLUMN `LastModules` MEDIUMTEXT NULL;

Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs

@@ -802,7 +802,7 @@ namespace BeWo.Report.ReportObjects
 	        return null;
 	    }
 
-	    private bool HatArbeitszeitImZeitraum(IList<Arbeitszeit> arbeitszeiten, DateTime start, DateTime ende)
+	    protected bool HatArbeitszeitImZeitraum(IList<Arbeitszeit> arbeitszeiten, DateTime start, DateTime ende)
 	    {
 	        if (arbeitszeiten != null)
 	        {
@@ -842,7 +842,7 @@ namespace BeWo.Report.ReportObjects
 	        return soll;
 	    }
 
-	    private decimal GetArbeitszeitStundenFuerTag(Arbeitszeit az, DateTime tag)
+	    protected decimal GetArbeitszeitStundenFuerTag(Arbeitszeit az, DateTime tag)
 	    {
 	        var day = tag.DayOfWeek;
 	        decimal stunden = 0;

ReportImp/AWOMuensterlandRecklinghausen/AWOMuensterlandRecklinghausen.csproj

@@ -56,6 +56,24 @@
     <Compile Include="CustomReportCreator.cs" />
     <Compile Include="Export\CustomDataExporter.cs" />
     <Compile Include="Export\DiamantExporter.cs" />
+    <Compile Include="Finanzauswertung.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Finanzauswertung.designer.cs">
+      <DependentUpon>Finanzauswertung.cs</DependentUpon>
+    </Compile>
+    <Compile Include="FKPlanung.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="FKPlanung.designer.cs">
+      <DependentUpon>FKPlanung.cs</DependentUpon>
+    </Compile>
+    <Compile Include="FSJPlanung.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="FSJPlanung.designer.cs">
+      <DependentUpon>FSJPlanung.cs</DependentUpon>
+    </Compile>
     <Compile Include="Invoicing\CustomInvoiceCreation.cs" />
     <Compile Include="Invoicing\CustomInvoiceFactory.cs" />
     <Compile Include="Mitarbeiterarbeitszeitkonto.cs">
@@ -84,12 +102,6 @@
       <DependentUpon>Quittierungsbeleg.cs</DependentUpon>
     </Compile>
     <Compile Include="Reporting\CustomerRelations.cs" />
-    <Compile Include="FKPlanung.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="FKPlanung.designer.cs">
-      <DependentUpon>FKPlanung.cs</DependentUpon>
-    </Compile>
     <Compile Include="Reporting\KannAllesWeissAllesRO.cs" />
     <Compile Include="Reporting\Klienteninformationen.cs" />
     <Compile Include="Reporting\KlientUmfeldPerson1.cs" />
@@ -105,12 +117,6 @@
     <Compile Include="SbdRechnung.Designer.cs">
       <DependentUpon>SbdRechnung.cs</DependentUpon>
     </Compile>
-    <Compile Include="FSJPlanung.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="FSJPlanung.designer.cs">
-      <DependentUpon>FSJPlanung.cs</DependentUpon>
-    </Compile>
     <Compile Include="SBListe.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -158,6 +164,16 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="Finanzauswertung.resx">
+      <DependentUpon>Finanzauswertung.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FKPlanung.resx">
+      <DependentUpon>FKPlanung.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FSJPlanung.resx">
+      <DependentUpon>FSJPlanung.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Mitarbeiterarbeitszeitkonto.resx">
       <DependentUpon>Mitarbeiterarbeitszeitkonto.cs</DependentUpon>
     </EmbeddedResource>
@@ -172,16 +188,10 @@
       <DependentUpon>Quittierungsbeleg.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="FKPlanung.resx">
-      <DependentUpon>FKPlanung.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="SbdRechnung.resx">
       <DependentUpon>SbdRechnung.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="FSJPlanung.resx">
-      <DependentUpon>FSJPlanung.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="SBListe.resx">
       <DependentUpon>SBListe.cs</DependentUpon>
     </EmbeddedResource>

ReportImp/AWOMuensterlandRecklinghausen/Finanzauswertung.cs

@@ -0,0 +1,59 @@
+using System;
+using System.Linq;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+using BeWo.Report;
+using BeWo.Report.ReportObjects;
+using BS.Shared;
+
+namespace AWOMuensterlandRecklinghausen
+{
+    public partial class Finanzauswertung : DevExpress.XtraReports.UI.XtraReport // , IBeWoReport<FinanceRO>
+    {
+        public Finanzauswertung()
+        {
+            InitializeComponent();
+        }
+
+        public void SetReportDataSource(FinanceRO pRO)
+        {
+            pRO.CalculateBillableAmountInReportTimeSpan();
+
+            if (pRO.SupportConceptFinanceList != null)
+            {
+                foreach (var scro in pRO.SupportConceptFinanceList)
+                {
+                    Customer c = DAOFactory.GenericDAO.LoadByID<Customer>(scro.Costbearer2Supportconcept.SupportConcept.Customer.CustomerOid);
+
+                    if (c.Customer2OrganisationList != null && c.Customer2OrganisationList.Count > 0)
+                    {
+                        foreach (var c2o in c.Customer2OrganisationList)
+                        {
+                            foreach (var v2o in c2o.ValueList)
+                            {
+                                if (v2o.Entry.Value != null && v2o.Entry.Value.Contains("Schule"))
+                                {
+                                    scro.Custom1 = c2o.Organisation.Name;
+                                }
+                            }
+                        }
+                    }
+
+                    foreach (var e2c in c.Employee2CustomerList)
+                    {
+                        foreach (var v2o in e2c.ValueList)
+                        {
+                            if (v2o.Entry.Type == ValueListEntryType.StaffRoleType && v2o.Entry.Value.Contains("Hauptbetreuung"))
+                            {
+                                scro.Custom2 = e2c.Employee.Person.LastNameFirstName;
+                                scro.Custom3 = e2c.Employee.TaxNumber;
+                            }
+                        }
+                    }
+                }
+            }
+
+            this.bindingSource1.DataSource = pRO;
+        }
+    }
+}

ReportImp/AWOMuensterlandRecklinghausen/Finanzauswertung.designer.cs

@@ -0,0 +1,532 @@
+using BeWo.Report.ReportObjects;
+namespace AWOMuensterlandRecklinghausen
+{
+    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();
+            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.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell26 = 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.cellGeleistetImZeitraumHeader = new DevExpress.XtraReports.UI.XRTableCell();
+            this.cellRateFactorHeader = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell25 = 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.xrTableCell27 = 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.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
+            ((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(817.7084F, 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.xrTableCell3,
+            this.xrTableCell29,
+            this.xrTableCell26});
+            this.xrTableRow2.Name = "xrTableRow2";
+            this.xrTableRow2.Weight = 1D;
+            // 
+            // xrTableCell6
+            // 
+            this.xrTableCell6.Multiline = true;
+            this.xrTableCell6.Name = "xrTableCell6";
+            this.xrTableCell6.Text = "[Custom1]";
+            this.xrTableCell6.Weight = 1.0995207971471486D;
+            // 
+            // xrTableCell7
+            // 
+            this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.Custom2")});
+            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.79763655127335309D;
+            // 
+            // xrTableCell29
+            // 
+            this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.Custom3", "{0:0.00}")});
+            this.xrTableCell29.Name = "xrTableCell29";
+            this.xrTableCell29.StylePriority.UseTextAlignment = false;
+            this.xrTableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell29.Weight = 0.37389115840758363D;
+            // 
+            // 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.55483772008254539D;
+            // 
+            // 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 = "Wirtschaftsplan";
+            // 
+            // 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(817.7084F, 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.cellGeleistetImZeitraumHeader,
+            this.cellRateFactorHeader,
+            this.xrTableCell25});
+            this.xrTableRow1.Name = "xrTableRow1";
+            this.xrTableRow1.Weight = 1.3953493323567705D;
+            // 
+            // xrTableCell1
+            // 
+            this.xrTableCell1.Name = "xrTableCell1";
+            this.xrTableCell1.Text = "Schule";
+            this.xrTableCell1.Weight = 1.0995207920311372D;
+            // 
+            // xrTableCell2
+            // 
+            this.xrTableCell2.Name = "xrTableCell2";
+            this.xrTableCell2.StylePriority.UseTextAlignment = false;
+            this.xrTableCell2.Text = "Schulbegleitung";
+            this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell2.Weight = 0.79763656689509443D;
+            // 
+            // cellGeleistetImZeitraumHeader
+            // 
+            this.cellGeleistetImZeitraumHeader.Name = "cellGeleistetImZeitraumHeader";
+            this.cellGeleistetImZeitraumHeader.StylePriority.UseTextAlignment = false;
+            this.cellGeleistetImZeitraumHeader.Text = "Klient*in";
+            this.cellGeleistetImZeitraumHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.cellGeleistetImZeitraumHeader.Weight = 0.79763688054294035D;
+            // 
+            // cellRateFactorHeader
+            // 
+            this.cellRateFactorHeader.Name = "cellRateFactorHeader";
+            this.cellRateFactorHeader.StylePriority.UseTextAlignment = false;
+            this.cellRateFactorHeader.Text = "Kostenstelle";
+            this.cellRateFactorHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.cellRateFactorHeader.Weight = 0.37389101824762494D;
+            // 
+            // xrTableCell25
+            // 
+            this.xrTableCell25.Name = "xrTableCell25";
+            this.xrTableCell25.StylePriority.UseTextAlignment = false;
+            this.xrTableCell25.Text = "Erlöse September";
+            this.xrTableCell25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell25.Weight = 0.5548377192100773D;
+            // 
+            // 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(817.7083F, 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.xrTableCell4,
+            this.xrTableCell5,
+            this.xrTableCell27});
+            this.xrTableRow3.Name = "xrTableRow3";
+            this.xrTableRow3.Weight = 1D;
+            // 
+            // xrTableCell15
+            // 
+            this.xrTableCell15.CanGrow = false;
+            this.xrTableCell15.Multiline = true;
+            this.xrTableCell15.Name = "xrTableCell15";
+            this.xrTableCell15.Weight = 1.099520814156477D;
+            // 
+            // 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.79763656271187944D;
+            // 
+            // 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;
+            xrSummary1.FormatString = "{0:c}";
+            xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell27.Summary = xrSummary1;
+            this.xrTableCell27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell27.Weight = 0.554837159761131D;
+            // 
+            // 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(677.7084F, 25F);
+            this.xrPageInfo2.Name = "xrPageInfo2";
+            this.xrPageInfo2.SizeF = new System.Drawing.SizeF(140F, 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(270.0002F, 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;
+            // 
+            // xrTableCell3
+            // 
+            this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.CustomerName")});
+            this.xrTableCell3.Name = "xrTableCell3";
+            this.xrTableCell3.StylePriority.UseTextAlignment = false;
+            this.xrTableCell3.Text = "xrTableCell3";
+            this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell3.Weight = 0.79763654045261245D;
+            // 
+            // xrTableCell4
+            // 
+            this.xrTableCell4.Name = "xrTableCell4";
+            this.xrTableCell4.StylePriority.UseTextAlignment = false;
+            this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell4.Weight = 0.79763690650198149D;
+            // 
+            // xrTableCell5
+            // 
+            this.xrTableCell5.Name = "xrTableCell5";
+            this.xrTableCell5.StylePriority.UseTextAlignment = false;
+            this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell5.Weight = 0.37389109139763022D;
+            // 
+            // 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(45, 40, 50, 30);
+            this.PageHeight = 827;
+            this.PageWidth = 1169;
+            this.PaperKind = System.Drawing.Printing.PaperKind.A4;
+            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.GroupHeaderBand GroupHeader2;
+		private DevExpress.XtraReports.UI.XRTableCell cellGeleistetImZeitraumHeader;
+		private DevExpress.XtraReports.UI.XRTableCell cellRateFactorHeader;
+		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 xrTableCell25;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell26;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell27;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell29;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
+    }
+}

ReportImp/AWOMuensterlandRecklinghausen/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/AWOMuensterlandRecklinghausen/Reporting/KannAllesWeissAllesRO.cs

@@ -302,7 +302,7 @@ namespace AWOMuensterlandRecklinghausen.Reporting
                         }
                     }
                 }
-                // 4. Organisationen des Umfelds setzen (Schule + Schulleitung und Kotenträger
+                // 4. Organisationen des Umfelds setzen (Schule + Schulleitung und Kostenträger
                 if (customer.EnvironmentOrganisations != null && customer.EnvironmentOrganisations.Count > 0)
                 {
                     // 4.1 Schule setzen

ReportImp/AidshilfeEssen/SettlementReport2.Designer.cs

@@ -118,7 +118,7 @@ namespace AidshilfeEssen
             this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
             this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
-            this.Zwischensumme = new DevExpress.XtraReports.UI.ReportFooterBand();
+            this.Zwischensumme = new DevExpress.XtraReports.UI.GroupFooterBand();
             this.xrTable6 = new DevExpress.XtraReports.UI.XRTable();
             this.xrTableRow12 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -221,7 +221,7 @@ namespace AidshilfeEssen
             this.xrLabel18,
             this.xrLabel10});
             this.ReportFooter.Font = new System.Drawing.Font("Verdana", 10F);
-            this.ReportFooter.HeightF = 345.4584F;
+            this.ReportFooter.HeightF = 304.0002F;
             this.ReportFooter.KeepTogether = true;
             this.ReportFooter.Name = "ReportFooter";
             this.ReportFooter.StylePriority.UseFont = false;
@@ -232,7 +232,7 @@ namespace AidshilfeEssen
             this.xrLabel34.Borders = DevExpress.XtraPrinting.BorderSide.Top;
             this.xrLabel34.CanShrink = true;
             this.xrLabel34.Font = new System.Drawing.Font("Arial", 11F);
-            this.xrLabel34.LocationFloat = new DevExpress.Utils.PointFloat(426.2916F, 325.4584F);
+            this.xrLabel34.LocationFloat = new DevExpress.Utils.PointFloat(426.2919F, 284.0002F);
             this.xrLabel34.Name = "xrLabel34";
             this.xrLabel34.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel34.SizeF = new System.Drawing.SizeF(317.7083F, 20F);
@@ -249,7 +249,7 @@ namespace AidshilfeEssen
             this.xrLabel33.BackColor = System.Drawing.Color.Transparent;
             this.xrLabel33.CanShrink = true;
             this.xrLabel33.Font = new System.Drawing.Font("Arial", 11F);
-            this.xrLabel33.LocationFloat = new DevExpress.Utils.PointFloat(0F, 305.4584F);
+            this.xrLabel33.LocationFloat = new DevExpress.Utils.PointFloat(0.0003814697F, 264.0002F);
             this.xrLabel33.Name = "xrLabel33";
             this.xrLabel33.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel33.SizeF = new System.Drawing.SizeF(200.0002F, 19.99991F);
@@ -266,7 +266,7 @@ namespace AidshilfeEssen
             this.xrLabel12.Borders = DevExpress.XtraPrinting.BorderSide.Top;
             this.xrLabel12.CanShrink = true;
             this.xrLabel12.Font = new System.Drawing.Font("Arial", 11F);
-            this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 325.4584F);
+            this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0.0003814697F, 284.0002F);
             this.xrLabel12.Name = "xrLabel12";
             this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel12.SizeF = new System.Drawing.SizeF(200F, 19.99988F);
@@ -284,7 +284,7 @@ namespace AidshilfeEssen
             this.xrLabel32.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "Claim", "{0:c}")});
             this.xrLabel32.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
-            this.xrLabel32.LocationFloat = new DevExpress.Utils.PointFloat(597.9172F, 198.25F);
+            this.xrLabel32.LocationFloat = new DevExpress.Utils.PointFloat(597.9172F, 180.5417F);
             this.xrLabel32.Name = "xrLabel32";
             this.xrLabel32.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel32.SizeF = new System.Drawing.SizeF(147.0831F, 20.00001F);
@@ -299,7 +299,7 @@ namespace AidshilfeEssen
             this.xrLabel31.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrLabel31.CanShrink = true;
             this.xrLabel31.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
-            this.xrLabel31.LocationFloat = new DevExpress.Utils.PointFloat(0F, 198.2501F);
+            this.xrLabel31.LocationFloat = new DevExpress.Utils.PointFloat(0F, 180.5417F);
             this.xrLabel31.Name = "xrLabel31";
             this.xrLabel31.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel31.SizeF = new System.Drawing.SizeF(597.9169F, 19.99998F);
@@ -315,7 +315,7 @@ namespace AidshilfeEssen
             this.xrLabel29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "AmountAdvancedPayments", "{0:c}")});
             this.xrLabel29.Font = new System.Drawing.Font("Arial", 11F);
-            this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(597.9172F, 178.25F);
+            this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(597.9172F, 160.5417F);
             this.xrLabel29.Name = "xrLabel29";
             this.xrLabel29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel29.SizeF = new System.Drawing.SizeF(147.0831F, 20.00001F);
@@ -329,7 +329,7 @@ namespace AidshilfeEssen
             this.xrLabel30.BackColor = System.Drawing.Color.Transparent;
             this.xrLabel30.CanShrink = true;
             this.xrLabel30.Font = new System.Drawing.Font("Arial", 11F);
-            this.xrLabel30.LocationFloat = new DevExpress.Utils.PointFloat(0.0002463659F, 178.25F);
+            this.xrLabel30.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 160.5417F);
             this.xrLabel30.Name = "xrLabel30";
             this.xrLabel30.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel30.SizeF = new System.Drawing.SizeF(597.9167F, 20F);
@@ -341,7 +341,7 @@ namespace AidshilfeEssen
             // lblBetragFuerKostentraeger
             // 
             this.lblBetragFuerKostentraeger.Font = new System.Drawing.Font("Arial", 11F);
-            this.lblBetragFuerKostentraeger.LocationFloat = new DevExpress.Utils.PointFloat(597.9172F, 158.25F);
+            this.lblBetragFuerKostentraeger.LocationFloat = new DevExpress.Utils.PointFloat(597.9172F, 140.5417F);
             this.lblBetragFuerKostentraeger.Name = "lblBetragFuerKostentraeger";
             this.lblBetragFuerKostentraeger.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.lblBetragFuerKostentraeger.SizeF = new System.Drawing.SizeF(147.0831F, 20.00001F);
@@ -354,7 +354,7 @@ namespace AidshilfeEssen
             this.xrLabel24.BackColor = System.Drawing.Color.Transparent;
             this.xrLabel24.CanShrink = true;
             this.xrLabel24.Font = new System.Drawing.Font("Arial", 11F);
-            this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(0F, 158.25F);
+            this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(0F, 140.5417F);
             this.xrLabel24.Name = "xrLabel24";
             this.xrLabel24.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel24.SizeF = new System.Drawing.SizeF(597.9167F, 20F);
@@ -370,7 +370,7 @@ namespace AidshilfeEssen
             this.xrLabel11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecipientOrganisation")});
             this.xrLabel11.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
-            this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 138.25F);
+            this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 120.5416F);
             this.xrLabel11.Name = "xrLabel11";
             this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel11.SizeF = new System.Drawing.SizeF(745.0002F, 20F);
@@ -1089,7 +1089,7 @@ namespace AidshilfeEssen
             this.xrLabel16,
             this.xrLine7});
             this.GroupFooter1.Font = new System.Drawing.Font("Verdana", 10F);
-            this.GroupFooter1.HeightF = 75.30354F;
+            this.GroupFooter1.HeightF = 62.80355F;
             this.GroupFooter1.Name = "GroupFooter1";
             this.GroupFooter1.StylePriority.UseFont = false;
             // 
@@ -1276,20 +1276,18 @@ namespace AidshilfeEssen
             // 
             this.Zwischensumme.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
             this.xrTable6});
-            this.Zwischensumme.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Zwischensumme.HeightF = 34F;
+            this.Zwischensumme.HeightF = 26F;
             this.Zwischensumme.Name = "Zwischensumme";
-            this.Zwischensumme.StylePriority.UseFont = false;
             this.Zwischensumme.Visible = false;
             // 
             // xrTable6
             // 
-            this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(0.000333786F, 0F);
+            this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
             this.xrTable6.Name = "xrTable6";
             this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.xrTableRow12,
             this.xrTableRow3});
-            this.xrTable6.SizeF = new System.Drawing.SizeF(743.9996F, 34F);
+            this.xrTable6.SizeF = new System.Drawing.SizeF(743.9996F, 26F);
             this.xrTable6.StylePriority.UseFont = false;
             // 
             // xrTableRow12
@@ -1303,7 +1301,7 @@ namespace AidshilfeEssen
             // xrTableCell9
             // 
             this.xrTableCell9.BorderColor = System.Drawing.SystemColors.ControlLight;
-            this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell9.Borders = DevExpress.XtraPrinting.BorderSide.None;
             this.xrTableCell9.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.xrTableCell9.Name = "xrTableCell9";
             this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -1317,14 +1315,15 @@ namespace AidshilfeEssen
             // xrTableCell10
             // 
             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.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Double;
+            this.xrTableCell10.Borders = DevExpress.XtraPrinting.BorderSide.Top;
             this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.GrossAmountTotal")});
             this.xrTableCell10.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.xrTableCell10.Name = "xrTableCell10";
             this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrTableCell10.StylePriority.UseBorderColor = false;
+            this.xrTableCell10.StylePriority.UseBorderDashStyle = false;
             this.xrTableCell10.StylePriority.UseBorders = false;
             this.xrTableCell10.StylePriority.UseFont = false;
             this.xrTableCell10.StylePriority.UsePadding = false;
@@ -1332,7 +1331,7 @@ namespace AidshilfeEssen
             xrSummary1.FormatString = "{0:c}";
             xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
             this.xrTableCell10.Summary = xrSummary1;
-            this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
             this.xrTableCell10.Weight = 0.73199773522987122D;
             // 
             // xrTableRow3
@@ -1340,13 +1339,12 @@ namespace AidshilfeEssen
             this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
             this.xrTableCell11});
             this.xrTableRow3.Name = "xrTableRow3";
-            this.xrTableRow3.Weight = 0.40476190476190466D;
+            this.xrTableRow3.Weight = 0.21428571428571425D;
             // 
             // xrTableCell11
             // 
             this.xrTableCell11.BorderColor = System.Drawing.SystemColors.ControlLight;
-            this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell11.Borders = DevExpress.XtraPrinting.BorderSide.None;
             this.xrTableCell11.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.xrTableCell11.Name = "xrTableCell11";
             this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -1478,13 +1476,13 @@ namespace AidshilfeEssen
         private DevExpress.XtraReports.UI.XRLabel xrLabel12;
         private DevExpress.XtraReports.UI.XRLabel xrLabel33;
         private DevExpress.XtraReports.UI.XRLabel xrLabel34;
-        private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2;
-        private DevExpress.XtraReports.UI.ReportFooterBand Zwischensumme;
-        private DevExpress.XtraReports.UI.XRTable xrTable6;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow12;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
+        private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2;
+        private DevExpress.XtraReports.UI.GroupFooterBand Zwischensumme;
+        private DevExpress.XtraReports.UI.XRTable xrTable6;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow12;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
     }
 }

ReportImp/AidshilfeEssen/SettlementReport2.cs

@@ -20,42 +20,23 @@ namespace AidshilfeEssen
 
         public void SetReportDataSource(Settlement2RO pRO)
         {
-	        bool isDefaultSpitzabrechnung = false;
-
-			//if (String.IsNullOrEmpty(pRO.Notice))
-			//{
-			//	lblNotice.Visible = false;
-			//}
-
-	        if (pRO.InvoiceItems != null && pRO.InvoiceItems.Count == 1)
-	        {
-		        var ii = pRO.InvoiceItems[0];
-				if ((ii.ItemDescription == "Spitzabrechung" || ii.ItemDescription == "Spitzabrechnung") && ii.GrossAmountTotal == null && ii.RateFactor == null)
-		        {
-			        isDefaultSpitzabrechnung = true;
-		        }
-	        }
-
 			decimal rateFactor = 1;
 
 			foreach (var ii in pRO.InvoiceItems)
 			{
+				if (ii.RateFactor == 0)
+				{
+					Zwischensumme.Visible = true;
+					ii.ItemDescription = "Fehlkontakte";
+				}
+
 				if (ii.RateFactor.HasValue)
 				{
 					rateFactor = (100 + ii.RateFactor.Value) / 100;
 					ii.RateFactor = rateFactor;
 				}
-
-				if (ii.RateFactor == 0)
-				{
-					Zwischensumme.Visible = true;
-					if (!ii.ItemDescription.IsNullOrEmpty())
-					{
-						//ii.DetailDescription = Regex.Replace(ii.DetailDescription, ii.ItemDescription, "Fehlkontakte");
-					}
-					ii.ItemDescription = "Fehlkontakte";
-				}
 			}
+
 			pRO.RateFactor = (double)rateFactor;
 
 			var tage = (pRO.AccountingEndDate - pRO.AccountingStartDate).TotalDays;

ReportImp/AkggMid/CustomMitarbeiterstundenkontoBerechnung.cs

@@ -14,6 +14,8 @@ namespace AkggMid
 	public class CustomMitarbeiterstundenkontoBerechnung : MitarbeiterstundenkontoBerechnung
 	{
 		private CustomVacationService customVacationService = new CustomVacationService();
+		bool istSchulassi = false;
+		bool angemeldeterUserDarfAllesSehen = true; // Schulassistenzen dürfen den Stand Ende August nicht sehen
 
 		public override List<DateTime> GetFeiertage(int year)
 		{
@@ -25,20 +27,51 @@ namespace AkggMid
 		
 		public bool BerechneFerienTage { get; set; }
 
-		protected override void StarteBerechnung(DateTime berichtsAnfang, DateTime berichtsEnde, MitarbeiterstundenkontoRO.EmployeeDetail empDetail)
+        public override void CreateEmployeeDetails(MitarbeiterstundenkontoRO ro)
+        {
+            base.CreateEmployeeDetails(ro);
+            foreach (var ep in ro.EmployeeDetailList)
+            {
+				if (istSchulassi && ro.ReportStartDate < new DateTime(2023, 9, 1))
+                {
+					ep.StundenSollMax = 0;
+					ep.StundenSollOhneUrlaubKrankheit = 0;
+					ep.UrlaubUndKrankheit = 0;
+					ep.FlsSoll = 0;
+					ep.FlsIst = 0;
+					ep.FlsDiff = 0;
+					ep.StundenGesamtIst = 0;
+					ep.RelationFlsZuMittelbar = 0;
+					ep.Ueberstunden = 0;
+					ep.UeberstundenVormonat = 0;
+					ep.UeberstundenGesamt = 0;
+                }
+
+            }
+        }
+
+        protected override void StarteBerechnung(DateTime berichtsAnfang, DateTime berichtsEnde, MitarbeiterstundenkontoRO.EmployeeDetail empDetail)
 		{
 			BerechneFerienTage = false;
+			istSchulassi = false;
 
 			var c = empDetail.Employee.GetValidContractForDate(berichtsAnfang);
-			if (c != null && c.EmploymentType != null && berichtsAnfang < new DateTime(2023, 9, 4))
-            {
+			//if (c != null && c.EmploymentType != null && berichtsAnfang < new DateTime(2023, 9, 4))
+			if (c != null && c.EmploymentType != null)
+			{
 				//if (c.EmploymentType.Name.Contains("Verwaltung") || c.EmploymentType.Name.Contains("Teamleitung"))
     //            {
 				//	BerechneFerienTage = false;
     //            }
 				if (c.EmploymentType.Name == "Schulassistenz")
 				{
+					istSchulassi = true;
 					BerechneFerienTage = true;
+
+					if (BeWo.Data.Security.UserRightHelper.LoggedInUserHasRight(BS.Shared.UserRightType.Mitarbeiterstundenkonto_ViewAll))
+                    {
+						istSchulassi = false;
+                    }
 				}
 
 			}
@@ -88,5 +121,44 @@ namespace AkggMid
 
 			return dd;
 		}
+
+		public override MitarbeiterstundenkontoRO.EmployeeDetail BerechneUeberstundenBis(MitarbeiterstundenkontoRO.EmployeeDetail edOrig, IList<ServiceRecord> records, DateTime monat, out decimal? ueberstunden, out decimal alteExtraUeberstunden)
+		{
+
+			DateTime stichTag = new DateTime(2023, 9, 1);
+
+            //	if (monat.Year > 2022)
+            //	{
+            //		stichTag = new DateTime(2023, 1, 1);
+            //	}
+
+            //	if (monat.Year == 2020)
+            //	{
+            //		stichTag = new DateTime(2020, 1, 1);
+            //	}
+
+            if (monat >= stichTag)
+            {
+                decimal? ueberstundenBisStichtag = 0;
+                decimal ueberstundenExtraBisStichtag = 0;
+
+                base.BerechneUeberstundenBis(edOrig, records, stichTag, out ueberstundenBisStichtag, out ueberstundenExtraBisStichtag);
+
+                var ed = base.BerechneUeberstundenBis(edOrig, records, monat, out ueberstunden, out alteExtraUeberstunden);
+
+                ueberstunden -= (ueberstundenBisStichtag ?? 0);
+                alteExtraUeberstunden -= ueberstundenExtraBisStichtag;
+
+                return ed;
+            }
+			return base.BerechneUeberstundenBis(edOrig, records, monat, out ueberstunden, out alteExtraUeberstunden);
+			//         var ed = base.BerechneUeberstundenBis(edOrig, records, monat, out ueberstunden, out alteExtraUeberstunden);
+			//if (istSchulassi && monat < stichTag)
+			//         {
+			//	ueberstunden = 0;
+			//	alteExtraUeberstunden = 0;
+			//         }
+			//return ed;
+		}
 	}
 }

ReportImp/Alloheim/Alloheim.csproj

@@ -57,7 +57,7 @@
     <Compile Include="InvoiceCustomerReport.Designer.cs">
       <DependentUpon>InvoiceCustomerReport.cs</DependentUpon>
     </Compile>
-    <Compile Include="Invoicing\CustomInvoiceCreation.cs" />
+    <Compile Include="Invoicing\AssistenzInvoiceCreation.cs" />
     <Compile Include="Invoicing\CustomInvoiceFactory.cs" />
     <Compile Include="Invoicing\SettlementInvoiceCreation.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -73,6 +73,7 @@
     <Compile Include="ServiceInvoiceReport.Designer.cs">
       <DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
     </Compile>
+    <Compile Include="Service\CustomAccountingService.cs" />
     <Compile Include="SettlementReport2.cs">
       <SubType>Component</SubType>
     </Compile>

ReportImp/Alloheim/Export/SAPExporter.cs

@@ -19,7 +19,7 @@ namespace Alloheim.Export
             DateTime dt = DateTime.Now;
             DateTime.TryParse(query.Parameter[0].Value.ToString(), out dt);
 
-            query.FileName = String.Format("Datev Export {0:yyyyMM}.csv", dt);
+            query.FileName = String.Format("1192_{0:yyyyMMdd}_{0:hhmmss}_FIBU.TXT", DateTime.Now);
             query.QueryResult = GetAbrechnungenString(dt);
 
             return query;
@@ -70,44 +70,45 @@ namespace Alloheim.Export
             qry.DebitorNumber,
             qry.CostCenter,
             qry.Verwendung,
+            qry.DebitorLVR,
             qry.Oid
                  */
                 DateTime lastDate = new DateTime(date.Year, date.Month, 1);
                 lastDate = lastDate.AddMonths(1).AddDays(-1);
 
-                sb.Append("7177\t"); // Buchungskreis 7177
+                sb.Append("1192\t"); // Buchungskreis 1192
                 sb.Append("DR\t"); // Beleg DR für Rechnung / DG für Gutschrift
                 sb.Append(String.Format("{0:ddMMyyyy} \t", lastDate));
                 sb.Append(String.Format("{0:ddMMyyyy} \t", lastDate));
                 sb.Append("EUR\t");
-                sb.Append(String.Format("7177{0:ddMMyyyy} \t", lastDate));// Profitcenter + Rechnungs - Nr.VN       
-                sb.Append("7177\t"); // Belegkopftext 7177
+                sb.Append(String.Format("1192{0:ddMMyyyy} \t", lastDate));// Profitcenter + Rechnungs - Nr.VN       
+                sb.Append("1192\t"); // Belegkopftext 1192
                 sb.Append("D\t"); // D = Debitorenposition / zweite Zeile: S = Sachkontenposition
                 sb.Append("01\t"); // Kontoart D: S=01 H=11 / zweite Zeile: Kontoart S: S=40 H=50
-                sb.Append(String.Format("{0}\t", row[1])); //DebitorNumber / zweite Zeile: Sachkonto SAP                
+                sb.Append(String.Format("1192{0}\t", row[4])); //DebitorNumber LVR/ zweite Zeile: Sachkonto SAP                
                 sb.Append(String.Format("{0:0.00}\t", row[0])); //Betrag
                 sb.Append("00\t"); // Umsatzsteuerschlüssel
-                sb.Append("H\t"); // zweite Zeile: S
-                sb.Append(String.Format("7177{0}\t", row[1]));  // Debitorennummer Bewohner                        
-                sb.Append(String.Format("7177{0} {1:MM}/{1:yyyy}:{2}\t", row[1], lastDate, row[3])); // Buchungstext: Bew.Nr., Abr.-Zeitraum, Nachname, Vorname
+                sb.Append("S\t"); // zweite Zeile: S
+                sb.Append(String.Format("1192{0}\t", row[1]));  // Debitorennummer Bewohner                        
+                sb.Append(String.Format("1192{0} {1:MM}/{1:yyyy}:{2}\t", row[1], lastDate, row[3])); // Buchungstext: Bew.Nr., Abr.-Zeitraum, Nachname, Vorname
                 sb.AppendLine();
 
                 // zweite Linie - Rechnungspostionen
-                sb.Append("7177\t"); // Buchungskreis 7177
+                sb.Append("1192\t"); // Buchungskreis 1192
                 sb.Append("DR\t"); // Beleg DR für Rechnung / DG für Gutschrift
                 sb.Append(String.Format("{0:ddMMyyyy} \t", lastDate));
                 sb.Append(String.Format("{0:ddMMyyyy} \t", lastDate));
                 sb.Append("EUR\t");
-                sb.Append(String.Format("7177{0:ddMMyyyy} \t", lastDate));// Profitcenter + Rechnungs - Nr.VN       
-                sb.Append("7177\t"); // Belegkopftext 7177
+                sb.Append(String.Format("1192{0:ddMMyyyy} \t", lastDate));// Profitcenter + Rechnungs - Nr.VN       
+                sb.Append("1192\t"); // Belegkopftext 1192
                 sb.Append("S\t"); // S = Sachkontenposition
                 sb.Append("50\t"); // Kontoart Kontoart S: S=40 H=50
                 sb.Append("409600\t"); // zweite Zeile: Sachkonto SAP
                 sb.Append(String.Format("{0:0.00}\t", row[0])); //Betrag
                 sb.Append("00\t"); // Umsatzsteuerschlüssel
-                sb.Append("S\t");
-                sb.Append(String.Format("7177{0}\t", row[1]));  // Debitorennummer Bewohner                        
-                sb.Append(String.Format("7177{0} {1:MM}/{1:yyyy}:{2}\t", row[1], lastDate, row[3])); // Buchungstext: Bew.Nr., Abr.-Zeitraum, Nachname, Vorname
+                sb.Append("H\t");
+                sb.Append(String.Format("1192{0}\t", row[1]));  // Debitorennummer Bewohner                        
+                sb.Append(String.Format("1192{0} {1:MM}/{1:yyyy}:{2}\t", row[1], lastDate, row[3])); // Buchungstext: Bew.Nr., Abr.-Zeitraum, Nachname, Vorname
             }
 
             return sb.ToString();
@@ -121,6 +122,7 @@ namespace Alloheim.Export
             qry.DebitorNumber,
             qry.CostCenter,
             qry.Verwendung,
+            qry.DebitorLvr,
             qry.Oid
             FROM
             (           
@@ -130,6 +132,7 @@ namespace Alloheim.Export
             c.DebitorNumber,
             c.CostCenter,
             CONCAT(p.`LastName`, ', ', p.`FirstName`) as 'Verwendung',
+            org.DebitorNumber AS DebitorLvr,
             cb2sc.Oid
             FROM `supportconcept` sc 
             INNER JOIN `costbearer2supportconcept` cb2sc ON sc.`Oid` = cb2sc.`SupportConceptOid`
@@ -145,17 +148,17 @@ namespace Alloheim.Export
 	            (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 and sd.Name <> 'Fehlkontakt' GROUP BY sr2.`CostBearer2SupportConceptOid`)
+                WHERE sr2.`StartDate` >= ':Monat_Start' AND sr2.`StartDate` < ':Monat_End' AND sc.`Billable` = 1 AND sc.Name <> 'Assistenzleistungen' and sd.Name <> 'Fehlkontakt' GROUP BY sr2.`CostBearer2SupportConceptOid`)
                 AS sr ON sr.`CostBearer2SupportConceptOid` = cb2sc.`Oid`
             WHERE c.`IsActive` = 1 AND sc.`IsActive` = 1
-            and (sr.`GeleisteteFLM` is not null)
-            and org.Name = 'LVR')
+            and (sr.`GeleisteteFLM` is not null))
             UNION
             (SELECT
             ROUND(0.8 * (sr.`GeleisteteFLM` / 60) * (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 )) AS 'Betrag',
             c.DebitorNumber,
             c.CostCenter,
             CONCAT(p.`LastName`, ', ', p.`FirstName`) as 'Verwendung',
+            org.DebitorNumber AS DebitorLvr,
             cb2sc.Oid
             FROM `supportconcept` sc 
             INNER JOIN `costbearer2supportconcept` cb2sc ON sc.`Oid` = cb2sc.`SupportConceptOid`
@@ -170,8 +173,7 @@ namespace Alloheim.Export
                 WHERE sr2.`StartDate` >= ':Monat_Start' AND sr2.`StartDate` < ':Monat_End' AND sc.`Billable` = 1 and sd.Name = 'Fehlkontakt' GROUP BY sr2.`CostBearer2SupportConceptOid`)
                 AS sr ON sr.`CostBearer2SupportConceptOid` = cb2sc.`Oid`
             WHERE c.`IsActive` = 1 AND sc.`IsActive` = 1
-            and (sr.`GeleisteteFLM` is not null)
-            and org.Name = 'LVR')
+            and (sr.`GeleisteteFLM` is not null))
             )qry
             GROUP BY qry.OID
             ORDER BY qry.Verwendung
@@ -210,6 +212,7 @@ ib.AccountingPeriodEnd
             StringBuilder sb = new StringBuilder();
             foreach (DataRow row in dt.Rows)
             {
+                bool storno = false;
                 if (sb.Length > 0)
                 {
                     sb.AppendLine();
@@ -221,39 +224,73 @@ ib.AccountingPeriodEnd
                     //key2Value.Add(key, key);
 
                 // Erste Linie - Rechnung 
-                sb.Append("7177\t"); // Buchungskreis 7177
+                sb.Append("1192\t"); // Buchungskreis 1192
                 sb.Append("DR\t"); // Beleg DR für Rechnung / DG für Gutschrift
                 sb.Append(String.Format("{0:ddMMyyyy}\t", row[3]));
                 sb.Append(String.Format("{0:ddMMyyyy}\t", row[3]));
                 sb.Append("EUR\t");
-                sb.Append(String.Format("7177{0}\t", row[1]));  // Profitcenter + Rechnungs - Nr.VN 
-                sb.Append("7177\t"); // Belegkopftext 7177
+                sb.Append(String.Format("{0}\t", row[1]));  // Rechnungs - Nr.VN (Profitcenter ist in Rechnungsnr. enthalten)
+                sb.Append("1192\t"); // Belegkopftext 1192
                 sb.Append("D\t"); // D = Debitorenposition / zweite Zeile: S = Sachkontenposition
                 sb.Append("01\t"); // Kontoart D: S=01 H=11 / zweite Zeile: Kontoart S: S=40 H=50
-                sb.Append(String.Format("{0}\t", row[2])); //DebitorNumber / zweite Zeile: Sachkonto SAP                 
+                sb.Append(String.Format("1192{0}\t", row[6])); //DebitorNumber Kostenträger / zweite Zeile: Sachkonto SAP                 
+                String betrag = String.Format("{0:0.00}", row[0]); // Betrag
+                if (betrag.Contains("-")) // Storno
+                {
+                    storno = true;
+                }
                 sb.Append(String.Format("{0:0.00}\t", row[0])); //Betrag
                 sb.Append("00\t"); // Umsatzsteuerschlüssel
-                sb.Append("H\t"); 
-                sb.Append(String.Format("7177{0}\t", row[2])); // Debitorennummer Bewohner
-                sb.Append(String.Format("7177{0}:{1:MM}/{1:yyyy}:{2}\t", row[2], row[3], row[5])); // Buchungstext: Bew.Nr., Abr.-Zeitraum, Nachname, Vorname
+                if (storno)
+                {
+                    sb.Append("H\t");
+                }
+                else
+                {
+                    sb.Append("S\t");
+                }
+                sb.Append(String.Format("1192{0}\t", row[2])); // Debitorennummer Bewohner
+                sb.Append(String.Format("1192{0}:{1:MM}/{1:yyyy}:{2}\t", row[2], row[3], row[5])); // Buchungstext: Bew.Nr., Abr.-Zeitraum, Nachname, Vorname
                 sb.AppendLine();
                 //}
                 // zweite Linie - Rechnungspostionen
-                sb.Append("7177\t"); // Buchungskreis 7177
-                sb.Append("DR\t"); // Beleg DR für Rechnung / DG für Gutschrift
+                sb.Append("1192\t"); // Buchungskreis 1192
+                if (storno)
+                {
+                    sb.Append("DG\t"); // DG für Gutschrift
+                }
+                else
+                {
+                    sb.Append("DR\t"); // Beleg DR für Rechnung / DG für Gutschrift
+                }
+
                 sb.Append(String.Format("{0:ddMMyyyy} \t", row[3]));
                 sb.Append(String.Format("{0:ddMMyyyy} \t", row[3]));
                 sb.Append("EUR\t");
-                sb.Append(String.Format("7177{0}\t", row[1]));  // Profitcenter + Rechnungs - Nr.VN 
-                sb.Append("7177\t"); // Belegkopftext 7177
+                sb.Append(String.Format("{0}\t", row[1]));  // Rechnungs - Nr.VN (Profitcenter ist in Rechnungsnr. enthalten)
+                sb.Append("1192\t"); // Belegkopftext 1192
                 sb.Append("S\t"); // S = Sachkontenposition
-                sb.Append("50\t"); // Kontoart Kontoart S: S=40 H=50
+                if (storno)
+                {
+                    sb.Append("40\t");
+                }
+                else
+                {
+                    sb.Append("50\t"); // Kontoart Kontoart S: S=40 H=50
+                }
                 sb.Append("409600\t"); // zweite Zeile: Sachkonto SAP
                 sb.Append(String.Format("{0:0.00}\t", row[0])); //Betrag
                 sb.Append("00\t"); // Umsatzsteuerschlüssel
-                sb.Append("S\t");
-                sb.Append(String.Format("7177{0}\t", row[2])); // Debitorennummer Bewohner
-                sb.Append(String.Format("7177{0}:{1:MM}/{1:yyyy}:{2}\t", row[2], row[3], row[5])); // Buchungstext: Bew.Nr., Abr.-Zeitraum, Nachname, Vorname
+                if (storno)
+                {
+                    sb.Append("S\t");
+                }
+                else
+                {
+                    sb.Append("H\t");
+                }
+                sb.Append(String.Format("1192{0}\t", row[2])); // Debitorennummer Bewohner
+                sb.Append(String.Format("1192{0}:{1:MM}/{1:yyyy}:{2}\t", row[2], row[3], row[5])); // Buchungstext: Bew.Nr., Abr.-Zeitraum, Nachname, Vorname
             }
 
             return sb.ToString();

ReportImp/Alloheim/InvoiceCustomerReport.Designer.cs

@@ -40,7 +40,15 @@ namespace BeWo.Report.DefaultReports
             this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
             this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
-            this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
+            this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel();
             this.lblAddress = new DevExpress.XtraReports.UI.XRLabel();
             this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
             this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -64,19 +72,12 @@ namespace BeWo.Report.DefaultReports
             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.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
             this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
             this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
             this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
-            this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
@@ -189,6 +190,7 @@ namespace BeWo.Report.DefaultReports
             // ReportHeader
             // 
             this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel14,
             this.xrLabel9,
             this.xrLabel13,
             this.xrLabel1,
@@ -197,7 +199,6 @@ namespace BeWo.Report.DefaultReports
             this.xrLabel16,
             this.xrLabel19,
             this.xrLabel18,
-            this.xrPictureBox1,
             this.lblAddress,
             this.xrTable3,
             this.xrLabel6,
@@ -210,24 +211,121 @@ namespace BeWo.Report.DefaultReports
             this.ReportHeader.Name = "ReportHeader";
             this.ReportHeader.StylePriority.UseFont = false;
             // 
-            // xrPictureBox1
+            // xrLabel14
             // 
-            this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
-            this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(495.2245F, 0F);
-            this.xrPictureBox1.Name = "xrPictureBox1";
-            this.xrPictureBox1.SizeF = new System.Drawing.SizeF(176.2755F, 142.0257F);
-            this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
+            this.xrLabel14.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+            this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 97.60911F);
+            this.xrLabel14.Multiline = true;
+            this.xrLabel14.Name = "xrLabel14";
+            this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel14.SizeF = new System.Drawing.SizeF(317.0001F, 18.79164F);
+            this.xrLabel14.StylePriority.UseFont = false;
+            this.xrLabel14.Text = "[RecipientPostCode] [RecipientTown]";
+            // 
+            // xrLabel9
+            // 
+            this.xrLabel9.CanShrink = true;
+            this.xrLabel9.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 3.750006F);
+            this.xrLabel9.Name = "xrLabel9";
+            this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel9.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+            this.xrLabel9.SizeF = new System.Drawing.SizeF(316.9999F, 17F);
+            this.xrLabel9.StylePriority.UseFont = false;
+            this.xrLabel9.Text = "Alloheim mobil - Gumbertstr. 90/92 - 40229 Düsseldorf";
+            // 
+            // xrLabel13
+            // 
+            this.xrLabel13.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(463.6248F, 37.9007F);
+            this.xrLabel13.Multiline = true;
+            this.xrLabel13.Name = "xrLabel13";
+            this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel13.SizeF = new System.Drawing.SizeF(213.3751F, 59.70834F);
+            this.xrLabel13.StylePriority.UseFont = false;
+            this.xrLabel13.Text = "Alloheim mobil Ambulante Dienste\r\nGumbertstr. 90/92\r\n40229 Düsseldorf\r\nduesseldor" +
+    "f@alloheim-mobil.de";
+            // 
+            // xrLabel1
+            // 
+            this.xrLabel1.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(463.6248F, 20.90069F);
+            this.xrLabel1.Multiline = true;
+            this.xrLabel1.Name = "xrLabel1";
+            this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel1.SizeF = new System.Drawing.SizeF(213.3751F, 17F);
+            this.xrLabel1.StylePriority.UseFont = false;
+            this.xrLabel1.Text = "Rechnungsanschrift: ";
+            // 
+            // xrLabel7
+            // 
+            this.xrLabel7.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(463.6248F, 413.5834F);
+            this.xrLabel7.Name = "xrLabel7";
+            this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel7.SizeF = new System.Drawing.SizeF(213.3754F, 19.99994F);
+            this.xrLabel7.StylePriority.UseFont = false;
+            this.xrLabel7.StylePriority.UseTextAlignment = false;
+            this.xrLabel7.Text = "Datum: [InvoiceDate]";
+            this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            // 
+            // xrLabel17
+            // 
+            this.xrLabel17.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(463.6248F, 114.6091F);
+            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(213.3751F, 59.70834F);
+            this.xrLabel17.StylePriority.UseFont = false;
+            this.xrLabel17.Text = "Alloheim Ambulante Dienste\r\nErste SE & Co. KG  \r\nAm Seestern 1 \r\n40547 Düsseldorf" +
+    " ";
+            // 
+            // xrLabel16
+            // 
+            this.xrLabel16.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(463.6248F, 97.60911F);
+            this.xrLabel16.Multiline = true;
+            this.xrLabel16.Name = "xrLabel16";
+            this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel16.SizeF = new System.Drawing.SizeF(213.3751F, 17F);
+            this.xrLabel16.StylePriority.UseFont = false;
+            this.xrLabel16.Text = "Firmensitz:";
+            // 
+            // xrLabel19
+            // 
+            this.xrLabel19.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(463.6246F, 192.0882F);
+            this.xrLabel19.Multiline = true;
+            this.xrLabel19.Name = "xrLabel19";
+            this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel19.SizeF = new System.Drawing.SizeF(213.3751F, 90.47916F);
+            this.xrLabel19.StylePriority.UseFont = false;
+            this.xrLabel19.Text = "Postfach 11 01 39, \r\n40501 Düsseldorf \r\nwww.alloheim-mobil.de duesseldorf@allohei" +
+    "m-mobil.de Telefon: 0211/2381963 \r\nTelefax: 0211/2381964";
+            // 
+            // xrLabel18
+            // 
+            this.xrLabel18.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(463.6246F, 175.0881F);
+            this.xrLabel18.Multiline = true;
+            this.xrLabel18.Name = "xrLabel18";
+            this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel18.SizeF = new System.Drawing.SizeF(213.3751F, 17F);
+            this.xrLabel18.StylePriority.UseFont = false;
+            this.xrLabel18.Text = "Briefanschrift:";
             // 
             // lblAddress
             // 
-            this.lblAddress.LocationFloat = new DevExpress.Utils.PointFloat(0F, 142.0257F);
+            this.lblAddress.Font = new System.Drawing.Font("Arial", 10F);
+            this.lblAddress.LocationFloat = new DevExpress.Utils.PointFloat(0F, 20.90069F);
             this.lblAddress.Multiline = true;
             this.lblAddress.Name = "lblAddress";
             this.lblAddress.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.lblAddress.SizeF = new System.Drawing.SizeF(351.375F, 131F);
+            this.lblAddress.SizeF = new System.Drawing.SizeF(351.375F, 76.70834F);
             this.lblAddress.StylePriority.UseFont = false;
             this.lblAddress.Text = "[RecipientOrganisation]\r\n[RecipientDivision]\r\n[RecipientFirstName] [RecipientLast" +
-    "Name]\r\n[RecipientStreet]\r\n[RecipientPostCode] [RecipientTown]";
+    "Name]\r\n[RecipientStreet]\r\n";
             // 
             // xrTable3
             // 
@@ -419,7 +517,7 @@ namespace BeWo.Report.DefaultReports
             this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 146.5417F);
             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.SizeF = new System.Drawing.SizeF(197.0015F, 17F);
             this.xrLabel10.StylePriority.UseFont = false;
             this.xrLabel10.Text = "Mit freundlichen Grüßen";
             // 
@@ -478,9 +576,19 @@ namespace BeWo.Report.DefaultReports
             // 
             // topMarginBand1
             // 
-            this.topMarginBand1.HeightF = 100F;
+            this.topMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrPictureBox1});
+            this.topMarginBand1.HeightF = 172F;
             this.topMarginBand1.Name = "topMarginBand1";
             // 
+            // xrPictureBox1
+            // 
+            this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
+            this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(513.2247F, 25.68266F);
+            this.xrPictureBox1.Name = "xrPictureBox1";
+            this.xrPictureBox1.SizeF = new System.Drawing.SizeF(163.7755F, 126.4007F);
+            this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
+            // 
             // bottomMarginBand1
             // 
             this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -488,6 +596,17 @@ namespace BeWo.Report.DefaultReports
             this.bottomMarginBand1.HeightF = 100F;
             this.bottomMarginBand1.Name = "bottomMarginBand1";
             // 
+            // xrLabel11
+            // 
+            this.xrLabel11.Font = new System.Drawing.Font("Arial", 7.5F);
+            this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 0F);
+            this.xrLabel11.Multiline = true;
+            this.xrLabel11.Name = "xrLabel11";
+            this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel11.SizeF = new System.Drawing.SizeF(676.9999F, 72.29163F);
+            this.xrLabel11.StylePriority.UseFont = false;
+            this.xrLabel11.Text = resources.GetString("xrLabel11.Text");
+            // 
             // DetailReport
             // 
             this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -510,110 +629,6 @@ namespace BeWo.Report.DefaultReports
             // 
             this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.InvoiceCustomerRO);
             // 
-            // xrLabel13
-            // 
-            this.xrLabel13.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(463.6248F, 159.0257F);
-            this.xrLabel13.Multiline = true;
-            this.xrLabel13.Name = "xrLabel13";
-            this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel13.SizeF = new System.Drawing.SizeF(213.3751F, 59.70834F);
-            this.xrLabel13.StylePriority.UseFont = false;
-            this.xrLabel13.Text = "Alloheim mobil Ambulante Dienste\r\nGumbertstr. 90/92\r\n40229 Düsseldorf\r\nduesseldor" +
-    "f@alloheim-mobil.de";
-            // 
-            // xrLabel1
-            // 
-            this.xrLabel1.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(463.6248F, 142.0257F);
-            this.xrLabel1.Multiline = true;
-            this.xrLabel1.Name = "xrLabel1";
-            this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel1.SizeF = new System.Drawing.SizeF(213.3751F, 17F);
-            this.xrLabel1.StylePriority.UseFont = false;
-            this.xrLabel1.Text = "Rechnungsanschrift: ";
-            // 
-            // xrLabel7
-            // 
-            this.xrLabel7.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(463.6248F, 413.5834F);
-            this.xrLabel7.Name = "xrLabel7";
-            this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel7.SizeF = new System.Drawing.SizeF(213.3754F, 19.99994F);
-            this.xrLabel7.StylePriority.UseFont = false;
-            this.xrLabel7.StylePriority.UseTextAlignment = false;
-            this.xrLabel7.Text = "Datum: [InvoiceDate]";
-            this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
-            // 
-            // xrLabel17
-            // 
-            this.xrLabel17.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(463.6248F, 235.7341F);
-            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(213.3751F, 59.70834F);
-            this.xrLabel17.StylePriority.UseFont = false;
-            this.xrLabel17.Text = "Alloheim Ambulante Dienste\r\nErste SE & Co. KG  \r\nAm Seestern 1 \r\n40547 Düsseldorf" +
-    " ";
-            // 
-            // xrLabel16
-            // 
-            this.xrLabel16.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(463.6248F, 218.7341F);
-            this.xrLabel16.Multiline = true;
-            this.xrLabel16.Name = "xrLabel16";
-            this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel16.SizeF = new System.Drawing.SizeF(213.3751F, 17F);
-            this.xrLabel16.StylePriority.UseFont = false;
-            this.xrLabel16.Text = "Firmensitz:";
-            // 
-            // xrLabel19
-            // 
-            this.xrLabel19.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(463.6246F, 313.2132F);
-            this.xrLabel19.Multiline = true;
-            this.xrLabel19.Name = "xrLabel19";
-            this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel19.SizeF = new System.Drawing.SizeF(213.3751F, 90.47916F);
-            this.xrLabel19.StylePriority.UseFont = false;
-            this.xrLabel19.Text = "Postfach 11 01 39, \r\n40501 Düsseldorf \r\nwww.alloheim-mobil.de duesseldorf@allohei" +
-    "m-mobil.de Telefon: 0211/2381963 \r\nTelefax: 0211/2381964";
-            // 
-            // xrLabel18
-            // 
-            this.xrLabel18.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(463.6246F, 296.2131F);
-            this.xrLabel18.Multiline = true;
-            this.xrLabel18.Name = "xrLabel18";
-            this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel18.SizeF = new System.Drawing.SizeF(213.3751F, 17F);
-            this.xrLabel18.StylePriority.UseFont = false;
-            this.xrLabel18.Text = "Briefanschrift:";
-            // 
-            // xrLabel11
-            // 
-            this.xrLabel11.Font = new System.Drawing.Font("Arial", 7.5F);
-            this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 0F);
-            this.xrLabel11.Multiline = true;
-            this.xrLabel11.Name = "xrLabel11";
-            this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel11.SizeF = new System.Drawing.SizeF(676.9999F, 72.29163F);
-            this.xrLabel11.StylePriority.UseFont = false;
-            this.xrLabel11.Text = resources.GetString("xrLabel11.Text");
-            // 
-            // xrLabel9
-            // 
-            this.xrLabel9.CanShrink = true;
-            this.xrLabel9.Font = new System.Drawing.Font("Arial Narrow", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 124.875F);
-            this.xrLabel9.Name = "xrLabel9";
-            this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel9.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
-            this.xrLabel9.SizeF = new System.Drawing.SizeF(316.9999F, 17F);
-            this.xrLabel9.StylePriority.UseFont = false;
-            this.xrLabel9.Text = "Alloheim mobil - Gumbertstr. 90/92 - 40229 Düsseldorf";
-            // 
             // InvoiceCustomerReport
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -627,7 +642,7 @@ namespace BeWo.Report.DefaultReports
             this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
             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, 75, 172, 100);
             this.PageHeight = 1169;
             this.PageWidth = 827;
             this.PaperKind = System.Drawing.Printing.PaperKind.A4;
@@ -678,7 +693,6 @@ namespace BeWo.Report.DefaultReports
         private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
         private DevExpress.XtraReports.UI.DetailBand Detail1;
         private DevExpress.XtraReports.UI.XRLabel lblAddress;
-        private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
         private DevExpress.XtraReports.UI.XRLabel xrLabel13;
         private DevExpress.XtraReports.UI.XRLabel xrLabel1;
         private DevExpress.XtraReports.UI.XRLabel xrLabel7;
@@ -688,5 +702,7 @@ namespace BeWo.Report.DefaultReports
         private DevExpress.XtraReports.UI.XRLabel xrLabel18;
         private DevExpress.XtraReports.UI.XRLabel xrLabel11;
         private DevExpress.XtraReports.UI.XRLabel xrLabel9;
+        private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel14;
     }
 }

ReportImp/Alloheim/Invoicing/AssistenzInvoiceCreation.cs

@@ -0,0 +1,102 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+using BeWo.Service.DCEntityMapper;
+using BeWo.Service.Invoicing;
+using BeWo.Service.Plugins;
+using BS.Shared;
+using BS.Shared.Core;
+using BS.Shared.DataContracts;
+using BS.Shared.DataContracts.Compact;
+using BS.Shared.Extensions;
+using BS.Shared.Services;
+
+namespace Alloheim.Invoicing
+{
+
+	public class CustomAssistenzInvoiceCreation : InvoiceCreation
+    {
+        public override void SetInvoiceBaseData(int invoiceCounter, ServiceInvoice invoice, CostBearer costBearer, DateTimeSpan invoicePeriod, IList<CompactSupportConceptDC> supportConceptList)
+        {
+            base.SetInvoiceBaseData(invoiceCounter, invoice, costBearer, invoicePeriod, supportConceptList);
+            invoice.InvoiceBase.InvoiceDate = invoice.InvoiceBase.AccountingPeriodEnd;
+        }
+
+
+        public override void SetAmountAdvancePayments(ServiceInvoice invoice)
+        {
+            //do nothing
+        }
+
+        public override void SetAmountEquityContribution(ServiceInvoice invoice)
+        {
+            //do nothing
+        }
+
+        public override InvoiceItem CreateInvoiceItem(ServiceRecordDC iServiceRecord, SupportConceptApprovalPeriod scap, Calculations calc)
+	    {
+            if (!iServiceRecord.ServiceDescription.CategoryName.Contains("Assistenz"))
+            {
+                return null;
+            }
+
+            var ii =  base.CreateInvoiceItem(iServiceRecord, scap, calc);
+            ii.ItemDescription = "Assistenzleistung";
+            return ii;
+        }
+
+        public override void SetInvoiceItems(ServiceInvoice invoice,
+           ServiceInvoicePeriod serviceInvoicePeriod,
+           SupportConceptApprovalPeriodDC supportConceptApprovalPeriod,
+           CostBearer2SupportConcept cb2sc,
+           DateTimeSpan invoicePeriod,
+           List<ServiceRecordDC> serviceRecords)
+        {
+            Calculations calc = PluginLoader.FindClass<Calculations>(_SpecificID) ?? Calculations.GetInstance(_SpecificID);
+
+            if (ShouldCreateFixedAmounts(serviceInvoicePeriod, supportConceptApprovalPeriod, cb2sc))
+            {
+                CreateFixedAmounts(serviceInvoicePeriod, supportConceptApprovalPeriod, cb2sc);
+            }
+            else
+            {
+                List<ServiceRecordDC> serviceRecordsInPeriod = serviceRecords.Where(
+                    i =>
+                    {
+                        bool valid = i.Start.Value.InBetween(serviceInvoicePeriod.Start.Value,
+                            serviceInvoicePeriod.End.Value, true);
+
+                        if (valid && serviceInvoicePeriod.SupportConceptApprovalPeriod != null && serviceInvoicePeriod.SupportConceptApprovalPeriod.ServiceCategory != null)
+                            valid = serviceInvoicePeriod.SupportConceptApprovalPeriod.ServiceCategory.Oid ==
+                                    i.ServiceDescription.Category.ServiceCategoryOid;
+                        return valid;
+                    }).ToList();
+
+                if (serviceRecordsInPeriod.Count > 0)
+                {
+                    var absenceTimes = MapperFactory.AbsenceTimeDC_AbsenceTime.MapToNewDCs(cb2sc.SupportConcept.Customer.AbsenceTimes);
+                    Dictionary<DateTimeSpan, decimal> span2Hours = calc.GetAbsencesTimesNotBillable(absenceTimes);
+
+                    // serviceInvoicePeriod.HoursNotBillableAbsence - eingeschränkte Anzahl bei Abwesenheit GILT laut LVR ausdrücklich nicht bei Assistenzleistungen
+                    serviceInvoicePeriod.HoursNotBillableNotApproved +=
+                        calc.GetHoursNotBillableDueToMoreThanApproved(supportConceptApprovalPeriod,
+                            cb2sc.CostBearer.CostRatePeriods.MapToNewDCs(),
+                            serviceRecordsInPeriod,
+                            true, true);
+
+                    var itemList = CreateInvoiceItems(serviceRecordsInPeriod, invoicePeriod, serviceInvoicePeriod.SupportConceptApprovalPeriod, calc);
+                    serviceInvoicePeriod.InvoiceItemList.AddRange(itemList);
+                }
+            }
+        }
+
+        public override IList<InvoiceItem> CreateSummaryInvoiceItems(IList<InvoiceItem> itemList, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap,
+            Calculations calc, bool summaryPerMonth, bool addRateFactorToUnitCount)
+        {
+            return base.CreateSummaryInvoiceItems(itemList, invoicePeriod, scap, calc, false, true);
+        }
+    }
+}

ReportImp/Alloheim/Invoicing/CustomInvoiceCreation.cs

@@ -1,96 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using BeWo.Data.Access;
-using BeWo.Data.Entities;
-using BeWo.Service.DCEntityMapper;
-using BeWo.Service.Invoicing;
-using BeWo.Service.Plugins;
-using BS.Shared;
-using BS.Shared.Core;
-using BS.Shared.DataContracts;
-using BS.Shared.DataContracts.Compact;
-using BS.Shared.Extensions;
-using BS.Shared.Services;
-
-namespace Alloheim.Invoicing
-{
-
-	public class CustomInvoiceCreation : InvoiceCreation
-    {
-        private DateTime? accountingPeriodStart = null;
-        private DateTime? accountingPeriodEnd = null;
-
-        public override List<ServiceInvoiceDC> GenerateServiceInvoices(long costBearerOid, DateTimeSpan invoicePeriod, Dictionary<CompactSupportConceptDC, List<ServiceRecordDC>> supportConcepts2ServiceRecords)
-        {
-            // eine Rechnung pro Leistungskategorie gewünscht 
-            var invoiceList = new List<ServiceInvoice>();
-            var invoiceCounter = 0;
-            var sortedScs = supportConcepts2ServiceRecords.Keys.OrderBy(s => s.Customer.LastNameFirstName).ToList();
-
-            foreach (var sc in sortedScs)
-            {
-                var serviceRecords = supportConcepts2ServiceRecords[sc];
-                if (sc.CostBearerList.Count > 0)
-                {
-                    var costBearer = DAOFactory.GenericDAO.LoadByID<CostBearer>(sc.CostBearerList[0].CostBearerOid);
-                    Dictionary<string, List<ServiceRecordDC>> srDict = new Dictionary<string, List<ServiceRecordDC>>();
-
-                    foreach (var sr in serviceRecords)
-                    {
-                        String key = sr.ServiceDescription.CategoryName;
-
-                        if (!srDict.ContainsKey(key))
-                            srDict.Add(key, new List<ServiceRecordDC>());
-
-                        srDict[key].Add(sr);
-                    }
-
-                    foreach (var catName in srDict.Keys)
-                    {
-                        var list = srDict[catName];
-                        var invoice = CreateSingleInvoice(invoiceCounter, costBearer, invoicePeriod, sc, list);
-
-                        if (invoice != null)
-                        {
-                            invoiceList.Add(invoice);
-                            invoiceCounter++;
-                        }
-                    }
-                }
-            }
-
-            var result = invoiceList.Select(item => MapperFactory.ServiceInvoiceDC_ServiceInvoice.MapToNewDC(item)).ToList();
-            return result;
-        }
-
-
-        public override ServiceInvoice CreateSingleInvoice(int invoiceCounter, CostBearer costBearer, DateTimeSpan invoicePeriod, CompactSupportConceptDC supportConcept, List<ServiceRecordDC> serviceRecords)
-        {
-            var i = base.CreateSingleInvoice(invoiceCounter, costBearer, invoicePeriod, supportConcept, serviceRecords);
-
-            if (i != null)
-            {
-                var claim = i.GetTotalClaim();
-
-                if (!claim.HasValue || claim.Value == 0)
-                    return null;
-            }
-
-            return i;
-        }
-
-        public override void SetInvoiceBaseData(int invoiceCounter, ServiceInvoice invoice, CostBearer costBearer, DateTimeSpan invoicePeriod,
-            IList<CompactSupportConceptDC> supportConceptList)
-        {
-            if (invoicePeriod != null)
-            {
-                accountingPeriodStart = invoicePeriod.StartDate;
-                accountingPeriodEnd = invoicePeriod.EndDate;
-            }
-            base.SetInvoiceBaseData(invoiceCounter, invoice, costBearer, invoicePeriod, supportConceptList);
-        }
-
-    }
-}

ReportImp/Alloheim/Invoicing/CustomInvoiceFactory.cs

@@ -8,9 +8,39 @@ namespace Alloheim.Invoicing
 {
 	public class CustomInvoiceFactory : InvoiceFactory
 	{
-		public override InvoiceCreation CreateInvoiceCreator(string specificId, string tenant, Dictionary<CompactSupportConceptDC, List<ServiceRecordDC>> supportConcepts2ServiceRecords)
-		{
-            return new CustomInvoiceCreation();
-		}
+        public override InvoiceCreation CreateInvoiceCreator(string specificId, string tenant, Dictionary<CompactSupportConceptDC, List<ServiceRecordDC>> supportConcepts2ServiceRecords)
+        {
+            foreach (var list in supportConcepts2ServiceRecords.Values)
+            {
+                foreach (var sr in list)
+                {
+                    var sd = sr.ServiceDescription.Category;
+                    var ic = GetInvoiceCreatorForCategory(sd);
+                    if (ic != null)
+                        return ic;
+                }
+            }
+            return base.CreateInvoiceCreator(specificId, tenant, supportConcepts2ServiceRecords);
+        }
+
+        private InvoiceCreation GetInvoiceCreatorForCategory(ServiceCategoryDC sd)
+        {
+            if (sd != null && !String.IsNullOrEmpty(sd.Name))
+            {
+                String cat = sd.Name.ToLower().Trim();
+                if (cat.IndexOf("assistenz") >= 0)
+                {
+                    return new CustomAssistenzInvoiceCreation();
+                }
+            }
+            return null;
+        }
+
+        // das war inhaltlich daneben, die wollten zwar je eine Rechnung pro Leistungskategorie, aber es ging um Assistenz und FLS -> alles ganz klassisch
+
+        //      public override InvoiceCreation CreateInvoiceCreator(string specificId, string tenant, Dictionary<CompactSupportConceptDC, List<ServiceRecordDC>> supportConcepts2ServiceRecords)
+		//{
+        //          return new CustomInvoiceCreation();
+		//}
     }
 }

ReportImp/Alloheim/Invoicing/SettlementInvoiceCreation.cs

@@ -1,6 +1,10 @@
 using BeWo.Data.Entities;
 using BeWo.Service.Invoicing;
 using BS.Shared.DataContracts;
+using BS.Shared.Services;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace Alloheim
 {
@@ -10,5 +14,38 @@ namespace Alloheim
 		{
 			return false;
 		}
+
+		public override bool IsServiceRecordBillable(ServiceRecord iRecord)
+		{
+			if (iRecord.ServiceDescription.ServiceCategory.Name.Contains("Assistenz"))
+            {
+				return false;
+			}
+			return true;
+		}
+
+		public override void CalculateSettlementInvoiceApprovedAmounts(Settlement2DC si, SupportConceptCostBearerRelDC relDC, Calculations calc)
+		{
+			si.ApprovedFLSWeekly = 0;
+			si.ApprovedFLS = 0;
+			foreach (var sp in relDC.ApprovalPeriodList)
+			{
+				if (sp.ServiceCategory == null || !sp.ServiceCategory.Name.Contains("Assistenz"))
+				{
+					si.ApprovedFLSWeekly += calc.GetApprovedHoursPerWeek(sp, relDC.CostBearer.CostRatePeriods) ?? 0m;
+
+					decimal flsTotal = calc.GetApprovedHoursTotal(sp, relDC.CostBearer.CostRatePeriods) ?? 0m;
+					flsTotal = Math.Round(flsTotal, 2, MidpointRounding.AwayFromZero);
+
+					si.ApprovedFLS += flsTotal;
+				}
+			}
+		}
+
+
+		public override IList<ServiceRecord> GetBillableServiceRecords(CostBearer2SupportConcept c2s)
+		{
+			return c2s.ServiceRecords.OrderBy(s => s.Start).Where(s => !s.ServiceDescription.ServiceCategory.Name.ToLower().Contains("assistenz")).ToList();
+		}
 	}
 }

ReportImp/Alloheim/Service/CustomAccountingService.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows;
+using Alloheim.Invoicing;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+using BeWo.Service.DCEntityMapper;
+using BeWo.Service.Plugins;
+using BS.Shared;
+using BS.Shared.DataContracts;
+
+
+
+namespace Alloheim.Service
+{
+	public class CustomAccountingService : AccountingService
+    {
+        public override ServiceInvoice ErstelleStornoRechnung(InvoiceBaseDC ibdc)
+        {
+            var i = base.ErstelleStornoRechnung(ibdc);
+            //if (!String.IsNullOrEmpty(i.InvoiceBase.InvoiceNumber))
+            //{
+            //    //i.InvoiceBase.InvoiceNumber = ibdc.InvoiceNumber + " Storno";
+            //    i.InvoiceBase.InvoiceNumber = i.InvoiceBase.InvoiceNumber + " Storno";
+            //}
+            int invoiceCounter = 0;
+            var inc = PluginLoader.FindClass<InvoiceNumberGenerator>();
+            i.InvoiceBase.InvoiceNumber = inc.GetNextInvoiceNumber(invoiceCounter, i.InvoiceBase) + " Storno";
+
+            if (String.IsNullOrEmpty(i.InvoiceBase.InvoiceTypeText))
+            {
+                i.InvoiceBase.InvoiceTypeText = "Storno";
+            }
+            else
+            {
+                i.InvoiceBase.InvoiceTypeText += " Storno";
+            }
+            
+            DAOFactory.GenericDAO.Insert(i);
+
+            inc.IncreaseInvoiceNumber(1, null);
+
+
+            return i;
+        }
+    }
+}

ReportImp/Alloheim/ServiceInvoiceReport.Designer.cs

@@ -135,22 +135,22 @@ namespace Alloheim
             // 
             this.topMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
             this.xrPictureBox1});
-            this.topMarginBand1.HeightF = 142.0257F;
+            this.topMarginBand1.HeightF = 176F;
             this.topMarginBand1.Name = "topMarginBand1";
             // 
             // xrPictureBox1
             // 
             this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
-            this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(500.5577F, 0F);
+            this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(510.0834F, 38.14096F);
             this.xrPictureBox1.Name = "xrPictureBox1";
-            this.xrPictureBox1.SizeF = new System.Drawing.SizeF(176.2755F, 142.0257F);
+            this.xrPictureBox1.SizeF = new System.Drawing.SizeF(166.9165F, 137.8591F);
             this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
             // 
             // bottomMarginBand1
             // 
             this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
             this.xrLabel11});
-            this.bottomMarginBand1.HeightF = 82.29166F;
+            this.bottomMarginBand1.HeightF = 103.1907F;
             this.bottomMarginBand1.Name = "bottomMarginBand1";
             // 
             // xrLabel11
@@ -210,7 +210,7 @@ namespace Alloheim
             this.xrLabel5,
             this.xrLabel8});
             this.Page1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Page1.HeightF = 431.7201F;
+            this.Page1.HeightF = 483.1784F;
             this.Page1.Name = "Page1";
             this.Page1.StylePriority.UseFont = false;
             // 
@@ -221,7 +221,7 @@ namespace Alloheim
             this.lblBelegNr.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceNumber")});
             this.lblBelegNr.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblBelegNr.LocationFloat = new DevExpress.Utils.PointFloat(64.90177F, 404.7201F);
+            this.lblBelegNr.LocationFloat = new DevExpress.Utils.PointFloat(64.90176F, 466.1784F);
             this.lblBelegNr.Name = "lblBelegNr";
             this.lblBelegNr.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.lblBelegNr.SizeF = new System.Drawing.SizeF(59.58686F, 17.00003F);
@@ -234,7 +234,7 @@ namespace Alloheim
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrLabel40.CanGrow = false;
             this.xrLabel40.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel40.LocationFloat = new DevExpress.Utils.PointFloat(0F, 404.6751F);
+            this.xrLabel40.LocationFloat = new DevExpress.Utils.PointFloat(0F, 466.1334F);
             this.xrLabel40.Name = "xrLabel40";
             this.xrLabel40.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel40.SizeF = new System.Drawing.SizeF(64.90177F, 17F);
@@ -247,7 +247,7 @@ namespace Alloheim
             this.lblHpStart.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.lblHpStart.CanGrow = false;
             this.lblHpStart.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblHpStart.LocationFloat = new DevExpress.Utils.PointFloat(157.4447F, 404.6751F);
+            this.lblHpStart.LocationFloat = new DevExpress.Utils.PointFloat(157.4447F, 466.1334F);
             this.lblHpStart.Name = "lblHpStart";
             this.lblHpStart.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.lblHpStart.SizeF = new System.Drawing.SizeF(95.55278F, 17F);
@@ -259,7 +259,7 @@ namespace Alloheim
             this.xrLabel42.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrLabel42.CanGrow = false;
             this.xrLabel42.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel42.LocationFloat = new DevExpress.Utils.PointFloat(252.9975F, 404.6751F);
+            this.xrLabel42.LocationFloat = new DevExpress.Utils.PointFloat(252.9975F, 466.1334F);
             this.xrLabel42.Name = "xrLabel42";
             this.xrLabel42.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel42.SizeF = new System.Drawing.SizeF(35.15613F, 17F);
@@ -272,7 +272,7 @@ namespace Alloheim
             this.lblHpEnd.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.lblHpEnd.CanGrow = false;
             this.lblHpEnd.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblHpEnd.LocationFloat = new DevExpress.Utils.PointFloat(288.1536F, 404.6751F);
+            this.lblHpEnd.LocationFloat = new DevExpress.Utils.PointFloat(288.1536F, 466.1334F);
             this.lblHpEnd.Name = "lblHpEnd";
             this.lblHpEnd.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.lblHpEnd.SizeF = new System.Drawing.SizeF(97.26303F, 17F);
@@ -284,7 +284,7 @@ namespace Alloheim
             this.xrLabel44.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrLabel44.CanGrow = false;
             this.xrLabel44.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel44.LocationFloat = new DevExpress.Utils.PointFloat(124.4886F, 404.6751F);
+            this.xrLabel44.LocationFloat = new DevExpress.Utils.PointFloat(124.4886F, 466.1334F);
             this.xrLabel44.Name = "xrLabel44";
             this.xrLabel44.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel44.SizeF = new System.Drawing.SizeF(32.95607F, 17F);
@@ -297,7 +297,7 @@ namespace Alloheim
             this.xrLabel45.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrLabel45.CanGrow = false;
             this.xrLabel45.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel45.LocationFloat = new DevExpress.Utils.PointFloat(385.4166F, 404.6751F);
+            this.xrLabel45.LocationFloat = new DevExpress.Utils.PointFloat(385.4166F, 466.1334F);
             this.xrLabel45.Name = "xrLabel45";
             this.xrLabel45.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel45.SizeF = new System.Drawing.SizeF(124.6667F, 17F);
@@ -310,7 +310,7 @@ namespace Alloheim
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrLabel46.CanGrow = false;
             this.xrLabel46.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel46.LocationFloat = new DevExpress.Utils.PointFloat(510.0834F, 404.6751F);
+            this.xrLabel46.LocationFloat = new DevExpress.Utils.PointFloat(510.0834F, 466.1334F);
             this.xrLabel46.Name = "xrLabel46";
             this.xrLabel46.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel46.SizeF = new System.Drawing.SizeF(166.7498F, 17F);
@@ -322,7 +322,7 @@ namespace Alloheim
             this.xrLabel36.Borders = DevExpress.XtraPrinting.BorderSide.Left;
             this.xrLabel36.CanGrow = false;
             this.xrLabel36.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel36.LocationFloat = new DevExpress.Utils.PointFloat(0F, 387.6751F);
+            this.xrLabel36.LocationFloat = new DevExpress.Utils.PointFloat(0F, 449.1334F);
             this.xrLabel36.Name = "xrLabel36";
             this.xrLabel36.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel36.SizeF = new System.Drawing.SizeF(100.6539F, 17.00003F);
@@ -333,7 +333,7 @@ namespace Alloheim
             // 
             this.xrLabel37.CanGrow = false;
             this.xrLabel37.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel37.LocationFloat = new DevExpress.Utils.PointFloat(385.4166F, 387.6751F);
+            this.xrLabel37.LocationFloat = new DevExpress.Utils.PointFloat(385.4166F, 449.1334F);
             this.xrLabel37.Name = "xrLabel37";
             this.xrLabel37.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel37.SizeF = new System.Drawing.SizeF(124.6668F, 17F);
@@ -346,7 +346,7 @@ namespace Alloheim
             this.xrLabel38.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerTown")});
             this.xrLabel38.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel38.LocationFloat = new DevExpress.Utils.PointFloat(100.6539F, 387.6751F);
+            this.xrLabel38.LocationFloat = new DevExpress.Utils.PointFloat(100.6539F, 449.1334F);
             this.xrLabel38.Name = "xrLabel38";
             this.xrLabel38.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel38.SizeF = new System.Drawing.SizeF(284.7627F, 17F);
@@ -357,7 +357,7 @@ namespace Alloheim
             this.xrLabel39.Borders = DevExpress.XtraPrinting.BorderSide.Right;
             this.xrLabel39.CanGrow = false;
             this.xrLabel39.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel39.LocationFloat = new DevExpress.Utils.PointFloat(510.0834F, 387.6751F);
+            this.xrLabel39.LocationFloat = new DevExpress.Utils.PointFloat(510.0834F, 449.1334F);
             this.xrLabel39.Name = "xrLabel39";
             this.xrLabel39.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel39.SizeF = new System.Drawing.SizeF(166.7498F, 17F);
@@ -369,7 +369,7 @@ namespace Alloheim
             this.xrLabel32.Borders = DevExpress.XtraPrinting.BorderSide.Left;
             this.xrLabel32.CanGrow = false;
             this.xrLabel32.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel32.LocationFloat = new DevExpress.Utils.PointFloat(0F, 370.675F);
+            this.xrLabel32.LocationFloat = new DevExpress.Utils.PointFloat(0F, 432.1334F);
             this.xrLabel32.Name = "xrLabel32";
             this.xrLabel32.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel32.SizeF = new System.Drawing.SizeF(100.6539F, 17.00003F);
@@ -382,7 +382,7 @@ namespace Alloheim
             this.xrLabel33.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerStreet")});
             this.xrLabel33.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel33.LocationFloat = new DevExpress.Utils.PointFloat(100.6539F, 370.675F);
+            this.xrLabel33.LocationFloat = new DevExpress.Utils.PointFloat(100.6539F, 432.1334F);
             this.xrLabel33.Name = "xrLabel33";
             this.xrLabel33.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel33.SizeF = new System.Drawing.SizeF(284.7627F, 17F);
@@ -392,7 +392,7 @@ namespace Alloheim
             // 
             this.xrLabel34.CanGrow = false;
             this.xrLabel34.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel34.LocationFloat = new DevExpress.Utils.PointFloat(385.4166F, 370.6751F);
+            this.xrLabel34.LocationFloat = new DevExpress.Utils.PointFloat(385.4166F, 432.1335F);
             this.xrLabel34.Name = "xrLabel34";
             this.xrLabel34.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel34.SizeF = new System.Drawing.SizeF(124.6668F, 16.99997F);
@@ -404,7 +404,7 @@ namespace Alloheim
             this.lblVersichertenNr.Borders = DevExpress.XtraPrinting.BorderSide.Right;
             this.lblVersichertenNr.CanGrow = false;
             this.lblVersichertenNr.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblVersichertenNr.LocationFloat = new DevExpress.Utils.PointFloat(510.0834F, 370.6751F);
+            this.lblVersichertenNr.LocationFloat = new DevExpress.Utils.PointFloat(510.0834F, 432.1335F);
             this.lblVersichertenNr.Name = "lblVersichertenNr";
             this.lblVersichertenNr.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.lblVersichertenNr.SizeF = new System.Drawing.SizeF(166.7498F, 17F);
@@ -416,7 +416,7 @@ namespace Alloheim
             this.lblPflegegrad.Borders = DevExpress.XtraPrinting.BorderSide.Right;
             this.lblPflegegrad.CanGrow = false;
             this.lblPflegegrad.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblPflegegrad.LocationFloat = new DevExpress.Utils.PointFloat(510.0834F, 353.6751F);
+            this.lblPflegegrad.LocationFloat = new DevExpress.Utils.PointFloat(510.0834F, 415.1334F);
             this.lblPflegegrad.Name = "lblPflegegrad";
             this.lblPflegegrad.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.lblPflegegrad.SizeF = new System.Drawing.SizeF(166.7498F, 17F);
@@ -427,7 +427,7 @@ namespace Alloheim
             // 
             this.xrLabel27.CanGrow = false;
             this.xrLabel27.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(385.4166F, 353.6751F);
+            this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(385.4166F, 415.1334F);
             this.xrLabel27.Name = "xrLabel27";
             this.xrLabel27.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel27.SizeF = new System.Drawing.SizeF(124.6668F, 17.00003F);
@@ -440,7 +440,7 @@ namespace Alloheim
             this.xrLabel28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerName")});
             this.xrLabel28.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel28.LocationFloat = new DevExpress.Utils.PointFloat(100.6539F, 353.675F);
+            this.xrLabel28.LocationFloat = new DevExpress.Utils.PointFloat(100.6539F, 415.1333F);
             this.xrLabel28.Name = "xrLabel28";
             this.xrLabel28.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel28.SizeF = new System.Drawing.SizeF(284.7627F, 17F);
@@ -451,7 +451,7 @@ namespace Alloheim
             this.xrLabel31.Borders = DevExpress.XtraPrinting.BorderSide.Left;
             this.xrLabel31.CanGrow = false;
             this.xrLabel31.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel31.LocationFloat = new DevExpress.Utils.PointFloat(0F, 353.675F);
+            this.xrLabel31.LocationFloat = new DevExpress.Utils.PointFloat(0F, 415.1333F);
             this.xrLabel31.Name = "xrLabel31";
             this.xrLabel31.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel31.SizeF = new System.Drawing.SizeF(100.6539F, 17.00003F);
@@ -463,7 +463,7 @@ namespace Alloheim
             this.xrLabel24.Borders = DevExpress.XtraPrinting.BorderSide.Left;
             this.xrLabel24.CanGrow = false;
             this.xrLabel24.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(0F, 336.6751F);
+            this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(0F, 398.1335F);
             this.xrLabel24.Name = "xrLabel24";
             this.xrLabel24.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel24.SizeF = new System.Drawing.SizeF(157.4447F, 17F);
@@ -475,7 +475,7 @@ namespace Alloheim
             // 
             this.xrLabel25.CanGrow = false;
             this.xrLabel25.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(157.4447F, 336.6751F);
+            this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(157.4447F, 398.1335F);
             this.xrLabel25.Name = "xrLabel25";
             this.xrLabel25.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel25.SizeF = new System.Drawing.SizeF(227.9719F, 17F);
@@ -485,7 +485,7 @@ namespace Alloheim
             // 
             this.xrLabel29.CanGrow = false;
             this.xrLabel29.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(385.4166F, 336.6751F);
+            this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(385.4166F, 398.1335F);
             this.xrLabel29.Name = "xrLabel29";
             this.xrLabel29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel29.SizeF = new System.Drawing.SizeF(124.6668F, 17F);
@@ -497,7 +497,7 @@ namespace Alloheim
             this.xrLabel30.Borders = DevExpress.XtraPrinting.BorderSide.Right;
             this.xrLabel30.CanGrow = false;
             this.xrLabel30.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel30.LocationFloat = new DevExpress.Utils.PointFloat(510.0834F, 336.6751F);
+            this.xrLabel30.LocationFloat = new DevExpress.Utils.PointFloat(510.0834F, 398.1335F);
             this.xrLabel30.Name = "xrLabel30";
             this.xrLabel30.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel30.SizeF = new System.Drawing.SizeF(166.7498F, 17F);
@@ -511,7 +511,7 @@ namespace Alloheim
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrLabel23.CanGrow = false;
             this.xrLabel23.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(510.0834F, 319.6751F);
+            this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(510.0834F, 381.1334F);
             this.xrLabel23.Name = "xrLabel23";
             this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel23.SizeF = new System.Drawing.SizeF(166.7498F, 17F);
@@ -523,7 +523,7 @@ namespace Alloheim
             this.xrLabel21.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrLabel21.CanGrow = false;
             this.xrLabel21.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(385.4166F, 319.6751F);
+            this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(385.4166F, 381.1334F);
             this.xrLabel21.Name = "xrLabel21";
             this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel21.SizeF = new System.Drawing.SizeF(124.6668F, 17F);
@@ -536,7 +536,7 @@ namespace Alloheim
             this.xrLabel20.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrLabel20.CanGrow = false;
             this.xrLabel20.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(288.1536F, 319.6751F);
+            this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(288.1536F, 381.1334F);
             this.xrLabel20.Name = "xrLabel20";
             this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel20.SizeF = new System.Drawing.SizeF(97.26303F, 17F);
@@ -549,7 +549,7 @@ namespace Alloheim
             this.xrLabel14.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrLabel14.CanGrow = false;
             this.xrLabel14.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(252.9975F, 319.6751F);
+            this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(252.9975F, 381.1334F);
             this.xrLabel14.Name = "xrLabel14";
             this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel14.SizeF = new System.Drawing.SizeF(35.15613F, 17F);
@@ -562,7 +562,7 @@ namespace Alloheim
             this.xrLabel9.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrLabel9.CanGrow = false;
             this.xrLabel9.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(157.4447F, 319.6751F);
+            this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(157.4447F, 381.1334F);
             this.xrLabel9.Name = "xrLabel9";
             this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel9.SizeF = new System.Drawing.SizeF(95.55278F, 17F);
@@ -573,7 +573,7 @@ namespace Alloheim
             // xrLabel18
             // 
             this.xrLabel18.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(448.6248F, 154.1875F);
+            this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(463.458F, 171.1458F);
             this.xrLabel18.Multiline = true;
             this.xrLabel18.Name = "xrLabel18";
             this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -584,7 +584,7 @@ namespace Alloheim
             // xrLabel19
             // 
             this.xrLabel19.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(448.6248F, 171.1875F);
+            this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(463.458F, 188.1458F);
             this.xrLabel19.Multiline = true;
             this.xrLabel19.Name = "xrLabel19";
             this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -596,7 +596,7 @@ namespace Alloheim
             // xrLabel16
             // 
             this.xrLabel16.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(448.6249F, 76.70835F);
+            this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(463.4581F, 93.66668F);
             this.xrLabel16.Multiline = true;
             this.xrLabel16.Name = "xrLabel16";
             this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -607,7 +607,7 @@ namespace Alloheim
             // xrLabel17
             // 
             this.xrLabel17.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(448.6249F, 93.70836F);
+            this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(463.4581F, 110.6667F);
             this.xrLabel17.Multiline = true;
             this.xrLabel17.Name = "xrLabel17";
             this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -619,7 +619,7 @@ namespace Alloheim
             // xrLabel13
             // 
             this.xrLabel13.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(448.6249F, 17.00001F);
+            this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(463.4581F, 33.95834F);
             this.xrLabel13.Multiline = true;
             this.xrLabel13.Name = "xrLabel13";
             this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -631,7 +631,7 @@ namespace Alloheim
             // xrLabel12
             // 
             this.xrLabel12.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(448.6249F, 0F);
+            this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(463.4581F, 16.95833F);
             this.xrLabel12.Multiline = true;
             this.xrLabel12.Name = "xrLabel12";
             this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -641,8 +641,8 @@ namespace Alloheim
             // 
             // xrLabel10
             // 
-            this.xrLabel10.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 112.5F);
+            this.xrLabel10.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+            this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 108.5833F);
             this.xrLabel10.Multiline = true;
             this.xrLabel10.Name = "xrLabel10";
             this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -653,7 +653,7 @@ namespace Alloheim
             // xrLabel6
             // 
             this.xrLabel6.CanShrink = true;
-            this.xrLabel6.Font = new System.Drawing.Font("Arial Narrow", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel6.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             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);
@@ -664,11 +664,12 @@ namespace Alloheim
             // 
             // xrLabel7
             // 
+            this.xrLabel7.Font = new System.Drawing.Font("Arial", 10F);
             this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 22.50001F);
             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(317F, 90F);
+            this.xrLabel7.SizeF = new System.Drawing.SizeF(317F, 86.08331F);
             this.xrLabel7.StylePriority.UseFont = false;
             this.xrLabel7.Text = "[RecipientOrganisation]\r\n[RecipientContactPerson]\r\n[RecipientDivision]\r\n[Recipien" +
     "tStreet]";
@@ -678,7 +679,7 @@ namespace Alloheim
             this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
             this.xrLabel4.CanShrink = true;
             this.xrLabel4.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 286.875F);
+            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 348.3334F);
             this.xrLabel4.Multiline = true;
             this.xrLabel4.Name = "xrLabel4";
             this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -693,7 +694,7 @@ namespace Alloheim
             this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
             this.xrLabel2.CanShrink = true;
             this.xrLabel2.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 266.6667F);
+            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 328.125F);
             this.xrLabel2.Name = "xrLabel2";
             this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel2.SizeF = new System.Drawing.SizeF(317.0001F, 20.20831F);
@@ -708,7 +709,7 @@ namespace Alloheim
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrLabel5.CanGrow = false;
             this.xrLabel5.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 319.6751F);
+            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 381.1334F);
             this.xrLabel5.Name = "xrLabel5";
             this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel5.SizeF = new System.Drawing.SizeF(157.4447F, 17F);
@@ -718,10 +719,12 @@ namespace Alloheim
             // 
             // xrLabel8
             // 
-            this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(448.6248F, 286.8751F);
+            this.xrLabel8.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(448.6248F, 348.3334F);
             this.xrLabel8.Name = "xrLabel8";
             this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel8.SizeF = new System.Drawing.SizeF(228.3752F, 19.99994F);
+            this.xrLabel8.StylePriority.UseFont = false;
             this.xrLabel8.StylePriority.UseTextAlignment = false;
             this.xrLabel8.Text = "Datum: [InvoiceDate]";
             this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
@@ -1041,7 +1044,7 @@ namespace Alloheim
             this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
             this.xrLabel1,
             this.xrLabel15});
-            this.GroupFooter1.HeightF = 101.9046F;
+            this.GroupFooter1.HeightF = 112.3213F;
             this.GroupFooter1.Name = "GroupFooter1";
             // 
             // xrLabel1
@@ -1076,7 +1079,7 @@ namespace Alloheim
             this.Font = new System.Drawing.Font("Verdana", 10F);
             this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
             this.ruleRateFactorNull});
-            this.Margins = new System.Drawing.Printing.Margins(75, 75, 142, 82);
+            this.Margins = new System.Drawing.Printing.Margins(75, 75, 176, 103);
             this.PageHeight = 1169;
             this.PageWidth = 827;
             this.PaperKind = System.Drawing.Printing.PaperKind.A4;

ReportImp/Alloheim/SettlementReport2.Designer.cs

@@ -33,8 +33,6 @@ namespace Alloheim
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung));
             DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary();
             this.Detail = new DevExpress.XtraReports.UI.DetailBand();
-            this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
-            this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
             this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
             this.rowErbrachteLeistung = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -96,7 +94,6 @@ namespace Alloheim
             this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
             this.xrTable5 = new DevExpress.XtraReports.UI.XRTable();
             this.xrTableRow31 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -115,12 +112,14 @@ namespace Alloheim
             this.xrTableRow37 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell59 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell60 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
             // 
             // Detail
@@ -130,32 +129,17 @@ namespace Alloheim
             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.xrPictureBox1});
-            this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F);
-            this.ReportHeader.HeightF = 142.0257F;
-            this.ReportHeader.Name = "ReportHeader";
-            this.ReportHeader.StylePriority.UseFont = false;
-            // 
-            // xrPictureBox1
-            // 
-            this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
-            this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(501.7245F, 0F);
-            this.xrPictureBox1.Name = "xrPictureBox1";
-            this.xrPictureBox1.SizeF = new System.Drawing.SizeF(176.2755F, 142.0257F);
-            this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
-            // 
             // xrTable1
             // 
             this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight;
+            this.xrTable1.Font = new System.Drawing.Font("Arial", 11F);
             this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 463.4999F);
             this.xrTable1.Name = "xrTable1";
             this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.rowErbrachteLeistung});
             this.xrTable1.SizeF = new System.Drawing.SizeF(650F, 17F);
             this.xrTable1.StylePriority.UseBorderColor = false;
+            this.xrTable1.StylePriority.UseFont = false;
             // 
             // rowErbrachteLeistung
             // 
@@ -188,7 +172,7 @@ namespace Alloheim
             // xrLabel6
             // 
             this.xrLabel6.BackColor = System.Drawing.Color.Transparent;
-            this.xrLabel6.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel6.Font = new System.Drawing.Font("Arial", 11F);
             this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 389.4999F);
             this.xrLabel6.Multiline = true;
             this.xrLabel6.Name = "xrLabel6";
@@ -200,7 +184,7 @@ namespace Alloheim
             // 
             // xrLabel5
             // 
-            this.xrLabel5.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel5.Font = new System.Drawing.Font("Arial", 11F);
             this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 362.4999F);
             this.xrLabel5.Name = "xrLabel5";
             this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -255,7 +239,7 @@ namespace Alloheim
             // RecipientPostCodeAndTown
             // 
             this.RecipientPostCodeAndTown.CanShrink = true;
-            this.RecipientPostCodeAndTown.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.RecipientPostCodeAndTown.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
             this.RecipientPostCodeAndTown.LocationFloat = new DevExpress.Utils.PointFloat(0F, 97.00002F);
             this.RecipientPostCodeAndTown.Name = "RecipientPostCodeAndTown";
             this.RecipientPostCodeAndTown.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -267,6 +251,7 @@ namespace Alloheim
             // xrLabel_RecipientStreet
             // 
             this.xrLabel_RecipientStreet.CanShrink = true;
+            this.xrLabel_RecipientStreet.Font = new System.Drawing.Font("Arial", 10F);
             this.xrLabel_RecipientStreet.LocationFloat = new DevExpress.Utils.PointFloat(0F, 74.00001F);
             this.xrLabel_RecipientStreet.Name = "xrLabel_RecipientStreet";
             this.xrLabel_RecipientStreet.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -278,6 +263,7 @@ namespace Alloheim
             // xrLabel_RecipientDivision
             // 
             this.xrLabel_RecipientDivision.CanShrink = true;
+            this.xrLabel_RecipientDivision.Font = new System.Drawing.Font("Arial", 10F);
             this.xrLabel_RecipientDivision.LocationFloat = new DevExpress.Utils.PointFloat(0F, 57F);
             this.xrLabel_RecipientDivision.Name = "xrLabel_RecipientDivision";
             this.xrLabel_RecipientDivision.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -289,6 +275,7 @@ namespace Alloheim
             // xrLabel_RecipientContactPerson
             // 
             this.xrLabel_RecipientContactPerson.CanShrink = true;
+            this.xrLabel_RecipientContactPerson.Font = new System.Drawing.Font("Arial", 10F);
             this.xrLabel_RecipientContactPerson.LocationFloat = new DevExpress.Utils.PointFloat(0F, 39.99999F);
             this.xrLabel_RecipientContactPerson.Name = "xrLabel_RecipientContactPerson";
             this.xrLabel_RecipientContactPerson.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -300,6 +287,7 @@ namespace Alloheim
             // xrLabel1
             // 
             this.xrLabel1.CanShrink = true;
+            this.xrLabel1.Font = new System.Drawing.Font("Arial", 10F);
             this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 22.99999F);
             this.xrLabel1.Name = "xrLabel1";
             this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -488,14 +476,16 @@ namespace Alloheim
             // 
             // topMarginBand1
             // 
-            this.topMarginBand1.HeightF = 100F;
+            this.topMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrPictureBox2});
+            this.topMarginBand1.HeightF = 176F;
             this.topMarginBand1.Name = "topMarginBand1";
             // 
             // bottomMarginBand1
             // 
             this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
             this.xrLabel14});
-            this.bottomMarginBand1.HeightF = 72.29163F;
+            this.bottomMarginBand1.HeightF = 96.62495F;
             this.bottomMarginBand1.Name = "bottomMarginBand1";
             // 
             // xrLabel14
@@ -539,7 +529,7 @@ namespace Alloheim
             // xrLabel19
             // 
             this.xrLabel19.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(464.6247F, 172.4792F);
+            this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(464.6244F, 186.4792F);
             this.xrLabel19.Multiline = true;
             this.xrLabel19.Name = "xrLabel19";
             this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -551,7 +541,7 @@ namespace Alloheim
             // xrLabel13
             // 
             this.xrLabel13.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(464.6249F, 17.29167F);
+            this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(464.6247F, 31.29168F);
             this.xrLabel13.Multiline = true;
             this.xrLabel13.Name = "xrLabel13";
             this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -563,7 +553,7 @@ namespace Alloheim
             // xrLabel17
             // 
             this.xrLabel17.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(464.6249F, 95.00002F);
+            this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(464.6247F, 109F);
             this.xrLabel17.Multiline = true;
             this.xrLabel17.Name = "xrLabel17";
             this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -575,7 +565,7 @@ namespace Alloheim
             // xrLabel16
             // 
             this.xrLabel16.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(464.6249F, 77.00001F);
+            this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(464.6247F, 91.00002F);
             this.xrLabel16.Multiline = true;
             this.xrLabel16.Name = "xrLabel16";
             this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -586,7 +576,7 @@ namespace Alloheim
             // xrLabel8
             // 
             this.xrLabel8.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(464.6249F, 0F);
+            this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(464.6247F, 14F);
             this.xrLabel8.Multiline = true;
             this.xrLabel8.Name = "xrLabel8";
             this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -597,7 +587,7 @@ namespace Alloheim
             // xrLabel18
             // 
             this.xrLabel18.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(464.6247F, 155.4792F);
+            this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(464.6244F, 169.4792F);
             this.xrLabel18.Multiline = true;
             this.xrLabel18.Name = "xrLabel18";
             this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -607,10 +597,12 @@ namespace Alloheim
             // 
             // xrLabel9
             // 
+            this.xrLabel9.Font = new System.Drawing.Font("Arial", 9F);
             this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(464.6247F, 284.1667F);
             this.xrLabel9.Name = "xrLabel9";
             this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel9.SizeF = new System.Drawing.SizeF(213.3751F, 19.99994F);
+            this.xrLabel9.StylePriority.UseFont = false;
             this.xrLabel9.StylePriority.UseTextAlignment = false;
             this.xrLabel9.Text = "Datum: [InvoiceDate!dd.MM.yyyy]";
             this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
@@ -618,12 +610,12 @@ namespace Alloheim
             // xrLabel7
             // 
             this.xrLabel7.CanShrink = true;
-            this.xrLabel7.Font = new System.Drawing.Font("Arial Narrow", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel7.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
             this.xrLabel7.Name = "xrLabel7";
             this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel7.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
-            this.xrLabel7.SizeF = new System.Drawing.SizeF(292F, 17F);
+            this.xrLabel7.SizeF = new System.Drawing.SizeF(292.0001F, 17F);
             this.xrLabel7.StylePriority.UseFont = false;
             this.xrLabel7.Text = "Alloheim mobil - Gumbertstr. 90/92 - 40229 Düsseldorf";
             // 
@@ -799,10 +791,6 @@ namespace Alloheim
             this.xrTableCell7.StylePriority.UsePadding = false;
             this.xrTableCell7.Weight = 3D;
             // 
-            // bindingSource1
-            // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
-            // 
             // GroupFooter1
             // 
             this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -1004,11 +992,22 @@ namespace Alloheim
             this.xrTableCell60.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
             this.xrTableCell60.Weight = 0.16397432767427886D;
             // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
+            // 
+            // xrPictureBox2
+            // 
+            this.xrPictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox2.Image")));
+            this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(511.0835F, 38.14093F);
+            this.xrPictureBox2.Name = "xrPictureBox2";
+            this.xrPictureBox2.SizeF = new System.Drawing.SizeF(166.9165F, 137.8591F);
+            this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
+            // 
             // Spitzabrechnung
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
             this.Detail,
-            this.ReportHeader,
             this.ReportFooter,
             this.topMarginBand1,
             this.bottomMarginBand1,
@@ -1021,7 +1020,7 @@ namespace Alloheim
             this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
             this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
             this.ruleRateFactorNull});
-            this.Margins = new System.Drawing.Printing.Margins(75, 74, 100, 72);
+            this.Margins = new System.Drawing.Printing.Margins(75, 74, 176, 97);
             this.PageHeight = 1169;
             this.PageWidth = 827;
             this.PaperKind = System.Drawing.Printing.PaperKind.A4;
@@ -1030,8 +1029,8 @@ namespace Alloheim
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
 
         }
@@ -1040,7 +1039,6 @@ namespace Alloheim
 
         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;
@@ -1112,7 +1110,6 @@ namespace Alloheim
         private DevExpress.XtraReports.UI.XRTableRow xrTableRow10;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
         private DevExpress.XtraReports.UI.XRLabel xrLabel7;
-        private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
         private DevExpress.XtraReports.UI.XRLabel xrLabel19;
         private DevExpress.XtraReports.UI.XRLabel xrLabel13;
         private DevExpress.XtraReports.UI.XRLabel xrLabel17;
@@ -1121,5 +1118,6 @@ namespace Alloheim
         private DevExpress.XtraReports.UI.XRLabel xrLabel18;
         private DevExpress.XtraReports.UI.XRLabel xrLabel9;
         private DevExpress.XtraReports.UI.XRLabel xrLabel14;
+        private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2;
     }
 }

ReportImp/Alloheim/SettlementReport2.resx

@@ -117,8 +117,12 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="xrLabel6.Text" xml:space="preserve">
+    <value>anbei sende ich Ihnen die unterschriebenen Nachweise über die im Rahmen des Betreuten Wohnens für [Salutation2] [CustomerFirstName] [CustomerLastName] erbrachten Leistungen zu. Nach unserer Berechnung ergeben sich für den Betreuungszeitraum [AccountingPeriod] hieraus:
+</value>
+  </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="xrPictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="xrPictureBox2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         /9j/4AAQSkZJRgABAQEAWgBaAAD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsN
         DhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQU
@@ -702,10 +706,6 @@
         FFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAF
         FFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAF
         FFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAf/9k=
-</value>
-  </data>
-  <data name="xrLabel6.Text" xml:space="preserve">
-    <value>anbei sende ich Ihnen die unterschriebenen Nachweise über die im Rahmen des Betreuten Wohnens für [Salutation2] [CustomerFirstName] [CustomerLastName] erbrachten Leistungen zu. Nach unserer Berechnung ergeben sich für den Betreuungszeitraum [AccountingPeriod] hieraus:
 </value>
   </data>
   <data name="xrLabel14.Text" xml:space="preserve">

ReportImp/AsbRheinErftDuerenSBD/Invoicing/ChristophorusPoolInvoiceCreation.cs

@@ -59,7 +59,7 @@ namespace AsbRheinErftDuerenSBD.Invoicing
                 {
                     serviceInvoicePeriod.Notice += e.FirstName + " " + e.LastName + ", ";
 
-                    if (e.LastName == "Bugla " && e.FirstName == "Frank") // Hier Ausnahme, also Teilzeit-MA, einfügen
+                    if (e.LastName.Contains("Bugla") && e.FirstName.Contains("Frank")) // Hier Ausnahme, also Teilzeit-MA, einfügen
                         anzHKTeilzeit++;
                     else if (e.IsQualified.HasValue && e.IsQualified.Value)
                         anzFK++;

ReportImp/AsbRheinErftDuerenSBD/PoolInvoiceReport.Designer.cs

@@ -101,7 +101,7 @@ namespace AsbRheinErftDuerenSBD
             // 
             // topMarginBand1
             // 
-            this.topMarginBand1.HeightF = 158F;
+            this.topMarginBand1.HeightF = 184.0417F;
             this.topMarginBand1.Name = "topMarginBand1";
             // 
             // bottomMarginBand1
@@ -263,7 +263,7 @@ namespace AsbRheinErftDuerenSBD
             // xrLabel7
             // 
             this.xrLabel7.Font = new System.Drawing.Font("Verdana", 10F);
-            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 30.20833F);
             this.xrLabel7.Multiline = true;
             this.xrLabel7.Name = "xrLabel7";
             this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -660,7 +660,7 @@ namespace AsbRheinErftDuerenSBD
             this.Font = new System.Drawing.Font("Verdana", 10F);
             this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
             this.ruleRateFactorNull});
-            this.Margins = new System.Drawing.Printing.Margins(75, 53, 158, 50);
+            this.Margins = new System.Drawing.Printing.Margins(75, 53, 184, 50);
             this.PageHeight = 1169;
             this.PageWidth = 827;
             this.PaperKind = System.Drawing.Printing.PaperKind.A4;

ReportImp/BeWoColonia5Reports/BeWoColonia5Reports.csproj

@@ -71,6 +71,10 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\Data\Data.csproj">
+      <Project>{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}</Project>
+      <Name>Data</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Report\Report.csproj">
       <Project>{40D8B312-EA64-49E3-A31A-5E57ED4D5654}</Project>
       <Name>Report</Name>

ReportImp/BeWoColonia5Reports/ServicesOverviewReport.Designer.cs

@@ -35,6 +35,7 @@ namespace BeWoDreilichPastorDreilich
             this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell1 = 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();
@@ -42,7 +43,9 @@ namespace BeWoDreilichPastorDreilich
             this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell2 = 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();
@@ -70,6 +73,10 @@ namespace BeWoDreilichPastorDreilich
             this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
             this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
             this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
+            this.xrLabel30 = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblFehlkontakt = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel();
@@ -84,16 +91,32 @@ namespace BeWoDreilichPastorDreilich
             this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField();
             this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField();
             this.fieldGroupHours = new DevExpress.XtraReports.UI.CalculatedField();
-            this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel30 = new DevExpress.XtraReports.UI.XRLabel();
-            this.lblFehlkontakt = new DevExpress.XtraReports.UI.XRLabel();
-            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            this.xrLabel31 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrTableAbwesenheiten = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell();
             ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTableAbwesenheiten)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
             // 
             // Detail
@@ -101,7 +124,7 @@ namespace BeWoDreilichPastorDreilich
             this.Detail.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
             this.xrTableServiceRecords1});
             this.Detail.Font = new System.Drawing.Font("Times New Roman", 11F, System.Drawing.FontStyle.Bold);
-            this.Detail.HeightF = 32F;
+            this.Detail.HeightF = 28F;
             this.Detail.Name = "Detail";
             this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
             this.Detail.StylePriority.UseFont = false;
@@ -110,13 +133,15 @@ namespace BeWoDreilichPastorDreilich
             // xrTableServiceRecords1
             // 
             this.xrTableServiceRecords1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(221)))), ((int)(((byte)(221)))), ((int)(((byte)(221)))));
-            this.xrTableServiceRecords1.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+            this.xrTableServiceRecords1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableServiceRecords1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
             this.xrTableServiceRecords1.Name = "xrTableServiceRecords1";
             this.xrTableServiceRecords1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
             this.xrTableServiceRecords1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.xrTableRow2});
-            this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(626.9999F, 32F);
+            this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(626.9999F, 28F);
             this.xrTableServiceRecords1.StylePriority.UseBackColor = false;
             this.xrTableServiceRecords1.StylePriority.UseBorders = false;
             this.xrTableServiceRecords1.StylePriority.UseFont = false;
@@ -133,7 +158,7 @@ namespace BeWoDreilichPastorDreilich
             this.xrTableRow2.Name = "xrTableRow2";
             this.xrTableRow2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
             this.xrTableRow2.StylePriority.UseTextAlignment = false;
-            this.xrTableRow2.Weight = 1D;
+            this.xrTableRow2.Weight = 0.875D;
             // 
             // xrTableCell3
             // 
@@ -154,6 +179,14 @@ namespace BeWoDreilichPastorDreilich
             this.xrTableCell4.Text = "Uhrzeit";
             this.xrTableCell4.Weight = 0.45659584837553346D;
             // 
+            // xrTableCell1
+            // 
+            this.xrTableCell1.Name = "xrTableCell1";
+            this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+            this.xrTableCell1.StylePriority.UsePadding = false;
+            this.xrTableCell1.Text = "Art";
+            this.xrTableCell1.Weight = 0.45659584837553346D;
+            // 
             // cellMinutenFLSHeader
             // 
             this.cellMinutenFLSHeader.Multiline = true;
@@ -179,8 +212,8 @@ namespace BeWoDreilichPastorDreilich
             // 
             this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
             this.xrTable3});
-            this.Detail1.Font = new System.Drawing.Font("Arial", 12F);
-            this.Detail1.HeightF = 25F;
+            this.Detail1.Font = new System.Drawing.Font("Times New Roman", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Detail1.HeightF = 24F;
             this.Detail1.Name = "Detail1";
             this.Detail1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
             this.Detail1.StylePriority.UseFont = false;
@@ -196,7 +229,7 @@ namespace BeWoDreilichPastorDreilich
             this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
             this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.xrTableRow6});
-            this.xrTable3.SizeF = new System.Drawing.SizeF(626.9999F, 25F);
+            this.xrTable3.SizeF = new System.Drawing.SizeF(626.9999F, 24F);
             this.xrTable3.StylePriority.UseFont = false;
             this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
             // 
@@ -210,7 +243,7 @@ namespace BeWoDreilichPastorDreilich
             this.xrTableRow6.Name = "xrTableRow6";
             this.xrTableRow6.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
             this.xrTableRow6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
-            this.xrTableRow6.Weight = 1.25D;
+            this.xrTableRow6.Weight = 1.2D;
             // 
             // xrTableCell13
             // 
@@ -238,6 +271,18 @@ namespace BeWoDreilichPastorDreilich
             this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
             this.xrTableCell14.Weight = 0.23641101510270648D;
             // 
+            // xrTableCell2
+            // 
+            this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice5")});
+            this.xrTableCell2.Name = "xrTableCell2";
+            this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+            this.xrTableCell2.StylePriority.UsePadding = false;
+            this.xrTableCell2.StylePriority.UseTextAlignment = false;
+            this.xrTableCell2.Text = "xrTableCell2";
+            this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell2.Weight = 0.23641101510270648D;
+            // 
             // xrTableCell15
             // 
             this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
@@ -251,6 +296,10 @@ namespace BeWoDreilichPastorDreilich
             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,6 +625,8 @@ namespace BeWoDreilichPastorDreilich
             // ReportFooter
             // 
             this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel31,
+            this.xrTableAbwesenheiten,
             this.xrLabel30,
             this.lblFehlkontakt,
             this.xrLabel11,
@@ -591,14 +642,75 @@ namespace BeWoDreilichPastorDreilich
             this.cellGesamt,
             this.xrLabel3});
             this.ReportFooter.Font = new System.Drawing.Font("Times New Roman", 11F);
-            this.ReportFooter.HeightF = 284.4999F;
+            this.ReportFooter.HeightF = 398.0415F;
             this.ReportFooter.Name = "ReportFooter";
             this.ReportFooter.StylePriority.UseFont = false;
             // 
+            // xrLabel30
+            // 
+            this.xrLabel30.Font = new System.Drawing.Font("Times New Roman", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel30.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrLabel30.Name = "xrLabel30";
+            this.xrLabel30.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.xrLabel30.SizeF = new System.Drawing.SizeF(245F, 25F);
+            this.xrLabel30.StylePriority.UseBackColor = false;
+            this.xrLabel30.StylePriority.UseBorders = false;
+            this.xrLabel30.StylePriority.UseFont = false;
+            this.xrLabel30.StylePriority.UsePadding = false;
+            this.xrLabel30.StylePriority.UseTextAlignment = false;
+            this.xrLabel30.Text = "E = ear to ear, face to face";
+            this.xrLabel30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // lblFehlkontakt
+            // 
+            this.lblFehlkontakt.Font = new System.Drawing.Font("Times New Roman", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lblFehlkontakt.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25.00001F);
+            this.lblFehlkontakt.Name = "lblFehlkontakt";
+            this.lblFehlkontakt.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.lblFehlkontakt.SizeF = new System.Drawing.SizeF(245F, 20F);
+            this.lblFehlkontakt.StylePriority.UseBackColor = false;
+            this.lblFehlkontakt.StylePriority.UseBorders = false;
+            this.lblFehlkontakt.StylePriority.UseFont = false;
+            this.lblFehlkontakt.StylePriority.UsePadding = false;
+            this.lblFehlkontakt.StylePriority.UseTextAlignment = false;
+            this.lblFehlkontakt.Text = "F = Fehlkontakt";
+            this.lblFehlkontakt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrLabel11
+            // 
+            this.xrLabel11.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrLabel11.BorderWidth = 2F;
+            this.xrLabel11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMFehlkontakte")});
+            this.xrLabel11.Font = new System.Drawing.Font("Times New Roman", 11F, System.Drawing.FontStyle.Bold);
+            this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(447.8571F, 50F);
+            this.xrLabel11.Name = "xrLabel11";
+            this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
+            this.xrLabel11.SizeF = new System.Drawing.SizeF(179.1428F, 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.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            // 
+            // xrLabel4
+            // 
+            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(300F, 50F);
+            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(147.8571F, 25F);
+            this.xrLabel4.StylePriority.UseFont = false;
+            this.xrLabel4.StylePriority.UseTextAlignment = false;
+            this.xrLabel4.Text = "Summe Fehlkontakte\r\n";
+            this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
             // xrLabel19
             // 
             this.xrLabel19.Font = new System.Drawing.Font("Times New Roman", 11F);
-            this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(0F, 262.9166F);
+            this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(0F, 376.4582F);
             this.xrLabel19.Multiline = true;
             this.xrLabel19.Name = "xrLabel19";
             this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -612,7 +724,7 @@ namespace BeWoDreilichPastorDreilich
             // xrLabel17
             // 
             this.xrLabel17.Font = new System.Drawing.Font("Times New Roman", 11F);
-            this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 128.75F);
+            this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 242.2916F);
             this.xrLabel17.Multiline = true;
             this.xrLabel17.Name = "xrLabel17";
             this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -626,7 +738,7 @@ namespace BeWoDreilichPastorDreilich
             // xrLabel16
             // 
             this.xrLabel16.Font = new System.Drawing.Font("Times New Roman", 11F, System.Drawing.FontStyle.Bold);
-            this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(0F, 108.75F);
+            this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(0F, 222.2917F);
             this.xrLabel16.Multiline = true;
             this.xrLabel16.Name = "xrLabel16";
             this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -639,7 +751,7 @@ namespace BeWoDreilichPastorDreilich
             // xrLabel5
             // 
             this.xrLabel5.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
-            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(300F, 188.75F);
+            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(300F, 302.2917F);
             this.xrLabel5.Name = "xrLabel5";
             this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel5.SizeF = new System.Drawing.SizeF(327F, 17.99997F);
@@ -679,7 +791,7 @@ namespace BeWoDreilichPastorDreilich
             // xrLabel7
             // 
             this.xrLabel7.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
-            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(300F, 148.75F);
+            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(300F, 262.2917F);
             this.xrLabel7.Name = "xrLabel7";
             this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel7.SizeF = new System.Drawing.SizeF(327F, 17.99997F);
@@ -690,7 +802,7 @@ namespace BeWoDreilichPastorDreilich
             // xrLabel6
             // 
             this.xrLabel6.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
-            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(300F, 108.75F);
+            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(300F, 222.2917F);
             this.xrLabel6.Name = "xrLabel6";
             this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel6.SizeF = new System.Drawing.SizeF(327F, 17.99997F);
@@ -753,90 +865,233 @@ namespace BeWoDreilichPastorDreilich
             this.fieldGroupHours.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
             this.fieldGroupHours.Name = "fieldGroupHours";
             // 
-            // xrTableCell1
+            // xrLabel31
             // 
-            this.xrTableCell1.Name = "xrTableCell1";
-            this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
-            this.xrTableCell1.StylePriority.UsePadding = false;
-            this.xrTableCell1.Text = "Art";
-            this.xrTableCell1.Weight = 0.45659584837553346D;
+            this.xrLabel31.Font = new System.Drawing.Font("Times New Roman", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel31.LocationFloat = new DevExpress.Utils.PointFloat(128.5713F, 94.4791F);
+            this.xrLabel31.Multiline = true;
+            this.xrLabel31.Name = "xrLabel31";
+            this.xrLabel31.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.xrLabel31.SizeF = new System.Drawing.SizeF(170F, 43.61115F);
+            this.xrLabel31.StylePriority.UseBackColor = false;
+            this.xrLabel31.StylePriority.UseBorders = false;
+            this.xrLabel31.StylePriority.UseFont = false;
+            this.xrLabel31.StylePriority.UsePadding = false;
+            this.xrLabel31.StylePriority.UseTextAlignment = false;
+            this.xrLabel31.Text = "Krankenhausaufenthalte/\r\nstat. Rehamaßnahmen:";
+            this.xrLabel31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
             // 
-            // xrTableCell2
+            // xrTableAbwesenheiten
             // 
-            this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice5")});
-            this.xrTableCell2.Name = "xrTableCell2";
-            this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
-            this.xrTableCell2.StylePriority.UsePadding = false;
-            this.xrTableCell2.StylePriority.UseTextAlignment = false;
-            this.xrTableCell2.Text = "xrTableCell2";
-            this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-            this.xrTableCell2.Weight = 0.23641101510270648D;
-            // 
-            // xrLabel11
-            // 
-            this.xrLabel11.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            this.xrTableAbwesenheiten.BorderColor = System.Drawing.Color.Black;
+            this.xrTableAbwesenheiten.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.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMFehlkontakte")});
-            this.xrLabel11.Font = new System.Drawing.Font("Times New Roman", 11F, System.Drawing.FontStyle.Bold);
-            this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(447.8571F, 50F);
-            this.xrLabel11.Name = "xrLabel11";
-            this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
-            this.xrLabel11.SizeF = new System.Drawing.SizeF(179.1428F, 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.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableAbwesenheiten.Font = new System.Drawing.Font("Times New Roman", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(300F, 94.4791F);
+            this.xrTableAbwesenheiten.Name = "xrTableAbwesenheiten";
+            this.xrTableAbwesenheiten.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.xrTableAbwesenheiten.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow3,
+            this.xrTableRow4,
+            this.xrTableRow5,
+            this.xrTableRow7,
+            this.xrTableRow8});
+            this.xrTableAbwesenheiten.SizeF = new System.Drawing.SizeF(327.0001F, 99.99999F);
+            this.xrTableAbwesenheiten.StylePriority.UseBorders = false;
+            this.xrTableAbwesenheiten.StylePriority.UseFont = false;
+            this.xrTableAbwesenheiten.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
             // 
-            // xrLabel4
+            // xrTableRow3
             // 
-            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(300F, 50F);
-            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(147.8571F, 25F);
-            this.xrLabel4.StylePriority.UseFont = false;
-            this.xrLabel4.StylePriority.UseTextAlignment = false;
-            this.xrLabel4.Text = "Summe Fehlkontakte\r\n";
-            this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell16,
+            this.xrTableCell17,
+            this.xrTableCell18});
+            this.xrTableRow3.Name = "xrTableRow3";
+            this.xrTableRow3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.xrTableRow3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            this.xrTableRow3.Weight = 1D;
             // 
-            // xrLabel30
+            // xrTableCell16
             // 
-            this.xrLabel30.Font = new System.Drawing.Font("Arial", 10F);
-            this.xrLabel30.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
-            this.xrLabel30.Name = "xrLabel30";
-            this.xrLabel30.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
-            this.xrLabel30.SizeF = new System.Drawing.SizeF(245F, 20F);
-            this.xrLabel30.StylePriority.UseBackColor = false;
-            this.xrLabel30.StylePriority.UseBorders = false;
-            this.xrLabel30.StylePriority.UseFont = false;
-            this.xrLabel30.StylePriority.UsePadding = false;
-            this.xrLabel30.StylePriority.UseTextAlignment = false;
-            this.xrLabel30.Text = "E = ear to ear, face to face";
-            this.xrLabel30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell16.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell16.Name = "xrTableCell16";
+            this.xrTableCell16.StylePriority.UseBorders = false;
+            this.xrTableCell16.StylePriority.UseFont = false;
+            this.xrTableCell16.StylePriority.UsePadding = false;
+            this.xrTableCell16.StylePriority.UseTextAlignment = false;
+            this.xrTableCell16.Text = "von";
+            this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell16.Weight = 0.1073232364991462D;
             // 
-            // lblFehlkontakt
+            // xrTableCell17
             // 
-            this.lblFehlkontakt.Font = new System.Drawing.Font("Arial", 10F);
-            this.lblFehlkontakt.LocationFloat = new DevExpress.Utils.PointFloat(0F, 20.00001F);
-            this.lblFehlkontakt.Name = "lblFehlkontakt";
-            this.lblFehlkontakt.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
-            this.lblFehlkontakt.SizeF = new System.Drawing.SizeF(245F, 20F);
-            this.lblFehlkontakt.StylePriority.UseBackColor = false;
-            this.lblFehlkontakt.StylePriority.UseBorders = false;
-            this.lblFehlkontakt.StylePriority.UseFont = false;
-            this.lblFehlkontakt.StylePriority.UsePadding = false;
-            this.lblFehlkontakt.StylePriority.UseTextAlignment = false;
-            this.lblFehlkontakt.Text = "F = Fehlkontakt";
-            this.lblFehlkontakt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell17.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell17.Name = "xrTableCell17";
+            this.xrTableCell17.StylePriority.UseBorders = false;
+            this.xrTableCell17.StylePriority.UseFont = false;
+            this.xrTableCell17.StylePriority.UsePadding = false;
+            this.xrTableCell17.StylePriority.UseTextAlignment = false;
+            this.xrTableCell17.Text = "bis";
+            this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell17.Weight = 0.10732323432577288D;
             // 
-            // bindingSource1
+            // xrTableCell18
             // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
+            this.xrTableCell18.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell18.Name = "xrTableCell18";
+            this.xrTableCell18.StylePriority.UseBorders = false;
+            this.xrTableCell18.StylePriority.UseFont = false;
+            this.xrTableCell18.StylePriority.UsePadding = false;
+            this.xrTableCell18.StylePriority.UseTextAlignment = false;
+            this.xrTableCell18.Text = "Tage";
+            this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell18.Weight = 0.075757568269402914D;
+            // 
+            // xrTableRow4
+            // 
+            this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell19,
+            this.xrTableCell20,
+            this.xrTableCell21});
+            this.xrTableRow4.Name = "xrTableRow4";
+            this.xrTableRow4.Weight = 1D;
+            // 
+            // xrTableCell19
+            // 
+            this.xrTableCell19.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell19.Name = "xrTableCell19";
+            this.xrTableCell19.StylePriority.UseFont = false;
+            this.xrTableCell19.StylePriority.UseTextAlignment = false;
+            this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell19.Weight = 0.1073232364991462D;
+            // 
+            // xrTableCell20
+            // 
+            this.xrTableCell20.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell20.Name = "xrTableCell20";
+            this.xrTableCell20.StylePriority.UseFont = false;
+            this.xrTableCell20.StylePriority.UseTextAlignment = false;
+            this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell20.Weight = 0.10732323432577288D;
+            // 
+            // xrTableCell21
+            // 
+            this.xrTableCell21.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell21.Name = "xrTableCell21";
+            this.xrTableCell21.StylePriority.UseFont = false;
+            this.xrTableCell21.StylePriority.UseTextAlignment = false;
+            this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell21.Weight = 0.075757568269402914D;
+            // 
+            // xrTableRow5
+            // 
+            this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell22,
+            this.xrTableCell23,
+            this.xrTableCell24});
+            this.xrTableRow5.Name = "xrTableRow5";
+            this.xrTableRow5.Weight = 1D;
+            // 
+            // xrTableCell22
+            // 
+            this.xrTableCell22.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell22.Name = "xrTableCell22";
+            this.xrTableCell22.StylePriority.UseFont = false;
+            this.xrTableCell22.StylePriority.UseTextAlignment = false;
+            this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell22.Weight = 0.1073232364991462D;
+            // 
+            // xrTableCell23
+            // 
+            this.xrTableCell23.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell23.Name = "xrTableCell23";
+            this.xrTableCell23.StylePriority.UseFont = false;
+            this.xrTableCell23.StylePriority.UseTextAlignment = false;
+            this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell23.Weight = 0.10732323432577288D;
+            // 
+            // xrTableCell24
+            // 
+            this.xrTableCell24.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell24.Name = "xrTableCell24";
+            this.xrTableCell24.StylePriority.UseFont = false;
+            this.xrTableCell24.StylePriority.UseTextAlignment = false;
+            this.xrTableCell24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell24.Weight = 0.075757568269402914D;
+            // 
+            // xrTableRow7
+            // 
+            this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell25,
+            this.xrTableCell26,
+            this.xrTableCell27});
+            this.xrTableRow7.Name = "xrTableRow7";
+            this.xrTableRow7.Weight = 1D;
+            // 
+            // xrTableCell25
+            // 
+            this.xrTableCell25.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell25.Name = "xrTableCell25";
+            this.xrTableCell25.StylePriority.UseFont = false;
+            this.xrTableCell25.StylePriority.UseTextAlignment = false;
+            this.xrTableCell25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell25.Weight = 0.1073232364991462D;
+            // 
+            // xrTableCell26
+            // 
+            this.xrTableCell26.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell26.Name = "xrTableCell26";
+            this.xrTableCell26.StylePriority.UseFont = false;
+            this.xrTableCell26.StylePriority.UseTextAlignment = false;
+            this.xrTableCell26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell26.Weight = 0.10732323432577288D;
+            // 
+            // xrTableCell27
+            // 
+            this.xrTableCell27.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell27.Name = "xrTableCell27";
+            this.xrTableCell27.StylePriority.UseFont = false;
+            this.xrTableCell27.StylePriority.UseTextAlignment = false;
+            this.xrTableCell27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell27.Weight = 0.075757568269402914D;
+            // 
+            // xrTableRow8
+            // 
+            this.xrTableRow8.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell29,
+            this.xrTableCell30,
+            this.xrTableCell31});
+            this.xrTableRow8.Name = "xrTableRow8";
+            this.xrTableRow8.Weight = 1D;
+            // 
+            // xrTableCell29
+            // 
+            this.xrTableCell29.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell29.Name = "xrTableCell29";
+            this.xrTableCell29.StylePriority.UseFont = false;
+            this.xrTableCell29.StylePriority.UseTextAlignment = false;
+            this.xrTableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell29.Weight = 0.1073232364991462D;
+            // 
+            // xrTableCell30
+            // 
+            this.xrTableCell30.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell30.Name = "xrTableCell30";
+            this.xrTableCell30.StylePriority.UseFont = false;
+            this.xrTableCell30.StylePriority.UseTextAlignment = false;
+            this.xrTableCell30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell30.Weight = 0.10732323432577288D;
+            // 
+            // xrTableCell31
+            // 
+            this.xrTableCell31.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell31.Name = "xrTableCell31";
+            this.xrTableCell31.StylePriority.UseFont = false;
+            this.xrTableCell31.StylePriority.UseTextAlignment = false;
+            this.xrTableCell31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell31.Weight = 0.075757568269402914D;
             // 
             // Stundenzettel
             // 
@@ -867,6 +1122,7 @@ namespace BeWoDreilichPastorDreilich
             ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTableAbwesenheiten)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
 
         }
@@ -934,5 +1190,27 @@ namespace BeWoDreilichPastorDreilich
         private DevExpress.XtraReports.UI.XRLabel xrLabel4;
         private DevExpress.XtraReports.UI.XRLabel xrLabel30;
         private DevExpress.XtraReports.UI.XRLabel lblFehlkontakt;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel31;
+        private DevExpress.XtraReports.UI.XRTable xrTableAbwesenheiten;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell18;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow4;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow5;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell23;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell24;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow7;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell25;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell26;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell27;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow8;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell29;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell30;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell31;
     }
 }

ReportImp/BeWoColonia5Reports/ServicesOverviewReport.cs

@@ -62,6 +62,49 @@ namespace BeWoDreilichPastorDreilich
             }
 
             this.bindingSource1.DataSource = pRO;
+
+            ErstelleAbwesenheitenTabelle(pRO);
+        }
+
+
+        private void ErstelleAbwesenheitenTabelle(ServicesOverviewRO pRO)
+        {
+            if (pRO.Abwesenheiten != null)
+            {
+                int newRows = 0;
+                int index = 1;
+                foreach (var at in pRO.Abwesenheiten)
+                {
+                    DevExpress.XtraReports.UI.XRTableRow row = null;
+                    if (index < xrTableAbwesenheiten.Rows.Count)
+                    {
+                        row = xrTableAbwesenheiten.Rows[index];
+                    }
+                    else
+                    {
+                        row = xrTableAbwesenheiten.InsertRowBelow(xrTableAbwesenheiten.Rows[xrTableAbwesenheiten.Rows.Count - 1]);
+                        newRows++;
+                    }
+
+                    row.Cells[0].Text = String.Format("{0:dd.MM.yyyy}", at.Start);
+                    int? days = null;
+
+                    if (at.End.HasValue)
+                    {
+                        row.Cells[1].Text = String.Format("{0:dd.MM.yyyy}", at.End);
+                        days = (int)at.End.Value.Subtract(at.Start.Value).TotalDays + 1;
+                    }
+                    else
+                    {
+                        row.Cells[1].Text = "unbekannt";
+                    }
+
+                    row.Cells[2].Text = String.Format("{0:0}", days);
+
+                    index++;
+                }
+            }
         }
     }
+
 }

ReportImp/BeWoNeuss/BeWoNeuss.csproj

@@ -107,6 +107,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="CustomReportCreator.cs" />
     <Compile Include="Finanzauswertung.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -125,6 +126,12 @@
     <Compile Include="InvoiceCustomerReport.Designer.cs">
       <DependentUpon>InvoiceCustomerReport.cs</DependentUpon>
     </Compile>
+    <Compile Include="Mahnungen.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Mahnungen.designer.cs">
+      <DependentUpon>Mahnungen.cs</DependentUpon>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="OffeneAufgaben.cs">
       <SubType>Component</SubType>
@@ -180,6 +187,9 @@
     <EmbeddedResource Include="InvoiceCustomerReport.resx">
       <DependentUpon>InvoiceCustomerReport.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Mahnungen.resx">
+      <DependentUpon>Mahnungen.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="OffeneAufgaben.resx">
       <DependentUpon>OffeneAufgaben.cs</DependentUpon>
@@ -214,6 +224,10 @@
       <Project>{40D8B312-EA64-49E3-A31A-5E57ED4D5654}</Project>
       <Name>Report</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Service\Service.csproj">
+      <Project>{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}</Project>
+      <Name>Service</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Shared\Shared.csproj">
       <Project>{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}</Project>
       <Name>Shared</Name>

ReportImp/BeWoNeuss/CustomReportCreator.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using BeWo.BeWoHeinsberg;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+using BeWo.Report;
+using BeWo.Report.ReportObjects;
+using BeWo.Service.DCEntityMapper;
+using BS.Shared;
+using BS.Shared.DataContracts;
+using DevExpress.XtraReports.UI;
+
+namespace BeWoNeuss
+{
+	public class CustomReportCreator : DefaultReportCreator
+	{
+	    public override XtraReport CreateCustomerInvoiceReport(long invoiceOid)
+	    {
+	        var ib = DAOFactory.GenericDAO.LoadByID<InvoiceBase>(invoiceOid);
+	        if (ib.Type == InvoiceType.General)
+	        {
+	            var report = new MahnungReport();
+
+	            report.SetReportDataSource(InvoiceCustomerRO.Create(MapperFactory.InvoiceBaseDC_InvoiceBase.MapToNewDC(ib)));
+	            return report;
+            }
+            return base.CreateCustomerInvoiceReport(invoiceOid);
+	    }
+	}
+}

ReportImp/BeWoNeuss/Mahnungen.cs

@@ -0,0 +1,101 @@
+using System;
+using System.Drawing;
+using System.Collections;
+using System.ComponentModel;
+using DevExpress.XtraReports.UI;
+using BeWo.Report.ReportObjects;
+using BeWo.Report;
+using BS.Shared.Core;
+using System.Text;
+
+namespace BeWo.BeWoHeinsberg
+{
+    public partial class MahnungReport : DevExpress.XtraReports.UI.XtraReport//, IBeWoReport<InvoiceCustomerRO>
+    {
+        public MahnungReport()
+        {
+            InitializeComponent();
+        }
+
+        public void SetReportDataSource(InvoiceCustomerRO pRO)
+        {
+			StringBuilder sb = new StringBuilder();
+			if (!String.IsNullOrEmpty(pRO.RecipientOrganisation) && !String.IsNullOrEmpty(pRO.RecipientOrganisation.Trim()))
+			{
+				sb.AppendLine(pRO.RecipientOrganisation);
+			}
+			if (!String.IsNullOrEmpty(pRO.RecipientDivision) && !String.IsNullOrEmpty(pRO.RecipientDivision.Trim()))
+			{
+				sb.AppendLine(pRO.RecipientDivision);
+			}
+			if ((!String.IsNullOrEmpty(pRO.RecipientFirstName) && !String.IsNullOrEmpty(pRO.RecipientFirstName.Trim()))
+				|| (!String.IsNullOrEmpty(pRO.RecipientLastName) && !String.IsNullOrEmpty(pRO.RecipientLastName.Trim())))
+			{
+				sb.AppendLine(String.Format("{0} {1}", pRO.RecipientFirstName, pRO.RecipientLastName).Trim());
+			}
+			if (!String.IsNullOrEmpty(pRO.RecipientStreet) && !String.IsNullOrEmpty(pRO.RecipientStreet.Trim()))
+			{
+				sb.AppendLine(pRO.RecipientStreet);
+			}
+			if (!String.IsNullOrEmpty(pRO.RecipientPostCode) && !String.IsNullOrEmpty(pRO.RecipientPostCode.Trim()))
+			{
+				sb.Append(pRO.RecipientPostCode);
+				sb.Append(" ");
+			}
+			if (!String.IsNullOrEmpty(pRO.RecipientTown) && !String.IsNullOrEmpty(pRO.RecipientTown.Trim()))
+			{
+				sb.Append(pRO.RecipientTown);
+			}
+			lblAdresse.Text = sb.ToString();
+
+			if (!String.IsNullOrEmpty(pRO.CustomerSalutation) && pRO.CustomerSalutation.ToLower().Contains("herr"))
+            {
+                lblAnrede.Text = String.Format("Sehr geehrter Herr {0},", pRO.CustomerLastName);
+            }
+            else if (!String.IsNullOrEmpty(pRO.CustomerSalutation) && pRO.CustomerSalutation.ToLower().Contains("frau"))
+            {
+                lblAnrede.Text = String.Format("Sehr geehrte " +
+					"Frau {0},", pRO.CustomerLastName);
+            }
+			decimal betrag = 0;
+			DateTime zahlziel = pRO.InvoiceDateTime.AddDays(14);
+
+			if (pRO.InvoiceItems != null)
+			{
+				if (pRO.InvoiceItems[0].ItemDescription.Contains("Mahnung") && pRO.InvoiceItems[0].ItemDescription.Contains("2"))
+				{
+					lblMahnung.Text = "2. Mahnung";
+					lblText.Text = String.Format("trotz unserer 1.Mahnung vom konnten wir leider bis zur benannten Frist keinen Zahlungseingang verbuchen. \n \n" +
+									"Wir bitten nunmehr um Zahlung bis zum {0:dd.MM.yyyy}: \n \n" +
+									"Rechnung  \t[TotalClaim] \n" +
+									"Mahngebühr\t  10,00 € ", zahlziel);
+
+					string claim = pRO.TotalClaim.Replace(" €", "");
+					Decimal.TryParse(claim, out betrag);
+					if (betrag > 0)
+					{
+						lblEndbetrag.Text = String.Format("{0:c2}", betrag + 10);
+					}
+				}
+				else if (pRO.InvoiceItems[0].ItemDescription.Contains("Mahnung") && pRO.InvoiceItems[0].ItemDescription.Contains("3"))
+				{
+					lblMahnung.Text = "3. und letzte Mahnung";
+					lblText.Text = String.Format("auf unsere 1. Mahnung vom und unserer 2. Mahnung vom , haben wir bis zum heutigen Tag keinen Zahlungseingang verbuchen können.  \n \n" +
+									"Wir bitten letztmalig um Zahlung bis zum {0:dd.MM.yyyy}: \n \n" +
+									"Rechnung  \t[TotalClaim] \n" +
+									"Mahngebühr\t  15,00 € ", zahlziel);
+
+					lblEndbetrag.Visible = true;
+					string claim = pRO.TotalClaim.Replace(" €", "");
+					Decimal.TryParse(claim, out betrag);
+					if (betrag > 0)
+					{
+						lblEndbetrag.Text = String.Format("{0:c2}", betrag + 15);
+					}
+				}
+			}
+
+			this.bindingSource1.DataSource = pRO;
+        }
+    }
+}

ReportImp/BeWoNeuss/Mahnungen.designer.cs

@@ -0,0 +1,296 @@
+using BeWo.Report.ReportObjects;
+namespace BeWo.BeWoHeinsberg
+{
+    partial class MahnungReport
+	{
+        /// <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(MahnungReport));
+            this.Detail = new DevExpress.XtraReports.UI.DetailBand();
+            this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
+            this.lblEndbetrag = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblText = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblAnrede = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblMahnung = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
+            this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
+            this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
+            this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
+            this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+            ((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.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.lblEndbetrag,
+            this.xrLabel7,
+            this.lblText,
+            this.xrLabel1,
+            this.lblAdresse,
+            this.lblAnrede,
+            this.lblMahnung,
+            this.xrLabel2});
+            this.ReportHeader.Font = new System.Drawing.Font("Times New Roman", 10F);
+            this.ReportHeader.HeightF = 692.8351F;
+            this.ReportHeader.Name = "ReportHeader";
+            this.ReportHeader.StylePriority.UseFont = false;
+            // 
+            // lblEndbetrag
+            // 
+            this.lblEndbetrag.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lblEndbetrag.LocationFloat = new DevExpress.Utils.PointFloat(82.29005F, 620.9601F);
+            this.lblEndbetrag.Multiline = true;
+            this.lblEndbetrag.Name = "lblEndbetrag";
+            this.lblEndbetrag.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblEndbetrag.SizeF = new System.Drawing.SizeF(581.4177F, 31.54175F);
+            this.lblEndbetrag.StylePriority.UseFont = false;
+            this.lblEndbetrag.Text = "Gesamt \t[TotalClaim] €";
+            this.lblEndbetrag.Visible = false;
+            // 
+            // xrLabel7
+            // 
+            this.xrLabel7.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(82.28989F, 652.5018F);
+            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(581.4177F, 40.3333F);
+            this.xrLabel7.StylePriority.UseFont = false;
+            this.xrLabel7.Text = "Sollte sich Ihre zwischenzeitliche Zahlung mit diesem Schreiben überschnitten hab" +
+    "en, so betrachten Sie dies als gegenstandslos.";
+            // 
+            // lblText
+            // 
+            this.lblText.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lblText.LocationFloat = new DevExpress.Utils.PointFloat(82.29002F, 457.7101F);
+            this.lblText.Multiline = true;
+            this.lblText.Name = "lblText";
+            this.lblText.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblText.SizeF = new System.Drawing.SizeF(581.4177F, 163.25F);
+            this.lblText.StylePriority.UseFont = false;
+            this.lblText.Text = resources.GetString("lblText.Text");
+            // 
+            // xrLabel1
+            // 
+            this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate", "Neuss, {0}")});
+            this.xrLabel1.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(548.248F, 305.2083F);
+            this.xrLabel1.Name = "xrLabel1";
+            this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel1.SizeF = new System.Drawing.SizeF(201.0417F, 23.95834F);
+            this.xrLabel1.StylePriority.UseFont = false;
+            this.xrLabel1.StylePriority.UseTextAlignment = false;
+            this.xrLabel1.Text = "xrLabel1";
+            this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            // 
+            // lblAdresse
+            // 
+            this.lblAdresse.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(82.29F, 192.38F);
+            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(351.375F, 109.125F);
+            this.lblAdresse.StylePriority.UseFont = false;
+            // 
+            // lblAnrede
+            // 
+            this.lblAnrede.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(82.28989F, 421.1667F);
+            this.lblAnrede.Multiline = true;
+            this.lblAnrede.Name = "lblAnrede";
+            this.lblAnrede.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblAnrede.SizeF = new System.Drawing.SizeF(581.4177F, 17.00003F);
+            this.lblAnrede.StylePriority.UseFont = false;
+            this.lblAnrede.Text = "Sehr geehrte Damen und Herren,";
+            // 
+            // lblMahnung
+            // 
+            this.lblMahnung.BackColor = System.Drawing.Color.Transparent;
+            this.lblMahnung.CanShrink = true;
+            this.lblMahnung.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lblMahnung.LocationFloat = new DevExpress.Utils.PointFloat(82.28989F, 338.1667F);
+            this.lblMahnung.Name = "lblMahnung";
+            this.lblMahnung.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblMahnung.SizeF = new System.Drawing.SizeF(650F, 16F);
+            this.lblMahnung.StylePriority.UseBackColor = false;
+            this.lblMahnung.StylePriority.UseFont = false;
+            this.lblMahnung.Text = "1. Mahnung";
+            this.lblMahnung.WordWrap = false;
+            // 
+            // xrLabel2
+            // 
+            this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel2.CanShrink = true;
+            this.xrLabel2.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(82.28989F, 354.1667F);
+            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.WordWrap = false;
+            // 
+            // ruleRateFactorNull
+            // 
+            this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?";
+            this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
+            this.ruleRateFactorNull.Name = "ruleRateFactorNull";
+            // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.InvoiceCustomerRO);
+            // 
+            // ReportFooter
+            // 
+            this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel6,
+            this.xrLabel8,
+            this.xrLabel10,
+            this.xrLabel12});
+            this.ReportFooter.Font = new System.Drawing.Font("Times New Roman", 10F);
+            this.ReportFooter.HeightF = 226.0834F;
+            this.ReportFooter.KeepTogether = true;
+            this.ReportFooter.Name = "ReportFooter";
+            this.ReportFooter.StylePriority.UseFont = false;
+            // 
+            // xrLabel6
+            // 
+            this.xrLabel6.Font = new System.Drawing.Font("Monotype Corsiva", 14.25F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(82.28989F, 139.6251F);
+            this.xrLabel6.Name = "xrLabel6";
+            this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel6.SizeF = new System.Drawing.SizeF(292F, 26.375F);
+            this.xrLabel6.StylePriority.UseFont = false;
+            this.xrLabel6.Text = "BeWo - Neuss";
+            // 
+            // xrLabel8
+            // 
+            this.xrLabel8.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(82.28989F, 9.999974F);
+            this.xrLabel8.Name = "xrLabel8";
+            this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel8.SizeF = new System.Drawing.SizeF(677F, 18.04168F);
+            this.xrLabel8.StylePriority.UseFont = false;
+            this.xrLabel8.Text = "[Notice]";
+            // 
+            // xrLabel10
+            // 
+            this.xrLabel10.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(82.28989F, 47.2084F);
+            this.xrLabel10.Multiline = true;
+            this.xrLabel10.Name = "xrLabel10";
+            this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel10.SizeF = new System.Drawing.SizeF(677F, 53.45834F);
+            this.xrLabel10.StylePriority.UseFont = false;
+            this.xrLabel10.Text = "Bei Rückfragen stehen wir Ihnen gern zur Verfügung und verbleiben\r\n\r\nmit freundli" +
+    "chen Grüßen";
+            // 
+            // xrLabel12
+            // 
+            this.xrLabel12.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(82.28989F, 122.6251F);
+            this.xrLabel12.Name = "xrLabel12";
+            this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel12.SizeF = new System.Drawing.SizeF(292F, 17.00002F);
+            this.xrLabel12.StylePriority.UseFont = false;
+            this.xrLabel12.Text = "i.A. Tamara Schaar";
+            // 
+            // topMarginBand1
+            // 
+            this.topMarginBand1.HeightF = 46F;
+            this.topMarginBand1.Name = "topMarginBand1";
+            // 
+            // bottomMarginBand1
+            // 
+            this.bottomMarginBand1.HeightF = 50F;
+            this.bottomMarginBand1.Name = "bottomMarginBand1";
+            // 
+            // MahnungReport
+            // 
+            this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail,
+            this.ReportHeader,
+            this.ReportFooter,
+            this.topMarginBand1,
+            this.bottomMarginBand1});
+            this.DataSource = this.bindingSource1;
+            this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
+            this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
+            this.ruleRateFactorNull});
+            this.Margins = new System.Drawing.Printing.Margins(0, 0, 46, 50);
+            this.PageHeight = 1169;
+            this.PageWidth = 827;
+            this.PaperKind = System.Drawing.Printing.PaperKind.A4;
+            this.Version = "17.1";
+            ((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.ReportHeaderBand ReportHeader;
+        private DevExpress.XtraReports.UI.XRLabel lblAnrede;
+        private DevExpress.XtraReports.UI.XRLabel lblMahnung;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel2;
+        private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel12;
+        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 xrLabel8;
+        private DevExpress.XtraReports.UI.XRLabel lblAdresse;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel1;
+        private DevExpress.XtraReports.UI.XRLabel lblText;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel7;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel6;
+        private DevExpress.XtraReports.UI.XRLabel lblEndbetrag;
+    }
+}

ReportImp/BeWoNeuss/Mahnungen.resx

@@ -0,0 +1,134 @@
+<?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>
+  <data name="lblText.Text" xml:space="preserve">
+    <value>der Inhalt dieses Erinnerungsschreibens sollte: 
+
+1. freundlich
+2. höflich
+3. kurz 
+4. erfolgreich sein
+
+Unser Schreiben ist freundlich, höflich und kurz. 
+Lassen Sie es durch Ihre Zahlung innerhalb einer Woche erfolgreich sein. </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>
+  </metadata>
+</root>

ReportImp/BehindertNaUnd/AssistenzRechung.Designer.cs

@@ -35,22 +35,8 @@ namespace BehindertNaUnd
             this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
             this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
             this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+            this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
             this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
-            this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
-            this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
             this.lblAbrechnungstext = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
@@ -79,8 +65,6 @@ namespace BehindertNaUnd
             this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
             this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
-            this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
@@ -95,7 +79,7 @@ namespace BehindertNaUnd
             // ReportHeader
             // 
             this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F);
-            this.ReportHeader.HeightF = 74.25F;
+            this.ReportHeader.HeightF = 0F;
             this.ReportHeader.Name = "ReportHeader";
             this.ReportHeader.StylePriority.UseFont = false;
             // 
@@ -107,7 +91,7 @@ namespace BehindertNaUnd
             // 
             // topMarginBand1
             // 
-            this.topMarginBand1.HeightF = 100F;
+            this.topMarginBand1.HeightF = 157.5F;
             this.topMarginBand1.Name = "topMarginBand1";
             // 
             // bottomMarginBand1
@@ -116,11 +100,22 @@ namespace BehindertNaUnd
             this.xrLabel9});
             this.bottomMarginBand1.HeightF = 90F;
             this.bottomMarginBand1.Name = "bottomMarginBand1";
+            // 
+            // xrLabel9
+            // 
+            this.xrLabel9.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10F);
+            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.1666F, 67.83335F);
+            this.xrLabel9.StylePriority.UseFont = false;
+            this.xrLabel9.Text = "Steuernummer: 132/59002594\r\nVereinsregister - Nr.: VR 2585 /Amtsgericht Wuppertal" +
+    ")\r\nSteuerbefreiung nach §5 Abs.1 Nr. 9 KstG";
             // 
             // Page1
             // 
             this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
-            this.xrTable2,
             this.lblAbrechnungstext,
             this.xrLabel1,
             this.xrLabel6,
@@ -135,155 +130,14 @@ namespace BehindertNaUnd
             this.xrLabel2,
             this.xrLabel5});
             this.Page1.Font = new System.Drawing.Font("Arial", 10F);
-            this.Page1.HeightF = 414.8683F;
+            this.Page1.HeightF = 482.2092F;
             this.Page1.Name = "Page1";
             this.Page1.StylePriority.UseFont = false;
             // 
-            // xrTable2
-            // 
-            this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(366.9998F, 0F);
-            this.xrTable2.Name = "xrTable2";
-            this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
-            this.xrTableRow2,
-            this.xrTableRow5,
-            this.xrTableRow4,
-            this.xrTableRow3,
-            this.xrTableRow1,
-            this.xrTableRow6,
-            this.xrTableRow8});
-            this.xrTable2.SizeF = new System.Drawing.SizeF(283F, 134F);
-            // 
-            // xrTableRow2
-            // 
-            this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell4});
-            this.xrTableRow2.Name = "xrTableRow2";
-            this.xrTableRow2.Weight = 0.13245033112582783D;
-            // 
-            // xrTableCell4
-            // 
-            this.xrTableCell4.CanShrink = true;
-            this.xrTableCell4.Name = "xrTableCell4";
-            this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell4.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
-            this.xrTableCell4.StylePriority.UseFont = false;
-            this.xrTableCell4.StylePriority.UseTextAlignment = false;
-            this.xrTableCell4.Text = "Ihr(e) Ansprechpartner(in):";
-            this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-            this.xrTableCell4.Weight = 1D;
-            // 
-            // xrTableRow5
-            // 
-            this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell13});
-            this.xrTableRow5.Name = "xrTableRow5";
-            this.xrTableRow5.Weight = 0.13245033112582783D;
-            // 
-            // xrTableCell13
-            // 
-            this.xrTableCell13.CanShrink = true;
-            this.xrTableCell13.Name = "xrTableCell13";
-            this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell13.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
-            this.xrTableCell13.StylePriority.UseFont = false;
-            this.xrTableCell13.StylePriority.UseTextAlignment = false;
-            this.xrTableCell13.Text = "[SenderContactPerson]";
-            this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-            this.xrTableCell13.Weight = 1D;
-            // 
-            // xrTableRow4
-            // 
-            this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell11});
-            this.xrTableRow4.Name = "xrTableRow4";
-            this.xrTableRow4.Weight = 0.13245033112582783D;
-            // 
-            // xrTableCell11
-            // 
-            this.xrTableCell11.CanShrink = true;
-            this.xrTableCell11.Name = "xrTableCell11";
-            this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell11.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
-            this.xrTableCell11.StylePriority.UseFont = false;
-            this.xrTableCell11.StylePriority.UseTextAlignment = false;
-            this.xrTableCell11.Text = "[SenderContactPersonDivision]";
-            this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-            this.xrTableCell11.Weight = 1D;
-            // 
-            // xrTableRow3
-            // 
-            this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell8});
-            this.xrTableRow3.Name = "xrTableRow3";
-            this.xrTableRow3.Weight = 0.13245033112582783D;
-            // 
-            // xrTableCell8
-            // 
-            this.xrTableCell8.CanShrink = true;
-            this.xrTableCell8.Name = "xrTableCell8";
-            this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell8.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
-            this.xrTableCell8.StylePriority.UseFont = false;
-            this.xrTableCell8.StylePriority.UseTextAlignment = false;
-            this.xrTableCell8.Text = "[SenderContactPersonMail]";
-            this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-            this.xrTableCell8.Weight = 1D;
-            // 
-            // xrTableRow1
-            // 
-            this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell1});
-            this.xrTableRow1.Name = "xrTableRow1";
-            this.xrTableRow1.Weight = 0.13245033112582783D;
-            // 
-            // xrTableCell1
-            // 
-            this.xrTableCell1.CanShrink = true;
-            this.xrTableCell1.Name = "xrTableCell1";
-            this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell1.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
-            this.xrTableCell1.StylePriority.UseFont = false;
-            this.xrTableCell1.StylePriority.UseTextAlignment = false;
-            this.xrTableCell1.Text = "[SenderContactPersonPhone]";
-            this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-            this.xrTableCell1.Weight = 1D;
-            // 
-            // xrTableRow6
-            // 
-            this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell2});
-            this.xrTableRow6.Name = "xrTableRow6";
-            this.xrTableRow6.Weight = 0.11258278145695365D;
-            // 
-            // xrTableCell2
-            // 
-            this.xrTableCell2.CanShrink = true;
-            this.xrTableCell2.Name = "xrTableCell2";
-            this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell2.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
-            this.xrTableCell2.StylePriority.UseFont = false;
-            this.xrTableCell2.StylePriority.UseTextAlignment = false;
-            this.xrTableCell2.Text = "[SenderContactPersonFax]";
-            this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-            this.xrTableCell2.Weight = 1D;
-            // 
-            // xrTableRow8
-            // 
-            this.xrTableRow8.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell5});
-            this.xrTableRow8.Name = "xrTableRow8";
-            this.xrTableRow8.Weight = 0.11258278145695365D;
-            // 
-            // xrTableCell5
-            // 
-            this.xrTableCell5.Name = "xrTableCell5";
-            this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell5.Weight = 1D;
-            // 
             // lblAbrechnungstext
             // 
             this.lblAbrechnungstext.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
-            this.lblAbrechnungstext.LocationFloat = new DevExpress.Utils.PointFloat(0.0003814697F, 372.6217F);
+            this.lblAbrechnungstext.LocationFloat = new DevExpress.Utils.PointFloat(0F, 459.2092F);
             this.lblAbrechnungstext.Name = "lblAbrechnungstext";
             this.lblAbrechnungstext.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.lblAbrechnungstext.SizeF = new System.Drawing.SizeF(530.5417F, 17F);
@@ -294,7 +148,7 @@ namespace BehindertNaUnd
             // 
             this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceBase.InvoiceItems.GrossAmountTotal")});
-            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(568F, 372.6217F);
+            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(567.9996F, 459.2092F);
             this.xrLabel1.Name = "xrLabel1";
             this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel1.SizeF = new System.Drawing.SizeF(100F, 23F);
@@ -302,7 +156,7 @@ namespace BehindertNaUnd
             // 
             // xrLabel6
             // 
-            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 300.9966F);
+            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 387.5841F);
             this.xrLabel6.Multiline = true;
             this.xrLabel6.Name = "xrLabel6";
             this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -314,7 +168,7 @@ namespace BehindertNaUnd
             // 
             this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")});
-            this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(366.9998F, 155.1858F);
+            this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(366.9995F, 241.7733F);
             this.xrLabel8.Name = "xrLabel8";
             this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel8.SizeF = new System.Drawing.SizeF(283F, 23F);
@@ -325,7 +179,7 @@ namespace BehindertNaUnd
             // RecipientPostCodeAndTown
             // 
             this.RecipientPostCodeAndTown.CanShrink = true;
-            this.RecipientPostCodeAndTown.LocationFloat = new DevExpress.Utils.PointFloat(0F, 68.00003F);
+            this.RecipientPostCodeAndTown.LocationFloat = new DevExpress.Utils.PointFloat(0F, 125.23F);
             this.RecipientPostCodeAndTown.Name = "RecipientPostCodeAndTown";
             this.RecipientPostCodeAndTown.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.RecipientPostCodeAndTown.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -336,7 +190,7 @@ namespace BehindertNaUnd
             // xrLabel_RecipientStreet
             // 
             this.xrLabel_RecipientStreet.CanShrink = true;
-            this.xrLabel_RecipientStreet.LocationFloat = new DevExpress.Utils.PointFloat(0F, 51.00002F);
+            this.xrLabel_RecipientStreet.LocationFloat = new DevExpress.Utils.PointFloat(0.0003814697F, 108.2301F);
             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;
@@ -347,7 +201,7 @@ namespace BehindertNaUnd
             // xrLabel_RecipientDivision
             // 
             this.xrLabel_RecipientDivision.CanShrink = true;
-            this.xrLabel_RecipientDivision.LocationFloat = new DevExpress.Utils.PointFloat(0F, 34.00008F);
+            this.xrLabel_RecipientDivision.LocationFloat = new DevExpress.Utils.PointFloat(0F, 91.23006F);
             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;
@@ -358,7 +212,7 @@ namespace BehindertNaUnd
             // xrLabel_RecipientContactPerson
             // 
             this.xrLabel_RecipientContactPerson.CanShrink = true;
-            this.xrLabel_RecipientContactPerson.LocationFloat = new DevExpress.Utils.PointFloat(0F, 17.00001F);
+            this.xrLabel_RecipientContactPerson.LocationFloat = new DevExpress.Utils.PointFloat(0F, 74.22999F);
             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;
@@ -369,7 +223,7 @@ namespace BehindertNaUnd
             // xrLabel7
             // 
             this.xrLabel7.CanShrink = true;
-            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0.0003814697F, 57.23F);
             this.xrLabel7.Name = "xrLabel7";
             this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel7.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -382,7 +236,7 @@ namespace BehindertNaUnd
             this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
             this.xrLabel4.CanShrink = true;
             this.xrLabel4.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
-            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 225F);
+            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 311.5875F);
             this.xrLabel4.Multiline = true;
             this.xrLabel4.Name = "xrLabel4";
             this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -397,7 +251,7 @@ namespace BehindertNaUnd
             this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
             this.xrLabel3.CanShrink = true;
             this.xrLabel3.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
-            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 209F);
+            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 295.5875F);
             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);
@@ -411,7 +265,7 @@ namespace BehindertNaUnd
             this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
             this.xrLabel2.CanShrink = true;
             this.xrLabel2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
-            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 192F);
+            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 278.5875F);
             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);
@@ -422,7 +276,7 @@ namespace BehindertNaUnd
             // 
             // xrLabel5
             // 
-            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 267.33F);
+            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 353.9175F);
             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);
@@ -556,18 +410,6 @@ namespace BehindertNaUnd
             // bindingSource1
             // 
             this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
-            // 
-            // xrLabel9
-            // 
-            this.xrLabel9.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10F);
-            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.1666F, 67.83335F);
-            this.xrLabel9.StylePriority.UseFont = false;
-            this.xrLabel9.Text = "Steuernummer: 132/59002594\r\nVereinsregister - Nr.: VR 2585 /Amtsgericht Wuppertal" +
-    ")\r\nSteuerbefreiung nach §5 Abs.1 Nr. 9 KstG";
             // 
             // Rechnung
             // 
@@ -583,12 +425,13 @@ namespace BehindertNaUnd
             this.Font = new System.Drawing.Font("Verdana", 10F);
             this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
             this.ruleRateFactorNull});
-            this.Margins = new System.Drawing.Printing.Margins(75, 74, 100, 90);
+            this.Margins = new System.Drawing.Printing.Margins(75, 74, 158, 90);
             this.PageHeight = 1169;
             this.PageWidth = 827;
             this.PaperKind = System.Drawing.Printing.PaperKind.A4;
             this.Version = "17.1";
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
+            this.Watermark.Image = ((System.Drawing.Image)(resources.GetObject("Rechnung.Watermark.Image")));
+            this.Watermark.ImageViewMode = DevExpress.XtraPrinting.Drawing.ImageViewMode.Zoom;
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
@@ -630,21 +473,6 @@ namespace BehindertNaUnd
         private DevExpress.XtraReports.UI.XRLabel xrLabel1;
         private DevExpress.XtraReports.UI.XRLabel xrLabel18;
         private DevExpress.XtraReports.UI.XRLabel lblAbrechnungstext;
-        private DevExpress.XtraReports.UI.XRTable xrTable2;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow5;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow4;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow6;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow8;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
         private DevExpress.XtraReports.UI.XRLabel xrLabel9;
     }
 }

ReportImp/CarlSonnenscheinHaus/Quittierungsbeleg.Designer.cs

@@ -62,7 +62,6 @@ namespace CarlSonnenscheinHaus
             this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell49 = 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.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
@@ -118,14 +117,15 @@ namespace CarlSonnenscheinHaus
             this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
-            this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
             this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTableAbwesenheiten)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
             // 
             // Detail
@@ -536,10 +536,6 @@ namespace CarlSonnenscheinHaus
             this.xrTableCell49.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
             this.xrTableCell49.Weight = 0.44692737430167606D;
             // 
-            // bindingSource1
-            // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
-            // 
             // formattingRuleStartDate
             // 
             this.formattingRuleStartDate.Condition = "[StartDate2]  < [StartDate]";
@@ -762,6 +758,7 @@ namespace CarlSonnenscheinHaus
             // GroupFooter1
             // 
             this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel19,
             this.xrLabel18,
             this.xrPictureBox2,
             this.lblUnterschriftKlient,
@@ -778,8 +775,7 @@ namespace CarlSonnenscheinHaus
             this.xrLabel10,
             this.xrLabel9,
             this.xrLabel1,
-            this.xrPictureBox1,
-            this.xrLabel17});
+            this.xrPictureBox1});
             this.GroupFooter1.HeightF = 270F;
             this.GroupFooter1.KeepTogether = true;
             this.GroupFooter1.Name = "GroupFooter1";
@@ -787,7 +783,7 @@ namespace CarlSonnenscheinHaus
             // xrLabel18
             // 
             this.xrLabel18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerSignatureDate", "{0:dd.MM.yyyy,}")});
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerSignatureDate", "{0:dd.MM.yyyy},")});
             this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(129.4998F, 227F);
             this.xrLabel18.Name = "xrLabel18";
             this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -797,7 +793,8 @@ namespace CarlSonnenscheinHaus
             // xrPictureBox2
             // 
             this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Tag", null, "CustomerSignature")});
+            new DevExpress.XtraReports.UI.XRBinding("Tag", null, "CustomerSignature"),
+            new DevExpress.XtraReports.UI.XRBinding("Image", null, "CustomerSignature")});
             this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(230F, 227F);
             this.xrPictureBox2.Name = "xrPictureBox2";
             this.xrPictureBox2.SizeF = new System.Drawing.SizeF(100F, 23F);
@@ -1213,7 +1210,8 @@ namespace CarlSonnenscheinHaus
             // xrPictureBox1
             // 
             this.xrPictureBox1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Tag", null, "EmployeeSignature")});
+            new DevExpress.XtraReports.UI.XRBinding("Tag", null, "EmployeeSignature"),
+            new DevExpress.XtraReports.UI.XRBinding("Image", null, "EmployeeSignature")});
             this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(535.6389F, 227F);
             this.xrPictureBox1.Name = "xrPictureBox1";
             this.xrPictureBox1.Scripts.OnBeforePrint = "xrPictureBox1_BeforePrint";
@@ -1221,16 +1219,6 @@ namespace CarlSonnenscheinHaus
             this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
             this.xrPictureBox1.BeforePrint += new System.Drawing.Printing.PrintEventHandler(this.EmployeeSignature_BeforePrint);
             // 
-            // xrLabel17
-            // 
-            this.xrLabel17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeSignatureDate", "{0:dd.MM.yyyy,}")});
-            this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(435.1388F, 227F);
-            this.xrLabel17.Name = "xrLabel17";
-            this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel17.SizeF = new System.Drawing.SizeF(100F, 23F);
-            this.xrLabel17.Visible = false;
-            // 
             // fieldKontaktArt
             // 
             this.fieldKontaktArt.DataMember = "Services";
@@ -1238,6 +1226,23 @@ namespace CarlSonnenscheinHaus
             this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String;
             this.fieldKontaktArt.Name = "fieldKontaktArt";
             // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
+            // 
+            // xrLabel19
+            // 
+            this.xrLabel19.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeSignatureDate", "{0:dd.MM.yyyy}")});
+            this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(398.31F, 227F);
+            this.xrLabel19.Name = "xrLabel19";
+            this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel19.SizeF = new System.Drawing.SizeF(136.8289F, 23.00002F);
+            this.xrLabel19.StylePriority.UseBackColor = false;
+            this.xrLabel19.StylePriority.UseTextAlignment = false;
+            this.xrLabel19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
+            // 
             // Quittierungsbeleg
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1263,10 +1268,10 @@ namespace CarlSonnenscheinHaus
             this.Version = "17.1";
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTableAbwesenheiten)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
 
         }
@@ -1358,9 +1363,9 @@ namespace CarlSonnenscheinHaus
         private DevExpress.XtraReports.UI.XRLabel xrLabel16;
         private DevExpress.XtraReports.UI.XRPictureBox picSignature;
         private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel17;
         private DevExpress.XtraReports.UI.XRLabel xrLabel18;
         private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2;
         private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox3;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel19;
     }
 }

ReportImp/DieLebenslotsen/DieLebenslotsen.csproj

@@ -32,6 +32,9 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="DevExpress.Data.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Mvvm.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <Private>False</Private>
+    </Reference>
     <Reference Include="DevExpress.Printing.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Utils.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.XtraPrinting.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />

ReportImp/DieLebenslotsen/ServiceRecordListReport.Designer.cs

@@ -36,16 +36,8 @@ namespace DieLebenslotsen
             this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
             this.formattingRuleGoalsInvisible = new DevExpress.XtraReports.UI.FormattingRule();
             this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
-            this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.cellGoalCaption = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
             this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
             this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
             this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
@@ -55,7 +47,6 @@ namespace DieLebenslotsen
             this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
             this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
             this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
@@ -70,12 +61,8 @@ namespace DieLebenslotsen
             this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
             this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
             this.fieldGoalCaption = new DevExpress.XtraReports.UI.CalculatedField();
-            this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand();
-            this.Detail2 = new DevExpress.XtraReports.UI.DetailBand();
-            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.lblStunden = new DevExpress.XtraReports.UI.XRLabel();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -97,7 +84,7 @@ namespace DieLebenslotsen
             this.xrTableCell3.StylePriority.UseTextAlignment = false;
             this.xrTableCell3.Text = "xrTableCell3";
             this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            this.xrTableCell3.Weight = 0.50085023633476844D;
+            this.xrTableCell3.Weight = 0.43083938143947753D;
             // 
             // xrTableCell1
             // 
@@ -117,8 +104,7 @@ namespace DieLebenslotsen
             this.xrTableCell1,
             this.xrTableCell2,
             this.xrTableCell3,
-            this.xrTableCell4,
-            this.xrTableCell14});
+            this.xrTableCell4});
             this.xrTableRow1.FormattingRules.Add(this.formattingRuleGoalsInvisible);
             this.xrTableRow1.Name = "xrTableRow1";
             this.xrTableRow1.StylePriority.UseBorders = false;
@@ -133,28 +119,17 @@ namespace DieLebenslotsen
             this.xrTableCell2.StylePriority.UseTextAlignment = false;
             this.xrTableCell2.Text = "xrTableCell2";
             this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            this.xrTableCell2.Weight = 0.62358280104033792D;
+            this.xrTableCell2.Weight = 0.41808386142067533D;
             // 
             // xrTableCell4
             // 
-            this.xrTableCell4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceRecordDetailList.Notice")});
             this.xrTableCell4.Multiline = true;
             this.xrTableCell4.Name = "xrTableCell4";
             this.xrTableCell4.StylePriority.UseBorders = false;
             this.xrTableCell4.StylePriority.UseTextAlignment = false;
-            this.xrTableCell4.Text = "xrTableCell4";
+            this.xrTableCell4.Text = "[ServiceRecord.Notice]\r\n[ServiceRecord.Notice2]";
             this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            this.xrTableCell4.Weight = 1.8242612071913762D;
-            // 
-            // xrTableCell14
-            // 
-            this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceRecordDetailList.ServiceRecord.Notice2")});
-            this.xrTableCell14.Name = "xrTableCell14";
-            this.xrTableCell14.StylePriority.UseTextAlignment = false;
-            this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            this.xrTableCell14.Weight = 1.6882105194846147D;
+            this.xrTableCell4.Weight = 3.7879815211909444D;
             // 
             // formattingRuleGoalsInvisible
             // 
@@ -172,85 +147,17 @@ namespace DieLebenslotsen
             this.xrTable1.Name = "xrTable1";
             this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
             this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
-            this.xrTableRow1,
-            this.xrTableRow3});
-            this.xrTable1.SizeF = new System.Drawing.SizeF(761F, 50F);
+            this.xrTableRow1});
+            this.xrTable1.SizeF = new System.Drawing.SizeF(761F, 25F);
             this.xrTable1.StylePriority.UseBorders = false;
             this.xrTable1.StylePriority.UsePadding = false;
             // 
-            // xrTableRow3
-            // 
-            this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell9,
-            this.xrTableCell10,
-            this.xrTableCell11,
-            this.cellGoalCaption,
-            this.xrTableCell12,
-            this.xrTableCell15});
-            this.xrTableRow3.Name = "xrTableRow3";
-            this.xrTableRow3.Weight = 1D;
-            // 
-            // xrTableCell9
-            // 
-            this.xrTableCell9.CanShrink = true;
-            this.xrTableCell9.Name = "xrTableCell9";
-            this.xrTableCell9.Weight = 0.46398341663570258D;
-            // 
-            // xrTableCell10
-            // 
-            this.xrTableCell10.CanShrink = true;
-            this.xrTableCell10.Name = "xrTableCell10";
-            this.xrTableCell10.Weight = 0.53583379516692309D;
-            // 
-            // xrTableCell11
-            // 
-            this.xrTableCell11.CanShrink = true;
-            this.xrTableCell11.Name = "xrTableCell11";
-            this.xrTableCell11.Weight = 0.43037185245101151D;
-            // 
-            // cellGoalCaption
-            // 
-            this.cellGoalCaption.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.cellGoalCaption.CanShrink = true;
-            this.cellGoalCaption.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceRecordDetailList.fieldGoalCaption")});
-            this.cellGoalCaption.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
-            this.cellGoalCaption.Name = "cellGoalCaption";
-            this.cellGoalCaption.StylePriority.UseBorders = false;
-            this.cellGoalCaption.StylePriority.UseFont = false;
-            this.cellGoalCaption.StylePriority.UseTextAlignment = false;
-            this.cellGoalCaption.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            this.cellGoalCaption.Weight = 0.4242732057715779D;
-            // 
-            // xrTableCell12
-            // 
-            this.xrTableCell12.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell12.CanShrink = true;
-            this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceRecordDetailList.Goals")});
-            this.xrTableCell12.Multiline = true;
-            this.xrTableCell12.Name = "xrTableCell12";
-            this.xrTableCell12.StylePriority.UseBorders = false;
-            this.xrTableCell12.StylePriority.UseTextAlignment = false;
-            this.xrTableCell12.Text = "xrTableCell12";
-            this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            this.xrTableCell12.Weight = 1.1432824260621373D;
-            // 
-            // xrTableCell15
-            // 
-            this.xrTableCell15.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell15.Name = "xrTableCell15";
-            this.xrTableCell15.StylePriority.UseBorders = false;
-            this.xrTableCell15.StylePriority.UseTextAlignment = false;
-            this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            this.xrTableCell15.Weight = 1.4506497001173451D;
-            // 
             // Detail1
             // 
             this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
             this.xrTable1});
             this.Detail1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Detail1.HeightF = 50F;
+            this.Detail1.HeightF = 25F;
             this.Detail1.Name = "Detail1";
             this.Detail1.StylePriority.UseFont = false;
             // 
@@ -261,7 +168,7 @@ namespace DieLebenslotsen
             this.GroupHeader1});
             this.DetailReport.DataMember = "ServiceRecordDetailList";
             this.DetailReport.DataSource = this.bindingSource1;
-            this.DetailReport.Level = 1;
+            this.DetailReport.Level = 0;
             this.DetailReport.Name = "DetailReport";
             // 
             // GroupHeader1
@@ -294,8 +201,7 @@ namespace DieLebenslotsen
             this.xrTableCell5,
             this.xrTableCell6,
             this.xrTableCell7,
-            this.xrTableCell8,
-            this.xrTableCell13});
+            this.xrTableCell8});
             this.xrTableRow2.Name = "xrTableRow2";
             this.xrTableRow2.Weight = 1D;
             // 
@@ -309,25 +215,19 @@ namespace DieLebenslotsen
             // 
             this.xrTableCell6.Name = "xrTableCell6";
             this.xrTableCell6.Text = "Uhrzeit";
-            this.xrTableCell6.Weight = 0.62358280104033792D;
+            this.xrTableCell6.Weight = 0.41808386142067533D;
             // 
             // xrTableCell7
             // 
             this.xrTableCell7.Name = "xrTableCell7";
             this.xrTableCell7.Text = "Minuten";
-            this.xrTableCell7.Weight = 0.50085023633476844D;
+            this.xrTableCell7.Weight = 0.43083938143947753D;
             // 
             // xrTableCell8
             // 
             this.xrTableCell8.Name = "xrTableCell8";
             this.xrTableCell8.Text = "Dokumentation";
-            this.xrTableCell8.Weight = 1.8242620376016823D;
-            // 
-            // xrTableCell13
-            // 
-            this.xrTableCell13.Name = "xrTableCell13";
-            this.xrTableCell13.Text = "Dokumentation 2";
-            this.xrTableCell13.Weight = 1.6882096890743086D;
+            this.xrTableCell8.Weight = 3.7879815211909444D;
             // 
             // bindingSource1
             // 
@@ -336,9 +236,11 @@ namespace DieLebenslotsen
             // ReportHeader
             // 
             this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.lblStunden,
+            this.xrLabel3,
             this.xrLabel2,
             this.xrLabel1});
-            this.ReportHeader.HeightF = 73.00002F;
+            this.ReportHeader.HeightF = 115.7084F;
             this.ReportHeader.Name = "ReportHeader";
             // 
             // xrLabel2
@@ -448,71 +350,24 @@ namespace DieLebenslotsen
             this.fieldGoalCaption.FieldType = DevExpress.XtraReports.UI.FieldType.String;
             this.fieldGoalCaption.Name = "fieldGoalCaption";
             // 
-            // DetailReport1
-            // 
-            this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
-            this.Detail2});
-            this.DetailReport1.DataMember = "Statistics";
-            this.DetailReport1.DataSource = this.bindingSource1;
-            this.DetailReport1.Level = 0;
-            this.DetailReport1.Name = "DetailReport1";
-            // 
-            // Detail2
-            // 
-            this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
-            this.xrLabel6,
-            this.xrLabel5,
-            this.xrLabel4,
-            this.xrLabel3});
-            this.Detail2.Font = new System.Drawing.Font("Arial", 9.75F);
-            this.Detail2.HeightF = 117.7083F;
-            this.Detail2.MultiColumn.ColumnCount = 3;
-            this.Detail2.MultiColumn.Layout = DevExpress.XtraPrinting.ColumnLayout.AcrossThenDown;
-            this.Detail2.MultiColumn.Mode = DevExpress.XtraReports.UI.MultiColumnMode.UseColumnCount;
-            this.Detail2.Name = "Detail2";
-            this.Detail2.StylePriority.UseFont = false;
-            // 
-            // xrLabel6
-            // 
-            this.xrLabel6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Statistics.Text4")});
-            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 68.99995F);
-            this.xrLabel6.Name = "xrLabel6";
-            this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel6.SizeF = new System.Drawing.SizeF(204.1667F, 23F);
-            this.xrLabel6.Text = "xrLabel6";
-            // 
-            // xrLabel5
-            // 
-            this.xrLabel5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Statistics.Text3")});
-            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 45.99997F);
-            this.xrLabel5.Name = "xrLabel5";
-            this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel5.SizeF = new System.Drawing.SizeF(204.1667F, 23F);
-            this.xrLabel5.Text = "xrLabel5";
-            // 
-            // xrLabel4
-            // 
-            this.xrLabel4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Statistics.Text2")});
-            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 22.99999F);
-            this.xrLabel4.Name = "xrLabel4";
-            this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel4.SizeF = new System.Drawing.SizeF(204.1667F, 23F);
-            this.xrLabel4.Text = "xrLabel4";
-            // 
             // xrLabel3
             // 
-            this.xrLabel3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Statistics.Text1")});
-            this.xrLabel3.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold);
-            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrLabel3.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(3.178914E-05F, 66.18751F);
             this.xrLabel3.Name = "xrLabel3";
             this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel3.SizeF = new System.Drawing.SizeF(204.1667F, 23F);
+            this.xrLabel3.SizeF = new System.Drawing.SizeF(156.25F, 20.83334F);
             this.xrLabel3.StylePriority.UseFont = false;
-            this.xrLabel3.Text = "xrLabel3";
+            this.xrLabel3.Text = "Geleistet diesen Monat:";
+            // 
+            // lblStunden
+            // 
+            this.lblStunden.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lblStunden.LocationFloat = new DevExpress.Utils.PointFloat(156.2501F, 66.18751F);
+            this.lblStunden.Name = "lblStunden";
+            this.lblStunden.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblStunden.SizeF = new System.Drawing.SizeF(156.25F, 20.83334F);
+            this.lblStunden.StylePriority.UseFont = false;
             // 
             // Leistungen
             // 
@@ -522,8 +377,7 @@ namespace DieLebenslotsen
             this.ReportHeader,
             this.pageFooterBand1,
             this.topMarginBand1,
-            this.bottomMarginBand1,
-            this.DetailReport1});
+            this.bottomMarginBand1});
             this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
             this.fieldGoalCaption});
             this.DataSource = this.bindingSource1;
@@ -576,23 +430,10 @@ namespace DieLebenslotsen
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
         private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
         private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
-		private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
-		private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
-		private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
-		private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
-		private DevExpress.XtraReports.UI.XRTableCell cellGoalCaption;
-		private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
 		private DevExpress.XtraReports.UI.FormattingRule formattingRuleGoalsInvisible;
 		private DevExpress.XtraReports.UI.CalculatedField fieldGoalCaption;
 		private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1;
-		private DevExpress.XtraReports.UI.DetailReportBand DetailReport1;
-		private DevExpress.XtraReports.UI.DetailBand Detail2;
-		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.XRTableCell xrTableCell14;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
+        private DevExpress.XtraReports.UI.XRLabel lblStunden;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel3;
     }
 }

ReportImp/DieLebenslotsen/ServiceRecordListReport.cs

@@ -1,5 +1,6 @@
 using BeWo.Report;
 using BeWo.Report.ReportObjects;
+using System;
 
 namespace DieLebenslotsen
 {
@@ -12,8 +13,17 @@ namespace DieLebenslotsen
 
         public void SetReportDataSource(ServiceRecordListRO pRO)
         {
-			if (pRO.Statistics == null || pRO.Statistics.Count == 0)
-				Detail2.Visible = false;
+			//if (pRO.Statistics == null || pRO.Statistics.Count == 0)
+			//	Detail2.Visible = false;
+            if (pRO.ServiceRecordDetailList != null)
+            {
+                decimal std = 0;
+                foreach (var srd in pRO.ServiceRecordDetailList)
+                {
+                    std += srd.RoundedDuration;
+                }
+                lblStunden.Text = string.Format("{0:0.00} Stunden", Math.Round(std / 60, 2, MidpointRounding.AwayFromZero));
+            }
             bindingSource1.DataSource = pRO;
         }
     }

ReportImp/Fortis/Fortis.csproj

@@ -70,6 +70,12 @@
       <DependentUpon>CustomerDataReport.cs</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Quittierungsbeleg.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Quittierungsbeleg.Designer.cs">
+      <DependentUpon>Quittierungsbeleg.cs</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="UI\" />
@@ -98,6 +104,9 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\licenses.licx" />
+    <EmbeddedResource Include="Quittierungsbeleg.resx">
+      <DependentUpon>Quittierungsbeleg.cs</DependentUpon>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />

ReportImp/Fortis/Quittierungsbeleg.cs

@@ -0,0 +1,70 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+using BeWo.Report;
+using BeWo.Report.ReportObjects;
+using DevExpress.XtraReports.UI;
+
+namespace Fortis
+{
+    public partial class Quittierungsbeleg : XtraReport, IBeWoReport<ServicesOverviewRO>
+    {
+        private Dictionary<string, Dictionary<String, bool>> key2TagesDict = new Dictionary<string, Dictionary<String, bool>>();
+
+        public Quittierungsbeleg()
+        {
+            InitializeComponent();
+        }
+
+        public void SetReportDataSource(ServicesOverviewRO pRO)
+        {
+            if (pRO.Services != null)
+            {
+                //H Hausbesuch = Notice
+                //B Begleitung im Sozialraum = Notice2
+                //T Kontakt per Telefon etc. = Notice3
+                //GD Kontakt mit Leistungsberechtigten in der Dienststelle = Notice4
+                //KL  Kompensatorische Leistung ohne LB = Notice5
+                //AK Assistenz im Krankenhaus = ServiceCategory
+                //MA Anzahl Mitarbeitende = ServiceCategoryAbbr
+                //GI Gemeinsame Inanspruchnahme = GefahreneKilometer
+
+                //Größe = StartDateString
+                //Summe1 = TimeRangeString
+                //Beginn = EmployeeFirstName
+                //Ende = EmployeeFullname
+                //Summe2 = EmployeeLastname
+
+                foreach (var sr in pRO.Services)
+                {
+                    sr.Notice = String.Format("{0:0}", sr.Minutes);
+                    sr.Notice2 = "";
+                    sr.Notice3 = "";
+                    sr.Notice4 = "";
+                    sr.Notice5 = "";
+                    sr.ServiceCategory = "";
+                    sr.ServiceCategoryAbbr = "";
+                    sr.GefahreneKilometer = "";
+                    sr.StartDateString = "";
+                    sr.TimeRangeString = "";
+                    sr.EmployeeFirstName = "";
+                    sr.EmployeeFullname = "";
+                    sr.EmployeeLastName = "";
+
+                    if (sr.ServiceDescription == "Hausbesuch")
+
+                    {
+                        sr.Notice = String.Format("{0:0}", sr.Minutes);
+                    }
+
+                    sr.ServiceDescription = "";
+                }
+            }
+            bindingSource1.DataSource = pRO;
+        }
+
+        
+    }
+}

ReportImp/Fortis/Quittierungsbeleg.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>21, 17</value>
+  </metadata>
+</root>

ReportImp/KomMitBewo/InvoiceCustomerReport.Designer.cs

@@ -56,23 +56,9 @@ namespace KommMit.Alt
             this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
-            this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
             this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
             this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
             this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
             this.lblNotice = new DevExpress.XtraReports.UI.XRLabel();
             this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
             this.xrTableRow11 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -82,11 +68,8 @@ namespace KommMit.Alt
             this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
             this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
             this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
-            this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
@@ -219,8 +202,7 @@ namespace KommMit.Alt
             this.xrLabel5,
             this.xrLabel4,
             this.xrLabel3,
-            this.xrLabel2,
-            this.xrTable2});
+            this.xrLabel2});
             this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F);
             this.ReportHeader.HeightF = 357.4165F;
             this.ReportHeader.Name = "ReportHeader";
@@ -417,127 +399,6 @@ namespace KommMit.Alt
             this.xrLabel2.Text = "Rechnung Nr. [InvoiceNumber]";
             this.xrLabel2.WordWrap = false;
             // 
-            // xrTable2
-            // 
-            this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(367.0001F, 0F);
-            this.xrTable2.Name = "xrTable2";
-            this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
-            this.xrTableRow2,
-            this.xrTableRow5,
-            this.xrTableRow4,
-            this.xrTableRow1,
-            this.xrTableRow6,
-            this.xrTableRow8});
-            this.xrTable2.SizeF = new System.Drawing.SizeF(283F, 114F);
-            // 
-            // xrTableRow2
-            // 
-            this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell4});
-            this.xrTableRow2.Name = "xrTableRow2";
-            this.xrTableRow2.Weight = 0.13245033112582783D;
-            // 
-            // xrTableCell4
-            // 
-            this.xrTableCell4.CanShrink = true;
-            this.xrTableCell4.Name = "xrTableCell4";
-            this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell4.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
-            this.xrTableCell4.StylePriority.UseFont = false;
-            this.xrTableCell4.StylePriority.UseTextAlignment = false;
-            this.xrTableCell4.Text = "Ihr(e) Ansprechpartner(in):";
-            this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-            this.xrTableCell4.Weight = 1D;
-            // 
-            // xrTableRow5
-            // 
-            this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell13});
-            this.xrTableRow5.Name = "xrTableRow5";
-            this.xrTableRow5.Weight = 0.13245033112582783D;
-            // 
-            // xrTableCell13
-            // 
-            this.xrTableCell13.CanShrink = true;
-            this.xrTableCell13.Name = "xrTableCell13";
-            this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell13.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
-            this.xrTableCell13.StylePriority.UseFont = false;
-            this.xrTableCell13.StylePriority.UseTextAlignment = false;
-            this.xrTableCell13.Text = "[SenderFirstName] [SenderLastName]";
-            this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-            this.xrTableCell13.Weight = 1D;
-            // 
-            // xrTableRow4
-            // 
-            this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell11});
-            this.xrTableRow4.Name = "xrTableRow4";
-            this.xrTableRow4.Weight = 0.13245033112582783D;
-            // 
-            // xrTableCell11
-            // 
-            this.xrTableCell11.CanShrink = true;
-            this.xrTableCell11.Name = "xrTableCell11";
-            this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell11.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
-            this.xrTableCell11.StylePriority.UseFont = false;
-            this.xrTableCell11.StylePriority.UseTextAlignment = false;
-            this.xrTableCell11.Text = "[SenderDivision]";
-            this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-            this.xrTableCell11.Weight = 1D;
-            // 
-            // xrTableRow1
-            // 
-            this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell1});
-            this.xrTableRow1.Name = "xrTableRow1";
-            this.xrTableRow1.Weight = 0.13245033112582783D;
-            // 
-            // xrTableCell1
-            // 
-            this.xrTableCell1.CanShrink = true;
-            this.xrTableCell1.Name = "xrTableCell1";
-            this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell1.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
-            this.xrTableCell1.StylePriority.UseFont = false;
-            this.xrTableCell1.StylePriority.UseTextAlignment = false;
-            this.xrTableCell1.Text = " [SenderPhone]";
-            this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-            this.xrTableCell1.Weight = 1D;
-            // 
-            // xrTableRow6
-            // 
-            this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell2});
-            this.xrTableRow6.Name = "xrTableRow6";
-            this.xrTableRow6.Weight = 0.11258278145695365D;
-            // 
-            // xrTableCell2
-            // 
-            this.xrTableCell2.CanShrink = true;
-            this.xrTableCell2.Name = "xrTableCell2";
-            this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell2.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
-            this.xrTableCell2.StylePriority.UseFont = false;
-            this.xrTableCell2.StylePriority.UseTextAlignment = false;
-            this.xrTableCell2.Text = "[SenderFax]";
-            this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-            this.xrTableCell2.Weight = 1D;
-            // 
-            // xrTableRow8
-            // 
-            this.xrTableRow8.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell5});
-            this.xrTableRow8.Name = "xrTableRow8";
-            this.xrTableRow8.Weight = 0.11258278145695365D;
-            // 
-            // xrTableCell5
-            // 
-            this.xrTableCell5.Name = "xrTableCell5";
-            this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell5.Weight = 1D;
-            // 
             // ruleRateFactorNull
             // 
             this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?";
@@ -547,14 +408,11 @@ namespace KommMit.Alt
             // ReportFooter
             // 
             this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
-            this.xrLabel7,
-            this.xrPictureBox1,
             this.xrLabel8,
-            this.xrLabel10,
             this.lblNotice,
             this.xrTable4});
             this.ReportFooter.Font = new System.Drawing.Font("Verdana", 10F);
-            this.ReportFooter.HeightF = 247.5417F;
+            this.ReportFooter.HeightF = 113.1667F;
             this.ReportFooter.KeepTogether = true;
             this.ReportFooter.Name = "ReportFooter";
             this.ReportFooter.StylePriority.UseFont = false;
@@ -570,15 +428,6 @@ namespace KommMit.Alt
             this.xrLabel8.StylePriority.UseFont = false;
             this.xrLabel8.Text = "[Notice]";
             // 
-            // xrLabel10
-            // 
-            this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 155.5417F);
-            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";
-            // 
             // lblNotice
             // 
             this.lblNotice.CanShrink = true;
@@ -625,12 +474,12 @@ namespace KommMit.Alt
             // 
             // topMarginBand1
             // 
-            this.topMarginBand1.HeightF = 221.1667F;
+            this.topMarginBand1.HeightF = 214F;
             this.topMarginBand1.Name = "topMarginBand1";
             // 
             // bottomMarginBand1
             // 
-            this.bottomMarginBand1.HeightF = 121F;
+            this.bottomMarginBand1.HeightF = 135.3333F;
             this.bottomMarginBand1.Name = "bottomMarginBand1";
             // 
             // DetailReport
@@ -655,26 +504,6 @@ namespace KommMit.Alt
             // 
             this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.InvoiceCustomerRO);
             // 
-            // xrLabel7
-            // 
-            this.xrLabel7.Borders = DevExpress.XtraPrinting.BorderSide.Top;
-            this.xrLabel7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "CreatorName")});
-            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 223.1667F);
-            this.xrLabel7.Name = "xrLabel7";
-            this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel7.SizeF = new System.Drawing.SizeF(196.875F, 23F);
-            this.xrLabel7.StylePriority.UseBorders = false;
-            this.xrLabel7.Text = "Unterschrift";
-            // 
-            // xrPictureBox1
-            // 
-            this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
-            this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 190.9583F);
-            this.xrPictureBox1.Name = "xrPictureBox1";
-            this.xrPictureBox1.SizeF = new System.Drawing.SizeF(166.7284F, 32.20832F);
-            this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
-            // 
             // InvoiceCustomerReport
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -688,7 +517,7 @@ namespace KommMit.Alt
             this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
             this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
             this.ruleRateFactorNull});
-            this.Margins = new System.Drawing.Printing.Margins(83, 67, 221, 121);
+            this.Margins = new System.Drawing.Printing.Margins(92, 58, 214, 135);
             this.PageHeight = 1169;
             this.PageWidth = 827;
             this.PaperKind = System.Drawing.Printing.PaperKind.A4;
@@ -697,7 +526,6 @@ namespace KommMit.Alt
             this.Watermark.ImageViewMode = DevExpress.XtraPrinting.Drawing.ImageViewMode.Zoom;
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
@@ -714,22 +542,8 @@ namespace KommMit.Alt
         private DevExpress.XtraReports.UI.XRLabel xrLabel4;
         private DevExpress.XtraReports.UI.XRLabel xrLabel3;
         private DevExpress.XtraReports.UI.XRLabel xrLabel2;
-        private DevExpress.XtraReports.UI.XRTable xrTable2;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow5;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow4;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow6;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow8;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
         private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter;
         private DevExpress.XtraReports.UI.XRLabel lblNotice;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel10;
         private DevExpress.XtraReports.UI.FormattingRule ruleRateFactorNull;
         private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
         private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
@@ -757,7 +571,5 @@ namespace KommMit.Alt
         private DevExpress.XtraReports.UI.DetailBand Detail1;
         private DevExpress.XtraReports.UI.XRLabel lblAddress;
         private DevExpress.XtraReports.UI.XRLabel xrLabel1;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel7;
-        private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
     }
 }

ReportImp/KomMitBewo/KommMitBewo.csproj

@@ -1,202 +1,202 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{1A585E99-09AB-4924-8FB9-9C9D1FE48044}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>KomMitBewo</RootNamespace>
-    <AssemblyName>4271389563_Reports</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\Host\bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\Host\bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="DevExpress.Data.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Pdf.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Printing.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Utils.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraPrinting.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Charts.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraCharts.v17.1.Wizard, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraCharts.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.PivotGrid.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Sparkline.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Utils.v17.1.UI, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraReports.v17.1.Extensions, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.CodeParser.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Office.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.RichEdit.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.RichEdit.v17.1.Export, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="CustomMitarbeiterstundenkontoBerechnung.cs" />
-    <Compile Include="CustomMitarbeiterstundenkontoBerechnungMonate.cs" />
-    <Compile Include="CustomMitarbeiterstundenkontoBerechnungTagesansicht.cs" />
-    <Compile Include="InvoiceCustomerReport.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="InvoiceCustomerReport.Designer.cs">
-      <DependentUpon>InvoiceCustomerReport.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Jahresabgrenzung.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Jahresabgrenzung.designer.cs">
-      <DependentUpon>Jahresabgrenzung.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Mitarbeiterarbeitszeitkonto.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Mitarbeiterarbeitszeitkonto.designer.cs">
-      <DependentUpon>Mitarbeiterarbeitszeitkonto.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Mitarbeiterstundenkonto.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Mitarbeiterstundenkonto.designer.cs">
-      <DependentUpon>Mitarbeiterstundenkonto.cs</DependentUpon>
-    </Compile>
-    <Compile Include="MitarbeiterstundenkontoJahr.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="MitarbeiterstundenkontoJahr.designer.cs">
-      <DependentUpon>MitarbeiterstundenkontoJahr.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ServiceInvoiceReport.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="ServiceInvoiceReport.Designer.cs">
-      <DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
-    </Compile>
-    <Compile Include="ServicesOverviewReport.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="ServicesOverviewReport.Designer.cs">
-      <DependentUpon>ServicesOverviewReport.cs</DependentUpon>
-    </Compile>
-    <Compile Include="SettlementReport2.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="SettlementReport2.Designer.cs">
-      <DependentUpon>SettlementReport2.cs</DependentUpon>
-    </Compile>
-    <Compile Include="SettlementReport.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="SettlementReport.Designer.cs">
-      <DependentUpon>SettlementReport.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Teamstundenkonto.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Teamstundenkonto.designer.cs">
-      <DependentUpon>Teamstundenkonto.cs</DependentUpon>
-    </Compile>
-    <Compile Include="CustomReportCreator.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="InvoiceCustomerReport.resx">
-      <DependentUpon>InvoiceCustomerReport.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Jahresabgrenzung.resx">
-      <DependentUpon>Jahresabgrenzung.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Mitarbeiterarbeitszeitkonto.resx">
-      <DependentUpon>Mitarbeiterarbeitszeitkonto.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Mitarbeiterstundenkonto.resx">
-      <DependentUpon>Mitarbeiterstundenkonto.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="MitarbeiterstundenkontoJahr.resx">
-      <DependentUpon>MitarbeiterstundenkontoJahr.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\licenses.licx" />
-    <EmbeddedResource Include="ServiceInvoiceReport.resx">
-      <DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ServicesOverviewReport.resx">
-      <DependentUpon>ServicesOverviewReport.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="SettlementReport2.resx">
-      <DependentUpon>SettlementReport2.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="SettlementReport.resx">
-      <DependentUpon>SettlementReport.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Teamstundenkonto.resx">
-      <DependentUpon>Teamstundenkonto.cs</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Data\Data.csproj">
-      <Project>{b0d73e3d-4ae7-4024-93a6-db1f46d7ccee}</Project>
-      <Name>Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Report\Report.csproj">
-      <Project>{40d8b312-ea64-49e3-a31a-5e57ed4d5654}</Project>
-      <Name>Report</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Service\Service.csproj">
-      <Project>{094331c3-ecee-4c89-bbfd-4c9ded89f0ef}</Project>
-      <Name>Service</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Shared\Shared.csproj">
-      <Project>{2f50b83d-a3f0-4ec4-979a-3f9b7e3d8ed4}</Project>
-      <Name>Shared</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Invoicing\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{1A585E99-09AB-4924-8FB9-9C9D1FE48044}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>KomMitBewo</RootNamespace>
+    <AssemblyName>4271389563_Reports</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\Host\bin\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\Host\bin\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="DevExpress.Data.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Pdf.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Printing.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Utils.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraPrinting.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Charts.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraCharts.v17.1.Wizard, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraCharts.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.PivotGrid.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Sparkline.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Utils.v17.1.UI, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraReports.v17.1.Extensions, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.CodeParser.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Office.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.RichEdit.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.RichEdit.v17.1.Export, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="CustomMitarbeiterstundenkontoBerechnung.cs" />
+    <Compile Include="CustomMitarbeiterstundenkontoBerechnungMonate.cs" />
+    <Compile Include="CustomMitarbeiterstundenkontoBerechnungTagesansicht.cs" />
+    <Compile Include="InvoiceCustomerReport.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="InvoiceCustomerReport.Designer.cs">
+      <DependentUpon>InvoiceCustomerReport.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Jahresabgrenzung.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Jahresabgrenzung.designer.cs">
+      <DependentUpon>Jahresabgrenzung.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Mitarbeiterarbeitszeitkonto.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Mitarbeiterarbeitszeitkonto.designer.cs">
+      <DependentUpon>Mitarbeiterarbeitszeitkonto.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Mitarbeiterstundenkonto.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Mitarbeiterstundenkonto.designer.cs">
+      <DependentUpon>Mitarbeiterstundenkonto.cs</DependentUpon>
+    </Compile>
+    <Compile Include="MitarbeiterstundenkontoJahr.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="MitarbeiterstundenkontoJahr.designer.cs">
+      <DependentUpon>MitarbeiterstundenkontoJahr.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ServiceInvoiceReport.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ServiceInvoiceReport.Designer.cs">
+      <DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
+    </Compile>
+    <Compile Include="ServicesOverviewReport.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ServicesOverviewReport.Designer.cs">
+      <DependentUpon>ServicesOverviewReport.cs</DependentUpon>
+    </Compile>
+    <Compile Include="SettlementReport2.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SettlementReport2.Designer.cs">
+      <DependentUpon>SettlementReport2.cs</DependentUpon>
+    </Compile>
+    <Compile Include="SettlementReport.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SettlementReport.Designer.cs">
+      <DependentUpon>SettlementReport.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Teamstundenkonto.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Teamstundenkonto.designer.cs">
+      <DependentUpon>Teamstundenkonto.cs</DependentUpon>
+    </Compile>
+    <Compile Include="CustomReportCreator.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="InvoiceCustomerReport.resx">
+      <DependentUpon>InvoiceCustomerReport.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Jahresabgrenzung.resx">
+      <DependentUpon>Jahresabgrenzung.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Mitarbeiterarbeitszeitkonto.resx">
+      <DependentUpon>Mitarbeiterarbeitszeitkonto.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Mitarbeiterstundenkonto.resx">
+      <DependentUpon>Mitarbeiterstundenkonto.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MitarbeiterstundenkontoJahr.resx">
+      <DependentUpon>MitarbeiterstundenkontoJahr.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\licenses.licx" />
+    <EmbeddedResource Include="ServiceInvoiceReport.resx">
+      <DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ServicesOverviewReport.resx">
+      <DependentUpon>ServicesOverviewReport.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="SettlementReport2.resx">
+      <DependentUpon>SettlementReport2.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="SettlementReport.resx">
+      <DependentUpon>SettlementReport.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Teamstundenkonto.resx">
+      <DependentUpon>Teamstundenkonto.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Data\Data.csproj">
+      <Project>{b0d73e3d-4ae7-4024-93a6-db1f46d7ccee}</Project>
+      <Name>Data</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Report\Report.csproj">
+      <Project>{40d8b312-ea64-49e3-a31a-5e57ed4d5654}</Project>
+      <Name>Report</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Service\Service.csproj">
+      <Project>{094331c3-ecee-4c89-bbfd-4c9ded89f0ef}</Project>
+      <Name>Service</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Shared\Shared.csproj">
+      <Project>{2f50b83d-a3f0-4ec4-979a-3f9b7e3d8ed4}</Project>
+      <Name>Shared</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Invoicing\" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
 </Project>

ReportImp/KomMitBewo/ServiceInvoiceReport.Designer.cs

@@ -43,22 +43,6 @@ namespace KommMit.Alt
             this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
             this.lblAbrechnungszeitraum = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
-            this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
-            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();
@@ -88,11 +72,8 @@ namespace KommMit.Alt
             this.xrTableCell46 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
             this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
-            this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
-            this.xrLabel6 = 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.xrTable2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
@@ -121,12 +102,12 @@ namespace KommMit.Alt
             // 
             // topMarginBand1
             // 
-            this.topMarginBand1.HeightF = 238F;
+            this.topMarginBand1.HeightF = 214F;
             this.topMarginBand1.Name = "topMarginBand1";
             // 
             // bottomMarginBand1
             // 
-            this.bottomMarginBand1.HeightF = 102F;
+            this.bottomMarginBand1.HeightF = 135.3333F;
             this.bottomMarginBand1.Name = "bottomMarginBand1";
             // 
             // Page1
@@ -138,8 +119,7 @@ namespace KommMit.Alt
             this.xrLabel2,
             this.xrLabel5,
             this.xrLabel8,
-            this.lblAbrechnungszeitraum,
-            this.xrTable2});
+            this.lblAbrechnungszeitraum});
             this.Page1.Font = new System.Drawing.Font("Verdana", 10F);
             this.Page1.HeightF = 354.0833F;
             this.Page1.Name = "Page1";
@@ -230,157 +210,6 @@ namespace KommMit.Alt
             this.lblAbrechnungszeitraum.StylePriority.UseFont = false;
             this.lblAbrechnungszeitraum.Text = "hiermit berechnen wir für den ... folgende erbrachte Tätigkeiten:";
             // 
-            // xrTable2
-            // 
-            this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(362.5F, 0F);
-            this.xrTable2.Name = "xrTable2";
-            this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
-            this.xrTableRow2,
-            this.xrTableRow5,
-            this.xrTableRow4,
-            this.xrTableRow3,
-            this.xrTableRow1,
-            this.xrTableRow6,
-            this.xrTableRow8});
-            this.xrTable2.SizeF = new System.Drawing.SizeF(283F, 134F);
-            // 
-            // xrTableRow2
-            // 
-            this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell4});
-            this.xrTableRow2.Name = "xrTableRow2";
-            this.xrTableRow2.Weight = 0.13245033112582783D;
-            // 
-            // xrTableCell4
-            // 
-            this.xrTableCell4.CanShrink = true;
-            this.xrTableCell4.Name = "xrTableCell4";
-            this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell4.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
-            this.xrTableCell4.StylePriority.UseFont = false;
-            this.xrTableCell4.StylePriority.UseTextAlignment = false;
-            this.xrTableCell4.Text = "Ihr(e) Ansprechpartner(in):";
-            this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-            this.xrTableCell4.Weight = 1D;
-            // 
-            // xrTableRow5
-            // 
-            this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell13});
-            this.xrTableRow5.Name = "xrTableRow5";
-            this.xrTableRow5.Weight = 0.13245033112582783D;
-            // 
-            // xrTableCell13
-            // 
-            this.xrTableCell13.CanShrink = true;
-            this.xrTableCell13.Name = "xrTableCell13";
-            this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell13.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
-            this.xrTableCell13.StylePriority.UseFont = false;
-            this.xrTableCell13.StylePriority.UseTextAlignment = false;
-            this.xrTableCell13.Text = "[SenderContactPerson]";
-            this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-            this.xrTableCell13.Weight = 1D;
-            // 
-            // xrTableRow4
-            // 
-            this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell11});
-            this.xrTableRow4.Name = "xrTableRow4";
-            this.xrTableRow4.Weight = 0.13245033112582783D;
-            // 
-            // xrTableCell11
-            // 
-            this.xrTableCell11.CanShrink = true;
-            this.xrTableCell11.Name = "xrTableCell11";
-            this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell11.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
-            this.xrTableCell11.StylePriority.UseFont = false;
-            this.xrTableCell11.StylePriority.UseTextAlignment = false;
-            this.xrTableCell11.Text = "[SenderContactPersonDivision]";
-            this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-            this.xrTableCell11.Weight = 1D;
-            // 
-            // xrTableRow3
-            // 
-            this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell8});
-            this.xrTableRow3.Name = "xrTableRow3";
-            this.xrTableRow3.Weight = 0.13245033112582783D;
-            // 
-            // xrTableCell8
-            // 
-            this.xrTableCell8.CanShrink = true;
-            this.xrTableCell8.Name = "xrTableCell8";
-            this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell8.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
-            this.xrTableCell8.StylePriority.UseFont = false;
-            this.xrTableCell8.StylePriority.UseTextAlignment = false;
-            this.xrTableCell8.Text = "[SenderContactPersonMail]";
-            this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-            this.xrTableCell8.Weight = 1D;
-            // 
-            // xrTableRow1
-            // 
-            this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell1});
-            this.xrTableRow1.Name = "xrTableRow1";
-            this.xrTableRow1.Weight = 0.13245033112582783D;
-            // 
-            // xrTableCell1
-            // 
-            this.xrTableCell1.CanShrink = true;
-            this.xrTableCell1.Name = "xrTableCell1";
-            this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell1.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
-            this.xrTableCell1.StylePriority.UseFont = false;
-            this.xrTableCell1.StylePriority.UseTextAlignment = false;
-            this.xrTableCell1.Text = "[SenderContactPersonPhone]";
-            this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-            this.xrTableCell1.Weight = 1D;
-            // 
-            // xrTableRow6
-            // 
-            this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell2});
-            this.xrTableRow6.Name = "xrTableRow6";
-            this.xrTableRow6.Weight = 0.11258278145695365D;
-            // 
-            // xrTableCell2
-            // 
-            this.xrTableCell2.CanShrink = true;
-            this.xrTableCell2.Name = "xrTableCell2";
-            this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell2.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
-            this.xrTableCell2.StylePriority.UseFont = false;
-            this.xrTableCell2.StylePriority.UseTextAlignment = false;
-            this.xrTableCell2.Text = "[SenderContactPersonFax]";
-            this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-            this.xrTableCell2.Weight = 1D;
-            // 
-            // xrTableRow8
-            // 
-            this.xrTableRow8.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell5});
-            this.xrTableRow8.Name = "xrTableRow8";
-            this.xrTableRow8.Weight = 0.11258278145695365D;
-            // 
-            // xrTableCell5
-            // 
-            this.xrTableCell5.Name = "xrTableCell5";
-            this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell5.Weight = 1D;
-            // 
-            // xrLabel15
-            // 
-            this.xrLabel15.Font = new System.Drawing.Font("Verdana", 10F);
-            this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 114.5833F);
-            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.Font = new System.Drawing.Font("Verdana", 10F);
@@ -754,35 +583,12 @@ namespace KommMit.Alt
             // GroupFooter1
             // 
             this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
-            this.xrPictureBox1,
-            this.xrLabel6,
             this.xrLabel1,
             this.xrLabel9,
-            this.xrTable4,
-            this.xrLabel15});
-            this.GroupFooter1.HeightF = 211.4583F;
+            this.xrTable4});
+            this.GroupFooter1.HeightF = 111.4583F;
             this.GroupFooter1.Name = "GroupFooter1";
             // 
-            // xrPictureBox1
-            // 
-            this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
-            this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 156.2499F);
-            this.xrPictureBox1.Name = "xrPictureBox1";
-            this.xrPictureBox1.SizeF = new System.Drawing.SizeF(166.7284F, 32.20832F);
-            this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
-            // 
-            // xrLabel6
-            // 
-            this.xrLabel6.Borders = DevExpress.XtraPrinting.BorderSide.Top;
-            this.xrLabel6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "CreatorName")});
-            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 188.4583F);
-            this.xrLabel6.Name = "xrLabel6";
-            this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel6.SizeF = new System.Drawing.SizeF(196.875F, 23F);
-            this.xrLabel6.StylePriority.UseBorders = false;
-            this.xrLabel6.Text = "Unterschrift";
-            // 
             // xrLabel1
             // 
             this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
@@ -816,14 +622,13 @@ namespace KommMit.Alt
             this.Font = new System.Drawing.Font("Verdana", 10F);
             this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
             this.ruleRateFactorNull});
-            this.Margins = new System.Drawing.Printing.Margins(82, 66, 238, 102);
+            this.Margins = new System.Drawing.Printing.Margins(95, 54, 214, 135);
             this.PageHeight = 1169;
             this.PageWidth = 827;
             this.PaperKind = System.Drawing.Printing.PaperKind.A4;
             this.Version = "17.1";
             this.Watermark.Image = ((System.Drawing.Image)(resources.GetObject("ServiceInvoiceReport.Watermark.Image")));
             this.Watermark.ImageViewMode = DevExpress.XtraPrinting.Drawing.ImageViewMode.Zoom;
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
@@ -846,22 +651,6 @@ namespace KommMit.Alt
         private DevExpress.XtraReports.UI.XRLabel xrLabel5;
 		private DevExpress.XtraReports.UI.XRLabel xrLabel8;
         private DevExpress.XtraReports.UI.XRLabel lblAbrechnungszeitraum;
-        private DevExpress.XtraReports.UI.XRTable xrTable2;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow5;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow4;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow6;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow8;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel15;
         private DevExpress.XtraReports.UI.XRTable xrTable4;
         private DevExpress.XtraReports.UI.XRTableRow xrTableRow10;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
@@ -893,7 +682,5 @@ namespace KommMit.Alt
         private DevExpress.XtraReports.UI.XRLabel xrLabel7;
 		private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
 		private DevExpress.XtraReports.UI.XRLabel xrLabel1;
-        private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel6;
     }
 }

ReportImp/KomMitBewo/ServicesOverviewReport.Designer.cs

@@ -49,6 +49,7 @@ namespace KommMit
             this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell23 = 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.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
@@ -75,6 +76,8 @@ namespace KommMit
             this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
             this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
             this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
+            this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
@@ -82,6 +85,7 @@ namespace KommMit
             this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
@@ -90,15 +94,13 @@ namespace KommMit
             this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField();
             this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField();
             this.fieldGruppe = new DevExpress.XtraReports.UI.CalculatedField();
-            this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel();
-            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
+            this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox();
             ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
             // 
             // Detail
@@ -302,6 +304,10 @@ namespace KommMit
             this.xrTableCell23.Text = "xrTableCell23";
             this.xrTableCell23.Weight = 0.18534334830769048D;
             // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
+            // 
             // formattingRuleStartDate
             // 
             this.formattingRuleStartDate.Condition = "[StartDate2]  < [StartDate]";
@@ -503,6 +509,8 @@ namespace KommMit
             // ReportFooter
             // 
             this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrPictureBox2,
+            this.xrPictureBox1,
             this.xrLabel20,
             this.xrLabel21,
             this.xrLabel2,
@@ -512,10 +520,46 @@ namespace KommMit
             this.xrLabel6,
             this.xrLabel5});
             this.ReportFooter.Font = new System.Drawing.Font("Arial", 11F);
-            this.ReportFooter.HeightF = 211.9583F;
+            this.ReportFooter.HeightF = 231.75F;
             this.ReportFooter.Name = "ReportFooter";
             this.ReportFooter.StylePriority.UseFont = false;
             // 
+            // xrLabel20
+            // 
+            this.xrLabel20.BackColor = System.Drawing.Color.Gainsboro;
+            this.xrLabel20.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrLabel20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMFehlkontakte", "{0:0.##}")});
+            this.xrLabel20.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(180F, 40.99998F);
+            this.xrLabel20.Name = "xrLabel20";
+            this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.xrLabel20.SizeF = new System.Drawing.SizeF(90.00002F, 20F);
+            this.xrLabel20.StylePriority.UseBackColor = false;
+            this.xrLabel20.StylePriority.UseBorders = false;
+            this.xrLabel20.StylePriority.UseFont = false;
+            this.xrLabel20.StylePriority.UsePadding = false;
+            this.xrLabel20.StylePriority.UseTextAlignment = false;
+            this.xrLabel20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            // 
+            // xrLabel21
+            // 
+            this.xrLabel21.BackColor = System.Drawing.Color.Gainsboro;
+            this.xrLabel21.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrLabel21.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 40.99998F);
+            this.xrLabel21.Name = "xrLabel21";
+            this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.xrLabel21.SizeF = new System.Drawing.SizeF(179.9999F, 20F);
+            this.xrLabel21.StylePriority.UseBackColor = false;
+            this.xrLabel21.StylePriority.UseBorders = false;
+            this.xrLabel21.StylePriority.UseFont = false;
+            this.xrLabel21.StylePriority.UsePadding = false;
+            this.xrLabel21.StylePriority.UseTextAlignment = false;
+            this.xrLabel21.Text = "Fehlkontakte in Minuten:";
+            this.xrLabel21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
             // xrLabel2
             // 
             this.xrLabel2.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
@@ -611,6 +655,17 @@ namespace KommMit
             this.xrTableCell26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
             this.xrTableCell26.Weight = 0.1610843054496002D;
             // 
+            // xrTableCell28
+            // 
+            this.xrTableCell28.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell28.Name = "xrTableCell28";
+            this.xrTableCell28.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
+            this.xrTableCell28.StylePriority.UseFont = false;
+            this.xrTableCell28.StylePriority.UsePadding = false;
+            this.xrTableCell28.StylePriority.UseTextAlignment = false;
+            this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell28.Weight = 0.161084523934385D;
+            // 
             // xrTableCell27
             // 
             this.xrTableCell27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
@@ -628,7 +683,7 @@ namespace KommMit
             // xrLabel7
             // 
             this.xrLabel7.Borders = DevExpress.XtraPrinting.BorderSide.Top;
-            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(407.5001F, 188.75F);
+            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(433.9999F, 203.75F);
             this.xrLabel7.Name = "xrLabel7";
             this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel7.SizeF = new System.Drawing.SizeF(216F, 17.99997F);
@@ -639,7 +694,7 @@ namespace KommMit
             // xrLabel6
             // 
             this.xrLabel6.Borders = DevExpress.XtraPrinting.BorderSide.Top;
-            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(159.3848F, 188.75F);
+            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(159.3847F, 203.75F);
             this.xrLabel6.Name = "xrLabel6";
             this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel6.SizeF = new System.Drawing.SizeF(216.8751F, 17.99997F);
@@ -650,7 +705,7 @@ namespace KommMit
             // xrLabel5
             // 
             this.xrLabel5.Borders = DevExpress.XtraPrinting.BorderSide.Top;
-            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 188.75F);
+            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 203.75F);
             this.xrLabel5.Name = "xrLabel5";
             this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel5.SizeF = new System.Drawing.SizeF(117F, 17.99997F);
@@ -684,56 +739,21 @@ namespace KommMit
             this.fieldGruppe.FieldType = DevExpress.XtraReports.UI.FieldType.String;
             this.fieldGruppe.Name = "fieldGruppe";
             // 
-            // xrTableCell28
+            // xrPictureBox1
             // 
-            this.xrTableCell28.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrTableCell28.Name = "xrTableCell28";
-            this.xrTableCell28.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
-            this.xrTableCell28.StylePriority.UseFont = false;
-            this.xrTableCell28.StylePriority.UsePadding = false;
-            this.xrTableCell28.StylePriority.UseTextAlignment = false;
-            this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
-            this.xrTableCell28.Weight = 0.161084523934385D;
+            this.xrPictureBox1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Image", null, "CustomerSignature")});
+            this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(433.9999F, 160.75F);
+            this.xrPictureBox1.Name = "xrPictureBox1";
+            this.xrPictureBox1.SizeF = new System.Drawing.SizeF(216F, 42.99997F);
             // 
-            // xrLabel20
+            // xrPictureBox2
             // 
-            this.xrLabel20.BackColor = System.Drawing.Color.Gainsboro;
-            this.xrLabel20.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrLabel20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMFehlkontakte", "{0:0.##}")});
-            this.xrLabel20.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(180F, 40.99998F);
-            this.xrLabel20.Name = "xrLabel20";
-            this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
-            this.xrLabel20.SizeF = new System.Drawing.SizeF(90.00002F, 20F);
-            this.xrLabel20.StylePriority.UseBackColor = false;
-            this.xrLabel20.StylePriority.UseBorders = false;
-            this.xrLabel20.StylePriority.UseFont = false;
-            this.xrLabel20.StylePriority.UsePadding = false;
-            this.xrLabel20.StylePriority.UseTextAlignment = false;
-            this.xrLabel20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
-            // 
-            // xrLabel21
-            // 
-            this.xrLabel21.BackColor = System.Drawing.Color.Gainsboro;
-            this.xrLabel21.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrLabel21.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 40.99998F);
-            this.xrLabel21.Name = "xrLabel21";
-            this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
-            this.xrLabel21.SizeF = new System.Drawing.SizeF(179.9999F, 20F);
-            this.xrLabel21.StylePriority.UseBackColor = false;
-            this.xrLabel21.StylePriority.UseBorders = false;
-            this.xrLabel21.StylePriority.UseFont = false;
-            this.xrLabel21.StylePriority.UsePadding = false;
-            this.xrLabel21.StylePriority.UseTextAlignment = false;
-            this.xrLabel21.Text = "Fehlkontakte in Minuten:";
-            this.xrLabel21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            // 
-            // bindingSource1
-            // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
+            this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Image", null, "EmployeeSignature")});
+            this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(159.3848F, 160.75F);
+            this.xrPictureBox2.Name = "xrPictureBox2";
+            this.xrPictureBox2.SizeF = new System.Drawing.SizeF(216.875F, 42.99997F);
             // 
             // Stundenzettel
             // 
@@ -763,9 +783,9 @@ namespace KommMit
             this.Version = "17.1";
             ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
 
         }
@@ -836,5 +856,7 @@ namespace KommMit
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell28;
         private DevExpress.XtraReports.UI.XRLabel xrLabel20;
         private DevExpress.XtraReports.UI.XRLabel xrLabel21;
+        private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2;
+        private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
     }
 }

ReportImp/KomMitBewo/SettlementReport.Designer.cs

@@ -113,6 +113,7 @@ namespace KommMit.Alt
             this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
             this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
             this.xrTableRow31 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -129,17 +130,14 @@ namespace KommMit.Alt
             this.xrTableRow36 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
-            this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable7)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
             // 
             // Detail
@@ -233,9 +231,7 @@ namespace KommMit.Alt
             // ReportFooter
             // 
             this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
-            this.xrTable3,
-            this.xrLabel2,
-            this.xrPictureBox1});
+            this.xrTable3});
             this.ReportFooter.HeightF = 134.9167F;
             this.ReportFooter.KeepTogether = true;
             this.ReportFooter.Name = "ReportFooter";
@@ -319,7 +315,7 @@ namespace KommMit.Alt
             // 
             // bottomMarginBand1
             // 
-            this.bottomMarginBand1.HeightF = 50F;
+            this.bottomMarginBand1.HeightF = 123F;
             this.bottomMarginBand1.Name = "bottomMarginBand1";
             // 
             // GroupHeader1
@@ -937,6 +933,10 @@ namespace KommMit.Alt
             this.xrTableCell31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
             this.xrTableCell31.Weight = 0.18439219485560091D;
             // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
+            // 
             // GroupFooter1
             // 
             this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -1113,28 +1113,6 @@ namespace KommMit.Alt
             this.xrTableCell58.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
             this.xrTableCell58.Weight = 0.30633278705788769D;
             // 
-            // bindingSource1
-            // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
-            // 
-            // xrLabel2
-            // 
-            this.xrLabel2.Borders = DevExpress.XtraPrinting.BorderSide.Top;
-            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 111.9167F);
-            this.xrLabel2.Name = "xrLabel2";
-            this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel2.SizeF = new System.Drawing.SizeF(196.875F, 23F);
-            this.xrLabel2.StylePriority.UseBorders = false;
-            this.xrLabel2.Text = "Unterschrift";
-            // 
-            // xrPictureBox1
-            // 
-            this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
-            this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 79.70835F);
-            this.xrPictureBox1.Name = "xrPictureBox1";
-            this.xrPictureBox1.SizeF = new System.Drawing.SizeF(166.7284F, 32.20832F);
-            this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
-            // 
             // Spitzabrechnung
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1151,7 +1129,7 @@ namespace KommMit.Alt
             this.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
             this.ruleRateFactorNull});
-            this.Margins = new System.Drawing.Printing.Margins(95, 50, 100, 50);
+            this.Margins = new System.Drawing.Printing.Margins(95, 50, 100, 123);
             this.PageHeight = 1169;
             this.PageWidth = 827;
             this.PaperKind = System.Drawing.Printing.PaperKind.A4;
@@ -1164,8 +1142,8 @@ namespace KommMit.Alt
             ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable7)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
 
         }
@@ -1271,7 +1249,5 @@ namespace KommMit.Alt
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell44;
         private DevExpress.XtraReports.UI.XRTableRow xrTableRow16;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell45;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel2;
-        private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
     }
 }

ReportImp/KomMitBewo/SettlementReport2.Designer.cs

@@ -29,9 +29,9 @@ namespace KommMit
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung));
             DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary();
             DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary();
+            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.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
@@ -42,8 +42,6 @@ namespace KommMit
             this.xrLabel_RecipientContactPerson = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
             this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
-            this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
-            this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
             this.xrTableRow21 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -243,32 +241,12 @@ namespace KommMit
             // ReportFooter
             // 
             this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
-            this.xrPictureBox1,
-            this.xrLabel2,
             this.xrTable3});
             this.ReportFooter.HeightF = 136.375F;
             this.ReportFooter.KeepTogether = true;
             this.ReportFooter.Name = "ReportFooter";
             this.ReportFooter.StylePriority.UseFont = false;
             // 
-            // xrPictureBox1
-            // 
-            this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
-            this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 81.16671F);
-            this.xrPictureBox1.Name = "xrPictureBox1";
-            this.xrPictureBox1.SizeF = new System.Drawing.SizeF(166.7284F, 32.20832F);
-            this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
-            // 
-            // xrLabel2
-            // 
-            this.xrLabel2.Borders = DevExpress.XtraPrinting.BorderSide.Top;
-            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 113.375F);
-            this.xrLabel2.Name = "xrLabel2";
-            this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel2.SizeF = new System.Drawing.SizeF(196.875F, 23F);
-            this.xrLabel2.StylePriority.UseBorders = false;
-            this.xrLabel2.Text = "Unterschrift";
-            // 
             // xrTable3
             // 
             this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00004F);
@@ -347,7 +325,7 @@ namespace KommMit
             // 
             // bottomMarginBand1
             // 
-            this.bottomMarginBand1.HeightF = 50F;
+            this.bottomMarginBand1.HeightF = 124F;
             this.bottomMarginBand1.Name = "bottomMarginBand1";
             // 
             // GroupHeader1
@@ -1249,7 +1227,7 @@ namespace KommMit
             this.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
             this.ruleRateFactorNull});
-            this.Margins = new System.Drawing.Printing.Margins(95, 50, 100, 50);
+            this.Margins = new System.Drawing.Printing.Margins(95, 50, 100, 124);
             this.PageHeight = 1169;
             this.PageWidth = 827;
             this.PaperKind = System.Drawing.Printing.PaperKind.A4;
@@ -1370,8 +1348,6 @@ namespace KommMit
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell44;
         private DevExpress.XtraReports.UI.XRTableRow xrTableRow16;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell45;
-        private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel2;
         private DevExpress.XtraReports.UI.GroupFooterBand Zwischensumme;
         private DevExpress.XtraReports.UI.XRTable xrTable8;
         private DevExpress.XtraReports.UI.XRTableRow xrTableRow17;

ReportImp/LebenshilfeBadKreuznach/Calculations/GroupDurationCalculator.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+using BeWo.Service.Plugins;
+using BS.Shared.Core;
+using BS.Shared.DataContracts;
+
+namespace LebenshilfeBadKreuznach.Calculations
+{
+	public class CustomGroupDurationCalculator : GroupDurationCalculator
+	{
+        // vorbereitet für Oktober
+        //public override GroupDurationDC CalculateGroupDuration(int personCount, int employeeCount, decimal totalDuration)
+        //{
+        //    return new GroupDurationDC()
+        //    {
+        //        SingleDuration = totalDuration,
+        //        TotalDuration = totalDuration
+        //    };
+        //}
+    }
+}

ReportImp/LebenshilfeBadKreuznach/Invoicing/CustomInvoiceCreation.cs

@@ -74,7 +74,7 @@ namespace LebenshilfeBadKreuznach.Invoicing
 				CostRatePeriodDC serviceUnit = costRates.GetCostRatePeriodForDate(CostRatePeriodType.MinutesPerServiceUnit, DateTime.Now);
 				serviceInvoicePeriod.ServiceUnitName = serviceUnit.UnitName;
 
-				Calculations calc = PluginLoader.FindClass<Calculations>(_SpecificID) ?? Calculations.GetInstance(_SpecificID);
+				BS.Shared.Services.Calculations calc = PluginLoader.FindClass<BS.Shared.Services.Calculations>(_SpecificID) ?? BS.Shared.Services.Calculations.GetInstance(_SpecificID);
 
 				decimal amountPerUnit;
 				decimal unitCount;
@@ -122,7 +122,7 @@ namespace LebenshilfeBadKreuznach.Invoicing
 		DateTimeSpan invoicePeriod,
 		List<ServiceRecordDC> serviceRecords)
 		{
-			Calculations calc = PluginLoader.FindClass<Calculations>(_SpecificID) ?? Calculations.GetInstance(_SpecificID);
+			BS.Shared.Services.Calculations calc = PluginLoader.FindClass<BS.Shared.Services.Calculations>(_SpecificID) ?? BS.Shared.Services.Calculations.GetInstance(_SpecificID);
 
 			if (ShouldCreateFixedAmounts(serviceInvoicePeriod, supportConceptApprovalPeriod, cb2sc))
 			{
@@ -171,7 +171,7 @@ namespace LebenshilfeBadKreuznach.Invoicing
 			}
 		}
 
-		public override InvoiceItem CreateInvoiceItem(ServiceRecordDC iServiceRecord, SupportConceptApprovalPeriod scap, Calculations calc)
+		public override InvoiceItem CreateInvoiceItem(ServiceRecordDC iServiceRecord, SupportConceptApprovalPeriod scap, BS.Shared.Services.Calculations calc)
         {
             var ii = base.CreateInvoiceItem(iServiceRecord, scap, calc);
 			ii.ItemDescription = iServiceRecord.ServiceDescription.CategoryName;
@@ -190,7 +190,7 @@ namespace LebenshilfeBadKreuznach.Invoicing
         }
 
 		public override IList<InvoiceItem> CreateInvoiceItems(List<ServiceRecordDC> serviceRecordsInPeriod, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap,
-		Calculations calc)
+		BS.Shared.Services.Calculations calc)
 		{
 			var list = base.CreateInvoiceItems(serviceRecordsInPeriod, invoicePeriod, scap, calc);
 			InvoiceItem wg = null; 
@@ -209,7 +209,7 @@ namespace LebenshilfeBadKreuznach.Invoicing
 
 		public override void CreateFixedAmounts(ServiceInvoicePeriod serviceInvoicePeriod, SupportConceptApprovalPeriodDC supportConceptApprovalPeriod, CostBearer2SupportConcept cb2sc)
 		{
-			var calc = PluginLoader.FindClass<Calculations>(_SpecificID) ?? Calculations.GetInstance(_SpecificID);
+			var calc = PluginLoader.FindClass<BS.Shared.Services.Calculations>(_SpecificID) ?? BS.Shared.Services.Calculations.GetInstance(_SpecificID);
 			var data = calc.GetFixedBillingData(supportConceptApprovalPeriod, serviceInvoicePeriod.Start, serviceInvoicePeriod.End);
 			string desc = "Pauschale";
 			if (supportConceptApprovalPeriod.ServiceCategory != null && supportConceptApprovalPeriod.ServiceCategory.Name != null)

ReportImp/LebenshilfeBadKreuznach/LebenshilfeBadKreuznach.csproj

@@ -49,6 +49,7 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Calculations\GroupDurationCalculator.cs" />
     <Compile Include="Export\CustomDataExporter.cs" />
     <Compile Include="Export\SageExporter.cs" />
     <Compile Include="Invoicing\CustomCalculations.cs" />

ReportImp/LebenshilfeBadKreuznach/Quittierungsbeleg.cs

@@ -95,6 +95,7 @@ namespace LebenshilfeBadKreuznach
                 Dictionary<long, long> ziel2kapitel = new Dictionary<long, long>();
                 Dictionary<long, string> ziel2value = new Dictionary<long, string>();
 
+                //masnahmen und foreach Schleife dazu können ab 2024 raus - ist auch getestet. Die brauchen keine Maßnahmen mehr dokumentieren und haben die auch alle gelöscht...
                 var masnahmen = srDc.Goals.Where(g => g.Type == BS.Shared.ValueListEntryType.SupportConceptIndividualGoalType || g.Type == BS.Shared.ValueListEntryType.SupportConceptGoalType).OrderBy(g => g.ParentOid).ThenBy(g => g.TypeDescription).ToList();
                 var kapitel = srDc.Goals.Where(g => (g.Type == BS.Shared.ValueListEntryType.SupportConceptIndividualGoalCategoryType || g.Type == BS.Shared.ValueListEntryType.SupportConceptGoalCategoryType) && (g.TypeDescription != null && g.TypeDescription.StartsWith("Kapitel")) || (g.DisplayName != null && g.DisplayName.StartsWith("Kapitel"))).OrderBy(g => g.DisplayName).ToList();
                 var ziele = srDc.Goals.Where(g => (g.Type == BS.Shared.ValueListEntryType.SupportConceptIndividualGoalCategoryType || g.Type == BS.Shared.ValueListEntryType.SupportConceptGoalCategoryType) && !g.DisplayName.StartsWith("Kapitel")).OrderBy(g => g.DisplayName).ToList();
@@ -223,7 +224,7 @@ namespace LebenshilfeBadKreuznach
                     }
                 }
 
-                
+
                 foreach (var item in ziel2kapitel)
                 {
                     key2Value[item.Value] += ", " + ziel2value[item.Key];
@@ -340,7 +341,7 @@ namespace LebenshilfeBadKreuznach
             if (pRO.SupportConceptCostBearer != null)
             {
                 CostBearer2SupportConcept c2s = DAOFactory.GenericDAO.LoadByID<CostBearer2SupportConcept>(pRO.SupportConceptCostBearer.CostBearer2SupportConceptOid.Value);
-                var calc = PluginLoader.FindClass<Calculations>(c2s.CostBearer.ID) ?? Calculations.GetInstance(c2s.CostBearer.ID);
+                var calc = PluginLoader.FindClass<BS.Shared.Services.Calculations>(c2s.CostBearer.ID) ?? BS.Shared.Services.Calculations.GetInstance(c2s.CostBearer.ID);
 
                 if (c2s.StartDate.HasValue && c2s.StartDate > pRO.StartDate)
                 {

ReportImp/LebenshilfeBadKreuznach/ServiceInvoiceReport.Designer.cs

@@ -77,6 +77,16 @@ namespace LebenshilfeBadKreuznach
             this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
@@ -93,16 +103,6 @@ namespace LebenshilfeBadKreuznach
             this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
             this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
-            this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
@@ -146,6 +146,7 @@ namespace LebenshilfeBadKreuznach
             // 
             this.Page1.BorderWidth = 2F;
             this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel11,
             this.xrTable4,
             this.xrLabel1,
             this.xrLabel6,
@@ -156,14 +157,14 @@ namespace LebenshilfeBadKreuznach
             this.xrLabel5,
             this.xrTable3});
             this.Page1.Font = new System.Drawing.Font("Arial", 10F);
-            this.Page1.HeightF = 371.7183F;
+            this.Page1.HeightF = 438.385F;
             this.Page1.Name = "Page1";
             this.Page1.StylePriority.UseBorderWidth = false;
             this.Page1.StylePriority.UseFont = false;
             // 
             // xrTable4
             // 
-            this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0.1302757F, 355.7183F);
+            this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 422.385F);
             this.xrTable4.Name = "xrTable4";
             this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.xrTableRow4});
@@ -216,7 +217,7 @@ namespace LebenshilfeBadKreuznach
             this.xrTableCell28.StylePriority.UseTextAlignment = false;
             this.xrTableCell28.Text = "Termin";
             this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            this.xrTableCell28.Weight = 0.51384779236056377D;
+            this.xrTableCell28.Weight = 0.5144251357823707D;
             // 
             // xrTableCell30
             // 
@@ -254,7 +255,7 @@ namespace LebenshilfeBadKreuznach
             this.xrTableCell31.StylePriority.UseTextAlignment = false;
             this.xrTableCell31.Text = "Einzelpreis";
             this.xrTableCell31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
-            this.xrTableCell31.Weight = 0.38774058006192436D;
+            this.xrTableCell31.Weight = 0.38716323664011743D;
             // 
             // xrTableCell32
             // 
@@ -706,7 +707,6 @@ namespace LebenshilfeBadKreuznach
             // 
             this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
             this.xrTable2,
-            this.xrLabel11,
             this.xrLabel10,
             this.xrLabel8,
             this.xrLabel4});
@@ -739,8 +739,7 @@ namespace LebenshilfeBadKreuznach
             // 
             this.xrTableCell11.BackColor = System.Drawing.Color.Gainsboro;
             this.xrTableCell11.BorderColor = System.Drawing.Color.DarkGray;
-            this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
-            | DevExpress.XtraPrinting.BorderSide.Right) 
+            this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell11.Font = new System.Drawing.Font("Arial", 8F);
             this.xrTableCell11.Name = "xrTableCell11";
@@ -759,8 +758,7 @@ namespace LebenshilfeBadKreuznach
             // 
             this.xrTableCell13.BackColor = System.Drawing.Color.Gainsboro;
             this.xrTableCell13.BorderColor = System.Drawing.Color.DarkGray;
-            this.xrTableCell13.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
-            | DevExpress.XtraPrinting.BorderSide.Right) 
+            this.xrTableCell13.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell13.Font = new System.Drawing.Font("Arial", 8F);
             this.xrTableCell13.Name = "xrTableCell13";
@@ -772,14 +770,13 @@ namespace LebenshilfeBadKreuznach
             this.xrTableCell13.StylePriority.UsePadding = false;
             this.xrTableCell13.StylePriority.UseTextAlignment = false;
             this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            this.xrTableCell13.Weight = 0.34529642562207463D;
+            this.xrTableCell13.Weight = 0.34471884552843379D;
             // 
             // xrTableCell14
             // 
             this.xrTableCell14.BackColor = System.Drawing.Color.Gainsboro;
             this.xrTableCell14.BorderColor = System.Drawing.Color.DarkGray;
-            this.xrTableCell14.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
-            | DevExpress.XtraPrinting.BorderSide.Right) 
+            this.xrTableCell14.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell14.Font = new System.Drawing.Font("Arial", 8F);
             this.xrTableCell14.Name = "xrTableCell14";
@@ -791,7 +788,7 @@ namespace LebenshilfeBadKreuznach
             this.xrTableCell14.StylePriority.UsePadding = false;
             this.xrTableCell14.StylePriority.UseTextAlignment = false;
             this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
-            this.xrTableCell14.Weight = 0.38774058006192436D;
+            this.xrTableCell14.Weight = 0.3883181601555652D;
             // 
             // xrTableCell15
             // 
@@ -815,17 +812,189 @@ namespace LebenshilfeBadKreuznach
             this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
             this.xrTableCell15.Weight = 0.56166837283914706D;
             // 
+            // xrTableRow2
+            // 
+            this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell4,
+            this.xrTableCell6,
+            this.xrTableCell7,
+            this.xrTableCell8});
+            this.xrTableRow2.Name = "xrTableRow2";
+            this.xrTableRow2.Weight = 0.64D;
+            // 
+            // xrTableCell4
+            // 
+            this.xrTableCell4.BackColor = System.Drawing.Color.Transparent;
+            this.xrTableCell4.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell4.Font = new System.Drawing.Font("Arial", 8F);
+            this.xrTableCell4.Name = "xrTableCell4";
+            this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell4.StylePriority.UseBackColor = false;
+            this.xrTableCell4.StylePriority.UseBorderColor = false;
+            this.xrTableCell4.StylePriority.UseBorders = false;
+            this.xrTableCell4.StylePriority.UseFont = false;
+            this.xrTableCell4.StylePriority.UsePadding = false;
+            this.xrTableCell4.StylePriority.UseTextAlignment = false;
+            this.xrTableCell4.Text = "abzüglich der geleisteten Abschlagszahlungen:";
+            this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell4.Weight = 1.4754431287218743D;
+            // 
+            // xrTableCell6
+            // 
+            this.xrTableCell6.BackColor = System.Drawing.Color.Transparent;
+            this.xrTableCell6.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell6.Font = new System.Drawing.Font("Arial", 8F);
+            this.xrTableCell6.Name = "xrTableCell6";
+            this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell6.StylePriority.UseBackColor = false;
+            this.xrTableCell6.StylePriority.UseBorderColor = false;
+            this.xrTableCell6.StylePriority.UseBorders = false;
+            this.xrTableCell6.StylePriority.UseFont = false;
+            this.xrTableCell6.StylePriority.UsePadding = false;
+            this.xrTableCell6.StylePriority.UseTextAlignment = false;
+            this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell6.Weight = 0.34471884552843379D;
+            // 
+            // xrTableCell7
+            // 
+            this.xrTableCell7.BackColor = System.Drawing.Color.Transparent;
+            this.xrTableCell7.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell7.Font = new System.Drawing.Font("Arial", 8F);
+            this.xrTableCell7.Name = "xrTableCell7";
+            this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell7.StylePriority.UseBackColor = false;
+            this.xrTableCell7.StylePriority.UseBorderColor = false;
+            this.xrTableCell7.StylePriority.UseBorders = false;
+            this.xrTableCell7.StylePriority.UseFont = false;
+            this.xrTableCell7.StylePriority.UsePadding = false;
+            this.xrTableCell7.StylePriority.UseTextAlignment = false;
+            this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell7.Weight = 0.3883181601555652D;
+            // 
+            // xrTableCell8
+            // 
+            this.xrTableCell8.BackColor = System.Drawing.Color.Transparent;
+            this.xrTableCell8.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell8.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "AmountAdvancedPayments")});
+            this.xrTableCell8.Font = new System.Drawing.Font("Arial", 8F);
+            this.xrTableCell8.Name = "xrTableCell8";
+            this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell8.StylePriority.UseBackColor = false;
+            this.xrTableCell8.StylePriority.UseBorderColor = false;
+            this.xrTableCell8.StylePriority.UseBorders = false;
+            this.xrTableCell8.StylePriority.UseFont = false;
+            this.xrTableCell8.StylePriority.UsePadding = false;
+            this.xrTableCell8.StylePriority.UseTextAlignment = false;
+            this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell8.Weight = 0.56166837283914706D;
+            // 
+            // xrTableRow10
+            // 
+            this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell9,
+            this.xrTableCell16,
+            this.xrTableCell29,
+            this.xrTableCell33});
+            this.xrTableRow10.Name = "xrTableRow10";
+            this.xrTableRow10.Weight = 0.64D;
+            // 
+            // xrTableCell9
+            // 
+            this.xrTableCell9.BackColor = System.Drawing.Color.Gainsboro;
+            this.xrTableCell9.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell9.Font = new System.Drawing.Font("Arial", 8F);
+            this.xrTableCell9.Name = "xrTableCell9";
+            this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell9.StylePriority.UseBackColor = false;
+            this.xrTableCell9.StylePriority.UseBorderColor = false;
+            this.xrTableCell9.StylePriority.UseBorders = false;
+            this.xrTableCell9.StylePriority.UseFont = false;
+            this.xrTableCell9.StylePriority.UsePadding = false;
+            this.xrTableCell9.StylePriority.UseTextAlignment = false;
+            this.xrTableCell9.Text = "Restforderung:";
+            this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell9.Weight = 1.4754431287218743D;
+            // 
+            // xrTableCell16
+            // 
+            this.xrTableCell16.BackColor = System.Drawing.Color.Gainsboro;
+            this.xrTableCell16.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell16.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell16.Font = new System.Drawing.Font("Arial", 8F);
+            this.xrTableCell16.Name = "xrTableCell16";
+            this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell16.StylePriority.UseBackColor = false;
+            this.xrTableCell16.StylePriority.UseBorderColor = false;
+            this.xrTableCell16.StylePriority.UseBorders = false;
+            this.xrTableCell16.StylePriority.UseFont = false;
+            this.xrTableCell16.StylePriority.UsePadding = false;
+            this.xrTableCell16.StylePriority.UseTextAlignment = false;
+            this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell16.Weight = 0.34471884552843379D;
+            // 
+            // xrTableCell29
+            // 
+            this.xrTableCell29.BackColor = System.Drawing.Color.Gainsboro;
+            this.xrTableCell29.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell29.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell29.Font = new System.Drawing.Font("Arial", 8F);
+            this.xrTableCell29.Name = "xrTableCell29";
+            this.xrTableCell29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell29.StylePriority.UseBackColor = false;
+            this.xrTableCell29.StylePriority.UseBorderColor = false;
+            this.xrTableCell29.StylePriority.UseBorders = false;
+            this.xrTableCell29.StylePriority.UseFont = false;
+            this.xrTableCell29.StylePriority.UsePadding = false;
+            this.xrTableCell29.StylePriority.UseTextAlignment = false;
+            this.xrTableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell29.Weight = 0.3883181601555652D;
+            // 
+            // 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.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "NetClaim")});
+            this.xrTableCell33.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            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.UseFont = false;
+            this.xrTableCell33.StylePriority.UsePadding = false;
+            this.xrTableCell33.StylePriority.UseTextAlignment = false;
+            this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell33.Weight = 0.56166837283914706D;
+            // 
             // xrLabel11
             // 
             this.xrLabel11.BackColor = System.Drawing.Color.Transparent;
             this.xrLabel11.CanShrink = true;
             this.xrLabel11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "NetClaim")});
-            this.xrLabel11.Font = new System.Drawing.Font("Arial", 8.25F);
-            this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(332.9583F, 86.66668F);
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Notice")});
+            this.xrLabel11.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 362.7083F);
             this.xrLabel11.Name = "xrLabel11";
             this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel11.SizeF = new System.Drawing.SizeF(77.66132F, 20F);
+            this.xrLabel11.SizeF = new System.Drawing.SizeF(625.1302F, 20F);
             this.xrLabel11.StylePriority.UseBackColor = false;
             this.xrLabel11.StylePriority.UseFont = false;
             this.xrLabel11.Text = "ohne Abzug";
@@ -929,8 +1098,7 @@ namespace LebenshilfeBadKreuznach
             // 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.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell40.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.ServiceDescription")});
             this.xrTableCell40.Font = new System.Drawing.Font("Arial", 8F);
@@ -948,8 +1116,7 @@ namespace LebenshilfeBadKreuznach
             // 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.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell42.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.Duration")});
             this.xrTableCell42.Font = new System.Drawing.Font("Arial", 8F);
@@ -966,8 +1133,7 @@ namespace LebenshilfeBadKreuznach
             // 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.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell44.Font = new System.Drawing.Font("Arial", 8F);
             this.xrTableCell44.Name = "xrTableCell44";
             this.xrTableCell44.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
@@ -983,8 +1149,7 @@ namespace LebenshilfeBadKreuznach
             // 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.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell45.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.HourlyRate", "{0:0.00} €")});
             this.xrTableCell45.Font = new System.Drawing.Font("Arial", 8F);
@@ -1021,184 +1186,6 @@ namespace LebenshilfeBadKreuznach
             // 
             this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
             // 
-            // xrTableRow2
-            // 
-            this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell4,
-            this.xrTableCell6,
-            this.xrTableCell7,
-            this.xrTableCell8});
-            this.xrTableRow2.Name = "xrTableRow2";
-            this.xrTableRow2.Weight = 0.64D;
-            // 
-            // xrTableCell4
-            // 
-            this.xrTableCell4.BackColor = System.Drawing.Color.Transparent;
-            this.xrTableCell4.BorderColor = System.Drawing.Color.DarkGray;
-            this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
-            | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell4.Font = new System.Drawing.Font("Arial", 8F);
-            this.xrTableCell4.Name = "xrTableCell4";
-            this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
-            this.xrTableCell4.StylePriority.UseBackColor = false;
-            this.xrTableCell4.StylePriority.UseBorderColor = false;
-            this.xrTableCell4.StylePriority.UseBorders = false;
-            this.xrTableCell4.StylePriority.UseFont = false;
-            this.xrTableCell4.StylePriority.UsePadding = false;
-            this.xrTableCell4.StylePriority.UseTextAlignment = false;
-            this.xrTableCell4.Text = "abzüglich der geleisteten Abschlagszahlungen:";
-            this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            this.xrTableCell4.Weight = 1.4754431287218743D;
-            // 
-            // xrTableCell6
-            // 
-            this.xrTableCell6.BackColor = System.Drawing.Color.Transparent;
-            this.xrTableCell6.BorderColor = System.Drawing.Color.DarkGray;
-            this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
-            | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell6.Font = new System.Drawing.Font("Arial", 8F);
-            this.xrTableCell6.Name = "xrTableCell6";
-            this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
-            this.xrTableCell6.StylePriority.UseBackColor = false;
-            this.xrTableCell6.StylePriority.UseBorderColor = false;
-            this.xrTableCell6.StylePriority.UseBorders = false;
-            this.xrTableCell6.StylePriority.UseFont = false;
-            this.xrTableCell6.StylePriority.UsePadding = false;
-            this.xrTableCell6.StylePriority.UseTextAlignment = false;
-            this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            this.xrTableCell6.Weight = 0.34529642562207463D;
-            // 
-            // xrTableCell8
-            // 
-            this.xrTableCell8.BackColor = System.Drawing.Color.Transparent;
-            this.xrTableCell8.BorderColor = System.Drawing.Color.DarkGray;
-            this.xrTableCell8.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
-            | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "AmountAdvancedPayments")});
-            this.xrTableCell8.Font = new System.Drawing.Font("Arial", 8F);
-            this.xrTableCell8.Name = "xrTableCell8";
-            this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
-            this.xrTableCell8.StylePriority.UseBackColor = false;
-            this.xrTableCell8.StylePriority.UseBorderColor = false;
-            this.xrTableCell8.StylePriority.UseBorders = false;
-            this.xrTableCell8.StylePriority.UseFont = false;
-            this.xrTableCell8.StylePriority.UsePadding = false;
-            this.xrTableCell8.StylePriority.UseTextAlignment = false;
-            this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
-            this.xrTableCell8.Weight = 0.56166837283914706D;
-            // 
-            // xrTableRow10
-            // 
-            this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell9,
-            this.xrTableCell16,
-            this.xrTableCell29,
-            this.xrTableCell33});
-            this.xrTableRow10.Name = "xrTableRow10";
-            this.xrTableRow10.Weight = 0.64D;
-            // 
-            // xrTableCell9
-            // 
-            this.xrTableCell9.BackColor = System.Drawing.Color.Gainsboro;
-            this.xrTableCell9.BorderColor = System.Drawing.Color.DarkGray;
-            this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
-            | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell9.Font = new System.Drawing.Font("Arial", 8F);
-            this.xrTableCell9.Name = "xrTableCell9";
-            this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
-            this.xrTableCell9.StylePriority.UseBackColor = false;
-            this.xrTableCell9.StylePriority.UseBorderColor = false;
-            this.xrTableCell9.StylePriority.UseBorders = false;
-            this.xrTableCell9.StylePriority.UseFont = false;
-            this.xrTableCell9.StylePriority.UsePadding = false;
-            this.xrTableCell9.StylePriority.UseTextAlignment = false;
-            this.xrTableCell9.Text = "Restforderung:";
-            this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            this.xrTableCell9.Weight = 1.4754431287218743D;
-            // 
-            // xrTableCell16
-            // 
-            this.xrTableCell16.BackColor = System.Drawing.Color.Gainsboro;
-            this.xrTableCell16.BorderColor = System.Drawing.Color.DarkGray;
-            this.xrTableCell16.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
-            | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell16.Font = new System.Drawing.Font("Arial", 8F);
-            this.xrTableCell16.Name = "xrTableCell16";
-            this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
-            this.xrTableCell16.StylePriority.UseBackColor = false;
-            this.xrTableCell16.StylePriority.UseBorderColor = false;
-            this.xrTableCell16.StylePriority.UseBorders = false;
-            this.xrTableCell16.StylePriority.UseFont = false;
-            this.xrTableCell16.StylePriority.UsePadding = false;
-            this.xrTableCell16.StylePriority.UseTextAlignment = false;
-            this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            this.xrTableCell16.Weight = 0.34529642562207463D;
-            // 
-            // xrTableCell29
-            // 
-            this.xrTableCell29.BackColor = System.Drawing.Color.Gainsboro;
-            this.xrTableCell29.BorderColor = System.Drawing.Color.DarkGray;
-            this.xrTableCell29.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
-            | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell29.Font = new System.Drawing.Font("Arial", 8F);
-            this.xrTableCell29.Name = "xrTableCell29";
-            this.xrTableCell29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
-            this.xrTableCell29.StylePriority.UseBackColor = false;
-            this.xrTableCell29.StylePriority.UseBorderColor = false;
-            this.xrTableCell29.StylePriority.UseBorders = false;
-            this.xrTableCell29.StylePriority.UseFont = false;
-            this.xrTableCell29.StylePriority.UsePadding = false;
-            this.xrTableCell29.StylePriority.UseTextAlignment = false;
-            this.xrTableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
-            this.xrTableCell29.Weight = 0.38774058006192436D;
-            // 
-            // 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.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "NetClaim")});
-            this.xrTableCell33.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            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.UseFont = false;
-            this.xrTableCell33.StylePriority.UsePadding = false;
-            this.xrTableCell33.StylePriority.UseTextAlignment = false;
-            this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
-            this.xrTableCell33.Weight = 0.56166837283914706D;
-            // 
-            // xrTableCell7
-            // 
-            this.xrTableCell7.BackColor = System.Drawing.Color.Transparent;
-            this.xrTableCell7.BorderColor = System.Drawing.Color.DarkGray;
-            this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
-            | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell7.Font = new System.Drawing.Font("Arial", 8F);
-            this.xrTableCell7.Name = "xrTableCell7";
-            this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
-            this.xrTableCell7.StylePriority.UseBackColor = false;
-            this.xrTableCell7.StylePriority.UseBorderColor = false;
-            this.xrTableCell7.StylePriority.UseBorders = false;
-            this.xrTableCell7.StylePriority.UseFont = false;
-            this.xrTableCell7.StylePriority.UsePadding = false;
-            this.xrTableCell7.StylePriority.UseTextAlignment = false;
-            this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
-            this.xrTableCell7.Weight = 0.38774058006192436D;
-            // 
             // Rechnung
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {

ReportImp/LebenshilfeBadKreuznach/Statistics/CustomServiceRecordStatisticFactory.cs

@@ -138,7 +138,7 @@ namespace LebenshilfeBadKreuznach.Statistics
         }
 
 
-        protected override void ProcessServiceRecord(ServiceRecord sr, CostBearer2SupportConcept cb2sc, SupportConceptStatisticsDC stats, DateTime statisticsDate, Calculations calc)
+        protected override void ProcessServiceRecord(ServiceRecord sr, CostBearer2SupportConcept cb2sc, SupportConceptStatisticsDC stats, DateTime statisticsDate, BS.Shared.Services.Calculations calc)
         {
             SupportConceptPeriodStatisticsDC periodStats = GetPeriodDCFromServiceRecord(stats.PeriodStatistics, sr);
 

ReportImp/LebenshilfeFrankfurtOder/CustomReportCreator.cs

@@ -589,8 +589,8 @@ namespace LebenshilfeFrankfurtOder
 	            else
 	            {
 #if DEBUG
-					//reallyNewInvoices = invoices;
-					reallyNewInvoices = GetNewInvoices(invoices, start, start.AddMonths(1).AddTicks(-1));
+					reallyNewInvoices = invoices;
+					//reallyNewInvoices = GetNewInvoices(invoices, start, start.AddMonths(1).AddTicks(-1));
 #else
 					reallyNewInvoices = GetNewInvoices(invoices, start, start.AddMonths(1).AddTicks(-1));
 #endif

ReportImp/LebenshilfeFrankfurtOder/Invoicing/FudInvoiceCreation.cs

@@ -44,7 +44,15 @@ namespace LebenshilfeFrankfurtOder.Invoicing
             var invoiceCounter = 0;
 
             //var sortedScs = supportConcepts2ServiceRecords.Keys.OrderBy(s => !String.IsNullOrEmpty(s.Customer.DebitorNumber) ? s.Customer.DebitorNumber : "zzzzz").ToList();
-            var sortedScs = supportConcepts2ServiceRecords.Keys.OrderBy(s => s.Customer.LastNameFirstName).ToList();
+            var sortedScs = supportConcepts2ServiceRecords.Keys.OrderBy(s =>
+            {
+                String name = s.Customer.LastNameFirstName;
+                if (s.CostBearerList.Count > 0)
+                {
+                    name = String.Format("{0} {1}", s.CostBearerList[0].OrganisationName, name);
+                }
+                return name;
+            }).ToList();
 
 
             foreach (var sc in sortedScs)

ReportImp/MobileEV/Sammelrechnung.Designer.cs

@@ -126,7 +126,7 @@ namespace MobileEV
             this.lblKategorie4 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.lblSumBAufwand = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell();
             this.lblSummeGelFLS4 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -942,7 +942,7 @@ namespace MobileEV
             // 
             this.lblKategorie1.BorderColor = System.Drawing.Color.DarkGray;
             this.lblKategorie1.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.lblKategorie1.Font = new System.Drawing.Font("Arial", 10F);
+            this.lblKategorie1.Font = new System.Drawing.Font("Calibri", 10.5F);
             this.lblKategorie1.Name = "lblKategorie1";
             this.lblKategorie1.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 0, 2, 0, 100F);
             this.lblKategorie1.StylePriority.UseBorderColor = false;
@@ -989,7 +989,7 @@ namespace MobileEV
             // 
             this.xrTableCellwf.BorderColor = System.Drawing.Color.DarkGray;
             this.xrTableCellwf.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCellwf.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrTableCellwf.Font = new System.Drawing.Font("Calibri", 10.5F);
             this.xrTableCellwf.Name = "xrTableCellwf";
             this.xrTableCellwf.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 0, 2, 0, 100F);
             this.xrTableCellwf.StylePriority.UseBorderColor = false;
@@ -1019,7 +1019,7 @@ namespace MobileEV
             // 
             this.lblSummeGelFLS1.BorderColor = System.Drawing.Color.DarkGray;
             this.lblSummeGelFLS1.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.lblSummeGelFLS1.Font = new System.Drawing.Font("Arial", 10F);
+            this.lblSummeGelFLS1.Font = new System.Drawing.Font("Calibri", 10.5F);
             this.lblSummeGelFLS1.Name = "lblSummeGelFLS1";
             this.lblSummeGelFLS1.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 0, 2, 0, 100F);
             this.lblSummeGelFLS1.StylePriority.UseBorderColor = false;
@@ -1034,7 +1034,7 @@ namespace MobileEV
             // 
             this.xrTableCell41.BorderColor = System.Drawing.Color.DarkGray;
             this.xrTableCell41.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell41.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrTableCell41.Font = new System.Drawing.Font("Calibri", 10.5F);
             this.xrTableCell41.Name = "xrTableCell41";
             this.xrTableCell41.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 0, 2, 0, 100F);
             this.xrTableCell41.StylePriority.UseBorderColor = false;
@@ -1050,7 +1050,7 @@ namespace MobileEV
             this.lblSumme1.BorderColor = System.Drawing.Color.DarkGray;
             this.lblSumme1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.lblSumme1.Font = new System.Drawing.Font("Arial", 10F);
+            this.lblSumme1.Font = new System.Drawing.Font("Calibri", 10.5F);
             this.lblSumme1.Name = "lblSumme1";
             this.lblSumme1.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 0, 2, 0, 100F);
             this.lblSumme1.StylePriority.UseBorderColor = false;
@@ -1079,7 +1079,7 @@ namespace MobileEV
             // 
             this.lblKategorie2.BorderColor = System.Drawing.Color.DarkGray;
             this.lblKategorie2.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.lblKategorie2.Font = new System.Drawing.Font("Arial", 10F);
+            this.lblKategorie2.Font = new System.Drawing.Font("Calibri", 10.5F);
             this.lblKategorie2.Name = "lblKategorie2";
             this.lblKategorie2.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 0, 2, 0, 100F);
             this.lblKategorie2.StylePriority.UseBorderColor = false;
@@ -1124,7 +1124,7 @@ namespace MobileEV
             // 
             this.xrTableCellwfr.BorderColor = System.Drawing.Color.DarkGray;
             this.xrTableCellwfr.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCellwfr.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrTableCellwfr.Font = new System.Drawing.Font("Calibri", 10.5F);
             this.xrTableCellwfr.Name = "xrTableCellwfr";
             this.xrTableCellwfr.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 0, 2, 0, 100F);
             this.xrTableCellwfr.StylePriority.UseBorderColor = false;
@@ -1154,7 +1154,7 @@ namespace MobileEV
             // 
             this.lblSummeGelFLS2.BorderColor = System.Drawing.Color.DarkGray;
             this.lblSummeGelFLS2.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.lblSummeGelFLS2.Font = new System.Drawing.Font("Arial", 10F);
+            this.lblSummeGelFLS2.Font = new System.Drawing.Font("Calibri", 10.5F);
             this.lblSummeGelFLS2.Name = "lblSummeGelFLS2";
             this.lblSummeGelFLS2.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 0, 2, 0, 100F);
             this.lblSummeGelFLS2.StylePriority.UseBorderColor = false;
@@ -1169,7 +1169,7 @@ namespace MobileEV
             // 
             this.xrTableCell42.BorderColor = System.Drawing.Color.DarkGray;
             this.xrTableCell42.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell42.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrTableCell42.Font = new System.Drawing.Font("Calibri", 10.5F);
             this.xrTableCell42.Name = "xrTableCell42";
             this.xrTableCell42.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 0, 2, 0, 100F);
             this.xrTableCell42.StylePriority.UseBorderColor = false;
@@ -1185,7 +1185,7 @@ namespace MobileEV
             this.lblSumme2.BorderColor = System.Drawing.Color.DarkGray;
             this.lblSumme2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.lblSumme2.Font = new System.Drawing.Font("Arial", 10F);
+            this.lblSumme2.Font = new System.Drawing.Font("Calibri", 10.5F);
             this.lblSumme2.Name = "lblSumme2";
             this.lblSumme2.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 0, 2, 0, 100F);
             this.lblSumme2.StylePriority.UseBorderColor = false;
@@ -1289,7 +1289,7 @@ namespace MobileEV
             // 
             this.lblSummeGelFLS3.BorderColor = System.Drawing.Color.DarkGray;
             this.lblSummeGelFLS3.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.lblSummeGelFLS3.Font = new System.Drawing.Font("Arial", 10F);
+            this.lblSummeGelFLS3.Font = new System.Drawing.Font("Calibri", 10.5F);
             this.lblSummeGelFLS3.Name = "lblSummeGelFLS3";
             this.lblSummeGelFLS3.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 0, 2, 0, 100F);
             this.lblSummeGelFLS3.StylePriority.UseBorderColor = false;
@@ -1320,7 +1320,7 @@ namespace MobileEV
             this.lblSumme3.BorderColor = System.Drawing.Color.DarkGray;
             this.lblSumme3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.lblSumme3.Font = new System.Drawing.Font("Arial", 10F);
+            this.lblSumme3.Font = new System.Drawing.Font("Calibri", 10.5F);
             this.lblSumme3.Name = "lblSumme3";
             this.lblSumme3.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 0, 2, 0, 100F);
             this.lblSumme3.StylePriority.UseBorderColor = false;
@@ -1337,7 +1337,7 @@ namespace MobileEV
             this.lblKategorie4,
             this.xrTableCell28,
             this.xrTableCell29,
-            this.xrTableCell30,
+            this.lblSumBAufwand,
             this.xrTableCell39,
             this.lblSummeGelFLS4,
             this.xrTableCell48,
@@ -1349,7 +1349,7 @@ namespace MobileEV
             // 
             this.lblKategorie4.BorderColor = System.Drawing.Color.DarkGray;
             this.lblKategorie4.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.lblKategorie4.Font = new System.Drawing.Font("Arial", 10F);
+            this.lblKategorie4.Font = new System.Drawing.Font("Calibri", 10.5F);
             this.lblKategorie4.Name = "lblKategorie4";
             this.lblKategorie4.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 0, 2, 0, 100F);
             this.lblKategorie4.StylePriority.UseBorderColor = false;
@@ -1391,20 +1391,20 @@ namespace MobileEV
             this.xrTableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
             this.xrTableCell29.Weight = 0.076656504057011743D;
             // 
-            // xrTableCell30
+            // lblSumBAufwand
             // 
-            this.xrTableCell30.BorderColor = System.Drawing.Color.DarkGray;
-            this.xrTableCell30.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell30.Font = new System.Drawing.Font("Arial", 10F);
-            this.xrTableCell30.Name = "xrTableCell30";
-            this.xrTableCell30.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 0, 2, 0, 100F);
-            this.xrTableCell30.StylePriority.UseBorderColor = false;
-            this.xrTableCell30.StylePriority.UseBorders = false;
-            this.xrTableCell30.StylePriority.UseFont = false;
-            this.xrTableCell30.StylePriority.UsePadding = false;
-            this.xrTableCell30.StylePriority.UseTextAlignment = false;
-            this.xrTableCell30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            this.xrTableCell30.Weight = 0.076656498710081483D;
+            this.lblSumBAufwand.BorderColor = System.Drawing.Color.DarkGray;
+            this.lblSumBAufwand.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.lblSumBAufwand.Font = new System.Drawing.Font("Calibri", 10.5F);
+            this.lblSumBAufwand.Name = "lblSumBAufwand";
+            this.lblSumBAufwand.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 0, 2, 0, 100F);
+            this.lblSumBAufwand.StylePriority.UseBorderColor = false;
+            this.lblSumBAufwand.StylePriority.UseBorders = false;
+            this.lblSumBAufwand.StylePriority.UseFont = false;
+            this.lblSumBAufwand.StylePriority.UsePadding = false;
+            this.lblSumBAufwand.StylePriority.UseTextAlignment = false;
+            this.lblSumBAufwand.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.lblSumBAufwand.Weight = 0.076656498710081483D;
             // 
             // xrTableCell39
             // 
@@ -1425,7 +1425,7 @@ namespace MobileEV
             // 
             this.lblSummeGelFLS4.BorderColor = System.Drawing.Color.DarkGray;
             this.lblSummeGelFLS4.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.lblSummeGelFLS4.Font = new System.Drawing.Font("Arial", 10F);
+            this.lblSummeGelFLS4.Font = new System.Drawing.Font("Calibri", 10.5F);
             this.lblSummeGelFLS4.Name = "lblSummeGelFLS4";
             this.lblSummeGelFLS4.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 0, 2, 0, 100F);
             this.lblSummeGelFLS4.StylePriority.UseBorderColor = false;
@@ -1440,7 +1440,7 @@ namespace MobileEV
             // 
             this.xrTableCell48.BorderColor = System.Drawing.Color.DarkGray;
             this.xrTableCell48.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell48.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrTableCell48.Font = new System.Drawing.Font("Calibri", 10.5F);
             this.xrTableCell48.Name = "xrTableCell48";
             this.xrTableCell48.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 0, 2, 0, 100F);
             this.xrTableCell48.StylePriority.UseBorderColor = false;
@@ -1456,7 +1456,7 @@ namespace MobileEV
             this.lblSumme4.BorderColor = System.Drawing.Color.DarkGray;
             this.lblSumme4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.lblSumme4.Font = new System.Drawing.Font("Arial", 10F);
+            this.lblSumme4.Font = new System.Drawing.Font("Calibri", 10.5F);
             this.lblSumme4.Name = "lblSumme4";
             this.lblSumme4.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 0, 2, 0, 100F);
             this.lblSumme4.StylePriority.UseBorderColor = false;
@@ -1614,7 +1614,7 @@ namespace MobileEV
         private DevExpress.XtraReports.UI.XRTableCell lblKategorie4;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell28;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell29;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell30;
+        private DevExpress.XtraReports.UI.XRTableCell lblSumBAufwand;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell39;
         private DevExpress.XtraReports.UI.XRTableCell lblSummeGelFLS4;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell48;

ReportImp/MobileEV/Sammelrechnung.cs

@@ -5,6 +5,7 @@ using DevExpress.XtraReports.UI;
 using BS.Shared.Core;
 using System.Collections.Generic;
 using System.Linq;
+using BS.Shared.Extensions;
 
 namespace MobileEV
 {
@@ -33,6 +34,8 @@ namespace MobileEV
             Dictionary<string, decimal> kategorieZuKosten = new Dictionary<string, decimal>();
             var stundenGesamt = 0.0m;
             var betragGeamt = 0.0m;
+            decimal betrag = 0;
+            decimal bAufwand = 0;
 
             foreach (var ip in pRO.ServiceInvoicePeriods)
             {
@@ -46,15 +49,25 @@ namespace MobileEV
                         kategorieZuKosten.Add(item.ServiceRecord.ServiceDescription.CategoryName, 0m);
 
                     kategorieZuStunden[item.ServiceRecord.ServiceDescription.CategoryName] += item.Hours.Value;
-                    kategorieZuKosten[item.ServiceRecord.ServiceDescription.CategoryName] += item.AmountPerUnit.Value * item.UnitCount.Value;
-
+                    betrag = GetGrossAmount(item);
+                    if (betrag != 0)
+                    {
+                        kategorieZuKosten[item.ServiceRecord.ServiceDescription.CategoryName] += betrag;
+                        betragGeamt += betrag;
+                    }
+                    else
+                    {
+                        kategorieZuKosten[item.ServiceRecord.ServiceDescription.CategoryName] += Math.Round(item.AmountPerUnit.Value * item.UnitCount.Value, 2, MidpointRounding.AwayFromZero);
+                        betrag += Math.Round(item.AmountPerUnit.Value * item.UnitCount.Value, 2, MidpointRounding.AwayFromZero);
+                    }
                     stundenGesamt += item.Hours.Value;
-                    betragGeamt += item.AmountPerUnit.Value * item.UnitCount.Value;
+                    bAufwand += GetBetreuungsaufwand(item);
                 }
             }
 
             lblSumme4.Text = string.Format("{0:c}", betragGeamt);
             lblSummeGelFLS4.Text = string.Format("{0:0.00}", stundenGesamt);
+            lblSumBAufwand.Text = string.Format("{0:c}", bAufwand);
             if (kategorieZuStunden.Count >= 1)
             {
                 lblKategorie1.Text = kategorieZuStunden.ElementAt(0).Key;
@@ -77,5 +90,39 @@ namespace MobileEV
 
             this.bindingSource1.DataSource = pRO;
         }
+
+        private decimal GetGrossAmount(ServiceInvoiceItemRO ii)
+        {
+            decimal amount = 0;
+
+            if (Decimal.TryParse(ii.GrossAmount.Replace("€", ""), out amount))
+            {
+                return amount;
+            }
+
+            return 0;
+        }
+
+        private decimal GetBetreuungsaufwand(ServiceInvoiceItemRO ii)
+        {
+            decimal amount = 0;
+            if (ii.ServiceRecord != null && !ii.ServiceRecord.Notice3.IsNullOrEmpty())
+            {
+                ii.ServiceRecord.Notice3 = ii.ServiceRecord.Notice3.Trim();
+                if (ii.ServiceRecord.Notice3.Contains("€"))
+                {
+                    if (Decimal.TryParse(ii.ServiceRecord.Notice3.Replace("€", ""), out amount))
+                    {
+                        return amount;
+                    }
+                }
+                else if (Decimal.TryParse(ii.ServiceRecord.Notice3, out amount))
+                {
+                    return amount;
+                }
+            }
+
+            return 0;
+        }
     }
 }

ReportImp/MobileEV/SettlementReport2.cs

@@ -1,51 +1,51 @@
-using System;
-using System.Drawing;
-using System.Collections;
-using System.ComponentModel;
-using DevExpress.XtraReports.UI;
-using BeWo.Report.ReportObjects;
-using BeWo.Report;
+using System;
+using System.Drawing;
+using System.Collections;
+using System.ComponentModel;
+using DevExpress.XtraReports.UI;
+using BeWo.Report.ReportObjects;
+using BeWo.Report;
 using BS.Shared.Extensions;
 using System.Text.RegularExpressions;
 
-namespace MobileEV.Alt
-{
-    public partial class Spitzabrechnung : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<Settlement2RO>
-    {
-        public Spitzabrechnung()
-        {
-            InitializeComponent();
-        }
-
-        public void SetReportDataSource(Settlement2RO pRO)
-        {
-			if (String.IsNullOrEmpty(pRO.Notice))
-			{
-				lblNotice.Visible = false;
-			}
-
-			decimal rateFactor = 1;
-
-			foreach (var ii in pRO.InvoiceItems)
-			{
-				if (ii.RateFactor.HasValue)
-				{
-					rateFactor = (100 + ii.RateFactor.Value) / 100;
-				}
-
+namespace MobileEV.Alt
+{
+    public partial class Spitzabrechnung : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<Settlement2RO>
+    {
+        public Spitzabrechnung()
+        {
+            InitializeComponent();
+        }
+
+        public void SetReportDataSource(Settlement2RO pRO)
+        {
+			if (String.IsNullOrEmpty(pRO.Notice))
+			{
+				lblNotice.Visible = false;
+			}
+
+			decimal rateFactor = 1;
+
+			foreach (var ii in pRO.InvoiceItems)
+			{
+				if (ii.RateFactor.HasValue)
+				{
+					rateFactor = (100 + ii.RateFactor.Value) / 100;
+				}
+
 				if (!pRO.FehlkontakteString.IsNullOrEmpty() && ii.RateFactor == 0)
 				{
-					Zwischensumme.Visible = true;
-					if (!ii.ItemDescription.IsNullOrEmpty())
-					{
-						ii.DetailDescription = Regex.Replace(ii.DetailDescription, ii.ItemDescription, "Fehlkontakte");
-					}
-					ii.ItemDescription = "Fehlkontakte";
-				}
-			}
-			pRO.RateFactor = (double)rateFactor;
-
-            this.bindingSource1.DataSource = pRO;
-        }
-    }
-}
+					Zwischensumme.Visible = true;
+					if (!ii.ItemDescription.IsNullOrEmpty())
+					{
+						ii.DetailDescription = Regex.Replace(ii.DetailDescription, ii.ItemDescription, "Fehlkontakte");
+					}
+					ii.ItemDescription = "Fehlkontakte";
+				}
+			}
+			pRO.RateFactor = (double)rateFactor;
+
+            this.bindingSource1.DataSource = pRO;
+        }
+    }
+}

ReportImp/MobileEV/Taetigkeitsnachweis.Designer.cs

@@ -41,8 +41,8 @@ namespace MobileEV
             this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell();
             this.picSignature = new DevExpress.XtraReports.UI.XRPictureBox();
+            this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell();
             this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
             this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
             this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -241,6 +241,18 @@ namespace MobileEV
             this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
             this.xrTableCell15.Weight = 0.2382376505443205D;
             // 
+            // picSignature
+            // 
+            this.picSignature.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.picSignature.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Tag", null, "Services.Signature")});
+            this.picSignature.LocationFloat = new DevExpress.Utils.PointFloat(37.22203F, 3.178914E-05F);
+            this.picSignature.Name = "picSignature";
+            this.picSignature.SizeF = new System.Drawing.SizeF(407.0374F, 36.66667F);
+            this.picSignature.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
+            this.picSignature.StylePriority.UseBorders = false;
+            this.picSignature.BeforePrint += new System.Drawing.Printing.PrintEventHandler(this.picSignature_BeforePrint);
+            // 
             // xrTableCell39
             // 
             this.xrTableCell39.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
@@ -254,18 +266,6 @@ namespace MobileEV
             this.xrTableCell39.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
             this.xrTableCell39.Weight = 0.2382376505443205D;
             // 
-            // picSignature
-            // 
-            this.picSignature.Borders = DevExpress.XtraPrinting.BorderSide.None;
-            this.picSignature.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Tag", null, "Services.Signature")});
-            this.picSignature.LocationFloat = new DevExpress.Utils.PointFloat(37.22203F, 3.178914E-05F);
-            this.picSignature.Name = "picSignature";
-            this.picSignature.SizeF = new System.Drawing.SizeF(183.079F, 36.66667F);
-            this.picSignature.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
-            this.picSignature.StylePriority.UseBorders = false;
-            this.picSignature.BeforePrint += new System.Drawing.Printing.PrintEventHandler(this.picSignature_BeforePrint);
-            // 
             // GroupHeader1
             // 
             this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -698,9 +698,10 @@ namespace MobileEV
             // 
             this.xrPictureBox1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Image", null, "EmployeeSignature")});
-            this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 85.00183F);
+            this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(9.536743E-05F, 85.00182F);
             this.xrPictureBox1.Name = "xrPictureBox1";
-            this.xrPictureBox1.SizeF = new System.Drawing.SizeF(271.8472F, 37.2544F);
+            this.xrPictureBox1.SizeF = new System.Drawing.SizeF(271.8471F, 37.25439F);
+            this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
             // 
             // xrTable3
             // 

ReportImp/PZDDuesseldorf/CustomMitarbeiterstundenkontoBerechnung.cs

@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.Remoting.Metadata.W3cXsd2001;
+using BeWo.Data.Entities;
+using BeWo.Report.ReportObjects;
+
+
+namespace PZDDuesseldorf
+{
+	public class CustomMitarbeiterstundenkontoBerechnung : MitarbeiterstundenkontoBerechnung
+	{
+		public override bool ShouldCreateDayDetails()
+		{
+			return true;
+		}
+
+        public override void HandleServiceRecord(MitarbeiterstundenkontoRO.EmployeeDetail emp, ServiceRecord item)
+        {
+            if (item.ServiceDescription != null && item.ServiceDescription.ServiceCategory != null)
+            {
+                decimal totalDuration = 0;
+                decimal duration = 0;
+                String cat = item.ServiceDescription.ServiceCategory.Name.ToLower();
+                String kurz = item.ServiceDescription.ServiceCategory.Abbreviation.ToLower();
+
+                if (item.GroupRoundedDuration.HasValue)
+                {
+                    duration = item.GroupRoundedDuration.Value;
+                }
+                else
+                {
+                    duration = item.RoundedDuration;
+                }
+                totalDuration += duration; 
+
+                if (item.ServiceDescription.ServiceCategory.IsBillable && (cat.StartsWith("fachleistung") || kurz == "fl"))
+                {
+                    emp.Custom1 += duration / 60;
+                }
+                else if (item.ServiceDescription.ServiceCategory.IsBillable && (cat.StartsWith("assistenz") || kurz == "as"))
+                {
+                    emp.Custom2 += duration / 60;
+                }
+                else if (item.ServiceDescription.ServiceCategory.IsBillable && (cat.StartsWith("arbeitszeit") || kurz == "az"))
+                {
+                    emp.Custom3 += duration / 60;
+                }
+
+                emp.Custom1 = Math.Round(emp.Custom1 / totalDuration, 2);
+                emp.Custom2 = Math.Round(emp.Custom2 / totalDuration, 2);
+                emp.Custom3 = Math.Round(emp.Custom3 / totalDuration, 2);
+            }
+        }
+
+        //public override MitarbeiterstundenkontoRO.DayDetail CreateDayDetail(DateTime date, MitarbeiterstundenkontoRO.EmployeeDetail ed)
+        //{
+        //	var dd = base.CreateDayDetail(date, ed);
+        //	dd.BreakMinutes2 = 15;
+        //	dd.MaxHoursUntilBreak2 = 9;
+
+        //	return dd;
+        //}
+    }
+}

ReportImp/PZDDuesseldorf/CustomMitarbeiterstundenkontoBerechnungMonate.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows.Forms;
+using BeWo.Report;
+using BeWo.Data.Entities;
+using BeWo.Report.ReportObjects;
+
+
+namespace PZDDuesseldorf
+{
+    public class CustomMitarbeiterstundenkontoBerechnungMonate : MitarbeiterstundenkontoBerechnungMonate
+    {
+        
+        public override MitarbeiterstundenkontoBerechnung CreateMitarbeiterstundenkontoBerechnung()
+        {
+            return new CustomMitarbeiterstundenkontoBerechnung();
+        }
+    }
+}