From 3f07527f8d2f0f8fb4cad267e364f0ec52807aec Mon Sep 17 00:00:00 2001
From: Alexandra <alexandra.becker@ownsoft.de>
Date: Wed, 18 Oct 2023 10:54:53 +0200
Subject: [PATCH] Finanzauswertung auf Leistungskategorie

---
 .../Report/Finance/FinanceOverviewView.xaml   |   6 +-
 .../Finance/FinanceOverviewView.xaml.cs       |   4 +
 Host/ReportView.aspx.cs                       |  13 +-
 Report/AbstractReportCreator.cs               |   2 +-
 Report/DefaultReportCreator.cs                |   4 +-
 Report/DefaultReports/Finanzauswertung.cs     |  36 +-
 .../Finanzauswertung.designer.cs              | 738 ++++++++++++------
 Report/ReportObjects/FinanceRO.cs             | 135 ++--
 .../AnalysisServiceImp.cs                     |  16 +-
 9 files changed, 664 insertions(+), 290 deletions(-)

diff --git a/BeWo/View/Report/Finance/FinanceOverviewView.xaml b/BeWo/View/Report/Finance/FinanceOverviewView.xaml
index 8c0a3b7be..d0f3e8dd3 100644
--- a/BeWo/View/Report/Finance/FinanceOverviewView.xaml
+++ b/BeWo/View/Report/Finance/FinanceOverviewView.xaml
@@ -22,7 +22,8 @@
 						<ColumnDefinition Width="Auto"/>
 						<ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="Auto"/>
-					</Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                    </Grid.ColumnDefinitions>
 					<Grid.RowDefinitions>
 						<RowDefinition Height="Auto" />
 					</Grid.RowDefinitions>
@@ -34,7 +35,8 @@
 					<dxe:DateEdit MaskType="DateTimeAdvancingCaret" Grid.Column="3" x:Name="datePickerEndDate" HorizontalAlignment="Left" Width="120" Margin="3,0,0,0" />
 					<Button Content="Aktualisieren" Grid.Column="4" Margin="5,0,0,0" x:Name="buttonRefresh" Click="buttonRefresh_Click" />
                     <CheckBox x:Name="checkbox_onlyNotApproved" Grid.Column="5" Grid.Row="4" IsChecked="False" Content="{markup:Translate Nur Hilfepläne ohne Bewilligung}" Margin="10,5,0,0" Grid.ColumnSpan="1" />
-				</Grid>
+                    <CheckBox x:Name="checkbox_splitByServiceCategory" Grid.Column="6" Grid.Row="4" IsChecked="False" Content="{markup:Translate Nach Leistungskategorie trennen}" Margin="10,5,0,0" Grid.ColumnSpan="1" />
+                </Grid>
 				<dxp:DocumentPreviewControl x:Name="docPrevControl" Grid.Row="1" Visibility="Collapsed" CommandBarStyle="Bars">
 					<dxp:DocumentPreviewControl.CommandProvider>
 						<dxp:DocumentCommandProvider>
diff --git a/BeWo/View/Report/Finance/FinanceOverviewView.xaml.cs b/BeWo/View/Report/Finance/FinanceOverviewView.xaml.cs
index 509545430..46b5686e0 100644
--- a/BeWo/View/Report/Finance/FinanceOverviewView.xaml.cs
+++ b/BeWo/View/Report/Finance/FinanceOverviewView.xaml.cs
@@ -23,6 +23,10 @@ namespace BeWo.View.Report.Finance
         {
 
 			var url = string.Format("{0}/ReportView.aspx?type={1}&start={2:ddMMyyyy}&end={3:ddMMyyyy}", BeWoApp.SiteOfOrigin, ReportTypes.FinanceReport, datePickerStartDate.DateTime, datePickerEndDate.DateTime);
+			if (checkbox_splitByServiceCategory.IsChecked == true)
+			{
+				url += "&splitByServiceCategory=1";
+			}
 			if (checkbox_onlyNotApproved.IsChecked == true)
             {
 				url += "&onlyNotApproved=1";
diff --git a/Host/ReportView.aspx.cs b/Host/ReportView.aspx.cs
index f93deea8f..b6c4f15a4 100644
--- a/Host/ReportView.aspx.cs
+++ b/Host/ReportView.aspx.cs
@@ -689,7 +689,18 @@ namespace Host
                     onlyNotApproved = true;
                 }
             }
-            return reportCreator.CreateFinanceReport(start, end, onlyNotApproved);
+            bool splitByServiceCategory = false;
+
+            if (Request.Params["splitByServiceCategory"] != null)
+            {
+                if (Request.Params["splitByServiceCategory"] == "1")
+                {
+                    splitByServiceCategory = true;
+                }
+            }
+
+
+            return reportCreator.CreateFinanceReport(start, end, splitByServiceCategory, onlyNotApproved);
             
         }
 
diff --git a/Report/AbstractReportCreator.cs b/Report/AbstractReportCreator.cs
index 9eb452557..52bb65b18 100644
--- a/Report/AbstractReportCreator.cs
+++ b/Report/AbstractReportCreator.cs
@@ -57,7 +57,7 @@ namespace BeWo.Report
 
 		public abstract XtraReport CreateKalenderReport(long? employeeOid, AppointmentViewType viewType, DateTime rangeStartDate, DateTime rangeEndDate, List<DateTime> datesList, List<UserRightType> userRights);
 
-		public abstract XtraReport CreateFinanceReport(DateTime? start, DateTime? end, bool onlyNotApproved);
+		public abstract XtraReport CreateFinanceReport(DateTime? start, DateTime? end, bool splitByServiceCategory, bool onlyNotApproved);
 
 		public abstract XtraReport CreateJahresberichtReport(int year, long? cbOid, long? teamOid, long? betreuungsartOid);
 
diff --git a/Report/DefaultReportCreator.cs b/Report/DefaultReportCreator.cs
index 7188780d5..d15583a1c 100644
--- a/Report/DefaultReportCreator.cs
+++ b/Report/DefaultReportCreator.cs
@@ -873,11 +873,11 @@ namespace BeWo.Report
         }
 
 
