cb

BeWo/BeWo.csproj

@@ -43,12 +43,12 @@
     <TargetCulture>de-DE</TargetCulture>
     <ProductName>BeWoPlaner</ProductName>
     <PublisherName>beyondSoft GmbH</PublisherName>
-    <MinimumRequiredVersion>2.0.1.212</MinimumRequiredVersion>
+    <MinimumRequiredVersion>2.0.1.214</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
     <TrustUrlParameters>true</TrustUrlParameters>
-    <ApplicationRevision>213</ApplicationRevision>
+    <ApplicationRevision>215</ApplicationRevision>
     <ApplicationVersion>2.0.1.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>

BeWo/BeWoApp.xaml.cs

@@ -48,8 +48,8 @@ namespace BeWo
 		public static LoginControl LoginControl;
 
 		public static MainControl MainControl;
-	    public static string ShortVersion = "3.7";
+	    public static string ShortVersion = "3.8";
-        public static string Version = "Version 3.7";
+        public static string Version = "Version 3.8";
 
 		public static int RenderTier = 0;
 
@@ -518,7 +518,7 @@ namespace BeWo
 				showMarker = true;
 				showUrlaubsplanung = true;
 				showDienstplanung = true;
-				showInfoButtonInCalender = true;
+				//showInfoButtonInCalender = true;
 #endif
 
 				AppSettings.ShowDatevFields                          = showDatevFields;

BeWo/MultiLanguage/ServiceTranslator.cs

@@ -55,7 +55,7 @@ namespace BeWo.MultiLanguage
             return String.Format(this.currentCulture, input, args);
         }
 
-        public String Translate(String key, String defaultText)
+        public String TranslateKey(String key, String defaultText)
         {
             if (key != null && this.dict != null && this.dict.TryGetValue(key, out var translation))
             {
@@ -65,7 +65,7 @@ namespace BeWo.MultiLanguage
             return defaultText;
         }
 
-        public String Translate(String key, String defaultText, params Object[] args)
+        public String TranslateKey(String key, String defaultText, params Object[] args)
         {
             String translation;
             if (!String.IsNullOrEmpty(key) && this.dict.TryGetValue(key, out translation))

BeWo/View/Master/DokumenteView.xaml.cs

@@ -108,14 +108,14 @@ namespace BeWo.View.Master
         {
             
             var list = new List<DocumentRootNodeConfig>();
-            list.Add(new DocumentRootNodeConfig { TableID = TableID.FinanzDokumente, Title = Translator.Translate("DocumentViewFinanzen", "Finanzen"), IconName = "CoinsDisabled", DocumentRightNeeded = UserRightType.DokumenteFinanzen, ListOfViewRightsNeeded = new List<UserRightType> { UserRightType.AccountingTransactionView_View } });
+            list.Add(new DocumentRootNodeConfig { TableID = TableID.FinanzDokumente, Title = Translator.TranslateKey("DocumentViewFinanzen", "Finanzen"), IconName = "CoinsDisabled", DocumentRightNeeded = UserRightType.DokumenteFinanzen, ListOfViewRightsNeeded = new List<UserRightType> { UserRightType.AccountingTransactionView_View } });
-            list.Add(new DocumentRootNodeConfig { TableID = TableID.SupportConcept, Title = Translator.Translate("DocumentViewSupportConcept", "Hilfepläne"), IconName = "IDBadgeDisabled", DocumentRightNeeded = UserRightType.DokumenteHilfeplaene, ListOfViewRightsNeeded = new List<UserRightType> { UserRightType.SupportConceptView_View, UserRightType.SupportConcept_ViewMyTeams, UserRightType.SupportConcept_ViewAllSupportConcepts } });
+            list.Add(new DocumentRootNodeConfig { TableID = TableID.SupportConcept, Title = Translator.TranslateKey("DocumentViewSupportConcept", "Hilfepläne"), IconName = "IDBadgeDisabled", DocumentRightNeeded = UserRightType.DokumenteHilfeplaene, ListOfViewRightsNeeded = new List<UserRightType> { UserRightType.SupportConceptView_View, UserRightType.SupportConcept_ViewMyTeams, UserRightType.SupportConcept_ViewAllSupportConcepts } });
-            list.Add(new DocumentRootNodeConfig { TableID = TableID.Customer, Title = Translator.Translate("DocumentViewCustomer", "Klienten"), IconName = "UserHomeMaleDisabled", DocumentRightNeeded = UserRightType.DokumenteKlienten, ListOfViewRightsNeeded = new List<UserRightType> { UserRightType.CustomerView_View, UserRightType.Customer_ViewMyCustomers, UserRightType.Customer_ViewMyTeams } });
+            list.Add(new DocumentRootNodeConfig { TableID = TableID.Customer, Title = Translator.TranslateKey("DocumentViewCustomer", "Klienten"), IconName = "UserHomeMaleDisabled", DocumentRightNeeded = UserRightType.DokumenteKlienten, ListOfViewRightsNeeded = new List<UserRightType> { UserRightType.CustomerView_View, UserRightType.Customer_ViewMyCustomers, UserRightType.Customer_ViewMyTeams } });
-            list.Add(new DocumentRootNodeConfig { TableID = TableID.Organisation, Title = Translator.Translate("DocumentViewOrganisation", "Organisationen"), IconName = "OfficeBulidingBlackDisabled", DocumentRightNeeded = UserRightType.DokumenteOrganisationen, ListOfViewRightsNeeded = new List<UserRightType> { UserRightType.OrganisationView_View } });
+            list.Add(new DocumentRootNodeConfig { TableID = TableID.Organisation, Title = Translator.TranslateKey("DocumentViewOrganisation", "Organisationen"), IconName = "OfficeBulidingBlackDisabled", DocumentRightNeeded = UserRightType.DokumenteOrganisationen, ListOfViewRightsNeeded = new List<UserRightType> { UserRightType.OrganisationView_View } });
-            list.Add(new DocumentRootNodeConfig { TableID = TableID.Person, Title = Translator.Translate("DocumentViewPerson", "Personen"), IconName = "AnonymousUserDisabled", DocumentRightNeeded = UserRightType.DokumentePersonen, ListOfViewRightsNeeded = new List<UserRightType> { UserRightType.PersonView_View, UserRightType.Person_FamilyView } });
+            list.Add(new DocumentRootNodeConfig { TableID = TableID.Person, Title = Translator.TranslateKey("DocumentViewPerson", "Personen"), IconName = "AnonymousUserDisabled", DocumentRightNeeded = UserRightType.DokumentePersonen, ListOfViewRightsNeeded = new List<UserRightType> { UserRightType.PersonView_View, UserRightType.Person_FamilyView } });
-            list.Add(new DocumentRootNodeConfig { TableID = TableID.Employee, Title = Translator.Translate("DocumentViewEmployee", "Mitarbeiter"), IconName = "UserBusinessMaleDisabled", DocumentRightNeeded = UserRightType.DokumenteMitarbeiter, ListOfViewRightsNeeded = new List<UserRightType> { UserRightType.EmployeeView_View, UserRightType.Employee_AllowViewOwnEmployees, UserRightType.Employee_AllowViewOwnTeam } });
+            list.Add(new DocumentRootNodeConfig { TableID = TableID.Employee, Title = Translator.TranslateKey("DocumentViewEmployee", "Mitarbeiter"), IconName = "UserBusinessMaleDisabled", DocumentRightNeeded = UserRightType.DokumenteMitarbeiter, ListOfViewRightsNeeded = new List<UserRightType> { UserRightType.EmployeeView_View, UserRightType.Employee_AllowViewOwnEmployees, UserRightType.Employee_AllowViewOwnTeam } });
-            list.Add(new DocumentRootNodeConfig { TableID = TableID.Team, Title = Translator.Translate("DocumentViewTeam", "Teams"), IconName = "UserGroupBusinessDisabled", DocumentRightNeeded = UserRightType.DokumenteTeams, ListOfViewRightsNeeded = new List<UserRightType> { UserRightType.TeamView_ViewAll, UserRightType.TeamView_ViewMyTeams, UserRightType.SupportConcept_ViewAllSupportConcepts } });
+            list.Add(new DocumentRootNodeConfig { TableID = TableID.Team, Title = Translator.TranslateKey("DocumentViewTeam", "Teams"), IconName = "UserGroupBusinessDisabled", DocumentRightNeeded = UserRightType.DokumenteTeams, ListOfViewRightsNeeded = new List<UserRightType> { UserRightType.TeamView_ViewAll, UserRightType.TeamView_ViewMyTeams, UserRightType.SupportConcept_ViewAllSupportConcepts } });
-            list.Add(new DocumentRootNodeConfig { TableID = TableID.ApplicationUser, Title = Translator.Translate("DocumentViewUser", "Benutzer"), IconName = "UserBusinessMaleDisabled", DocumentRightNeeded = UserRightType.UserView_View, ListOfViewRightsNeeded = new List<UserRightType> { UserRightType.UserView_View } });
+            list.Add(new DocumentRootNodeConfig { TableID = TableID.ApplicationUser, Title = Translator.TranslateKey("DocumentViewUser", "Benutzer"), IconName = "UserBusinessMaleDisabled", DocumentRightNeeded = UserRightType.UserView_View, ListOfViewRightsNeeded = new List<UserRightType> { UserRightType.UserView_View } });
             //firstLevel.Add("usergroups", "Benutzergruppen");
             
             return list;

BeWo/ViewModel/ListViewModel/ServiceRecordListVM.cs

@@ -139,6 +139,7 @@ namespace BeWo.ViewModel.ListViewModel
 	        }
 	        _AllGoals = pAllGoals;
             AllDocTypes = allDocTypes;
+            AllGoalCategories = _AllGoalCategories;
 			if (AllDocTypes != null)
 			{
 				AllDocTypes.Sort((a, b) => a.ValueListEntryOid.Value.CompareTo(b.ValueListEntryOid.Value));
@@ -153,7 +154,9 @@ namespace BeWo.ViewModel.ListViewModel
         //}
 
         public List<ValueListEntryDC> AllDocTypes { get; set; }
-        
+
+        public List<ValueListEntryDC> AllGoalCategories { get; set; }
+
         //CB EINKOMMENTIEREN
         //public void LoadExistingWohnheimbuchung(CompactWohnheimDC pWohnheim, DateTime pBuchungsdatum, Action<bool> callback)
         //{
@@ -936,7 +939,7 @@ namespace BeWo.ViewModel.ListViewModel
 		    }
 	    }
 
-		private static IEnumerable<ValueListEntryDC> GetAllParentGoalCategoies(Dictionary<long, ValueListEntryDC> goalCategoryDict, ValueListEntryDC goal)
+		public static IEnumerable<ValueListEntryDC> GetAllParentGoalCategoies(Dictionary<long, ValueListEntryDC> goalCategoryDict, ValueListEntryDC goal)
 		{
 			IList<ValueListEntryDC> path = new List<ValueListEntryDC>();
 

BeWo/ownChat/ChatDokumentationsView.xaml.cs

@@ -17,6 +17,8 @@ using BS.Shared.DataContracts.Compact;
 using ChatController.ChatKlassen;
 using DevExpress.XtraScheduler;
 using BeWo.View.Detail.Zeiterfassung;
+using BeWo.ServiceProxy;
+using System.Linq;
 
 namespace BeWo.ownChat
 {
@@ -124,8 +126,71 @@ namespace BeWo.ownChat
                                 {
                                     dc.Employee = employee;
                                 }
-                                vm.PrototypeVM.UpdateServiceAccountings(null, vm.PrototypeVM.Category2Services, customerCompact != null);
 
+                                //####
+
+                                long? scOid = null;
+                                long? customerOid = null;
+                                long? cb2scOid = null;
+                                if (customerCompact != null)
+                                {
+                                    customerOid = customerCompact.Oid;
+                                }
+                                if (dc.SupportConcept != null)
+                                {
+                                    scOid = dc.SupportConcept.SupportConceptOid;
+                                    if (dc.SupportConcept.CostBearerRelOids.Count > 0)
+                                    {
+                                        cb2scOid = dc.SupportConcept.CostBearerRelOids[0];
+                                    }
+                                }
+                                
+                                
+                                if (customerOid != null && scOid != null)
+                                {
+                                    
+
+                                    var infoDC = ServiceFacade.DoOperationsServiceSync(s => s.GetSupportConceptTreeNodeDetailInfo(customerOid.Value, scOid, cb2scOid));
+
+
+                                    if (infoDC.SupportConceptGoals != null && infoDC.SupportConceptGoals.Count > 0)
+                                    {
+                                        var goalCats = new List<ValueListEntryDC>();
+                                        var goals = new List<ValueListEntryDC>();
+
+                                        var goalCategoryDict = vm.AllGoalCategories.ToDictionary(goalCat => goalCat.ValueListEntryOid.Value);
+
+                                        foreach (var goal in infoDC.SupportConceptGoals)
+                                        {
+                                            if (goal.ParentOid != null && goalCategoryDict.ContainsKey(goal.ParentOid.Value))
+                                            {
+                                                var path = ServiceRecordListVM.GetAllParentGoalCategoies(goalCategoryDict, goal);
+                                                foreach (var goalCat in path)
+                                                {
+                                                    goalCats.Add(goalCat);
+                                                    goalCategoryDict.Remove(goalCat.ValueListEntryOid.Value);
+                                                }
+                                            }
+
+                                            goals.Add(goal);
+                                        }
+                                        var copyGoalCats = GoalService.CopyGoals(goalCats, false);
+                                        var copyGoals = GoalService.CopyGoals(goals, false);
+
+                                        vm.PrototypeVM.ChangeGoalTree(copyGoalCats, copyGoals);
+                                    }
+
+                                    
+                                    vm.PrototypeVM.UpdateServiceAccountings(infoDC.ServiceAccountings, vm.PrototypeVM.Category2Services, true);
+                                    
+                                }
+                                else
+                                {
+                                    vm.PrototypeVM.UpdateServiceAccountings(null, vm.PrototypeVM.Category2Services, customerCompact != null);
+                                }
+                                //####
+                                
+                                //vm.PrototypeVM.ChangeGoalTree()
                                 if(vm.PrototypeVM.SortedCategories != null && vm.PrototypeVM.SortedCategories.Count > 0)
                                 {
                                     var cat1 = vm.PrototypeVM.SortedCategories[0];
@@ -146,6 +211,8 @@ namespace BeWo.ownChat
                             })));
         }
 
