PSM: Neues Projekt mit QB + Spitzabrechnung (nur SR2) + Rechnung

2023-12-04 18:07:11 +01:00
parent cdebac63c6
commit 135113648a
16 changed files with 10438 additions and 0 deletions
--- a/ReportImp/PSM/Invoicing/SettlementInvoiceCreation.cs
+++ b/ReportImp/PSM/Invoicing/SettlementInvoiceCreation.cs
@@ -0,0 +1,16 @@
+using BeWo.Data.Entities;
+using BeWo.Service.Invoicing;
+using BS.Shared.DataContracts;
+
+namespace PSM.Invoicing
+{
+	
+	public class CustomSettlementInvoiceCreation : SettlementInvoiceCreation
+	{
+		public override bool CanCreateInvoiceTheOldWay(Settlement2DC si, CostBearer2SupportConcept c2s)
+		{
+			return false;
+		}
+
+	}
+}
--- a/DerParitätische.jpg
+++ b/DerParitätische.jpg
--- a/ReportImp/PSM/Logo
+++ b/ReportImp/PSM/Logo
--- a/ReportImp/PSM/Logo
+++ b/ReportImp/PSM/Logo
--- a/ReportImp/PSM/PSM.csproj
+++ b/ReportImp/PSM/PSM.csproj
@@ -0,0 +1,107 @@
+<?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>{3D34C4A1-C566-43F8-AA58-467B3FF17A51}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>PSM</RootNamespace>
+    <AssemblyName>9814444882_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>..\..\CustomerDlls\</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>..\..\CustomerDlls\</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="Invoicing\SettlementInvoiceCreation.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="QuittierungsbelegMitDatum.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="QuittierungsbelegMitDatum.Designer.cs">
+      <DependentUpon>QuittierungsbelegMitDatum.cs</DependentUpon>
+    </Compile>
+    <Compile Include="ServiceInvoiceReport.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ServiceInvoiceReport.Designer.cs">
+      <DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
+    </Compile>
+    <Compile Include="SettlementReport2.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SettlementReport2.Designer.cs">
+      <DependentUpon>SettlementReport2.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="QuittierungsbelegMitDatum.resx">
+      <DependentUpon>QuittierungsbelegMitDatum.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ServiceInvoiceReport.resx">
+      <DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="SettlementReport2.resx">
+      <DependentUpon>SettlementReport2.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
--- a/ReportImp/PSM/Properties/AssemblyInfo.cs
+++ b/ReportImp/PSM/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("PSM")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("PSM")]
+[assembly: AssemblyCopyright("Copyright ©  2023")]
+[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/PSM/Properties/licenses.licx
+++ b/ReportImp/PSM/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/PSM/QuittierungsbelegMitDatum.Designer.cs
+++ b/ReportImp/PSM/QuittierungsbelegMitDatum.Designer.cs
--- a/ReportImp/PSM/QuittierungsbelegMitDatum.cs
+++ b/ReportImp/PSM/QuittierungsbelegMitDatum.cs
@@ -0,0 +1,144 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+using System.Text.RegularExpressions;
+using BeWo.Report;
+using BeWo.Report.ReportObjects;
+using BS.Shared.Core;
+using BS.Shared.Extensions;
+using DevExpress.XtraReports.UI;
+
+namespace PSM
+{
+    public partial class Quittierungsbeleg : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<ServicesOverviewRO>
+    {
+        public Quittierungsbeleg()
+        {
+            InitializeComponent();
+        }
+
+        public void SetReportDataSource(ServicesOverviewRO pRO)
+        {
+            bool hatGruppen = false;
+
+            if (pRO.Services != null)
+            {
+                List<ServicesOverviewRO.ServiceDetail> servicesBillable = new List<ServicesOverviewRO.ServiceDetail>();
+
+                foreach (var sd in pRO.Services)
+                {
+                    if (sd.IsBillable || sd.ServiceDescription.ToLower().Contains("fehlkontakt") || sd.ServiceCategory.ToLower().Contains("fehlkontakt"))
+                    {
+                        if (sd.ServiceDescription.ToLower().Contains("fehlkontakt") || sd.ServiceCategory.ToLower().Contains("fehlkontakt"))
+                            sd.Notice5 = "F";
+                        else if (sd.IsGroup)
+                            sd.Notice5 = "GR";
+                        else if (!sd.IsGroup)
+                            sd.Notice5 = "E";
+
+                        //ServicesOverviewRO.CreateSignatureString(sd);
+                        if (sd.IsGroup)
+                        {
+                            //sd.Notice5 = String.Format("{0} Teilnehmer", sd.CustomerCount);
+                            hatGruppen = true;
+                        }
+                        servicesBillable.Add(sd);
+                    }
+                }
+
+                pRO.Services = servicesBillable;
+            }
+
+            if (String.IsNullOrWhiteSpace(pRO.AbsenceTimes))
+            {
+                lblHatAbwesenheiten.Text = "X";
+            }
+
+            if (!hatGruppen)
+            {
+                lblHatGruppen.Text = "X";
+            }
+
+            ErstelleAbwesenheitenTabelle(pRO);
+            
+            bindingSource1.DataSource = pRO;
+        }
+
+        private void ErstelleAbwesenheitenTabelle(ServicesOverviewRO pRo)
+        {
+            if (pRo.Abwesenheiten != null)
+            {
+                int newRows = 0;
+                int index = 1;
+                foreach (var at in pRo.Abwesenheiten)
+                {
+                    if (at.AbsenceReason.BillableMinutes.HasValue && at.AbsenceReason.BillableMinutes.Value > 0)
+                    {
+                        DevExpress.XtraReports.UI.XRTableRow row = null;
+                        if (index < xrTableAbwesenheiten.Rows.Count)
+                        {
+                            row = xrTableAbwesenheiten.Rows[index];
+                        }
+                        else
+                        {
+                            row = xrTableAbwesenheiten.InsertRowBelow(
+                                xrTableAbwesenheiten.Rows[xrTableAbwesenheiten.Rows.Count - 1]);
+                            newRows++;
+                        }
+
+                        row.Cells[0].Text = String.Format("{0:dd.MM.yyyy}", at.Start);
+                        int? days = null;
+
+                        if (at.End.HasValue)
+                        {
+                            row.Cells[1].Text = String.Format("{0:dd.MM.yyyy}", at.End);
+                            days = (int) at.End.Value.Subtract(at.Start.Value).TotalDays + 1;
+                        }
+                        else
+                        {
+                            row.Cells[1].Text = "unbekannt";
+                        }
+
+                        row.Cells[2].Text = String.Format("{0:0}", days);
+
+                        index++;
+                    }
+                }
+
+                if (newRows > 0)
+                {
+                    lblUnterschriftKlient.Top += newRows * 20;
+                    lblUnterschriftMitarbeiter.Top += newRows * 20;
+                }
+            }
+        }
+
+        private void picSignature_BeforePrint(object sender, System.Drawing.Printing.PrintEventArgs e)
+        {
+            XRPictureBox xrBox = sender as XRPictureBox;
+            //var test = this.GetCurrent
+            string base64String = xrBox.Tag as string;
+            if (!String.IsNullOrWhiteSpace(base64String))
+            {
+                var base64Data = Regex.Match(base64String, @"data:image/(?<type>.+?),(?<data>.+)").Groups["data"].Value;
+                var binData = Convert.FromBase64String(base64Data);
+                Image img = ByteArrayToImage(binData);
+                xrBox.Image = Utils.CropImage(img);
+            }
+            else
+            {
+                xrBox.Image = null;
+            }
+        }
+
+        public Image ByteArrayToImage(byte[] byteArrayIn)
+        {
+            Image returnImage = null;
+            MemoryStream ms = new System.IO.MemoryStream(byteArrayIn);
+            returnImage = Image.FromStream(ms);
+
+            return returnImage;
+        }
+    }
+}
--- a/ReportImp/PSM/QuittierungsbelegMitDatum.resx
+++ b/ReportImp/PSM/QuittierungsbelegMitDatum.resx
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>21, 17</value>
+  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="xrPictureBox3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+</value>
+  </data>
+  <data name="xrRichText2.SerializableRtfString" xml:space="preserve">
+    <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgAEsAZQBpAG4AZQAgAH0AewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXAB1AGwAXABmADIAXABmAHMAMgAwAFwAYwBmADEAIABLAHIAYQBuAGsAZQBuAGgAYQB1AHMAYQB1AGYAZQBuAHQAaABhAGwAdABlAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAdQBsAFwAZgAyAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAdQBsAFwAZgAyAFwAZgBzADIAMABcAGMAZgAxACAAYgBlAGsAYQBuAG4AdAAgAG8AZABlAHIAIAB9AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAHUAbABcAGYAMgBcAGYAcwAyADAAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAHUAbABcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgAGEAYgByAGUAYwBoAG4AdQBuAGcAcwByAGUAbABlAHYAYQBuAHQAfQB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgACAAaQBtACAAQQBiAHIAZQBjAGgAbgB1AG4AZwBzAHoAZQBpAHQAcgBhAHUAbQB9AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A</value>
+  </data>
+  <data name="xrRichText1.SerializableRtfString" xml:space="preserve">
+    <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgAEsAZQBpAG4AZQAgAH0AewBcAHUAbABcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgAEcAcgB1AHAAcABlAG4AYQBuAGcAZQBiAG8AdABlAH0AewBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgACAAaQBtACAAQQBiAHIAZQBjAGgAbgB1AG4AZwBzAHoAZQBpAHQAcgBhAHUAbQB9AFwAZgAxAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAfQA=</value>
+  </data>
+</root>
--- a/ReportImp/PSM/ServiceInvoiceReport.Designer.cs
+++ b/ReportImp/PSM/ServiceInvoiceReport.Designer.cs
--- a/ReportImp/PSM/ServiceInvoiceReport.cs
+++ b/ReportImp/PSM/ServiceInvoiceReport.cs
@@ -0,0 +1,32 @@
+using System;
+using BeWo.Report;
+using BeWo.Report.ReportObjects;
+
+using DevExpress.XtraReports.UI;
+
+namespace PSM
+{
+    public partial class ServiceInvoiceReport : XtraReport, IBeWoReport<ServiceInvoiceRO>
+    {
+        public ServiceInvoiceReport()
+        {
+            this.InitializeComponent();
+        }
+
+        public void SetReportDataSource(ServiceInvoiceRO pRO)
+        {
+			DateTime start = pRO.AccountingPeriodStart;
+			DateTime end = pRO.AccountingPeriodEnd;
+			if (start.Month == end.Month && start.Year == end.Year)
+			{
+				lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Monat {0:MMMM yyyy} folgende erbrachte Tätigkeiten:", start);
+			}
+			else
+			{
+				lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Zeitraum {0:MMMM yyyy} - {1:MMMM yyyy} folgende erbrachte Tätigkeiten:", start, end);
+			}
+
+            this.bindingSource1.DataSource = pRO;
+        }
+    }
+}
--- a/ReportImp/PSM/ServiceInvoiceReport.resx
+++ b/ReportImp/PSM/ServiceInvoiceReport.resx
--- a/ReportImp/PSM/SettlementReport2.Designer.cs
+++ b/ReportImp/PSM/SettlementReport2.Designer.cs
--- a/ReportImp/PSM/SettlementReport2.cs
+++ b/ReportImp/PSM/SettlementReport2.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Drawing;
+using System.Collections;
+using System.ComponentModel;
+using DevExpress.XtraReports.UI;
+using BeWo.Report.ReportObjects;
+using BeWo.Report;
+using System.Text.RegularExpressions;
+using BS.Shared.Extensions;
+
+namespace PSM
+{
+    public partial class Spitzabrechnung : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<Settlement2RO>
+    {
+        public Spitzabrechnung()
+        {
+            InitializeComponent();
+        }
+
+        public void SetReportDataSource(Settlement2RO pRO)
+        {
+			if (String.IsNullOrEmpty(pRO.Notice))
+			{
+				lblNotice.Visible = false;
+			}
+
+			decimal rateFactor = 1;
+
+			foreach (var ii in pRO.InvoiceItems)
+			{
+				if (ii.RateFactor.HasValue)
+				{
+					rateFactor = (100 + ii.RateFactor.Value) / 100;
+				}
+
+				if (!pRO.FehlkontakteString.IsNullOrEmpty() && ii.RateFactor == 0)
+                {				
+					Zwischensumme.Visible = true;
+					//if (!ii.ItemDescription.IsNullOrEmpty())
+					//{
+					//ii.AbrechnungsText = Regex.Replace(ii.DetailDescription, ii.ItemDescription, "Fehlkontakte");
+					//}
+					ii.AbrechnungsText = ii.AbrechnungsText.Replace("FLS", "Std.");
+					ii.ItemDescription = "Fehlkontakte";
+				}
+				else if (ii.ItemDescription.IsNullOrEmpty())
+                {
+					ii.ItemDescription = "Fachleistungsstunden";
+				}
+			}
+			pRO.RateFactor = (double)rateFactor;
+
+            this.bindingSource1.DataSource = pRO;
+        }
+    }
+}
--- a/ReportImp/PSM/SettlementReport2.resx
+++ b/ReportImp/PSM/SettlementReport2.resx
				`@@ -0,0 +1 @@`
				`DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a`