-        public override XtraReport CreateFinanceReport(DateTime? start, DateTime? end, bool onlyNotApproved)
+        public override XtraReport CreateFinanceReport(DateTime? start, DateTime? end, bool splitByServiceCategory, bool onlyNotApproved)
         {
             var report = FindReportImp<FinanceRO>();
 
-            report.SetReportDataSource(FinanceRO.Create(start, end, onlyNotApproved));
+            report.SetReportDataSource(FinanceRO.Create(start, end,splitByServiceCategory, onlyNotApproved));
 
             return report as XtraReport;
         }
diff --git a/Report/DefaultReports/Finanzauswertung.cs b/Report/DefaultReports/Finanzauswertung.cs
index aaed1dc5e..69d751aee 100644
--- a/Report/DefaultReports/Finanzauswertung.cs
+++ b/Report/DefaultReports/Finanzauswertung.cs
@@ -1,4 +1,5 @@
 using System;
+using BeWo.Report;
 using BeWo.Report.ReportObjects;
 
 namespace BeWo.Report.DefaultReports
@@ -13,8 +14,8 @@ namespace BeWo.Report.DefaultReports
 		public void SetReportDataSource(FinanceRO pRO)
         {
             pRO.CalculateBillableAmountInReportTimeSpan();
-			
-            if (pRO.ReportStartDate.HasValue && pRO.ReportEndDate.HasValue)
+
+			if (pRO.ReportStartDate.HasValue && pRO.ReportEndDate.HasValue)
 			{
 				DateTime start = pRO.ReportStartDate.Value;
 				DateTime end = pRO.ReportEndDate.Value;
@@ -26,9 +27,6 @@ namespace BeWo.Report.DefaultReports
 					cellBewilligtImZeitraumHeader.Text = String.Format("bewilligte FLS {0:MMMM}", start);
 					cellGeleistetImZeitraumHeader.Text = String.Format("geleistete Std. {0:MMMM}", start);
 					cellFehlkontakteHeader.Text = String.Format("Fehl-\nkontakte {0:MMMM}", start);
-					
-
-
 				}
 				else
 				{
@@ -36,7 +34,6 @@ namespace BeWo.Report.DefaultReports
 					cellBewilligtImZeitraumHeader.Text = String.Format("bewilligte FLS {0:dd.MM.yyyy}-{1:dd.MM.yyyy}", start, end);
 					cellGeleistetImZeitraumHeader.Text = String.Format("geleistete Std. {0:dd.MM.yyyy}-{1:dd.MM.yyyy}", start, end);
 					//cellFehlkontakteHeader.Text = String.Format("Fehl-\nkontakte {0:dd.MM.yyyy}-{1:dd.MM.yyyy}", start, end);
-
 				}
 				if (pRO.RateFactor.HasValue)
 				{
@@ -46,8 +43,7 @@ namespace BeWo.Report.DefaultReports
 				{
 					//cellRateFactorHeader.Visible = false;
 					//cellRateFactor.Visible = false;
-				}
-				
+				}	
 			}
 			else
 			{
@@ -58,9 +54,25 @@ namespace BeWo.Report.DefaultReports
 				cellRateFactorHeader.Visible = false;
 				cellRateFactor.Visible = false;
 			}
-            this.bindingSource1.DataSource = pRO;
+
+			if (pRO.GruppierungLeistungskategorie && pRO.SupportConceptFinanceList != null)
+			{
+				GroupHeader1.Visible = true;
+				GroupFooter1.Visible = true;
+				foreach (var scRo in pRO.SupportConceptFinanceList)
+				{
+					if (String.IsNullOrEmpty(scRo.Leistungskategorie))
+					{
+						scRo.GruppierungsKategorie = " ";
+					}
+					else
+					{
+						scRo.GruppierungsKategorie = String.Format("Leistungskategorie {0}", scRo.Leistungskategorie);
+					}
+				}
+			}
+
+			this.bindingSource1.DataSource = pRO;
         }
-
-    }
-
+	}
 }
diff --git a/Report/DefaultReports/Finanzauswertung.designer.cs b/Report/DefaultReports/Finanzauswertung.designer.cs
index b891aa60d..1716c3254 100644
--- a/Report/DefaultReports/Finanzauswertung.designer.cs
+++ b/Report/DefaultReports/Finanzauswertung.designer.cs
@@ -38,8 +38,18 @@ namespace BeWo.Report.DefaultReports
             DevExpress.XtraReports.UI.XRSummary xrSummary6 = new DevExpress.XtraReports.UI.XRSummary();
             DevExpress.XtraReports.UI.XRSummary xrSummary7 = new DevExpress.XtraReports.UI.XRSummary();
             DevExpress.XtraReports.UI.XRSummary xrSummary8 = new DevExpress.XtraReports.UI.XRSummary();
-            DevExpress.XtraReports.UI.XRSummary xrSummary10 = new DevExpress.XtraReports.UI.XRSummary();
             DevExpress.XtraReports.UI.XRSummary xrSummary9 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary10 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary11 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary12 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary13 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary14 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary15 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary16 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary17 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary18 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary19 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary20 = 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();
@@ -54,10 +64,25 @@ namespace BeWo.Report.DefaultReports
             this.cellBewilligteFLSImBereich = new DevExpress.XtraReports.UI.XRTableCell();
             this.cellGeleistetImBereich = new DevExpress.XtraReports.UI.XRTableCell();
             this.cellRateFactor = 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.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell41 = new DevExpress.XtraReports.UI.XRTableCell();
             this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
             this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
             this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -71,21 +96,11 @@ namespace BeWo.Report.DefaultReports
             this.cellBewilligtImZeitraumHeader = new DevExpress.XtraReports.UI.XRTableCell();
             this.cellGeleistetImZeitraumHeader = new DevExpress.XtraReports.UI.XRTableCell();
             this.cellRateFactorHeader = new DevExpress.XtraReports.UI.XRTableCell();
+            this.cellFehlkontakteHeader = 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.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+            this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
             this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
             this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
             this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo();
@@ -98,11 +113,23 @@ namespace BeWo.Report.DefaultReports
             this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
             this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
             this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
-            this.cellFehlkontakteHeader = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
+            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.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
             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.xrTable1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -257,6 +284,15 @@ namespace BeWo.Report.DefaultReports
             this.cellRateFactor.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
             this.cellRateFactor.Weight = 0.31019202366528686D;
             // 