+        
+
         //GruppenBuchung Konstruktor für Kalender
         public ChatDokumentationsView(string notice, DateTime firstTime, DateTime lastTime, List<CompactCustomerDC> _compactCustomer, List<CompactEmployeeDC> _compactEmployee, Action schedulerCallback = null, Appointment appointment = null)
         {

BeWoPlanerMobil/Controllers/CustomerController.cs

@@ -43,17 +43,30 @@ namespace BeWoPlanerMobil.Controllers
         [Authorize]
         public ActionResult Customer()
         {
-            if (!MobileSessionFacade.IsUserLoggedIn() || Request.Browser.Browser.Equals("InternetExplorer"))
+            try
             {
-                return Logout();
+                if (!MobileSessionFacade.IsUserLoggedIn() || Request.Browser.Browser.Equals("InternetExplorer"))
+                {
+                    return Logout();
+                }
+
+                var customerFilter = MobileUserSettingsUtils.GetSettingValueAsEnum(AbstractModel.UserSettings, SettingsKeys.CustomerFilterCustomers, CustomerFilterEnum.MyCustomer);
+
+                Model.SelectedCustomerFilter = customerFilter;
+
+                InitViewModel();
             }
+            catch (Exception e)
+            {
+                Log.Info($"Exception: " + e.Message + "\n" + e.StackTrace);
+                if (e.InnerException != null)
+                {
+                    Log.Info($"\n\nInnerException: " + e.InnerException.Message + "\n" + e.InnerException.StackTrace);
+                }
 
-            var customerFilter = MobileUserSettingsUtils.GetSettingValueAsEnum(AbstractModel.UserSettings, SettingsKeys.CustomerFilterCustomers, CustomerFilterEnum.MyCustomer);
+                throw;
-
+            }
-            Model.SelectedCustomerFilter = customerFilter;
+            
-
-            InitViewModel();
-
             return View(Model);
         }
 

BeWoPlanerMobil/Controllers/LoginController.cs

@@ -20,79 +20,93 @@ namespace BeWoPlanerMobil.Controllers
 		[HttpPost]
 		public ActionResult Index()
 		{
-			ViewData[LoginErrorIndex] = string.Empty;
+            try
-            TempData[LoginErrorIndex] = string.Empty;
-
-            var isUserLoggedIn = MobileSessionFacade.IsUserLoggedIn();
-
-			if (isUserLoggedIn && !Request.Browser.Browser.Equals("InternetExplorer"))
             {
-				var loginState = MobileUtils.GetLoginState(MobileSessionFacade.Tenant);
+				ViewData[LoginErrorIndex] = string.Empty;
+				TempData[LoginErrorIndex] = string.Empty;
 
-                if (loginState.Message != null && loginState.State > -1)
+				var isUserLoggedIn = MobileSessionFacade.IsUserLoggedIn();
-                {
-                    TempData[MobileUtils.TempDataLoginStateKey] = loginState;
-                }
 
-				Log.Info($"LoginController.Index(): Loggedin User: {MobileSessionFacade.LoggedInUser.LoginName}");
+				if (isUserLoggedIn && !Request.Browser.Browser.Equals("InternetExplorer"))
-
-				if (!MobileSessionFacade.LoggedInUser.UserGroups.Any(a => a.Rights.Any(f => f.RightType.Equals(UserRightType.ServiceRecordView_View))) &&
-					!MobileSessionFacade.LoggedInUser.UserGroups.Any(a => a.Rights.Any(f => f.RightType.Equals(UserRightType.ViewAll))))
 				{
-					ViewData[LoginErrorIndex] = HttpUtility.HtmlDecode("Sie haben keine ausreichenden Berechtigungen, um die Zeiterfassung anzeigen zu lassen.");
+					var loginState = MobileUtils.GetLoginState(MobileSessionFacade.Tenant);
-                    MobileSessionFacade.LogUserOut();
+
-                    FormsAuthentication.SignOut();
+					if (loginState.Message != null && loginState.State > -1)
-					return View("Index");
+					{
+						TempData[MobileUtils.TempDataLoginStateKey] = loginState;
+					}
+
+					Log.Info($"LoginController.Index(): Loggedin User: {MobileSessionFacade.LoggedInUser.LoginName}");
+
+					if (!MobileSessionFacade.LoggedInUser.UserGroups.Any(a => a.Rights.Any(f => f.RightType.Equals(UserRightType.ServiceRecordView_View))) &&
+						!MobileSessionFacade.LoggedInUser.UserGroups.Any(a => a.Rights.Any(f => f.RightType.Equals(UserRightType.ViewAll))))
+					{
+						ViewData[LoginErrorIndex] = HttpUtility.HtmlDecode("Sie haben keine ausreichenden Berechtigungen, um die Zeiterfassung anzeigen zu lassen.");
+						MobileSessionFacade.LogUserOut();
+						FormsAuthentication.SignOut();
+						return View("Index");
+					}
+
+					FormsAuthentication.SetAuthCookie(MobileSessionFacade.LoggedInUser.LoginName, true);
+					ViewData[LoginErrorIndex] = string.Empty;
+
+					var keks = new HttpCookie(MobileSessionFacade.CookieName) { Value = MobileSessionFacade.Tenant, Expires = DateTime.Now.AddDays(1) };
+					HttpContext.Response.SetCookie(keks);
+
+					var brauser = Request.Browser;
+					var brauserInfoDC = new BeWoMobilBrowserInfoDC
+					{
+						Type = brauser.Type,
+						Name = brauser.Browser,
+						BrowserVersion = brauser.Version,
+						Platform = brauser.Platform,
+						Tenant = MobileSessionFacade.Tenant
+					};
+
+					// TODO: Führt manchmal zu Exception
+					//OperationsService.InsertBeWoMobilBrowserInfo(brauserInfoDC);
+
+					AbstractModel.TimeOfLastAction = $"{DateTime.Now:yyyy-MM-dd}T{DateTime.Now:HH:mm:ss}";
+
+					return RedirectToActionPermanent("Main", "Main");
 				}
 
-				FormsAuthentication.SetAuthCookie(MobileSessionFacade.LoggedInUser.LoginName, true);
+				if (isUserLoggedIn && Request.Browser.Browser.Equals("InternetExplorer"))
-				ViewData[LoginErrorIndex] = string.Empty;
-
-			    var keks = new HttpCookie(MobileSessionFacade.CookieName) { Value = MobileSessionFacade.Tenant, Expires = DateTime.Now.AddDays(1) };
-				HttpContext.Response.SetCookie(keks);
-
-				var brauser = Request.Browser;
-				var brauserInfoDC = new BeWoMobilBrowserInfoDC
 				{
-					Type = brauser.Type,
+					MobileSessionFacade.LogUserOut();
-					Name = brauser.Browser,
+					FormsAuthentication.SignOut();
-					BrowserVersion = brauser.Version,
+				}
-					Platform = brauser.Platform,
-					Tenant = MobileSessionFacade.Tenant
-				};
 
-				// TODO: Führt manchmal zu Exception
+				var beWoCookie = HttpContext.Response.Cookies[MobileSessionFacade.CookieName];
-				//OperationsService.InsertBeWoMobilBrowserInfo(brauserInfoDC);
+				if (beWoCookie != null)
+				{
+					var newCookie = new HttpCookie(MobileSessionFacade.CookieName)
+					{
+						Expires = DateTime.Now.AddDays(-1)
+					};
 
-                AbstractModel.TimeOfLastAction = $"{DateTime.Now:yyyy-MM-dd}T{DateTime.Now:HH:mm:ss}";
+					Response.Cookies.Add(newCookie);
+				}
 
-				return RedirectToActionPermanent("Main", "Main");
+				Log.Info($"LoginController.Index(): Login failed! Tenant = {MobileSessionFacade.Tenant}");
+
+				ViewData[LoginErrorIndex] = Request.Browser.Browser.Equals("InternetExplorer") ?
+					"Dieser Browser ist nicht mit dem mobilen BeWoPlaner kompatibel. Bitte benutzen Sie einen anderen Browser als den Internet Explorer." :
+					"Die Anmeldung ist fehlgeschlagen. Bitte überprüfen Sie Benutzername und Passwort.";
+
+				return View("Index");
 			}
-
+            catch (Exception e)
-		    if(isUserLoggedIn && Request.Browser.Browser.Equals("InternetExplorer"))
-		    {
-		        MobileSessionFacade.LogUserOut();
-		        FormsAuthentication.SignOut();
-            }
-
-            var beWoCookie = HttpContext.Response.Cookies[MobileSessionFacade.CookieName];
-            if(beWoCookie != null)
             {
-                var newCookie = new HttpCookie(MobileSessionFacade.CookieName)
+				Log.Info($"Exception: " + e.Message + "\n" + e.StackTrace);
+				if (e.InnerException != null)
                 {
-                    Expires = DateTime.Now.AddDays(-1)
+					Log.Info($"\n\nInnerException: " + e.InnerException.Message + "\n" + e.InnerException.StackTrace);
-                };
+				}
-
+				
-                Response.Cookies.Add(newCookie);
+				return View("Index");
-            }
+			}
-
+			
-			Log.Info($"LoginController.Index(): Login failed! Tenant = {MobileSessionFacade.Tenant}");
-
-			ViewData[LoginErrorIndex] = Request.Browser.Browser.Equals("InternetExplorer") ? 
-                "Dieser Browser ist nicht mit dem mobilen BeWoPlaner kompatibel. Bitte benutzen Sie einen anderen Browser als den Internet Explorer." : 
-                "Die Anmeldung ist fehlgeschlagen. Bitte überprüfen Sie Benutzername und Passwort.";
-
-			return View("Index");
 		}
 
 	    public ActionResult Index(string tenant, string returnUrl)

Host/Host.csproj.user

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <NameOfLastUsedPublishProfile>BeWo2.0</NameOfLastUsedPublishProfile>
     <UseIISExpress>true</UseIISExpress>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress>false</Use64BitIISExpress>
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />

Model/Changes_2022_03_21_Abwesenheitsinformationprint.txt

