MH: Anpassung für BeWo am Heumarkt

2022-05-13 11:46:39 +02:00
parent 8dc8e01825
commit 2b6d21508f
8 changed files with 1642 additions and 3 deletions
--- a/BeWo.sln
+++ b/BeWo.sln
@@ -531,6 +531,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreundeskreisSuchthilfe", "
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PerspektivenEV", "ReportImp\PerspektivenEV\PerspektivenEV.csproj", "{443E3556-DDEC-42DE-A97E-FD394579A1B3}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeWoAmHeumarkt", "ReportImp\BeWoAmHeumarkt\BeWoAmHeumarkt.csproj", "{BB3514B3-71A6-4F54-9365-9AA1D29A248C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|.NET = Debug|.NET
@@ -4166,6 +4168,22 @@ Global
 		{443E3556-DDEC-42DE-A97E-FD394579A1B3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{443E3556-DDEC-42DE-A97E-FD394579A1B3}.Release|x86.ActiveCfg = Release|Any CPU
 		{443E3556-DDEC-42DE-A97E-FD394579A1B3}.Release|x86.Build.0 = Release|Any CPU
+		{BB3514B3-71A6-4F54-9365-9AA1D29A248C}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{BB3514B3-71A6-4F54-9365-9AA1D29A248C}.Debug|.NET.Build.0 = Debug|Any CPU
+		{BB3514B3-71A6-4F54-9365-9AA1D29A248C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BB3514B3-71A6-4F54-9365-9AA1D29A248C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BB3514B3-71A6-4F54-9365-9AA1D29A248C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BB3514B3-71A6-4F54-9365-9AA1D29A248C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BB3514B3-71A6-4F54-9365-9AA1D29A248C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BB3514B3-71A6-4F54-9365-9AA1D29A248C}.Debug|x86.Build.0 = Debug|Any CPU
+		{BB3514B3-71A6-4F54-9365-9AA1D29A248C}.Release|.NET.ActiveCfg = Release|Any CPU
+		{BB3514B3-71A6-4F54-9365-9AA1D29A248C}.Release|.NET.Build.0 = Release|Any CPU
+		{BB3514B3-71A6-4F54-9365-9AA1D29A248C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BB3514B3-71A6-4F54-9365-9AA1D29A248C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BB3514B3-71A6-4F54-9365-9AA1D29A248C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{BB3514B3-71A6-4F54-9365-9AA1D29A248C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{BB3514B3-71A6-4F54-9365-9AA1D29A248C}.Release|x86.ActiveCfg = Release|Any CPU
+		{BB3514B3-71A6-4F54-9365-9AA1D29A248C}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -4427,6 +4445,7 @@ Global
 		{6A79BF8C-7F6A-43D9-BB33-9BE0CD6EBFCD} = {D8A691C5-146D-4613-86CC-438F02FE9106}
 		{AC8FC2BC-BF65-40D4-95EE-E9EE423736CA} = {D8A691C5-146D-4613-86CC-438F02FE9106}
 		{443E3556-DDEC-42DE-A97E-FD394579A1B3} = {D8A691C5-146D-4613-86CC-438F02FE9106}
+		{BB3514B3-71A6-4F54-9365-9AA1D29A248C} = {D8A691C5-146D-4613-86CC-438F02FE9106}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9}
--- a/ReportImp/BeWoAmHeumarkt/BeWoAmHeumarkt.csproj
+++ b/ReportImp/BeWoAmHeumarkt/BeWoAmHeumarkt.csproj
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{BB3514B3-71A6-4F54-9365-9AA1D29A248C}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>BeWoAmHeumarkt</RootNamespace>
+    <AssemblyName>9482484652_Reports</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\Host\bin\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\Host\bin\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="DevExpress.Data.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Printing.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Utils.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraPrinting.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SettlementReport.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SettlementReport.Designer.cs">
+      <DependentUpon>SettlementReport.cs</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Data\Data.csproj">
+      <Project>{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}</Project>
+      <Name>Data</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Report\Report.csproj">
+      <Project>{40d8b312-ea64-49e3-a31a-5e57ed4d5654}</Project>
+      <Name>Report</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Service\Service.csproj">
+      <Project>{094331c3-ecee-4c89-bbfd-4c9ded89f0ef}</Project>
+      <Name>Service</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Shared\Shared.csproj">
+      <Project>{2f50b83d-a3f0-4ec4-979a-3f9b7e3d8ed4}</Project>
+      <Name>Shared</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Properties\licenses.licx" />
+    <EmbeddedResource Include="SettlementReport.resx">
+      <DependentUpon>SettlementReport.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
--- a/ReportImp/BeWoAmHeumarkt/Properties/AssemblyInfo.cs
+++ b/ReportImp/BeWoAmHeumarkt/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// Allgemeine Informationen über eine Assembly werden über die folgenden
+// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
+// die einer Assembly zugeordnet sind.
+[assembly: AssemblyTitle("KundeXyz")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("KundeXyz")]
+[assembly: AssemblyCopyright("Copyright ©  2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly
+// für COM-Komponenten unsichtbar.  Wenn Sie auf einen Typ in dieser Assembly von
+// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen.
+[assembly: ComVisible(false)]
+
+// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
+[assembly: Guid("c1fed668-adb9-47e0-b589-1389618e1b6e")]
+
+// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
+//
+//      Hauptversion
+//      Nebenversion
+//      Buildnummer
+//      Revision
+//
+// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
+// indem Sie "*" wie unten gezeigt eingeben:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
--- a/ReportImp/BeWoAmHeumarkt/Properties/licenses.licx
+++ b/ReportImp/BeWoAmHeumarkt/Properties/licenses.licx
@@ -0,0 +1 @@
+DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
--- a/ReportImp/BeWoAmHeumarkt/SettlementReport.Designer.cs
+++ b/ReportImp/BeWoAmHeumarkt/SettlementReport.Designer.cs
--- a/ReportImp/BeWoAmHeumarkt/SettlementReport.cs
+++ b/ReportImp/BeWoAmHeumarkt/SettlementReport.cs
@@ -0,0 +1,228 @@
+using System;
+using System.Collections.Generic;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+using BeWo.Report;
+using BeWo.Report.ReportObjects;
+using BS.Shared.DataContracts;
+
+namespace BeWo.Report.DefaultReports.Alt
+{
+    public partial class Spitzabrechnung : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<SettlementRO>
+    {
+        public Spitzabrechnung()
+        {
+            InitializeComponent();
+        }
+
+        public void SetReportDataSource(SettlementRO pRO)
+        {
+	        bool isDefaultSpitzabrechnung = false;
+
+			if (String.IsNullOrEmpty(pRO.Notice))
+			{
+				lblNotice.Visible = false;
+			}
+
+	        if (pRO.InvoiceItems != null && pRO.InvoiceItems.Count == 1)
+	        {
+		        var ii = pRO.InvoiceItems[0];
+				if ((ii.ItemDescription == "Spitzabrechung" || ii.ItemDescription == "Spitzabrechnung") && ii.GrossAmountTotal == null && ii.RateFactor == null)
+		        {
+			        isDefaultSpitzabrechnung = true;
+		        }
+	        }
+	        if (!isDefaultSpitzabrechnung)
+	        {
+		        if (pRO.DifferentHourlyRateCount > 0 && pRO.HourlyRateNew.HasValue)
+		        {
+			        isDefaultSpitzabrechnung = true;
+		        }
+	        }
+
+	        if (isDefaultSpitzabrechnung)
+	        {
+		        //UpdateAbrechnungsFelder(pRO);
+
+		        pRO.InvoiceItems = CreateDefaultSpitzabrechnungInvoiceItems(pRO);
+	        }
+	        else
+	        {
+				var id = GetCustomerId(pRO);
+				if (id == "LWLNEU")
+				{
+					pRO.RateFactorText = null;
+					pRO.RateFactorText2 = null;
+
+					if (pRO.InvoiceItems != null)
+					{
+						foreach (var ii in pRO.InvoiceItems)
+						{
+							ii.ItemDescription = String.Format("{0:dd.MM.yyyy} bis {1:dd.MM.yyyy}: {2:0.##} FLS x {3:c}",
+								ii.ItemPeriodStart, ii.ItemPeriodEnd, ii.UnitCount, ii.AmountPerUnit);
+						}
+					}
+				}
+				else
+				{
+					if (pRO.InvoiceItems != null)
+					{
+						foreach (var ii in pRO.InvoiceItems)
+						{
+							ii.ItemDescription = String.Format("{0:dd.MM.yyyy} bis {1:dd.MM.yyyy}: {2:0.##} FLS {3}x {4:c}",
+								ii.ItemPeriodStart, ii.ItemPeriodEnd,
+								ii.UnitCount, ii.RateFactor == 0 ? "" : "x " + pRO.RateFactorText2 + " ",
+								ii.AmountPerUnit);
+						}
+					}
+				}
+	        }
+	        
+			if (pRO.RecipientOrganisation.ToLower() == "lvr" && pRO.RateFactor > 1)
+            {
+				pRO.ApprovedFLSWithFactor = pRO.ApprovedFLS;
+				var flsWithFactor = pRO.ApprovedFLSWithFactor.Split(' ');
+				pRO.ApprovedFLS = string.Format("{0:0.00 FLS}", Convert.ToDecimal(flsWithFactor[0]) / pRO.RateFactor);
+            }
+
+	        this.bindingSource1.DataSource = pRO;
+        }
+
+	    private String GetCustomerId(SettlementRO pRO)
+	    {
+		    var cb2sc = DAOFactory.GenericDAO.LoadByID<CostBearer2SupportConcept>(pRO.CostBearer2SupportConceptOid);
+		    return cb2sc.CostBearer.ID;
+	    }
+
+		private IList<InvoiceItemDC> CreateDefaultSpitzabrechnungInvoiceItems(SettlementRO pRO)
+		{
+			IList<InvoiceItemDC> itemList = new List<InvoiceItemDC>();
+			if (pRO.DifferentHourlyRateCount == 3)
+			{
+				itemList.Add(new InvoiceItemDC
+				{
+					ItemDescription = String.Format("{0} bis {1}: {2:0.##} FLS {3}x {4:c}", 
+						pRO.AccountingStartDateString, pRO.HourlyRate3EndDateString, 
+						pRO.GeleisteteFLSMitStundensatz3, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRate3),
+
+					GrossAmountTotal = pRO.GeleisteteFLSMitStundensatz3 * pRO.RateFactor * pRO.HourlyRate3
+				});
+
+				itemList.Add(new InvoiceItemDC
+				{
+					ItemDescription = String.Format("{0} bis {1}: {2:0.##} FLS {3}x {4:c}",
+						pRO.HourlyRateOldStartDateString, pRO.HourlyRateOldEndDateString,
+						pRO.GeleisteteFLSMitStundensatzAlt, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateOld),
+
+					GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAlt * pRO.RateFactor * pRO.HourlyRateOld
+				});
+
+				itemList.Add(new InvoiceItemDC
+				{
+					ItemDescription = String.Format("{0} bis {1}: {2:0.##} FLS {3}x {4:c}",
+						pRO.HourlyRateNewStartDateString, pRO.AccountingEndDateString,
+						pRO.GeleisteteFLSMitStundensatzAktuell, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateNew),
+
+					GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAktuell * pRO.RateFactor * pRO.HourlyRateNew
+				});
+
+			}
+			else if (pRO.DifferentHourlyRateCount == 2)
+			{
+				itemList.Add(new InvoiceItemDC
+				{
+					ItemDescription = String.Format("{0} bis {1}: {2:0.##} FLS {3}x {4:c}",
+						pRO.AccountingStartDateString, pRO.HourlyRateOldEndDateString,
+						pRO.GeleisteteFLSMitStundensatzAlt, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateOld),
+
+					GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAlt * (decimal)pRO.RateFactor * pRO.HourlyRateOld
+				});
+
+				itemList.Add(new InvoiceItemDC
+				{
+					ItemDescription = String.Format("{0} bis {1}: {2:0.##} FLS {3}x {4:c}",
+						pRO.HourlyRateNewStartDateString, pRO.AccountingEndDateString,
+						pRO.GeleisteteFLSMitStundensatzAktuell, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateNew),
+
+					GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAktuell * pRO.RateFactor * pRO.HourlyRateNew
+				});
+
+			}
+			else
+			{
+				itemList.Add(new InvoiceItemDC
+				{
+					ItemDescription = String.Format("{0} bis {1}: {2:0.##} FLS {3}x {4:c}",
+						pRO.AccountingStartDateString, pRO.AccountingEndDateString,
+						pRO.GeleisteteFLSMitStundensatzAktuell, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateNew),
+
+					GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAktuell * pRO.RateFactor * pRO.HourlyRateNew
+				});
+
+			}
+
+			return itemList;
+		}
+
+		private void UpdateAbrechnungsFelder(SettlementRO pRO)
+		{
+			if (pRO.DifferentHourlyRateCount == 3)
+			{
+				//Erbrachte Leistungen (FLS) - bis [HourlyRateOldEndDateString] à [HourlyRateOldString] €
+
+				pRO.Abrechnungstext1 = String.Format("{0} bis {1}",
+					pRO.AccountingStartDateString, pRO.HourlyRate3EndDateString);
+
+				pRO.Abrechnungstext1 += String.Format(": {0:0.##} FLS {1}x {2:c}",
+					pRO.GeleisteteFLSMitStundensatz3, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRate3);
+
+				//[AccountingStartDateString] - [HourlyRate3EndDateString] sind [RecordedFLSWithHourlyRate3String] Std. x [HourlyRate3String] € =";
+
+				pRO.Betrag1 = String.Format("{0:c}", pRO.GeleisteteFLSMitStundensatz3 * (decimal)pRO.RateFactor * pRO.HourlyRate3);
+
+
+				pRO.Abrechnungstext2 = String.Format("{0} bis {1}",
+					pRO.HourlyRateOldStartDateString, pRO.HourlyRateOldEndDateString);
+				pRO.Abrechnungstext2 += String.Format(": {0:0.##} FLS {1}x {2:c}",
+					pRO.GeleisteteFLSMitStundensatzAlt, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateOld);
+
+				pRO.Betrag2 = String.Format("{0:c}", pRO.GeleisteteFLSMitStundensatzAlt * (decimal)pRO.RateFactor * pRO.HourlyRateOld);
+
+
+				pRO.Abrechnungstext3 = String.Format("{0} bis {1}",
+					pRO.HourlyRateNewStartDateString, pRO.AccountingEndDateString);
+				pRO.Abrechnungstext3 += String.Format(": {0:0.##} FLS {1}x {2:c}",
+					pRO.GeleisteteFLSMitStundensatzAktuell, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateNew);
+
+				pRO.Betrag3 = String.Format("{0:c}", pRO.GeleisteteFLSMitStundensatzAktuell * (decimal)pRO.RateFactor * pRO.HourlyRateNew);
+			}
+			else if (pRO.DifferentHourlyRateCount == 2)
+			{
+
+				pRO.Abrechnungstext2 = String.Format("{0} bis {1}",
+					pRO.AccountingStartDateString, pRO.HourlyRateOldEndDateString);
+				pRO.Abrechnungstext2 += String.Format(": {0:0.##} FLS {1}x {2:c}",
+					pRO.GeleisteteFLSMitStundensatzAlt, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateOld);
+
+				pRO.Betrag2 = String.Format("{0:c}", pRO.GeleisteteFLSMitStundensatzAlt * (decimal)pRO.RateFactor * pRO.HourlyRateOld);
+
+
+				pRO.Abrechnungstext3 = String.Format("{0} bis {1}",
+					pRO.HourlyRateNewStartDateString, pRO.AccountingEndDateString);
+				pRO.Abrechnungstext3 += String.Format(": {0:0.##} FLS {1}x {2:c}",
+					pRO.GeleisteteFLSMitStundensatzAktuell, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateNew);
+
+				pRO.Betrag3 = String.Format("{0:c}", pRO.GeleisteteFLSMitStundensatzAktuell * (decimal)pRO.RateFactor * pRO.HourlyRateNew);
+			}
+			else
+			{
+				pRO.Abrechnungstext3 = String.Format("{0} bis {1}",
+					pRO.AccountingStartDateString, pRO.AccountingEndDateString);
+				pRO.Abrechnungstext3 += String.Format(": {0:0.##} FLS {1}x {2:c}",
+					pRO.GeleisteteFLSMitStundensatzAktuell, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateNew);
+
+				pRO.Betrag3 = String.Format("{0:c}", pRO.GeleisteteFLSMitStundensatzAktuell * (decimal)pRO.RateFactor * pRO.HourlyRateNew);
+			}
+		}
+    }
+}
--- a/ReportImp/BeWoAmHeumarkt/SettlementReport.resx
+++ b/ReportImp/BeWoAmHeumarkt/SettlementReport.resx
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="xrLabel6.Text" xml:space="preserve">
+    <value>anbei sende ich Ihnen die unterschriebenen Nachweise über die im Rahmen des Betreuten Wohnens für [Salutation2] [CustomerName] erbrachten Leistungen zu. Nach unserer Berechnung ergeben sich für den Betreuungszeitraum [AccountingPeriod] hieraus:
+</value>
+  </data>
+  <metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
--- a/Service/Plugins/PluginLoader.cs
+++ b/Service/Plugins/PluginLoader.cs
@@ -170,7 +170,7 @@ namespace BeWo.Service.Plugins
                //t = "7755740484"; // Sawo
                //t = "8275654834"; // Twg Jonathan
                //t = "6586058528"; // Freundeskreis Suchtkrankenhilfe e.V.
-                //t = "2632162696"; // Pro BeWo Düren
+                t = "2632162696"; // Pro BeWo Düren
                //t = "6340891020"; // Caritas Ahlen
                //t = "3659854106"; // alpha e.V.
                //t = "5809130435"; // Lebenshilfe Kusel
@@ -300,7 +300,7 @@ namespace BeWo.Service.Plugins
                //t = "3536079480"; // Behindertenhilfe Menden
                //t = "5427523619"; // ChristopherusHausFamilienhilfe
                //t = "8251343124"; // Rat Plus Tat
-                t = "6819347851"; // Awo Kreisverband Plön
+                //t = "6819347851"; // Awo Kreisverband Plön
                //t = "2385915144"; // AKGG GmbHd
                //t = "8002913382"; // AKGG GmbH (MID)
                //t = "5155880294"; // BHV Bergische Hauspflege
@@ -325,8 +325,9 @@ namespace BeWo.Service.Plugins
                //t = "2221228727"; // Autismus Leben gGmbH
                //t = "5065709552"; // Biotop e.V.
                //t = "9094672461"; // Toprak GmbH
-                //t= "9008813932"; // Aids Hilfe Giessen
+                //t = "9008813932"; // Aids Hilfe Giessen
                //t = "4052216789"; // Perspektiven e.V.
+                t = "9482484652"; // BeWo Am Heumarkt

                return t;
 #else
				`@@ -0,0 +1 @@`
				`DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a`