+            // xrTableCell29
+            // 
+            this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.StundenFehlkontakteInReportTimeSpan", "{0:0.00}")});
+            this.xrTableCell29.Name = "xrTableCell29";
+            this.xrTableCell29.StylePriority.UseTextAlignment = false;
+            this.xrTableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell29.Weight = 0.31019202365054616D;
+            // 
             // xrTableCell26
             // 
             this.xrTableCell26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
@@ -282,7 +318,8 @@ namespace BeWo.Report.DefaultReports
             this.Detail1,
             this.GroupFooter1,
             this.GroupHeader2,
-            this.GroupFooter2});
+            this.GroupFooter2,
+            this.GroupHeader1});
             this.DetailReport.DataMember = "SupportConceptFinanceList";
             this.DetailReport.DataSource = this.bindingSource1;
             this.DetailReport.Level = 0;
@@ -290,10 +327,218 @@ namespace BeWo.Report.DefaultReports
             // 
             // GroupFooter1
             // 
+            this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable4});
             this.GroupFooter1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
-            this.GroupFooter1.HeightF = 0F;
+            this.GroupFooter1.HeightF = 25F;
             this.GroupFooter1.Name = "GroupFooter1";
             this.GroupFooter1.StylePriority.UseFont = false;
+            this.GroupFooter1.Visible = false;
+            // 
+            // xrTable4
+            // 
+            this.xrTable4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTable4.Name = "xrTable4";
+            this.xrTable4.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
+            this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow4});
+            this.xrTable4.SizeF = new System.Drawing.SizeF(1080F, 25F);
+            this.xrTable4.StylePriority.UseBorders = false;
+            this.xrTable4.StylePriority.UseFont = false;
+            this.xrTable4.StylePriority.UsePadding = false;
+            this.xrTable4.StylePriority.UseTextAlignment = false;
+            this.xrTable4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrTableRow4
+            // 
+            this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell28,
+            this.xrTableCell31,
+            this.xrTableCell32,
+            this.xrTableCell33,
+            this.xrTableCell34,
+            this.xrTableCell35,
+            this.xrTableCell36,
+            this.xrTableCell37,
+            this.xrTableCell38,
+            this.xrTableCell39,
+            this.xrTableCell40,
+            this.xrTableCell41});
+            this.xrTableRow4.Name = "xrTableRow4";
+            this.xrTableRow4.Weight = 1D;
+            // 
+            // xrTableCell28
+            // 
+            this.xrTableCell28.CanGrow = false;
+            this.xrTableCell28.Multiline = true;
+            this.xrTableCell28.Name = "xrTableCell28";
+            this.xrTableCell28.Weight = 0.66469718772399189D;
+            // 
+            // xrTableCell31
+            // 
+            this.xrTableCell31.CanGrow = false;
+            this.xrTableCell31.Name = "xrTableCell31";
+            this.xrTableCell31.StylePriority.UseTextAlignment = false;
+            this.xrTableCell31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell31.Weight = 0.5317577529262556D;
+            // 
+            // xrTableCell32
+            // 
+            this.xrTableCell32.CanGrow = false;
+            this.xrTableCell32.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.AmountTotal")});
+            this.xrTableCell32.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
+            this.xrTableCell32.Name = "xrTableCell32";
+            this.xrTableCell32.StylePriority.UseFont = false;
+            this.xrTableCell32.StylePriority.UseTextAlignment = false;
+            xrSummary1.FormatString = "{0:c}";
+            xrSummary1.IgnoreNullValues = true;
+            xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell32.Summary = xrSummary1;
+            this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell32.Weight = 0.44313146794248365D;
+            // 
+            // xrTableCell33
+            // 
+            this.xrTableCell33.CanGrow = false;
+            this.xrTableCell33.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.AmountPaid")});
+            this.xrTableCell33.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
+            this.xrTableCell33.Name = "xrTableCell33";
+            this.xrTableCell33.StylePriority.UseFont = false;
+            this.xrTableCell33.StylePriority.UseTextAlignment = false;
+            xrSummary2.FormatString = "{0:c}";
+            xrSummary2.IgnoreNullValues = true;
+            xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell33.Summary = xrSummary2;
+            this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell33.Weight = 0.4431314633550375D;
+            // 
+            // xrTableCell34
+            // 
+            this.xrTableCell34.CanGrow = false;
+            this.xrTableCell34.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.OpenAmount")});
+            this.xrTableCell34.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
+            this.xrTableCell34.Name = "xrTableCell34";
+            this.xrTableCell34.StylePriority.UseFont = false;
+            this.xrTableCell34.StylePriority.UseTextAlignment = false;
+            xrSummary3.FormatString = "{0:c}";
+            xrSummary3.IgnoreNullValues = true;
+            xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell34.Summary = xrSummary3;
+            this.xrTableCell34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell34.Weight = 0.44313146284443172D;
+            // 
+            // xrTableCell35
+            // 
+            this.xrTableCell35.CanGrow = false;
+            this.xrTableCell35.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHours")});
+            this.xrTableCell35.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
+            this.xrTableCell35.Name = "xrTableCell35";
+            this.xrTableCell35.StylePriority.UseFont = false;
+            this.xrTableCell35.StylePriority.UseTextAlignment = false;
+            xrSummary4.FormatString = "{0:0.00}";
+            xrSummary4.IgnoreNullValues = true;
+            xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell35.Summary = xrSummary4;
+            this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell35.Weight = 0.35450517012236349D;
+            // 
+            // xrTableCell36
+            // 
+            this.xrTableCell36.CanGrow = false;
+            this.xrTableCell36.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHours")});
+            this.xrTableCell36.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
+            this.xrTableCell36.Name = "xrTableCell36";
+            this.xrTableCell36.StylePriority.UseFont = false;
+            this.xrTableCell36.StylePriority.UseTextAlignment = false;
+            xrSummary5.FormatString = "{0:0.00}";
+            xrSummary5.IgnoreNullValues = true;
+            xrSummary5.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell36.Summary = xrSummary5;
+            this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell36.Weight = 0.35450516999471215D;
+            // 
+            // xrTableCell37
+            // 
+            this.xrTableCell37.CanGrow = false;
+            this.xrTableCell37.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHoursInReportTimeSpan")});
+            this.xrTableCell37.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
+            this.xrTableCell37.Name = "xrTableCell37";
+            this.xrTableCell37.StylePriority.UseFont = false;
+            this.xrTableCell37.StylePriority.UseTextAlignment = false;
+            xrSummary6.FormatString = "{0:0.00}";
+            xrSummary6.IgnoreNullValues = true;
+            xrSummary6.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell37.Summary = xrSummary6;
+            this.xrTableCell37.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell37.Weight = 0.31019202369719984D;
+            // 
+            // xrTableCell38
+            // 
+            this.xrTableCell38.CanGrow = false;
+            this.xrTableCell38.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.StundenNichtFehlkontakteInReportTimeSpan")});
+            this.xrTableCell38.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
+            this.xrTableCell38.Name = "xrTableCell38";
+            this.xrTableCell38.StylePriority.UseFont = false;
+            this.xrTableCell38.StylePriority.UseTextAlignment = false;
+            xrSummary7.FormatString = "{0:0.00}";
+            xrSummary7.IgnoreNullValues = true;
+            xrSummary7.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell38.Summary = xrSummary7;
+            this.xrTableCell38.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell38.Weight = 0.31019202366528686D;
+            // 
+            // xrTableCell39
+            // 
+            this.xrTableCell39.CanGrow = false;
+            this.xrTableCell39.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHoursInReportTimeSpanWithFactor")});
+            this.xrTableCell39.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
+            this.xrTableCell39.Name = "xrTableCell39";
+            this.xrTableCell39.StylePriority.UseFont = false;
+            this.xrTableCell39.StylePriority.UseTextAlignment = false;
+            xrSummary8.FormatString = "{0:0.00}";
+            xrSummary8.IgnoreNullValues = true;
+            xrSummary8.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell39.Summary = xrSummary8;
+            this.xrTableCell39.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell39.Weight = 0.31019202366528686D;
+            // 
+            // xrTableCell40
+            // 
+            this.xrTableCell40.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.StundenFehlkontakteInReportTimeSpan")});
+            this.xrTableCell40.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
+            this.xrTableCell40.Name = "xrTableCell40";
+            this.xrTableCell40.StylePriority.UseFont = false;
+            this.xrTableCell40.StylePriority.UseTextAlignment = false;
+            xrSummary9.FormatString = "{0:0.00}";
+            xrSummary9.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell40.Summary = xrSummary9;
+            this.xrTableCell40.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell40.Weight = 0.31019202365054616D;
+            // 
+            // xrTableCell41
+            // 
+            this.xrTableCell41.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableAmountInReportTimeSpan")});
+            this.xrTableCell41.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
+            this.xrTableCell41.Name = "xrTableCell41";
+            this.xrTableCell41.StylePriority.UseFont = false;
+            this.xrTableCell41.StylePriority.UseTextAlignment = false;
+            xrSummary10.FormatString = "{0:c}";
+            xrSummary10.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell41.Summary = xrSummary10;
+            this.xrTableCell41.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell41.Weight = 0.31019202365054621D;
             // 
             // GroupHeader2
             // 