@@ -19,4 +19,4 @@ CREATE TABLE `abwesenheitsinformationprint` (
   `TageUrlaub` varchar(256) DEFAULT NULL,
   `GeschenkteUrlaubstage` varchar(256) DEFAULT NULL,
   PRIMARY KEY (`Oid`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;

ReportImp/AidshilfeDortmund/AidshilfeDortmund.csproj

@@ -82,6 +82,26 @@
     <Compile Include="SettlementReport.Designer.cs">
       <DependentUpon>SettlementReport.cs</DependentUpon>
     </Compile>
+    <Compile Include="Stundenkonto\CustomMitarbeiterstundenkontoBerechnung.cs" />
+    <Compile Include="Stundenkonto\CustomMitarbeiterstundenkontoBerechnungMonate.cs" />
+    <Compile Include="Stundenkonto\Mitarbeiterarbeitszeitkonto.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Stundenkonto\Mitarbeiterarbeitszeitkonto.designer.cs">
+      <DependentUpon>Mitarbeiterarbeitszeitkonto.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Stundenkonto\Mitarbeiterstundenkonto.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Stundenkonto\Mitarbeiterstundenkonto.designer.cs">
+      <DependentUpon>Mitarbeiterstundenkonto.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Stundenkonto\MitarbeiterstundenkontoJahr.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Stundenkonto\MitarbeiterstundenkontoJahr.designer.cs">
+      <DependentUpon>MitarbeiterstundenkontoJahr.cs</DependentUpon>
+    </Compile>
     <Compile Include="SupportConceptReport.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -103,6 +123,17 @@
       <DependentUpon>SettlementReport.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Stundenkonto\Mitarbeiterarbeitszeitkonto.resx">
+      <DependentUpon>Mitarbeiterarbeitszeitkonto.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Stundenkonto\Mitarbeiterstundenkonto.resx">
+      <DependentUpon>Mitarbeiterstundenkonto.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Stundenkonto\MitarbeiterstundenkontoJahr.resx">
+      <DependentUpon>MitarbeiterstundenkontoJahr.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="SupportConceptReport.resx">
       <DependentUpon>SupportConceptReport.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -129,6 +160,7 @@
   <ItemGroup>
     <None Include="app.config" />
   </ItemGroup>
+  <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.

ReportImp/AidshilfeDortmund/Stundenkonto/CustomMitarbeiterstundenkontoBerechnung.cs

@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using BeWo.Data.Entities;
+using BeWo.Report.ReportObjects;
+using BeWo.Service.Plugins;
+using BS.Shared.DataContracts;
+using BS.Shared.Extensions;
+
+
+namespace AidshilfeDortmund.Stundenkonto
+{
+	public class CustomMitarbeiterstundenkontoBerechnung : MitarbeiterstundenkontoBerechnung
+	{
+		public override bool AddServiceRecordToDuration(ServiceRecord item)
+		{
+			if (item.ServiceDescription != null && item.ServiceDescription.ServiceCategory != null)
+			{
+				if (item.ServiceDescription.ServiceCategory.Name == "Arbeitszeit")
+				{
+					return true;
+				}
+			}
+			return false;
+		}
+
+        protected override ServiceRecordSummary BerechneStunden(MitarbeiterstundenkontoRO.EmployeeDetail empDetail, IList<ServiceRecord> groupFilteredRecords, DateTime berichtsAnfang,
+            DateTime berichtsEnde)
+        {
+            decimal flsGesamt = 0;
+            decimal arbeitszeit = 0;
+
+            var sum = new ServiceRecordSummary();
+            sum.RecordsImBerichtszeitraum = new List<ServiceRecord>();
+            //base.CorrectOverlappingTimes(groupFilteredRecords);
+
+            foreach (var item in groupFilteredRecords)
+            {
+                if (!IsServiceRecordFehlzeit(item))
+                {
+                    if (item.Start.Value >= berichtsAnfang && item.Start.Value < berichtsEnde)
+                    {
+                        //if (AddServiceRecordToDuration(item))
+                        //{
+                        decimal duration = 0;
+
+                        if (item.GroupRoundedDuration.HasValue)
+                        {
+                            duration = item.GroupRoundedDuration.Value;
+                        }
+                        else
+                        {
+                            duration = item.RoundedDuration;
+                        }
+
+                        if (item.ServiceDescription != null &&
+                            item.ServiceDescription.ServiceCategory != null)
+                        {
+                            if (item.ServiceDescription.ServiceCategory.Name == "Arbeitszeit")
+                            {
+                                arbeitszeit += duration;
+                            }
+                            else if (item.ServiceDescription.ServiceCategory.IsBillable)
+                            {
+                                flsGesamt += duration;
+                            }
+
+                        }
+                        sum.RecordsImBerichtszeitraum.Add(item);
+                    }
+                }
+            }
+
+
+            sum.IstAbrechenbar = flsGesamt;
+            sum.IstNichtAbrechenbar = arbeitszeit - flsGesamt;
+
+
+            return sum;
+        }
+
+        public override bool ShouldCreateDayDetails()
+		{
+			return true;
+		}
+
+		public override MitarbeiterstundenkontoRO.DayDetail CreateDayDetail(DateTime date, MitarbeiterstundenkontoRO.EmployeeDetail ed)
+		{
+			var dd = base.CreateDayDetail(date, ed);
+			dd.MaxHoursUntilBreak = null;
+			dd.MaxHoursUntilBreak2 = null;
+			dd.BreakMinutes = null;
+			dd.BreakMinutes2 = null;
+			return dd;
+		}
+	}
+}

ReportImp/AidshilfeDortmund/Stundenkonto/CustomMitarbeiterstundenkontoBerechnungMonate.cs

@@ -0,0 +1,19 @@
+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 AidshilfeDortmund.Stundenkonto
+{
+    public class CustomMitarbeiterstundenkontoBerechnungMonate : MitarbeiterstundenkontoBerechnungMonate
+    {
+        public override MitarbeiterstundenkontoBerechnung CreateMitarbeiterstundenkontoBerechnung()
+        {
+            return new CustomMitarbeiterstundenkontoBerechnung();
+        }
+    }
+}

ReportImp/AidshilfeDortmund/Stundenkonto/Mitarbeiterarbeitszeitkonto.cs

@@ -0,0 +1,47 @@
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using BeWo.Report;
+using BeWo.Report.ReportObjects;
+
+using BS.Shared.Core;
+using DevExpress.XtraReports.UI;
+
+namespace AidshilfeDortmund.Stundenkonto
+{
+	[IDSpecificClass(Identifier = "Mitarbeiterarbeitszeitkonto")]
+	public partial class Mitarbeiterarbeitszeitkonto : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<MitarbeiterstundenkontoRO>
+	{
+        
+        public Mitarbeiterarbeitszeitkonto()
+		{
+			InitializeComponent();
+		}
+
+		public void SetReportDataSource(MitarbeiterstundenkontoRO pRO)
+		{
+		    var msb = new CustomMitarbeiterstundenkontoBerechnung();
+		    msb.CreateReport(pRO);
+
+		    foreach (var ed in pRO.EmployeeDetailList)
+		    {
+		        var c = ed.Employee.GetValidContractForDate(pRO.ReportStartDate);
+		        if (c != null)
+		        {
+		            if (c.MonthlyTotalHours.HasValue)
+		            {
+		                ed.Regelarbeitszeit = String.Format("{0:0.00} Stunden im Monat", c.MonthlyTotalHours);
+		            }
+		            else if (c.WeeklyTotalHours.HasValue)
+		            {
+		                ed.Regelarbeitszeit = String.Format("{0:0.00} Stunden pro Woche", c.WeeklyTotalHours);
+                    }
+                }
+		        
+		    }
+		    this.bindingSource1.DataSource = pRO;
+        }
+        
+    }
+}

ReportImp/AidshilfeDortmund/Stundenkonto/Mitarbeiterarbeitszeitkonto.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/AidshilfeDortmund/Stundenkonto/Mitarbeiterstundenkonto.cs

@@ -0,0 +1,28 @@
+using System;
+using BeWo.Report;
+using BeWo.Report.ReportObjects;
+using BS.Shared.Core;
+
+
+namespace AidshilfeDortmund.Stundenkonto
+{
+	[IDSpecificClass(Identifier = "Mitarbeiterstundenkonto")]
+	public partial class Mitarbeiterstundenkonto : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<MitarbeiterstundenkontoRO>
+	{
+		
+
+		public Mitarbeiterstundenkonto()
+		{
+			InitializeComponent();
+		}
+
+		public void SetReportDataSource(MitarbeiterstundenkontoRO pRO)
+		{
+			var msb = new CustomMitarbeiterstundenkontoBerechnung();
+			msb.CreateReport(pRO);
+
+			this.bindingSource1.DataSource = pRO;
+		}
+
+	}
+}

ReportImp/AidshilfeDortmund/Stundenkonto/Mitarbeiterstundenkonto.designer.cs

@@ -0,0 +1,716 @@
+using BeWo.Report.ReportObjects;
+namespace AidshilfeDortmund.Stundenkonto
+{
+    partial class Mitarbeiterstundenkonto
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            this.Detail = new DevExpress.XtraReports.UI.DetailBand();
+            this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
+            this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
+            this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+            this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
+            this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.cellSollGesamt = new DevExpress.XtraReports.UI.XRTableCell();
+            this.cellFLSSollGesamt = new DevExpress.XtraReports.UI.XRTableCell();
+            this.cellFLSIstGesamt = new DevExpress.XtraReports.UI.XRTableCell();
+            this.cellFLSPlusMinusGesamt = new DevExpress.XtraReports.UI.XRTableCell();
+            this.cellGesamtGesamt = new DevExpress.XtraReports.UI.XRTableCell();
+            this.cellRelationGesamt = new DevExpress.XtraReports.UI.XRTableCell();
+            this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
+            this.lblMonat = new DevExpress.XtraReports.UI.XRLabel();
+            this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
+            this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo();
+            this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo();
+            this.Title = new DevExpress.XtraReports.UI.XRControlStyle();
+            this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle();
+            this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle();
+            this.DataField = new DevExpress.XtraReports.UI.XRControlStyle();
+            this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField();
+            this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
+            this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRowHeader = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableHeader = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRowDetail = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).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;
+            // 
+            // Detail1
+            // 
+            this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTableDetail});
+            this.Detail1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Detail1.HeightF = 25F;
+            this.Detail1.Name = "Detail1";
+            this.Detail1.StylePriority.UseFont = false;
+            // 
+            // DetailReport
+            // 
+            this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail1,
+            this.GroupHeader1,
+            this.GroupFooter1});
+            this.DetailReport.DataMember = "EmployeeDetailList";
+            this.DetailReport.DataSource = this.bindingSource1;
+            this.DetailReport.Level = 0;
+            this.DetailReport.Name = "DetailReport";
+            // 
+            // GroupHeader1
+            // 
+            this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTableHeader});
+            this.GroupHeader1.HeightF = 70F;
+            this.GroupHeader1.Name = "GroupHeader1";
+            this.GroupHeader1.RepeatEveryPage = true;
+            // 
+            // GroupFooter1
+            // 
+            this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable1});
+            this.GroupFooter1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+            this.GroupFooter1.HeightF = 48.95833F;
+            this.GroupFooter1.Name = "GroupFooter1";
+            this.GroupFooter1.StylePriority.UseFont = false;
+            // 
+            // xrTable1
+            // 
+            this.xrTable1.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTable1.Name = "xrTable1";
+            this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow1});
+            this.xrTable1.SizeF = new System.Drawing.SizeF(1005F, 25F);
+            this.xrTable1.StylePriority.UseBorders = false;
+            this.xrTable1.StylePriority.UseFont = false;
+            this.xrTable1.StylePriority.UsePadding = false;
+            this.xrTable1.StylePriority.UseTextAlignment = false;
+            this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            // 
+            // xrTableRow1
+            // 
+            this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell35,
+            this.xrTableCell37,
+            this.xrTableCell39,
+            this.cellSollGesamt,
+            this.cellFLSSollGesamt,
+            this.cellFLSIstGesamt,
+            this.cellFLSPlusMinusGesamt,
+            this.cellGesamtGesamt,
+            this.cellRelationGesamt,
+            this.xrTableCell47,
+            this.xrTableCell48,
+            this.xrTableCell51});
+            this.xrTableRow1.Name = "xrTableRow1";
+            this.xrTableRow1.Weight = 1D;
+            // 
+            // xrTableCell35
+            // 
+            this.xrTableCell35.Name = "xrTableCell35";
+            this.xrTableCell35.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+            this.xrTableCell35.StylePriority.UseFont = false;
+            this.xrTableCell35.StylePriority.UsePadding = false;
+            this.xrTableCell35.StylePriority.UseTextAlignment = false;
+            this.xrTableCell35.Text = "Gesamt";
+            this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell35.Weight = 0.15329126714047708D;
+            // 
+            // cellSollGesamt
+            // 
+            this.cellSollGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SollGesamt", "{0:0.00}")});
+            this.cellSollGesamt.Name = "cellSollGesamt";
+            this.cellSollGesamt.Text = "cellSollGesamt";
+            this.cellSollGesamt.Weight = 0.0721370604147881D;
+            // 
+            // cellFLSSollGesamt
+            // 
+            this.cellFLSSollGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsSollGesamt", "{0:0.00}")});
+            this.cellFLSSollGesamt.Name = "cellFLSSollGesamt";
+            this.cellFLSSollGesamt.Text = "cellFLSSollGesamt";
+            this.cellFLSSollGesamt.Weight = 0.063119927862939587D;
+            // 
+            // cellFLSIstGesamt
+            // 
+            this.cellFLSIstGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsIstGesamt", "{0:0.00}")});
+            this.cellFLSIstGesamt.Name = "cellFLSIstGesamt";
+            this.cellFLSIstGesamt.Text = "cellFLSIstGesamt";
+            this.cellFLSIstGesamt.Weight = 0.063119927862939615D;
+            // 
+            // cellFLSPlusMinusGesamt
+            // 
+            this.cellFLSPlusMinusGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsDiffGesamt", "{0:0.00}")});
+            this.cellFLSPlusMinusGesamt.Name = "cellFLSPlusMinusGesamt";
+            this.cellFLSPlusMinusGesamt.Text = "cellFLSPlusMinusGesamt";
+            this.cellFLSPlusMinusGesamt.Weight = 0.063119927862939587D;
+            // 
+            // cellGesamtGesamt
+            // 
+            this.cellGesamtGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "StundenGesamt", "{0:0.00}")});
+            this.cellGesamtGesamt.Name = "cellGesamtGesamt";
+            this.cellGesamtGesamt.Text = "cellGesamtGesamt";
+            this.cellGesamtGesamt.Weight = 0.063119927862939573D;
+            // 
+            // cellRelationGesamt
+            // 
+            this.cellRelationGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "RelationFlsZuMittelbar", "{0:0.00}")});
+            this.cellRelationGesamt.Name = "cellRelationGesamt";
+            this.cellRelationGesamt.Text = "cellRelationGesamt";
+            this.cellRelationGesamt.Weight = 0.0631199278629396D;
+            // 
+            // ReportHeader
+            // 
+            this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.lblMonat});
+            this.ReportHeader.HeightF = 35F;
+            this.ReportHeader.Name = "ReportHeader";
+            // 
+            // lblMonat
+            // 
+            this.lblMonat.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReportStartDate", "Stundenkonto {0:MMMM yyyy}")});
+            this.lblMonat.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold);
+            this.lblMonat.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.lblMonat.Multiline = true;
+            this.lblMonat.Name = "lblMonat";
+            this.lblMonat.SizeF = new System.Drawing.SizeF(1007F, 25F);
+            this.lblMonat.StyleName = "Title";
+            this.lblMonat.StylePriority.UseFont = false;
+            // 
+            // 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(864.9999F, 25F);
+            this.xrPageInfo2.Name = "xrPageInfo2";
+            this.xrPageInfo2.SizeF = new System.Drawing.SizeF(139.9999F, 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(260.0001F, 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.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";
+            // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);
+            // 
+            // xrTableCell37
+            // 
+            this.xrTableCell37.Name = "xrTableCell37";
+            this.xrTableCell37.Weight = 0.081154151689479551D;
+            // 
+            // xrTableCell39
+            // 
+            this.xrTableCell39.Name = "xrTableCell39";
+            this.xrTableCell39.Weight = 0.094679919312514085D;
+            // 
+            // xrTableCell48
+            // 
+            this.xrTableCell48.Name = "xrTableCell48";
+            this.xrTableCell48.Weight = 0.063119927862939587D;
+            // 
+            // xrTableCell51
+            // 
+            this.xrTableCell51.Name = "xrTableCell51";
+            this.xrTableCell51.Weight = 0.063119927862939573D;
+            // 
+            // xrTableCell47
+            // 
+            this.xrTableCell47.Name = "xrTableCell47";
+            this.xrTableCell47.Weight = 0.063119927862939587D;
+            // 
+            // xrTableCell15
+            // 
+            this.xrTableCell15.Name = "xrTableCell15";
+            this.xrTableCell15.Text = "Überstd. Gesamt";
+            this.xrTableCell15.Weight = 0.0631199213956443D;
+            // 
+            // xrTableCell14
+            // 
+            this.xrTableCell14.Name = "xrTableCell14";
+            this.xrTableCell14.StylePriority.UseBackColor = false;
+            this.xrTableCell14.Text = "Überstd. Vormonat";
+            this.xrTableCell14.Weight = 0.063119928275170531D;
+            // 
+            // xrTableCell13
+            // 
+            this.xrTableCell13.Name = "xrTableCell13";
+            this.xrTableCell13.Text = "Überstd. neu";
+            this.xrTableCell13.Weight = 0.063119928687401447D;
+            // 
+            // xrTableCell12
+            // 
+            this.xrTableCell12.Name = "xrTableCell12";
+            this.xrTableCell12.Text = "Relation FLS IST zu Mittelbare IST (in %)";
+            this.xrTableCell12.Weight = 0.063119929511863376D;
+            // 
+            // xrTableCell11
+            // 
+            this.xrTableCell11.Multiline = true;
+            this.xrTableCell11.Name = "xrTableCell11";
+            this.xrTableCell11.StylePriority.UseBackColor = false;
+            this.xrTableCell11.Text = "Gesamt-\r\nstunden lfd. Monat";
+            this.xrTableCell11.Weight = 0.063119927721024011D;
+            // 
+            // xrTableCell7
+            // 
+            this.xrTableCell7.Name = "xrTableCell7";
+            this.xrTableCell7.Text = "FLS Plus/Minus lfd. Monat";
+            this.xrTableCell7.Weight = 0.06311992757910842D;
+            // 
+            // xrTableCell10
+            // 
+            this.xrTableCell10.Name = "xrTableCell10";
+            this.xrTableCell10.StylePriority.UseBackColor = false;
+            this.xrTableCell10.Text = "FLS IST lfd. Monat";
+            this.xrTableCell10.Weight = 0.063119927721024D;
+            // 
+            // xrTableCell8
+            // 
+            this.xrTableCell8.Name = "xrTableCell8";
+            this.xrTableCell8.Text = "FLS Stunden SOLL";
+            this.xrTableCell8.Weight = 0.063119927721024038D;
+            // 
+            // xrTableCell9
+            // 
+            this.xrTableCell9.Multiline = true;
+            this.xrTableCell9.Name = "xrTableCell9";
+            this.xrTableCell9.Text = "Tatsächliche SOLL Stunden";
+            this.xrTableCell9.Weight = 0.072137063712635591D;
+            // 
+            // xrTableCell2
+            // 
+            this.xrTableCell2.Name = "xrTableCell2";
+            this.xrTableCell2.Text = "Fehlzeiten Urlaub Krankheit(Tage)";
+            this.xrTableCell2.Weight = 0.094679896646570338D;
+            // 
+            // xrTableCell4
+            // 
+            this.xrTableCell4.Name = "xrTableCell4";
+            this.xrTableCell4.Text = "Reguläre SOLL Stunden";
+            this.xrTableCell4.Weight = 0.081154192324637608D;
+            // 
+            // xrTableCell5
+            // 
+            this.xrTableCell5.Name = "xrTableCell5";
+            this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+            this.xrTableCell5.StylePriority.UsePadding = false;
+            this.xrTableCell5.StylePriority.UseTextAlignment = false;
+            this.xrTableCell5.Text = "Name";
+            this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell5.Weight = 0.15329125016467182D;
+            // 
+            // xrTableRowHeader
+            // 
+            this.xrTableRowHeader.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell5,
+            this.xrTableCell4,
+            this.xrTableCell2,
+            this.xrTableCell9,
+            this.xrTableCell8,
+            this.xrTableCell10,
+            this.xrTableCell7,
+            this.xrTableCell11,
+            this.xrTableCell12,
+            this.xrTableCell13,
+            this.xrTableCell14,
+            this.xrTableCell15});
+            this.xrTableRowHeader.Name = "xrTableRowHeader";
+            this.xrTableRowHeader.Weight = 2.8D;
+            // 
+            // xrTableHeader
+            // 
+            this.xrTableHeader.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableHeader.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold);
+            this.xrTableHeader.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTableHeader.Name = "xrTableHeader";
+            this.xrTableHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableHeader.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRowHeader});
+            this.xrTableHeader.SizeF = new System.Drawing.SizeF(1005F, 70F);
+            this.xrTableHeader.StylePriority.UseBorders = false;
+            this.xrTableHeader.StylePriority.UseFont = false;
+            this.xrTableHeader.StylePriority.UsePadding = false;
+            this.xrTableHeader.StylePriority.UseTextAlignment = false;
+            this.xrTableHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            // 
+            // xrTableCell26
+            // 
+            this.xrTableCell26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenGesamt", "{0:0.00}")});
+            this.xrTableCell26.Name = "xrTableCell26";
+            this.xrTableCell26.Text = "xrTableCell26";
+            this.xrTableCell26.Weight = 0.063119927862939573D;
+            // 
+            // xrTableCell24
+            // 
+            this.xrTableCell24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenVormonat", "{0:0.00}")});
+            this.xrTableCell24.Name = "xrTableCell24";
+            this.xrTableCell24.Text = "xrTableCell24";
+            this.xrTableCell24.Weight = 0.0631199278629396D;
+            // 
+            // xrTableCell25
+            // 
+            this.xrTableCell25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Ueberstunden", "{0:0.00}")});
+            this.xrTableCell25.Name = "xrTableCell25";
+            this.xrTableCell25.Text = "xrTableCell25";
+            this.xrTableCell25.Weight = 0.063119927862939587D;
+            // 
+            // xrTableCell21
+            // 
+            this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.RelationFlsZuMittelbar", "{0:0.00}")});
+            this.xrTableCell21.Name = "xrTableCell21";
+            this.xrTableCell21.Text = "xrTableCell21";
+            this.xrTableCell21.Weight = 0.063119927862939615D;
+            // 
+            // xrTableCell23
+            // 
+            this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenGesamtIst", "{0:0.00}")});
+            this.xrTableCell23.Name = "xrTableCell23";
+            this.xrTableCell23.Text = "xrTableCell23";
+            this.xrTableCell23.Weight = 0.063119927862939559D;
+            // 
+            // xrTableCell22
+            // 
+            this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsDiff", "{0:0.00}")});
+            this.xrTableCell22.Name = "xrTableCell22";
+            this.xrTableCell22.Text = "xrTableCell22";
+            this.xrTableCell22.Weight = 0.063119927862939587D;
+            // 
+            // xrTableCell27
+            // 
+            this.xrTableCell27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsIst", "{0:0.00}")});
+            this.xrTableCell27.Name = "xrTableCell27";
+            this.xrTableCell27.Text = "xrTableCell27";
+            this.xrTableCell27.Weight = 0.063119927862939615D;
+            // 
+            // xrTableCell16
+            // 
+            this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsSoll", "{0:0.00}")});
+            this.xrTableCell16.Name = "xrTableCell16";
+            this.xrTableCell16.Text = "xrTableCell16";
+            this.xrTableCell16.Weight = 0.063119927862939587D;
+            // 
+            // xrTableCell28
+            // 
+            this.xrTableCell28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenSollOhneUrlaubKrankheit", "{0:0.00}")});
+            this.xrTableCell28.Name = "xrTableCell28";
+            this.xrTableCell28.Text = "xrTableCell28";
+            this.xrTableCell28.Weight = 0.0721370604147881D;
+            // 
+            // xrTableCell20
+            // 
+            this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UrlaubUndKrankheit", "{0:0.00}")});
+            this.xrTableCell20.Name = "xrTableCell20";
+            this.xrTableCell20.Text = "xrTableCell20";
+            this.xrTableCell20.Weight = 0.094679933071566441D;
+            // 
+            // xrTableCell19
+            // 
+            this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenSollMax", "{0:0.00}")});
+            this.xrTableCell19.Name = "xrTableCell19";
+            this.xrTableCell19.Text = "xrTableCell19";
+            this.xrTableCell19.Weight = 0.081154151689479551D;
+            // 
+            // xrTableCell3
+            // 
+            this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FullName")});
+            this.xrTableCell3.Name = "xrTableCell3";
+            this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+            this.xrTableCell3.StylePriority.UseFont = false;
+            this.xrTableCell3.StylePriority.UsePadding = false;
+            this.xrTableCell3.StylePriority.UseTextAlignment = false;
+            this.xrTableCell3.Text = "xrTableCell3";
+            this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell3.Weight = 0.15329125338142471D;
+            // 
+            // xrTableRowDetail
+            // 
+            this.xrTableRowDetail.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell3,
+            this.xrTableCell19,
+            this.xrTableCell20,
+            this.xrTableCell28,
+            this.xrTableCell16,
+            this.xrTableCell27,
+            this.xrTableCell22,
+            this.xrTableCell23,
+            this.xrTableCell21,
+            this.xrTableCell25,
+            this.xrTableCell24,
+            this.xrTableCell26});
+            this.xrTableRowDetail.Name = "xrTableRowDetail";
+            this.xrTableRowDetail.Weight = 1D;
+            // 
+            // xrTableDetail
+            // 
+            this.xrTableDetail.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableDetail.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableDetail.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTableDetail.Name = "xrTableDetail";
+            this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRowDetail});
+            this.xrTableDetail.SizeF = new System.Drawing.SizeF(1005F, 25F);
+            this.xrTableDetail.StylePriority.UseBorders = false;
+            this.xrTableDetail.StylePriority.UseFont = false;
+            this.xrTableDetail.StylePriority.UsePadding = false;
+            this.xrTableDetail.StylePriority.UseTextAlignment = false;
+            this.xrTableDetail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            // 
+            // Mitarbeiterstundenkonto
+            // 
+            this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail,
+            this.DetailReport,
+            this.ReportHeader,
+            this.pageFooterBand1,
+            this.topMarginBand1,
+            this.bottomMarginBand1});
+            this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
+            this.fieldFLS});
+            this.DataSource = this.bindingSource1;
+            this.Landscape = true;
+            this.Margins = new System.Drawing.Printing.Margins(75, 75, 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.xrTable1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).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.XRLabel lblMonat;
+        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.GroupHeaderBand GroupHeader1;
+		private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
+        private DevExpress.XtraReports.UI.XRTable xrTable1;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell35;
+        private DevExpress.XtraReports.UI.XRTableCell cellSollGesamt;
+        private DevExpress.XtraReports.UI.XRTableCell cellFLSSollGesamt;
+        private DevExpress.XtraReports.UI.XRTableCell cellFLSIstGesamt;
+        private DevExpress.XtraReports.UI.XRTableCell cellFLSPlusMinusGesamt;
+        private DevExpress.XtraReports.UI.XRTableCell cellGesamtGesamt;
+		private DevExpress.XtraReports.UI.XRTableCell cellRelationGesamt;
+        private DevExpress.XtraReports.UI.XRTable xrTableDetail;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRowDetail;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell28;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell27;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell23;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell25;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell24;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell26;
+        private DevExpress.XtraReports.UI.XRTable xrTableHeader;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRowHeader;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell37;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell39;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell47;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell48;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell51;
+    }
+}