@@ -417,6 +662,15 @@ namespace BeWo.Report.DefaultReports
             this.cellRateFactorHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
             this.cellRateFactorHeader.Weight = 0.31019202366528692D;
             // 
+            // cellFehlkontakteHeader
+            // 
+            this.cellFehlkontakteHeader.Multiline = true;
+            this.cellFehlkontakteHeader.Name = "cellFehlkontakteHeader";
+            this.cellFehlkontakteHeader.StylePriority.UseTextAlignment = false;
+            this.cellFehlkontakteHeader.Text = "Fehl-\r\nkontakte";
+            this.cellFehlkontakteHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.cellFehlkontakteHeader.Weight = 0.31019202365054621D;
+            // 
             // xrTableCell25
             // 
             this.xrTableCell25.Name = "xrTableCell25";
@@ -427,186 +681,34 @@ namespace BeWo.Report.DefaultReports
             // 
             // 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.HeightF = 0F;
             this.GroupFooter2.Level = 1;
             this.GroupFooter2.Name = "GroupFooter2";
             this.GroupFooter2.StylePriority.UseFont = false;
             // 
-            // xrTable3
+            // GroupHeader1
             // 
-            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(1080F, 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;
+            this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel1});
+            this.GroupHeader1.GroupFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] {
+            new DevExpress.XtraReports.UI.GroupField("GruppierungsKategorie", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)});
+            this.GroupHeader1.HeightF = 43.75F;
+            this.GroupHeader1.Level = 1;
+            this.GroupHeader1.Name = "GroupHeader1";
+            this.GroupHeader1.Visible = false;
             // 
-            // xrTableRow3
+            // xrLabel1
             // 
-            this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell15,
-            this.xrTableCell16,
-            this.xrTableCell17,
-            this.xrTableCell18,
-            this.xrTableCell19,
-            this.xrTableCell20,
-            this.xrTableCell21,
-            this.xrTableCell22,
-            this.xrTableCell23,
-            this.xrTableCell24,
-            this.xrTableCell30,
-            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 = 0.66469718772399189D;
-            // 
-            // 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.5317577529262556D;
-            // 
-            // xrTableCell17
-            // 
-            this.xrTableCell17.CanGrow = false;
-            this.xrTableCell17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.AmountTotal")});
-            this.xrTableCell17.Name = "xrTableCell17";
-            this.xrTableCell17.StylePriority.UseTextAlignment = false;
-            xrSummary1.FormatString = "{0:c}";
-            xrSummary1.IgnoreNullValues = true;
-            xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
-            this.xrTableCell17.Summary = xrSummary1;
-            this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
-            this.xrTableCell17.Weight = 0.44313146794248365D;
-            // 
-            // xrTableCell18
-            // 
-            this.xrTableCell18.CanGrow = false;
-            this.xrTableCell18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.AmountPaid")});
-            this.xrTableCell18.Name = "xrTableCell18";
-            this.xrTableCell18.StylePriority.UseTextAlignment = false;
-            xrSummary2.FormatString = "{0:c}";
-            xrSummary2.IgnoreNullValues = true;
-            xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
-            this.xrTableCell18.Summary = xrSummary2;
-            this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
-            this.xrTableCell18.Weight = 0.4431314633550375D;
-            // 
-            // xrTableCell19
-            // 
-            this.xrTableCell19.CanGrow = false;
-            this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.OpenAmount")});
-            this.xrTableCell19.Name = "xrTableCell19";
-            this.xrTableCell19.StylePriority.UseTextAlignment = false;
-            xrSummary3.FormatString = "{0:c}";
-            xrSummary3.IgnoreNullValues = true;
-            xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
-            this.xrTableCell19.Summary = xrSummary3;
-            this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
-            this.xrTableCell19.Weight = 0.44313146284443172D;
-            // 
-            // xrTableCell20
-            // 
-            this.xrTableCell20.CanGrow = false;
-            this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHours")});
-            this.xrTableCell20.Name = "xrTableCell20";
-            this.xrTableCell20.StylePriority.UseTextAlignment = false;
-            xrSummary4.FormatString = "{0:0.00}";
-            xrSummary4.IgnoreNullValues = true;
-            xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
-            this.xrTableCell20.Summary = xrSummary4;
-            this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
-            this.xrTableCell20.Weight = 0.35450517012236349D;
-            // 
-            // xrTableCell21
-            // 
-            this.xrTableCell21.CanGrow = false;
-            this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHours")});
-            this.xrTableCell21.Name = "xrTableCell21";
-            this.xrTableCell21.StylePriority.UseTextAlignment = false;
-            xrSummary5.FormatString = "{0:0.00}";
-            xrSummary5.IgnoreNullValues = true;
-            xrSummary5.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
-            this.xrTableCell21.Summary = xrSummary5;
-            this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
-            this.xrTableCell21.Weight = 0.35450516999471215D;
-            // 
-            // xrTableCell22
-            // 
-            this.xrTableCell22.CanGrow = false;
-            this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHoursInReportTimeSpan")});
-            this.xrTableCell22.Name = "xrTableCell22";
-            this.xrTableCell22.StylePriority.UseTextAlignment = false;
-            xrSummary6.FormatString = "{0:0.00}";
-            xrSummary6.IgnoreNullValues = true;
-            xrSummary6.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
-            this.xrTableCell22.Summary = xrSummary6;
-            this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
-            this.xrTableCell22.Weight = 0.31019202369719984D;
-            // 
-            // xrTableCell23
-            // 
-            this.xrTableCell23.CanGrow = false;
-            this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.StundenNichtFehlkontakteInReportTimeSpan")});
-            this.xrTableCell23.Name = "xrTableCell23";
-            this.xrTableCell23.StylePriority.UseTextAlignment = false;
-            xrSummary7.FormatString = "{0:0.00}";
-            xrSummary7.IgnoreNullValues = true;
-            xrSummary7.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
-            this.xrTableCell23.Summary = xrSummary7;
-            this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
-            this.xrTableCell23.Weight = 0.31019202366528686D;
-            // 
-            // xrTableCell24
-            // 
-            this.xrTableCell24.CanGrow = false;
-            this.xrTableCell24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHoursInReportTimeSpanWithFactor")});
-            this.xrTableCell24.Name = "xrTableCell24";
-            this.xrTableCell24.StylePriority.UseTextAlignment = false;
-            xrSummary8.FormatString = "{0:0.00}";
-            xrSummary8.IgnoreNullValues = true;
-            xrSummary8.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
-            this.xrTableCell24.Summary = xrSummary8;
-            this.xrTableCell24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
-            this.xrTableCell24.Weight = 0.31019202366528686D;
-            // 
-            // 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;
-            xrSummary10.FormatString = "{0:c}";
-            xrSummary10.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
-            this.xrTableCell27.Summary = xrSummary10;
-            this.xrTableCell27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
-            this.xrTableCell27.Weight = 0.31019202365054621D;
+            this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.GruppierungsKategorie")});
+            this.xrLabel1.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
+            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00001F);
+            this.xrLabel1.Name = "xrLabel1";
+            this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel1.SizeF = new System.Drawing.SizeF(1030F, 23F);
+            this.xrLabel1.StylePriority.UseFont = false;
+            this.xrLabel1.Text = "xrLabel1";
             // 
             // ReportHeader
             // 
@@ -704,41 +806,218 @@ namespace BeWo.Report.DefaultReports
             // 
             // ReportFooter
             // 
+            this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable3});
             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.HeightF = 25F;
             this.ReportFooter.Name = "ReportFooter";
             this.ReportFooter.StylePriority.UseFont = false;
             // 
-            // cellFehlkontakteHeader
+            // xrTable3
             // 