ReportImp/AidshilfeDortmund/Stundenkonto/Mitarbeiterstundenkonto.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/AidshilfeDortmund/Stundenkonto/MitarbeiterstundenkontoJahr.cs

@@ -0,0 +1,28 @@
+using System;
+using BeWo.Report;
+using BeWo.Report.ReportObjects;
+using BS.Shared.Core;
+
+
+namespace AidshilfeDortmund.Stundenkonto
+{
+	[IDSpecificClass(Identifier = "MitarbeiterstundenkontoJahr")]
+	public partial class MitarbeiterstundenkontoJahr : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<MitarbeiterstundenkontoMonateRO>
+	{
+		
+
+		public MitarbeiterstundenkontoJahr()
+		{
+			InitializeComponent();
+		}
+
+		public void SetReportDataSource(MitarbeiterstundenkontoMonateRO pRO)
+		{
+			var msb = new CustomMitarbeiterstundenkontoBerechnungMonate();
+			msb.CreateReport(pRO);
+
+			this.bindingSource1.DataSource = pRO;
+		}
+
+	}
+}

ReportImp/AidshilfeDortmund/Stundenkonto/MitarbeiterstundenkontoJahr.designer.cs

@@ -0,0 +1,761 @@
+using BeWo.Report.ReportObjects;
+namespace AidshilfeDortmund.Stundenkonto
+{
+    partial class MitarbeiterstundenkontoJahr
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary3 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary4 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary5 = new DevExpress.XtraReports.UI.XRSummary();
+            this.Detail = new DevExpress.XtraReports.UI.DetailBand();
+            this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRowDetail = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableHeader = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRowHeader = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.cellSollGesamt = new DevExpress.XtraReports.UI.XRTableCell();
+            this.cellFLSSollGesamt = new DevExpress.XtraReports.UI.XRTableCell();
+            this.cellFLSIstGesamt = new DevExpress.XtraReports.UI.XRTableCell();
+            this.cellFLSPlusMinusGesamt = new DevExpress.XtraReports.UI.XRTableCell();
+            this.cellGesamtGesamt = new DevExpress.XtraReports.UI.XRTableCell();
+            this.cellRelationGesamt = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
+            this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo();
+            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.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand();
+            this.Detail2 = new DevExpress.XtraReports.UI.DetailBand();
+            this.DetailReport2 = new DevExpress.XtraReports.UI.DetailReportBand();
+            this.Detail3 = new DevExpress.XtraReports.UI.DetailBand();
+            this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+            this.GroupHeader3 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+            this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+            this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand();
+            this.fieldRelationGesamt = new DevExpress.XtraReports.UI.CalculatedField();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
+            ((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;
+            // 
+            // xrTableDetail
+            // 
+            this.xrTableDetail.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableDetail.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableDetail.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTableDetail.Name = "xrTableDetail";
+            this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRowDetail});
+            this.xrTableDetail.SizeF = new System.Drawing.SizeF(1005F, 25F);
+            this.xrTableDetail.StylePriority.UseBorders = false;
+            this.xrTableDetail.StylePriority.UseFont = false;
+            this.xrTableDetail.StylePriority.UsePadding = false;
+            this.xrTableDetail.StylePriority.UseTextAlignment = false;
+            this.xrTableDetail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            // 
+            // xrTableRowDetail
+            // 
+            this.xrTableRowDetail.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell3,
+            this.xrTableCell19,
+            this.xrTableCell20,
+            this.xrTableCell28,
+            this.xrTableCell16,
+            this.xrTableCell27,
+            this.xrTableCell22,
+            this.xrTableCell23,
+            this.xrTableCell21,
+            this.xrTableCell25,
+            this.xrTableCell24,
+            this.xrTableCell26});
+            this.xrTableRowDetail.Name = "xrTableRowDetail";
+            this.xrTableRowDetail.Weight = 1D;
+            // 
+            // xrTableCell3
+            // 
+            this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.Monat", "{0:MMMM}")});
+            this.xrTableCell3.Name = "xrTableCell3";
+            this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+            this.xrTableCell3.StylePriority.UseFont = false;
+            this.xrTableCell3.StylePriority.UsePadding = false;
+            this.xrTableCell3.StylePriority.UseTextAlignment = false;
+            this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell3.Weight = 0.15329125338142471D;
+            // 
+            // xrTableCell19
+            // 
+            this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.StundenSollMax", "{0:0.00}")});
+            this.xrTableCell19.Name = "xrTableCell19";
+            this.xrTableCell19.Text = "xrTableCell19";
+            this.xrTableCell19.Weight = 0.081154151689479551D;
+            // 
+            // xrTableCell20
+            // 
+            this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.UrlaubUndKrankheit", "{0:0.00}")});
+            this.xrTableCell20.Name = "xrTableCell20";
+            this.xrTableCell20.Text = "xrTableCell20";
+            this.xrTableCell20.Weight = 0.094679933071566441D;
+            // 
+            // xrTableCell28
+            // 
+            this.xrTableCell28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.StundenSollOhneUrlaubKrankheit", "{0:0.00}")});
+            this.xrTableCell28.Name = "xrTableCell28";
+            this.xrTableCell28.Text = "xrTableCell28";
+            this.xrTableCell28.Weight = 0.0721370604147881D;
+            // 
+            // xrTableCell16
+            // 
+            this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsSoll", "{0:0.00}")});
+            this.xrTableCell16.Name = "xrTableCell16";
+            this.xrTableCell16.Text = "xrTableCell16";
+            this.xrTableCell16.Weight = 0.063119927862939587D;
+            // 
+            // xrTableCell27
+            // 
+            this.xrTableCell27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsIst", "{0:0.00}")});
+            this.xrTableCell27.Name = "xrTableCell27";
+            this.xrTableCell27.Text = "xrTableCell27";
+            this.xrTableCell27.Weight = 0.063119927862939615D;
+            // 
+            // xrTableCell22
+            // 
+            this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsDiff", "{0:0.00}")});
+            this.xrTableCell22.Name = "xrTableCell22";
+            this.xrTableCell22.Text = "xrTableCell22";
+            this.xrTableCell22.Weight = 0.063119927862939587D;
+            // 
+            // xrTableCell23
+            // 
+            this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.StundenGesamtIst", "{0:0.00}")});
+            this.xrTableCell23.Name = "xrTableCell23";
+            this.xrTableCell23.Text = "xrTableCell23";
+            this.xrTableCell23.Weight = 0.063119927862939559D;
+            // 
+            // xrTableCell21
+            // 
+            this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.RelationFlsZuMittelbar", "{0:0.00}")});
+            this.xrTableCell21.Name = "xrTableCell21";
+            this.xrTableCell21.Text = "xrTableCell21";
+            this.xrTableCell21.Weight = 0.063119927862939615D;
+            // 
+            // xrTableCell25
+            // 
+            this.xrTableCell25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.Ueberstunden", "{0:0.00}")});
+            this.xrTableCell25.Name = "xrTableCell25";
+            this.xrTableCell25.Text = "xrTableCell25";
+            this.xrTableCell25.Weight = 0.063119927862939587D;
+            // 
+            // xrTableCell24
+            // 
+            this.xrTableCell24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.LaufendeGesamtsumme", "{0:0.00}")});
+            this.xrTableCell24.Name = "xrTableCell24";
+            this.xrTableCell24.Text = "xrTableCell24";
+            this.xrTableCell24.Weight = 0.0631199278629396D;
+            // 
+            // xrTableCell26
+            // 
+            this.xrTableCell26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.UeberstundenGesamt", "{0:0.00}")});
+            this.xrTableCell26.Name = "xrTableCell26";
+            this.xrTableCell26.Text = "xrTableCell26";
+            this.xrTableCell26.Weight = 0.063119927862939573D;
+            // 
+            // xrTableHeader
+            // 
+            this.xrTableHeader.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableHeader.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold);
+            this.xrTableHeader.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTableHeader.Name = "xrTableHeader";
+            this.xrTableHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableHeader.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRowHeader});
+            this.xrTableHeader.SizeF = new System.Drawing.SizeF(1005F, 70F);
+            this.xrTableHeader.StylePriority.UseBorders = false;
+            this.xrTableHeader.StylePriority.UseFont = false;
+            this.xrTableHeader.StylePriority.UsePadding = false;
+            this.xrTableHeader.StylePriority.UseTextAlignment = false;
+            this.xrTableHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            // 
+            // xrTableRowHeader
+            // 
+            this.xrTableRowHeader.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell5,
+            this.xrTableCell4,
+            this.xrTableCell2,
+            this.xrTableCell9,
+            this.xrTableCell8,
+            this.xrTableCell10,
+            this.xrTableCell7,
+            this.xrTableCell11,
+            this.xrTableCell12,
+            this.xrTableCell13,
+            this.xrTableCell14,
+            this.xrTableCell15});
+            this.xrTableRowHeader.Name = "xrTableRowHeader";
+            this.xrTableRowHeader.Weight = 2.8D;
+            // 
+            // xrTableCell5
+            // 
+            this.xrTableCell5.Name = "xrTableCell5";
+            this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+            this.xrTableCell5.StylePriority.UsePadding = false;
+            this.xrTableCell5.StylePriority.UseTextAlignment = false;
+            this.xrTableCell5.Text = "Monat";
+            this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell5.Weight = 0.15329125016467182D;
+            // 
+            // xrTableCell4
+            // 
+            this.xrTableCell4.Name = "xrTableCell4";
+            this.xrTableCell4.Text = "Reguläre SOLL Stunden";
+            this.xrTableCell4.Weight = 0.081154192324637608D;
+            // 
+            // xrTableCell2
+            // 
+            this.xrTableCell2.Name = "xrTableCell2";
+            this.xrTableCell2.Text = "Fehlzeiten Urlaub Krankheit(Tage)";
+            this.xrTableCell2.Weight = 0.094679896646570338D;
+            // 
+            // xrTableCell9
+            // 
+            this.xrTableCell9.Multiline = true;
+            this.xrTableCell9.Name = "xrTableCell9";
+            this.xrTableCell9.Text = "Tatsächliche SOLL Stunden";
+            this.xrTableCell9.Weight = 0.072137063712635591D;
+            // 
+            // xrTableCell8
+            // 
+            this.xrTableCell8.Name = "xrTableCell8";
+            this.xrTableCell8.Text = "FLS Stunden SOLL";
+            this.xrTableCell8.Weight = 0.063119927721024038D;
+            // 
+            // xrTableCell10
+            // 
+            this.xrTableCell10.Name = "xrTableCell10";
+            this.xrTableCell10.StylePriority.UseBackColor = false;
+            this.xrTableCell10.Text = "FLS IST lfd. Monat";
+            this.xrTableCell10.Weight = 0.063119927721024D;
+            // 
+            // xrTableCell7
+            // 
+            this.xrTableCell7.Name = "xrTableCell7";
+            this.xrTableCell7.Text = "FLS Plus/Minus lfd. Monat";
+            this.xrTableCell7.Weight = 0.06311992757910842D;
+            // 
+            // xrTableCell11
+            // 
+            this.xrTableCell11.Multiline = true;
+            this.xrTableCell11.Name = "xrTableCell11";
+            this.xrTableCell11.StylePriority.UseBackColor = false;
+            this.xrTableCell11.Text = "Gesamt-\r\nstunden lfd. Monat";
+            this.xrTableCell11.Weight = 0.063119927721024011D;
+            // 
+            // xrTableCell12
+            // 
+            this.xrTableCell12.Name = "xrTableCell12";
+            this.xrTableCell12.Text = "Relation FLS IST zu Mittelbare IST (in %)";
+            this.xrTableCell12.Weight = 0.063119929511863376D;
+            // 
+            // xrTableCell13
+            // 
+            this.xrTableCell13.Name = "xrTableCell13";
+            this.xrTableCell13.Text = "Überstd. neu";
+            this.xrTableCell13.Weight = 0.063119928687401447D;
+            // 
+            // xrTableCell14
+            // 
+            this.xrTableCell14.Multiline = true;
+            this.xrTableCell14.Name = "xrTableCell14";
+            this.xrTableCell14.StylePriority.UseBackColor = false;
+            this.xrTableCell14.Text = "Überstd.\r\ndieses Jahr";
+            this.xrTableCell14.Weight = 0.063119928275170531D;
+            // 
+            // xrTableCell15
+            // 
+            this.xrTableCell15.Multiline = true;
+            this.xrTableCell15.Name = "xrTableCell15";
+            this.xrTableCell15.Text = "Überstd. Gesamt";
+            this.xrTableCell15.Weight = 0.0631199213956443D;
+            // 
+            // xrTable1
+            // 
+            this.xrTable1.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTable1.Name = "xrTable1";
+            this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow1});
+            this.xrTable1.SizeF = new System.Drawing.SizeF(1005F, 25F);
+            this.xrTable1.StylePriority.UseBorders = false;
+            this.xrTable1.StylePriority.UseFont = false;
+            this.xrTable1.StylePriority.UsePadding = false;
+            this.xrTable1.StylePriority.UseTextAlignment = false;
+            this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            // 
+            // xrTableRow1
+            // 
+            this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell35,
+            this.xrTableCell37,
+            this.xrTableCell39,
+            this.cellSollGesamt,
+            this.cellFLSSollGesamt,
+            this.cellFLSIstGesamt,
+            this.cellFLSPlusMinusGesamt,
+            this.cellGesamtGesamt,
+            this.cellRelationGesamt,
+            this.xrTableCell47,
+            this.xrTableCell48,
+            this.xrTableCell51});
+            this.xrTableRow1.Name = "xrTableRow1";
+            this.xrTableRow1.Weight = 1D;
+            // 
+            // xrTableCell35
+            // 
+            this.xrTableCell35.Name = "xrTableCell35";
+            this.xrTableCell35.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+            this.xrTableCell35.StylePriority.UseFont = false;
+            this.xrTableCell35.StylePriority.UsePadding = false;
+            this.xrTableCell35.StylePriority.UseTextAlignment = false;
+            this.xrTableCell35.Text = "Gesamt";
+            this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell35.Weight = 0.15329126714047708D;
+            // 
+            // xrTableCell37
+            // 
+            this.xrTableCell37.Name = "xrTableCell37";
+            this.xrTableCell37.Weight = 0.081154151689479551D;
+            // 
+            // xrTableCell39
+            // 
+            this.xrTableCell39.Name = "xrTableCell39";
+            this.xrTableCell39.Weight = 0.094679919312514085D;
+            // 
+            // cellSollGesamt
+            // 
+            this.cellSollGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.StundenSollOhneUrlaubKrankheit")});
+            this.cellSollGesamt.Name = "cellSollGesamt";
+            xrSummary1.FormatString = "{0:0.00}";
+            xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.cellSollGesamt.Summary = xrSummary1;
+            this.cellSollGesamt.Weight = 0.0721370604147881D;
+            // 
+            // cellFLSSollGesamt
+            // 
+            this.cellFLSSollGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsSoll")});
+            this.cellFLSSollGesamt.Name = "cellFLSSollGesamt";
+            xrSummary2.FormatString = "{0:0.00}";
+            xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.cellFLSSollGesamt.Summary = xrSummary2;
+            this.cellFLSSollGesamt.Weight = 0.063119927862939587D;
+            // 
+            // cellFLSIstGesamt
+            // 
+            this.cellFLSIstGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsIst")});
+            this.cellFLSIstGesamt.Name = "cellFLSIstGesamt";
+            xrSummary3.FormatString = "{0:0.00}";
+            xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.cellFLSIstGesamt.Summary = xrSummary3;
+            this.cellFLSIstGesamt.Weight = 0.063119927862939615D;
+            // 
+            // cellFLSPlusMinusGesamt
+            // 
+            this.cellFLSPlusMinusGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsDiff")});
+            this.cellFLSPlusMinusGesamt.Name = "cellFLSPlusMinusGesamt";
+            xrSummary4.FormatString = "{0:0.00}";
+            xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.cellFLSPlusMinusGesamt.Summary = xrSummary4;
+            this.cellFLSPlusMinusGesamt.Weight = 0.063119927862939587D;
+            // 
+            // cellGesamtGesamt
+            // 
+            this.cellGesamtGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.StundenGesamtIst")});
+            this.cellGesamtGesamt.Name = "cellGesamtGesamt";
+            xrSummary5.FormatString = "{0:0.00}";
+            xrSummary5.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.cellGesamtGesamt.Summary = xrSummary5;
+            this.cellGesamtGesamt.Weight = 0.063119927862939573D;
+            // 
+            // cellRelationGesamt
+            // 
+            this.cellRelationGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.fieldRelationGesamt", "{0:0.00}")});
+            this.cellRelationGesamt.Name = "cellRelationGesamt";
+            this.cellRelationGesamt.Text = "cellRelationGesamt";
+            this.cellRelationGesamt.Weight = 0.0631199278629396D;
+            // 
+            // xrTableCell47
+            // 
+            this.xrTableCell47.Name = "xrTableCell47";
+            this.xrTableCell47.Weight = 0.063119927862939587D;
+            // 
+            // xrTableCell48
+            // 
+            this.xrTableCell48.Name = "xrTableCell48";
+            this.xrTableCell48.Weight = 0.063119927862939587D;
+            // 
+            // xrTableCell51
+            // 
+            this.xrTableCell51.Name = "xrTableCell51";
+            this.xrTableCell51.Weight = 0.063119927862939573D;
+            // 
+            // 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(864.9999F, 25F);
+            this.xrPageInfo2.Name = "xrPageInfo2";
+            this.xrPageInfo2.SizeF = new System.Drawing.SizeF(139.9999F, 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(260.0001F, 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.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";
+            // 
+            // DetailReport1
+            // 
+            this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail2,
+            this.DetailReport2});
+            this.DetailReport1.DataMember = "EmployeeInfoList";
+            this.DetailReport1.DataSource = this.bindingSource1;
+            this.DetailReport1.Level = 0;
+            this.DetailReport1.Name = "DetailReport1";
+            // 
+            // Detail2
+            // 
+            this.Detail2.HeightF = 0F;
+            this.Detail2.Name = "Detail2";
+            this.Detail2.PageBreak = DevExpress.XtraReports.UI.PageBreak.BeforeBandExceptFirstEntry;
+            // 
+            // DetailReport2
+            // 
+            this.DetailReport2.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail3,
+            this.GroupHeader2,
+            this.GroupHeader3,
+            this.GroupFooter2});
+            this.DetailReport2.DataMember = "EmployeeInfoList.EmployeeDetails";
+            this.DetailReport2.DataSource = this.bindingSource1;
+            this.DetailReport2.Level = 0;
+            this.DetailReport2.Name = "DetailReport2";
+            // 
+            // Detail3
+            // 
+            this.Detail3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTableDetail});
+            this.Detail3.Font = new System.Drawing.Font("Arial", 9.75F);
+            this.Detail3.HeightF = 25F;
+            this.Detail3.Name = "Detail3";
+            this.Detail3.StylePriority.UseFont = false;
+            // 
+            // GroupHeader2
+            // 
+            this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTableHeader});
+            this.GroupHeader2.HeightF = 70F;
+            this.GroupHeader2.Name = "GroupHeader2";
+            // 
+            // GroupHeader3
+            // 
+            this.GroupHeader3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel1});
+            this.GroupHeader3.HeightF = 35F;
+            this.GroupHeader3.Level = 1;
+            this.GroupHeader3.Name = "GroupHeader3";
+            // 
+            // xrLabel1
+            // 
+            this.xrLabel1.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold);
+            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrLabel1.Multiline = true;
+            this.xrLabel1.Name = "xrLabel1";
+            this.xrLabel1.SizeF = new System.Drawing.SizeF(1005F, 25F);
+            this.xrLabel1.StyleName = "Title";
+            this.xrLabel1.StylePriority.UseFont = false;
+            this.xrLabel1.Text = "Stundenkonto [EmployeeInfoList.LastName], [EmployeeInfoList.FirstName] [ReportSta" +
+    "rtDate!yyyy]";
+            // 
+            // GroupFooter2
+            // 
+            this.GroupFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable1});
+            this.GroupFooter2.HeightF = 25F;
+            this.GroupFooter2.Name = "GroupFooter2";
+            // 
+            // fieldRelationGesamt
+            // 
+            this.fieldRelationGesamt.DataMember = "EmployeeInfoList.EmployeeDetails";
+            this.fieldRelationGesamt.Expression = "(Sum([EmployeeDetail.FlsIst]) / Sum([EmployeeDetail.StundenGesamtIst])) * 100";
+            this.fieldRelationGesamt.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+            this.fieldRelationGesamt.Name = "fieldRelationGesamt";
+            // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoMonateRO);
+            // 
+            // MitarbeiterstundenkontoJahr
+            // 
+            this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail,
+            this.pageFooterBand1,
+            this.topMarginBand1,
+            this.bottomMarginBand1,
+            this.DetailReport1});
+            this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
+            this.fieldFLS,
+            this.fieldRelationGesamt});
+            this.DataSource = this.bindingSource1;
+            this.DisplayName = "Mitarbeiterstundenkonto";
+            this.Landscape = true;
+            this.Margins = new System.Drawing.Printing.Margins(75, 75, 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.xrTableDetail)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).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.PageFooterBand pageFooterBand1;
+        private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo2;
+        private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo1;
+        private DevExpress.XtraReports.UI.XRControlStyle Title;
+        private DevExpress.XtraReports.UI.XRControlStyle FieldCaption;
+        private DevExpress.XtraReports.UI.XRControlStyle PageInfo;
+        private DevExpress.XtraReports.UI.XRControlStyle DataField;
+        private DevExpress.XtraReports.UI.XRTable xrTableHeader;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRowHeader;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
+        private DevExpress.XtraReports.UI.XRTable xrTableDetail;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRowDetail;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
+        private DevExpress.XtraReports.UI.CalculatedField fieldFLS;
+        private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
+        private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell28;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell27;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell23;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell25;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell24;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell26;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
+        private DevExpress.XtraReports.UI.XRTable xrTable1;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell35;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell37;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell39;
+        private DevExpress.XtraReports.UI.XRTableCell cellSollGesamt;
+        private DevExpress.XtraReports.UI.XRTableCell cellFLSSollGesamt;
+        private DevExpress.XtraReports.UI.XRTableCell cellFLSIstGesamt;
+        private DevExpress.XtraReports.UI.XRTableCell cellFLSPlusMinusGesamt;
+        private DevExpress.XtraReports.UI.XRTableCell cellGesamtGesamt;
+		private DevExpress.XtraReports.UI.XRTableCell cellRelationGesamt;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell47;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell48;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell51;
+        private DevExpress.XtraReports.UI.DetailReportBand DetailReport1;
+        private DevExpress.XtraReports.UI.DetailBand Detail2;
+        private DevExpress.XtraReports.UI.DetailReportBand DetailReport2;
+        private DevExpress.XtraReports.UI.DetailBand Detail3;
+        private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2;
+        private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader3;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel1;
+        private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter2;
+        private DevExpress.XtraReports.UI.CalculatedField fieldRelationGesamt;
+    }
+}

ReportImp/AidshilfeDortmund/Stundenkonto/MitarbeiterstundenkontoJahr.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/AidshilfeEssen/AidshilfeEssen.csproj

@@ -48,6 +48,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Invoicing\CustomInvoiceCreation.cs" />
+    <Compile Include="Invoicing\CustomInvoiceFactory.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ServiceInvoiceReport.cs">
       <SubType>Component</SubType>
@@ -91,5 +93,6 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

ReportImp/AidshilfeEssen/Invoicing/CustomInvoiceCreation.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using BeWo.Data.Entities;
+using BeWo.Service.DCEntityMapper;
+using BeWo.Service.Invoicing;
+using BeWo.Service.Plugins;
+using BS.Shared.Core;
+using BS.Shared.DataContracts;
+using BS.Shared.DataContracts.Compact;
+using BS.Shared.Extensions;
+using BS.Shared.Services;
+
+namespace AidshilfeEssen.Invoicing
+{
+	public class CustomInvoiceCreation : InvoiceCreation
+	{
+        public override void BerechneSummaryItemsSummen(List<InvoiceItem> newlist, bool addRateFactorToUnitCount)
+        {
+            base.BerechneSummaryItemsSummen(newlist, true);
+        }
+
+    }
+}

ReportImp/AidshilfeEssen/Invoicing/CustomInvoiceFactory.cs

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