-            this.cellFehlkontakteHeader.Multiline = true;
-            this.cellFehlkontakteHeader.Name = "cellFehlkontakteHeader";
-            this.cellFehlkontakteHeader.StylePriority.UseTextAlignment = false;
-            this.cellFehlkontakteHeader.Text = "Fehl-\r\nkontakte";
-            this.cellFehlkontakteHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-            this.cellFehlkontakteHeader.Weight = 0.31019202365054621D;
+            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(1080F, 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;
             // 
-            // xrTableCell29
+            // xrTableRow3
             // 
-            this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.StundenFehlkontakteInReportTimeSpan", "{0:0.00}")});
-            this.xrTableCell29.Name = "xrTableCell29";
-            this.xrTableCell29.StylePriority.UseTextAlignment = false;
-            this.xrTableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
-            this.xrTableCell29.Weight = 0.31019202365054616D;
+            this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell15,
+            this.xrTableCell16,
+            this.xrTableCell17,
+            this.xrTableCell18,
+            this.xrTableCell19,
+            this.xrTableCell20,
+            this.xrTableCell21,
+            this.xrTableCell22,
+            this.xrTableCell23,
+            this.xrTableCell24,
+            this.xrTableCell30,
+            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 = 0.66469718772399189D;
+            // 
+            // 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.5317577529262556D;
+            // 
+            // xrTableCell17
+            // 
+            this.xrTableCell17.CanGrow = false;
+            this.xrTableCell17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.AmountTotal")});
+            this.xrTableCell17.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
+            this.xrTableCell17.Name = "xrTableCell17";
+            this.xrTableCell17.StylePriority.UseFont = false;
+            this.xrTableCell17.StylePriority.UseTextAlignment = false;
+            xrSummary11.FormatString = "{0:c}";
+            xrSummary11.IgnoreNullValues = true;
+            xrSummary11.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
+            this.xrTableCell17.Summary = xrSummary11;
+            this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell17.Weight = 0.44313146794248365D;
+            // 
+            // xrTableCell18
+            // 
+            this.xrTableCell18.CanGrow = false;
+            this.xrTableCell18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.AmountPaid")});
+            this.xrTableCell18.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
+            this.xrTableCell18.Name = "xrTableCell18";
+            this.xrTableCell18.StylePriority.UseFont = false;
+            this.xrTableCell18.StylePriority.UseTextAlignment = false;
+            xrSummary12.FormatString = "{0:c}";
+            xrSummary12.IgnoreNullValues = true;
+            xrSummary12.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
+            this.xrTableCell18.Summary = xrSummary12;
+            this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell18.Weight = 0.4431314633550375D;
+            // 
+            // xrTableCell19
+            // 
+            this.xrTableCell19.CanGrow = false;
+            this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.OpenAmount")});
+            this.xrTableCell19.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
+            this.xrTableCell19.Name = "xrTableCell19";
+            this.xrTableCell19.StylePriority.UseFont = false;
+            this.xrTableCell19.StylePriority.UseTextAlignment = false;
+            xrSummary13.FormatString = "{0:c}";
+            xrSummary13.IgnoreNullValues = true;
+            xrSummary13.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
+            this.xrTableCell19.Summary = xrSummary13;
+            this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell19.Weight = 0.44313146284443172D;
+            // 
+            // xrTableCell20
+            // 
+            this.xrTableCell20.CanGrow = false;
+            this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHours")});
+            this.xrTableCell20.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
+            this.xrTableCell20.Name = "xrTableCell20";
+            this.xrTableCell20.StylePriority.UseFont = false;
+            this.xrTableCell20.StylePriority.UseTextAlignment = false;
+            xrSummary14.FormatString = "{0:0.00}";
+            xrSummary14.IgnoreNullValues = true;
+            xrSummary14.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
+            this.xrTableCell20.Summary = xrSummary14;
+            this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell20.Weight = 0.35450517012236349D;
+            // 
+            // xrTableCell21
+            // 
+            this.xrTableCell21.CanGrow = false;
+            this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHours")});
+            this.xrTableCell21.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
+            this.xrTableCell21.Name = "xrTableCell21";
+            this.xrTableCell21.StylePriority.UseFont = false;
+            this.xrTableCell21.StylePriority.UseTextAlignment = false;
+            xrSummary15.FormatString = "{0:0.00}";
+            xrSummary15.IgnoreNullValues = true;
+            xrSummary15.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
+            this.xrTableCell21.Summary = xrSummary15;
+            this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell21.Weight = 0.35450516999471215D;
+            // 
+            // xrTableCell22
+            // 
+            this.xrTableCell22.CanGrow = false;
+            this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHoursInReportTimeSpan")});
+            this.xrTableCell22.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
+            this.xrTableCell22.Name = "xrTableCell22";
+            this.xrTableCell22.StylePriority.UseFont = false;
+            this.xrTableCell22.StylePriority.UseTextAlignment = false;
+            xrSummary16.FormatString = "{0:0.00}";
+            xrSummary16.IgnoreNullValues = true;
+            xrSummary16.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
+            this.xrTableCell22.Summary = xrSummary16;
+            this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell22.Weight = 0.31019202369719984D;
+            // 
+            // xrTableCell23
+            // 
+            this.xrTableCell23.CanGrow = false;
+            this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.StundenNichtFehlkontakteInReportTimeSpan")});
+            this.xrTableCell23.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
+            this.xrTableCell23.Name = "xrTableCell23";
+            this.xrTableCell23.StylePriority.UseFont = false;
+            this.xrTableCell23.StylePriority.UseTextAlignment = false;
+            xrSummary17.FormatString = "{0:0.00}";
+            xrSummary17.IgnoreNullValues = true;
+            xrSummary17.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
+            this.xrTableCell23.Summary = xrSummary17;
+            this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell23.Weight = 0.31019202366528686D;
+            // 
+            // xrTableCell24
+            // 
+            this.xrTableCell24.CanGrow = false;
+            this.xrTableCell24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHoursInReportTimeSpanWithFactor")});
+            this.xrTableCell24.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
+            this.xrTableCell24.Name = "xrTableCell24";
+            this.xrTableCell24.StylePriority.UseFont = false;
+            this.xrTableCell24.StylePriority.UseTextAlignment = false;
+            xrSummary18.FormatString = "{0:0.00}";
+            xrSummary18.IgnoreNullValues = true;
+            xrSummary18.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
+            this.xrTableCell24.Summary = xrSummary18;
+            this.xrTableCell24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell24.Weight = 0.31019202366528686D;
             // 
             // xrTableCell30
             // 
             this.xrTableCell30.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.StundenFehlkontakteInReportTimeSpan")});
+            this.xrTableCell30.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
             this.xrTableCell30.Name = "xrTableCell30";
+            this.xrTableCell30.StylePriority.UseFont = false;
             this.xrTableCell30.StylePriority.UseTextAlignment = false;
-            xrSummary9.FormatString = "{0:0.00}";
-            xrSummary9.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
-            this.xrTableCell30.Summary = xrSummary9;
+            xrSummary19.FormatString = "{0:0.00}";
+            xrSummary19.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
+            this.xrTableCell30.Summary = xrSummary19;
             this.xrTableCell30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
             this.xrTableCell30.Weight = 0.31019202365054616D;
             // 
+            // xrTableCell27
+            // 
+            this.xrTableCell27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableAmountInReportTimeSpan")});
+            this.xrTableCell27.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
+            this.xrTableCell27.Name = "xrTableCell27";
+            this.xrTableCell27.StylePriority.UseFont = false;
+            this.xrTableCell27.StylePriority.UseTextAlignment = false;
+            xrSummary20.FormatString = "{0:c}";
+            xrSummary20.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
+            this.xrTableCell27.Summary = xrSummary20;
+            this.xrTableCell27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell27.Weight = 0.31019202365054621D;
+            // 
             // bindingSource1
             // 
             this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.FinanceRO);
@@ -766,6 +1045,7 @@ namespace BeWo.Report.DefaultReports
             this.DataField});
             this.Version = "17.1";
             ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
@@ -819,23 +1099,39 @@ namespace BeWo.Report.DefaultReports
 		private DevExpress.XtraReports.UI.XRTableCell cellRateFactorHeader;
 		private DevExpress.XtraReports.UI.XRTableCell cellRateFactor;
 		private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter2;