ReportImp/AidshilfeEssen/ServiceInvoiceReport.Designer.cs

@@ -1,5 +1,5 @@
 using BeWo.Report.ReportObjects;
-namespace BeWo.Report.DefaultReports
+namespace AidshilfeEssen
 {
     partial class ServiceInvoiceReport
     {

ReportImp/AidshilfeEssen/ServiceInvoiceReport.cs

@@ -1,11 +1,12 @@
 using System;
 using BeWo.Data.Access;
 using BeWo.Data.Entities;
+using BeWo.Report;
 using BeWo.Report.ReportObjects;
 
 using DevExpress.XtraReports.UI;
 
-namespace BeWo.Report.DefaultReports
+namespace AidshilfeEssen
 {
     public partial class ServiceInvoiceReport : XtraReport, IBeWoReport<ServiceInvoiceRO>
     {

ReportImp/AidshilfeEssen/SettlementReport.Designer.cs

@@ -1,4 +1,4 @@
-namespace BeWo.Report.DefaultReports.Alt
+namespace AidshilfeEssen.Alt
 {
     partial class Spitzabrechnung
     {

ReportImp/AidshilfeEssen/SettlementReport.cs

@@ -7,7 +7,7 @@ using BeWo.Report.ReportObjects;
 using BS.Shared;
 using BS.Shared.DataContracts;
 
-namespace BeWo.Report.DefaultReports.Alt
+namespace AidshilfeEssen.Alt
 {
     public partial class Spitzabrechnung : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<SettlementRO>
     {

ReportImp/VSDHammReports/Budgetnachweis.cs

@@ -5,7 +5,7 @@ using BS.Shared.Core;
 
 namespace VSDHammReports.Alt
 {
-	[IDSpecificClass(Identifier = "LWL")]
+	[IDSpecificClass(Identifier = "LWLMITANHANG")]
 
 	public partial class Budgetnachweis : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<SettlementRO>
     {
@@ -27,7 +27,6 @@ namespace VSDHammReports.Alt
 			else
             {
 				lblZad.Text = "60-9011897.1";
-				pRO.RecordedFLSTotal *= 1.2;
 			}
 
 			foreach (var ii in pRO.InvoiceItems)
@@ -52,9 +51,9 @@ namespace VSDHammReports.Alt
 				pRO.RateFactor = 1;
 		        replaceFF = true;
 
-		        cellBewilligteFLSText.Text = "Bewilligte FLS";
+		        //cellBewilligteFLSText.Text = "Bewilligte FLS";
-		        cellRateFactorFLSText.Text = "";
+		        //cellRateFactorFLSText.Text = "";
-		        cellApprovedFLSWithRF.Text = "";
+		        //cellApprovedFLSWithRF.Text = "";
 
 		        if (pRO.InvoiceItems.Count == 3)
 		        {

ReportImp/VSDHammReports/Budgetnachweis.designer.cs

@@ -37,10 +37,7 @@ namespace VSDHammReports.Alt
             this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow();
             this.cellBewilligteFLSText = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.cellRateFactorFLSText = new DevExpress.XtraReports.UI.XRTableCell();
             this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
-            this.cellApprovedFLSWithRF = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -158,11 +155,10 @@ namespace VSDHammReports.Alt
             this.xrTable1.Name = "xrTable1";
             this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.xrTableRow9,
-            this.xrTableRow10,
             this.xrTableRow3,
             this.xrTableRow11,
             this.rowErbrachteLeistung});
-            this.xrTable1.SizeF = new System.Drawing.SizeF(650F, 85F);
+            this.xrTable1.SizeF = new System.Drawing.SizeF(650F, 68F);
             this.xrTable1.StylePriority.UseBorderColor = false;
             // 
             // xrTableRow9
@@ -183,7 +179,7 @@ namespace VSDHammReports.Alt
             this.cellBewilligteFLSText.StylePriority.UseBorderColor = false;
             this.cellBewilligteFLSText.StylePriority.UseBorders = false;
             this.cellBewilligteFLSText.StylePriority.UseFont = false;
-            this.cellBewilligteFLSText.Text = "Bewilligte Fachleistungsstunden (FLS):";
+            this.cellBewilligteFLSText.Text = "Bewilligte FLS:";
             this.cellBewilligteFLSText.Weight = 0.81391028771033669D;
             // 
             // xrTableCell6
@@ -202,52 +198,12 @@ namespace VSDHammReports.Alt
             this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
             this.xrTableCell6.Weight = 0.18608971228966348D;
             // 
-            // xrTableRow10
-            // 
-            this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.cellRateFactorFLSText,
-            this.cellApprovedFLSWithRF});
-            this.xrTableRow10.FormattingRules.Add(this.ruleRateFactorNull);
-            this.xrTableRow10.Name = "xrTableRow10";
-            this.xrTableRow10.Weight = 0.085D;
-            // 
-            // cellRateFactorFLSText
-            // 
-            this.cellRateFactorFLSText.BorderColor = System.Drawing.SystemColors.ControlLight;
-            this.cellRateFactorFLSText.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)));
-            this.cellRateFactorFLSText.CanShrink = true;
-            this.cellRateFactorFLSText.FormattingRules.Add(this.ruleRateFactorNull);
-            this.cellRateFactorFLSText.Name = "cellRateFactorFLSText";
-            this.cellRateFactorFLSText.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.cellRateFactorFLSText.StylePriority.UseBorderColor = false;
-            this.cellRateFactorFLSText.StylePriority.UseBorders = false;
-            this.cellRateFactorFLSText.StylePriority.UseFont = false;
-            this.cellRateFactorFLSText.Text = "- zzgl. Faktor [RateFactorText2] (FLS Gesamt):";
-            this.cellRateFactorFLSText.Weight = 0.81391028771033669D;
-            // 
             // ruleRateFactorNull
             // 
             this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?";
             this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
             this.ruleRateFactorNull.Name = "ruleRateFactorNull";
             // 
-            // cellApprovedFLSWithRF
-            // 
-            this.cellApprovedFLSWithRF.BorderColor = System.Drawing.SystemColors.ControlLight;
-            this.cellApprovedFLSWithRF.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)));
-            this.cellApprovedFLSWithRF.CanShrink = true;
-            this.cellApprovedFLSWithRF.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
-            this.cellApprovedFLSWithRF.FormattingRules.Add(this.ruleRateFactorNull);
-            this.cellApprovedFLSWithRF.Name = "cellApprovedFLSWithRF";
-            this.cellApprovedFLSWithRF.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.cellApprovedFLSWithRF.StylePriority.UseBorderColor = false;
-            this.cellApprovedFLSWithRF.StylePriority.UseBorders = false;
-            this.cellApprovedFLSWithRF.StylePriority.UseFont = false;
-            this.cellApprovedFLSWithRF.StylePriority.UseTextAlignment = false;
-            this.cellApprovedFLSWithRF.Text = "[ApprovedFLSWithFactor]";
-            this.cellApprovedFLSWithRF.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-            this.cellApprovedFLSWithRF.Weight = 0.18608971228966348D;
-            // 
             // xrTableRow3
             // 
             this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
@@ -265,7 +221,7 @@ namespace VSDHammReports.Alt
             this.xrTableCell3.StylePriority.UseBorderColor = false;
             this.xrTableCell3.StylePriority.UseBorders = false;
             this.xrTableCell3.StylePriority.UsePadding = false;
-            this.xrTableCell3.Text = "Tatsächlich geleistete Fachleistungsstunden im Bewilligungszeitraum:";
+            this.xrTableCell3.Text = "Tatsächlich geleistete FLS im Bewilligungszeitraum:";
             this.xrTableCell3.Weight = 0.81391028771033669D;
             // 
             // xrTableCell4
@@ -505,7 +461,7 @@ namespace VSDHammReports.Alt
             this.xrTable1,
             this.xrLabel8});
             this.GroupHeader1.Font = new System.Drawing.Font("Arial", 12F);
-            this.GroupHeader1.HeightF = 705.75F;
+            this.GroupHeader1.HeightF = 688.75F;
             this.GroupHeader1.Name = "GroupHeader1";
             this.GroupHeader1.StylePriority.UseFont = false;
             // 
@@ -1273,9 +1229,6 @@ namespace VSDHammReports.Alt
         private DevExpress.XtraReports.UI.XRTable xrTable1;
         private DevExpress.XtraReports.UI.XRTableRow xrTableRow9;
         private DevExpress.XtraReports.UI.XRTableCell cellBewilligteFLSText;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow10;
-        private DevExpress.XtraReports.UI.XRTableCell cellRateFactorFLSText;
-        private DevExpress.XtraReports.UI.XRTableCell cellApprovedFLSWithRF;
         private DevExpress.XtraReports.UI.XRTableRow xrTableRow11;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
         private DevExpress.XtraReports.UI.XRTableRow rowErbrachteLeistung;

ReportImp/VSDHammReports/Budgetnachweis2.Designer.cs

@@ -65,9 +65,6 @@ namespace VSDHammReports
             this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow();
             this.cellBewilligteFLSText = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.cellRateFactorFLSText = new DevExpress.XtraReports.UI.XRTableCell();
-            this.cellApprovedFLSWithRF = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -102,7 +99,6 @@ namespace VSDHammReports
             this.xrTableRow33 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell52 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell53 = 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.xrTableRow30 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -123,13 +119,14 @@ namespace VSDHammReports
             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);
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).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
@@ -430,7 +427,7 @@ namespace VSDHammReports
             this.RecipientPostCodeAndTown,
             this.xrLabel8});
             this.GroupHeader1.Font = new System.Drawing.Font("Arial", 12F);