-		private DevExpress.XtraReports.UI.XRTable xrTable3;
-		private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
-		private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
-		private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
-		private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
-		private DevExpress.XtraReports.UI.XRTableCell xrTableCell18;
-		private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
-		private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
-		private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
-		private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
-		private DevExpress.XtraReports.UI.XRTableCell xrTableCell23;
-		private DevExpress.XtraReports.UI.XRTableCell xrTableCell24;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell25;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell26;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell27;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell29;
         private DevExpress.XtraReports.UI.XRTableCell cellFehlkontakteHeader;
+        private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel1;
+        private DevExpress.XtraReports.UI.XRTable xrTable4;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow4;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell28;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell31;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell32;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell33;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell34;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell35;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell36;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell37;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell38;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell39;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell40;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell41;
+        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 xrTableCell17;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell18;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell23;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell24;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell30;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell27;
     }
 }
diff --git a/Report/ReportObjects/FinanceRO.cs b/Report/ReportObjects/FinanceRO.cs
index 7d3dc16b4..1b0166cea 100644
--- a/Report/ReportObjects/FinanceRO.cs
+++ b/Report/ReportObjects/FinanceRO.cs
@@ -26,7 +26,9 @@ namespace BeWo.Report.ReportObjects
 
 		public decimal? RateFactor { get; set; }
 
-		public IList<SupportConceptFinanceRO> SupportConceptFinanceList { get; set; }
+        public bool GruppierungLeistungskategorie { get; set; }
+
+        public IList<SupportConceptFinanceRO> SupportConceptFinanceList { get; set; }
 
 
 		public class SupportConceptFinanceRO
@@ -87,6 +89,8 @@ namespace BeWo.Report.ReportObjects
 
 		    public String Leistungskategorie { get; set; }
 
+            public String GruppierungsKategorie { get; set; }
+
             public string Custom1 { get; set; }
 
             public string Custom2 { get; set; }
@@ -106,24 +110,22 @@ namespace BeWo.Report.ReportObjects
         }
 
         public static FinanceRO Create(DateTime? start, DateTime? end, bool onlyNotApproved)
-	    {
+        {
 
-	        return Create(start, end, false, onlyNotApproved);
-	    }
+            return Create(start, end, false, onlyNotApproved);
+        }
 
-	    public static FinanceRO Create(DateTime? start, DateTime? end, bool splitByServiceCategory, bool onlyNotApproved)
+        public static FinanceRO Create(DateTime? start, DateTime? end, bool splitByServiceCategory, bool onlyNotApproved)
 		{
 			var result = new FinanceRO();
 			result.ReportStartDate = start;
 			result.ReportEndDate = end;
+            result.GruppierungLeistungskategorie = splitByServiceCategory;
 			result.SupportConceptFinanceList = new List<SupportConceptFinanceRO>();
 
             var service = new AnalysisServiceImp();
             var financeList = service.GetOutstandingReceivables(false, false, start, end);
 
-
-
-
             foreach (var item in financeList)
             {
                 if (item.SupportConcept != null && item.SupportConcept.ActivationType != ActivationTypeId.Deleted)
@@ -137,31 +139,18 @@ namespace BeWo.Report.ReportObjects
                     {
                         continue; // Überspringen, wenn nur die NICHT bewilligten angezeigt werden sollen.
                     }
-                    
 
                     if (splitByServiceCategory)
                     {
-                        
-
-                        foreach (var scap in cb2sc.ApprovalPeriodList)
-                        {
-                            var scapDC = MapperFactory.SupportConceptApprovalPeriodDC_SupportConceptApprovalPeriod.MapToNewDC(scap);
-
-                            var ro = CreateSupportConceptFinanceRO(item, relDC, scapDC);
-
-                            // 1.
-                            result.SupportConceptFinanceList.Add(ro);
-                        }
+                        var financeRO = new FinanceRO();
+                        financeRO.AddByServiceCategory(result, item, cb2sc, relDC);
                     }
                     else
                     {
                         var ro = CreateSupportConceptFinanceRO(item, relDC, null);
-                        
-                        //2
-
+                        // 2.
                         result.SupportConceptFinanceList.Add(ro);
-                    }
-                    
+                    }  
                 }
             }
 
@@ -372,11 +361,8 @@ namespace BeWo.Report.ReportObjects
                     {
                         if (srDc.Start >= start && srDc.Start.Value.Date <= end.Value.Date)
                         {
-
                             var billable = calc.GetBillableDurationInMinutes(srDc, false) / 60;
                             ro.StundenFehlkontakteInReportTimeSpan += billable;
-
-                            
                             decimal stundensatz = 0;
 
                             var hcr = costRateDcs.GetCostRatePeriodForDate(CostRatePeriodType.HourlyRate, srDc.Start.Value);
@@ -399,16 +385,11 @@ namespace BeWo.Report.ReportObjects
                     ro.AmountInReportTimeSpan = (ro.AmountNichtFehlkontakteInReportTimeSpan ?? 0) + (ro.AmountFehlkontakteInReportTimeSpan ?? 0);
                     
                 }
-
-
-
             }
-            
-            
-
             return result;
 		}
 
+
         private static ServiceRecordDC CreateServiceRecordDC(object[] sqlRow, Dictionary<long, ServiceDescriptionDC> serviceDict)
         {
             try
@@ -464,25 +445,93 @@ namespace BeWo.Report.ReportObjects
 
         }
 
-        private static SupportConceptFinanceRO CreateSupportConceptFinanceRO(FinanceOverviewItemDC item, SupportConceptCostBearerRelDC relDc, SupportConceptApprovalPeriodDC scapDc)
+        public static SupportConceptFinanceRO CreateSupportConceptFinanceRO(FinanceOverviewItemDC item, SupportConceptCostBearerRelDC relDc, SupportConceptApprovalPeriodDC scapDc, bool SplitServiceCategory = false)
         {
             var ro = new SupportConceptFinanceRO();
-
             ro.CustomerName = item.CustomerName;
             ro.SupportConceptTimeSpanString = item.SupportConceptTimeSpanString;
             ro.CostBearerName = item.CostBearerName;
 
-            ro.AmountTotal = item.AmountTotal;
-            ro.AmountPaid = item.AmountPaid;
-            ro.OpenAmount = item.OpenAmount;
-
+            if (SplitServiceCategory)
+            {
+                ro.AmountPaid = 0;
+                ro.OpenAmount = ro.AmountTotal;
+            }
+            else
+            {
+                ro.AmountTotal = item.AmountTotal;
+                ro.AmountPaid = item.AmountPaid;
+                ro.OpenAmount = item.OpenAmount;
+            }
             ro.Costbearer2Supportconcept = relDc;
             ro.SupportConceptApprovalPeriod = scapDc;
-            
             ro.IsApproved = (relDc.ApprovedEndDate.HasValue || relDc.ApprovedStartDate.HasValue);
 
             return ro;
         }