-            this.GroupHeader1.HeightF = 706.8333F;
+            this.GroupHeader1.HeightF = 689.8333F;
             this.GroupHeader1.Name = "GroupHeader1";
             this.GroupHeader1.StylePriority.UseFont = false;
             // 
@@ -529,11 +526,10 @@ namespace VSDHammReports
             this.xrTable1.Name = "xrTable1";
             this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.xrTableRow9,
-            this.xrTableRow10,
             this.xrTableRow3,
             this.xrTableRow11,
             this.rowErbrachteLeistung});
-            this.xrTable1.SizeF = new System.Drawing.SizeF(650F, 85F);
+            this.xrTable1.SizeF = new System.Drawing.SizeF(650F, 68F);
             this.xrTable1.StylePriority.UseBorderColor = false;
             // 
             // xrTableRow9
@@ -554,7 +550,7 @@ namespace VSDHammReports
             this.cellBewilligteFLSText.StylePriority.UseBorderColor = false;
             this.cellBewilligteFLSText.StylePriority.UseBorders = false;
             this.cellBewilligteFLSText.StylePriority.UseFont = false;
-            this.cellBewilligteFLSText.Text = "Bewilligte Fachleistungsstunden (FF):";
+            this.cellBewilligteFLSText.Text = "Bewilligte FLS:";
             this.cellBewilligteFLSText.Weight = 0.8039743276742789D;
             // 
             // xrTableCell6
@@ -575,46 +571,6 @@ namespace VSDHammReports
             this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
             this.xrTableCell6.Weight = 0.19602567232572116D;
             // 
-            // xrTableRow10
-            // 
-            this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.cellRateFactorFLSText,
-            this.cellApprovedFLSWithRF});
-            this.xrTableRow10.FormattingRules.Add(this.ruleRateFactorNull);
-            this.xrTableRow10.Name = "xrTableRow10";
-            this.xrTableRow10.Weight = 0.085D;
-            // 
-            // cellRateFactorFLSText
-            // 
-            this.cellRateFactorFLSText.BorderColor = System.Drawing.SystemColors.ControlLight;
-            this.cellRateFactorFLSText.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)));
-            this.cellRateFactorFLSText.CanShrink = true;
-            this.cellRateFactorFLSText.FormattingRules.Add(this.ruleRateFactorNull);
-            this.cellRateFactorFLSText.Name = "cellRateFactorFLSText";
-            this.cellRateFactorFLSText.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.cellRateFactorFLSText.StylePriority.UseBorderColor = false;
-            this.cellRateFactorFLSText.StylePriority.UseBorders = false;
-            this.cellRateFactorFLSText.StylePriority.UseFont = false;
-            this.cellRateFactorFLSText.Text = "- zzgl. Faktor [RateFactorText2] (FLS Gesamt):";
-            this.cellRateFactorFLSText.Weight = 0.8039743276742789D;
-            // 
-            // cellApprovedFLSWithRF
-            // 
-            this.cellApprovedFLSWithRF.BorderColor = System.Drawing.SystemColors.ControlLight;
-            this.cellApprovedFLSWithRF.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)));
-            this.cellApprovedFLSWithRF.CanShrink = true;
-            this.cellApprovedFLSWithRF.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
-            this.cellApprovedFLSWithRF.FormattingRules.Add(this.ruleRateFactorNull);
-            this.cellApprovedFLSWithRF.Name = "cellApprovedFLSWithRF";
-            this.cellApprovedFLSWithRF.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.cellApprovedFLSWithRF.StylePriority.UseBorderColor = false;
-            this.cellApprovedFLSWithRF.StylePriority.UseBorders = false;
-            this.cellApprovedFLSWithRF.StylePriority.UseFont = false;
-            this.cellApprovedFLSWithRF.StylePriority.UseTextAlignment = false;
-            this.cellApprovedFLSWithRF.Text = "[ApprovedFLSWithFactor]";
-            this.cellApprovedFLSWithRF.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-            this.cellApprovedFLSWithRF.Weight = 0.19602567232572116D;
-            // 
             // xrTableRow3
             // 
             this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
@@ -632,7 +588,7 @@ namespace VSDHammReports
             this.xrTableCell3.StylePriority.UseBorderColor = false;
             this.xrTableCell3.StylePriority.UseBorders = false;
             this.xrTableCell3.StylePriority.UsePadding = false;
-            this.xrTableCell3.Text = "Tatsächlich geleistete Fachleistungsstunden im Bewilligungszeitraum:";
+            this.xrTableCell3.Text = "Tatsächlich geleistete FLS im Bewilligungszeitraum:";
             this.xrTableCell3.Weight = 0.8039743276742789D;
             // 
             // xrTableCell4
@@ -1010,10 +966,6 @@ namespace VSDHammReports
             this.xrTableCell53.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
             this.xrTableCell53.Weight = 0.21685899000901443D;
             // 
-            // bindingSource1
-            // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
-            // 
             // GroupFooter1
             // 
             this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -1232,6 +1184,10 @@ namespace VSDHammReports
             this.xrTableCell60.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
             this.xrTableCell60.Weight = 0.21685899000901443D;
             // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
+            // 
             // Budgetnachweis2
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1258,8 +1214,8 @@ namespace VSDHammReports
             ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
 
         }
@@ -1318,9 +1274,6 @@ namespace VSDHammReports
 		private DevExpress.XtraReports.UI.XRTableRow xrTableRow9;
 		private DevExpress.XtraReports.UI.XRTableCell cellBewilligteFLSText;
 		private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
-		private DevExpress.XtraReports.UI.XRTableRow xrTableRow10;
-		private DevExpress.XtraReports.UI.XRTableCell cellRateFactorFLSText;
-		private DevExpress.XtraReports.UI.XRTableCell cellApprovedFLSWithRF;
 		private DevExpress.XtraReports.UI.XRTableRow xrTableRow11;
 		private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
 		private DevExpress.XtraReports.UI.XRTableRow rowErbrachteLeistung;

ReportImp/VSDHammReports/Budgetnachweis2.cs

@@ -7,7 +7,7 @@ using BS.Shared.Core;
 
 namespace VSDHammReports
 {
-	[IDSpecificClass(Identifier = "LWL")]
+	[IDSpecificClass(Identifier = "LWLMITANHANG")]
 
 	public partial class Budgetnachweis2 : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<Settlement2RO>
     {
@@ -24,12 +24,11 @@ namespace VSDHammReports
 			{
 				lblAZ.Text = "";
 				lblAZLabel.Text = "";
-				lblZad.Text = "60 - 9011896.1";
+				lblZad.Text = "60-9011896.1";
 			}
 			else
             {
 				lblZad.Text = "60-9011897.1";
-				pRO.RecordedFlsTotal *= 1.2m;
 			}
 
 			//if (!pRO.HourlyRateNew.HasValue && pRO.DifferentHourlyRateCount > 0 && pRO.InvoiceItems != null &&
@@ -44,8 +43,8 @@ namespace VSDHammReports
 
 				//}
 			cellBewilligteFLSText.Text = "Bewilligte FLS";
-			cellRateFactorFLSText.Text = "";
+			//cellRateFactorFLSText.Text = "";
-			cellApprovedFLSWithRF.Text = "";
+			//cellApprovedFLSWithRF.Text = "";
 
 	        if (!String.IsNullOrEmpty(pRO.SenderContactPersonMail))
 	        {

ReportImp/VSDHammReports/VsdHammReportCreator.cs

@@ -6,6 +6,10 @@ using BeWo.Data.Access;
 using BeWo.Data.Entities;
 using BeWo.Report;
 using BeWo.Report.ReportObjects;
+using BeWo.Service.DCEntityMapper;
+using BeWo.Service.Plugins;
+using BS.Shared.Core;
+using BS.Shared.DataContracts;
 using DevExpress.XtraReports.Design;
 using DevExpress.XtraReports.UI;
 
@@ -89,14 +93,69 @@ namespace VSDHammReports
 
         public override XtraReport CreateSettlementReport(string dcId, long? invoiceBaseOid)
         {
-            if (invoiceBaseOid.HasValue && invoiceBaseOid.Value > 0)
+            long oid = 0;
+            long? ibOid = null;
+            if (string.IsNullOrEmpty(dcId) && invoiceBaseOid.HasValue)
             {
-                var ib = DAOFactory.GenericDAO.LoadByID<InvoiceBase>(invoiceBaseOid.Value);
+                ibOid = invoiceBaseOid.Value;
+            }
+            else
+            {
+                Int64.TryParse(dcId, out oid);
+                var si = DAOFactory.GenericDAO.LoadByID<SettlementInvoice>(oid);
+                ibOid = si.InvoiceBase.Oid;
+            }
+            
+            if (ibOid.HasValue && ibOid.Value > 0)
+            {
+                var ib = DAOFactory.GenericDAO.LoadByID<InvoiceBase>(ibOid.Value);
                 if (ib.CostBearer2SupportConcept.CostBearer.Organisation.Name == "LWL" || ib.CostBearer2SupportConcept.CostBearer.Organisation.Name == "Landschaftsverband Westfalen-Lippe")
-                    return base.CreateSettlementReport(dcId, invoiceBaseOid, true);
+                    return CreateSettlementReportLwl(ibOid.Value, true);
             }
 
             return base.CreateSettlementReport(dcId, invoiceBaseOid, false);
         }
+
+        private XtraReport CreateSettlementReportLwl(long invoiceBaseOid, bool createAnhang)
+        {
+            XtraReport report = null;
+
+            Settlement2DC lSettlementDC = MapperFactory.SettlementDC_SettlementInvoice.MapToNewDC(DAOFactory.SearchDAO.GetSettlementInvoiceByInvoiceBaseOid(invoiceBaseOid));
+            
+            var anhangRo = new BudgetnachweisAnhangRO();
+            anhangRo.Create(lSettlementDC);
+            var geleisteteFls = anhangRo.SummeGesamtStunden;
+            
+            if (lSettlementDC.DifferentHourlyRateCount > 0)
+            {
+                IBeWoReport<SettlementRO> lSettlementReport = new VSDHammReports.Alt.Budgetnachweis();
+                var ro = SettlementRO.Create(lSettlementDC);
+                ro.RecordedFLSTotal = (double)geleisteteFls;
+                lSettlementReport.SetReportDataSource(ro);
+
+                report = lSettlementReport as XtraReport;
+            }
+            else
+            {
+                IBeWoReport<Settlement2RO> lSettlementReport = new VSDHammReports.Budgetnachweis2();
+                var ro = Settlement2RO.Create(lSettlementDC);
+                ro.RecordedFlsTotal = geleisteteFls;
+                lSettlementReport.SetReportDataSource(ro);
+                report = lSettlementReport as XtraReport;
+
+
+            }
+
+            
+            report.CreateDocument();
+
+            
+            var anhangReport = new BudgetnachweisAnhang();
+            anhangReport.SetReportDataSource(anhangRo);
+            anhangReport.CreateDocument();
+            report.Pages.AddRange(anhangReport.Pages);
+            
+            return report;
+        }
     }
 }

Shared/Translation/ITranslator.cs

@@ -11,7 +11,7 @@ namespace BS.Shared.Translation
         String Translate(String input);
         String Translate(String input, params Object[] args);
 
-        String Translate(String key, String defaultText);
+        String TranslateKey(String key, String defaultText);
-        String Translate(String key, String defaultText, params Object[] args);
+        String TranslateKey(String key, String defaultText, params Object[] args);
     }
 }

Shared/Translation/Translator.cs

@@ -58,12 +58,12 @@ namespace BS.Shared.Translation
             return input;
         }
 
-        public static String Translate(String key, String defaultText)
+        public static String TranslateKey(String key, String defaultText)
         {
             if (instance != null)
             {
                 // handle null instance in design mode
-                return Instance.Translate(key, defaultText);
+                return Instance.TranslateKey(key, defaultText);
             }
             return defaultText;
         }
@@ -78,12 +78,12 @@ namespace BS.Shared.Translation
             return String.Format(input, args);
         }
 
-        public static String Translate(String key, String defaultText, params Object[] args)
+        public static String TranslateKey(String key, String defaultText, params Object[] args)
         {
             if (instance != null)
             {
                 // handle null instance in design mode
-                return Instance.Translate(key, defaultText, args);
+                return Instance.TranslateKey(key, defaultText, args);
             }
             return String.Format(defaultText, args);
         }