+
+        public virtual void AddByServiceCategory(FinanceRO result, FinanceOverviewItemDC item, CostBearer2SupportConcept cb2sc, SupportConceptCostBearerRelDC relDC)
+        {
+            if (cb2sc.ApprovalPeriodList.Count > 1) // komplexer Ablauf nur, wenn mehr als eine Bewilligung vorliegt
+            {
+                Dictionary<string, decimal> key2Value = new Dictionary<string, decimal>();
+                var SmallList = new List<SupportConceptFinanceRO>();
+                SupportConceptFinanceRO ro;
+                var baseRo = CreateSupportConceptFinanceRO(item, relDC, null);
+
+                foreach (var scap in cb2sc.ApprovalPeriodList)
+                {
+                    var scapDC = MapperFactory.SupportConceptApprovalPeriodDC_SupportConceptApprovalPeriod.MapToNewDC(scap);
+                    var calc = PluginLoader.FindClass<Calculations>(relDC.CostBearer.CostBearerID) ?? Calculations.GetInstance(relDC.CostBearer.CostBearerID);
+                    ro = CreateSupportConceptFinanceRO(item, relDC, scapDC, true);
+
+                    // statt dem auskommentierten Bereich
+                    var AmountTotal = calc.GetApprovedAmount(scapDC, relDC.CostBearer.CostRatePeriods) ?? 0;
+                    ro.AmountTotal = AmountTotal;
+                    ro.OpenAmount = AmountTotal;
+                    SmallList.Add(ro);
+
+
+                    //string key = "";
+
+                    //if (scap.ServiceCategory != null)
+                    //{
+                    //    key = scap.ServiceCategory.Name;
+                    //}
+                    //if (key2Value.ContainsKey(key)) // 1. Summenbildung von Gesamtbewilligung pro ServiceKategorie
+                    //{
+                    //    key2Value[key] += AmountTotal;
+                    //    foreach (var r in SmallList)
+                    //    {
+                    //        if (key == "" && r.SupportConceptApprovalPeriod.ServiceCategory == null)
+                    //        {
+                    //            r.AmountTotal = key2Value[key];
+                    //        }
+                    //        else if (key != "" && r.SupportConceptApprovalPeriod.ServiceCategory != null && r.SupportConceptApprovalPeriod.ServiceCategory.Name == key)
+                    //        {
+                    //            r.AmountTotal = key2Value[key];
+                    //        }
+                    //    }
+                    //}
+                    //else
+                    //{
+                    //    key2Value.Add(key, AmountTotal);
+                    //    ro.AmountTotal = AmountTotal;
+                    //    SmallList.Add(ro);
+                    //}
+                }
+                var flsEntry = SmallList.OrderByDescending(e => e.AmountTotal).FirstOrDefault(); // 2. Zuordnung der Abschlagszahlungen zur betragsmäßig größten Bewilligung
+                flsEntry.AmountPaid = baseRo.AmountPaid;
+                flsEntry.OpenAmount = flsEntry.AmountTotal - flsEntry.AmountPaid;
+                result.SupportConceptFinanceList.AddRange(SmallList);
+            }
+            else
+            {
+                var ro = CreateSupportConceptFinanceRO(item, relDC, null);
+                result.SupportConceptFinanceList.Add(ro);
+            }
+        }
+
         public void CalculateBillableAmountInReportTimeSpan()
 	    {
 	        if (this.SupportConceptFinanceList != null)
@@ -605,9 +654,7 @@ namespace BeWo.Report.ReportObjects
 	                    CalculatePaidAmountInReportTimeSpan(scRo, this.ReportStartDate ?? DateTime.MinValue, this.ReportEndDate ?? DateTime.MaxValue);
 	                }
 	            }
-	        }
-
-            
+	        } 
         }
 
         private void CalculatePaidAmountInReportTimeSpan(SupportConceptFinanceRO scRo, DateTime start, DateTime end)
diff --git a/Service/ServiceImplementations/AnalysisServiceImp.cs b/Service/ServiceImplementations/AnalysisServiceImp.cs
index a9a4f7124..33a5e08da 100644
--- a/Service/ServiceImplementations/AnalysisServiceImp.cs
+++ b/Service/ServiceImplementations/AnalysisServiceImp.cs
@@ -323,9 +323,7 @@ namespace BeWo.Service.ServiceImplementations
             try
             {
                 List<FinanceOverviewItemDC> result = new List<FinanceOverviewItemDC>();
-
 				var financeItemsByCb2scOid = new Dictionary<long, FinanceOverviewItemDC>();
-
 				IEnumerable<SupportConcept> scList = DAOFactory.SearchDAO.GetAllActiveAndArchivedSupportConcepts();
 				foreach (SupportConcept sc in scList)
 				{
@@ -361,9 +359,15 @@ namespace BeWo.Service.ServiceImplementations
 
 								dc.SupportConcept = this.CreateCompactSupportConceptDC(sc);
 								dc.CostBearer = this.CreateCompactCostBearerDC(cb2sc);
-								dc.AmountTotal = this.GetTotalAmount(cb2sc);
-
-								financeItemsByCb2scOid.Add(cb2sc.Oid.Value, dc);
+                                //if (cb2sc.ApprovalPeriodList != null && cb2sc.ApprovalPeriodList.Count > 0)
+                                //{
+                                //    foreach (var scap in cb2sc.ApprovalPeriodList)
+                                //    {
+                                //        dc.AmountTotal = this.GetTotalAmount(cb2sc);
+                                //    }
+                                //}
+                                dc.AmountTotal = this.GetTotalAmount(cb2sc);
+                                financeItemsByCb2scOid.Add(cb2sc.Oid.Value, dc);
 							}
 						}
 					}
@@ -422,8 +426,6 @@ namespace BeWo.Service.ServiceImplementations
                     }
                 }
 
-                
-
                 return result.OrderBy(
                                       item =>
                                       {