DokumenteView weitergeführt + Anpassung für MVZ Medikus GmbH

BeWo.sln

@@ -419,6 +419,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeWoNordeifel", "ReportImp\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BetreuungsbueroFrankRoehrig", "ReportImp\BetreuungsbueroFrankRoehrig\BetreuungsbueroFrankRoehrig.csproj", "{C252012D-4EE1-4262-B599-28297AE41E9C}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MVZMedikusGmbH", "ReportImp\MVZMedikusGmbH\MVZMedikusGmbH.csproj", "{D71875ED-CD52-43D9-B066-843E891EDA0E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|.NET = Debug|.NET
@@ -3154,6 +3156,22 @@ Global
 		{C252012D-4EE1-4262-B599-28297AE41E9C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C252012D-4EE1-4262-B599-28297AE41E9C}.Release|x86.ActiveCfg = Release|Any CPU
 		{C252012D-4EE1-4262-B599-28297AE41E9C}.Release|x86.Build.0 = Release|Any CPU
+		{D71875ED-CD52-43D9-B066-843E891EDA0E}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{D71875ED-CD52-43D9-B066-843E891EDA0E}.Debug|.NET.Build.0 = Debug|Any CPU
+		{D71875ED-CD52-43D9-B066-843E891EDA0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D71875ED-CD52-43D9-B066-843E891EDA0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D71875ED-CD52-43D9-B066-843E891EDA0E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D71875ED-CD52-43D9-B066-843E891EDA0E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D71875ED-CD52-43D9-B066-843E891EDA0E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D71875ED-CD52-43D9-B066-843E891EDA0E}.Debug|x86.Build.0 = Debug|Any CPU
+		{D71875ED-CD52-43D9-B066-843E891EDA0E}.Release|.NET.ActiveCfg = Release|Any CPU
+		{D71875ED-CD52-43D9-B066-843E891EDA0E}.Release|.NET.Build.0 = Release|Any CPU
+		{D71875ED-CD52-43D9-B066-843E891EDA0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D71875ED-CD52-43D9-B066-843E891EDA0E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D71875ED-CD52-43D9-B066-843E891EDA0E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{D71875ED-CD52-43D9-B066-843E891EDA0E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{D71875ED-CD52-43D9-B066-843E891EDA0E}.Release|x86.ActiveCfg = Release|Any CPU
+		{D71875ED-CD52-43D9-B066-843E891EDA0E}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -3359,6 +3377,7 @@ Global
 		{B4E9D5AF-7B46-47F8-B918-052D341A378B} = {D8A691C5-146D-4613-86CC-438F02FE9106}
 		{CF08D1BE-588E-4A0F-8FC4-B7D6F69091B0} = {D8A691C5-146D-4613-86CC-438F02FE9106}
 		{C252012D-4EE1-4262-B599-28297AE41E9C} = {D8A691C5-146D-4613-86CC-438F02FE9106}
+		{D71875ED-CD52-43D9-B066-843E891EDA0E} = {D8A691C5-146D-4613-86CC-438F02FE9106}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9}

BeWo/View/Detail/RatingEditView.xaml.cs

@@ -92,6 +92,7 @@ namespace BeWo.View.Detail
             richEditControl1.RtfText = rating.RTFNotice;
             richEditControl1.BarManager = barManager;
             
+            
 
             FontSizeComboBox.OfficeFontSizeProvider = richEditControl1;
             RichEditStyleComboBox.RichEditControl = richEditControl1;

BeWo/View/Detail/VorlageEditView.xaml

@@ -52,12 +52,13 @@
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
 
-            <TabControl Grid.Row="1">
+            <TabControl Grid.Row="2">
 
                 <TabItem Header="Vorlageninhalt"  x:Name="TabitemVorlageninhalt" Visibility="Visible" >
                     <Grid>
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
+                            <RowDefinition Height="30" />   
                             <RowDefinition Height="*" />
                         </Grid.RowDefinitions>
                         <dxb:BarManager ToolbarGlyphSize="Small" x:Name="barManager" AllowQuickCustomization="False" AllowHotCustomization="False" AllowCustomization="False">
@@ -100,7 +101,7 @@
                                 </dxb:Bar>
                                 <dxb:Bar x:Name="barParagraph" Caption="{Binding ConverterParameter=Caption_GroupParagraph, Converter={StaticResource stringIdConverter}, Mode=OneTime, Source={StaticResource stringIdConverter}}">
                                     <dxb:Bar.DockInfo>
-                                        <dxb:BarDockInfo ContainerType="Top" Row="1"/>
+                                        <dxb:BarDockInfo ContainerType="Top" Row="2"/>
                                     </dxb:Bar.DockInfo>
                                     <dxb:Bar.ItemLinks>
                                         <dxb:BarCheckItemLink BarItemName="biFormatBulletedList"/>
@@ -121,7 +122,7 @@
 
                                 <dxb:Bar x:Name="barEditing" Caption="{Binding ConverterParameter=Caption_GroupEditing, Converter={StaticResource stringIdConverter}, Mode=OneTime, Source={StaticResource stringIdConverter}}">
                                     <dxb:Bar.DockInfo>
-                                        <dxb:BarDockInfo ContainerType="Top" Row="1"/>
+                                        <dxb:BarDockInfo ContainerType="Top" Row="2"/>
                                     </dxb:Bar.DockInfo>
                                     <dxb:Bar.ItemLinks>
                                         <dxb:BarButtonItemLink BarItemName="biEditFind"/>
@@ -134,7 +135,7 @@
 
                                 <dxb:Bar x:Name="barZoom" Caption="{Binding ConverterParameter=Caption_GroupZoom, Converter={StaticResource stringIdConverter}, Mode=OneTime, Source={StaticResource stringIdConverter}}">
                                     <dxb:Bar.DockInfo>
-                                        <dxb:BarDockInfo ContainerType="Top" Row="1"/>
+                                        <dxb:BarDockInfo ContainerType="Top" Row="2"/>
                                     </dxb:Bar.DockInfo>
                                     <dxb:Bar.ItemLinks>
                                         <dxb:BarButtonItemLink BarItemName="biViewZoomOut"/>
@@ -593,7 +594,12 @@
       </DockPanel>-->
                         </dxb:BarManager>
 
-                        <DockPanel Grid.Row="1">
+                        <WrapPanel HorizontalAlignment="Right" Margin="5" Grid.Row="1">
+                            <Label Margin="0 0 5 0" Content="Platzhalter"/>
+                            <ComboBox x:Name="combobox_templates" Width="150" SelectionChanged="combobox_templates_SelectionChanged" MaxDropDownHeight="200" ScrollViewer.VerticalScrollBarVisibility="Visible"></ComboBox>
+                        </WrapPanel>
+
+                        <DockPanel Grid.Row="2">
                             <dxre:RichEditControl x:Name="richEditControl1" BarManager="{Binding ElementName=barManager, Mode=OneTime}" CommandBarStyle="Empty" ActiveViewType="Simple" ShowBorder="False" HorizontalAlignment="Stretch" Margin="0" VerticalAlignment="Stretch" ContentChanged="richEditControl1_ContentChanged"/>
                         </DockPanel>
                     </Grid>

BeWo/View/Detail/VorlageEditView.xaml.cs

@@ -53,17 +53,87 @@ namespace BeWo.View.Detail
             }
         }
 
-        public void InitView(DokumentvorlageVM pVM)
+        public void InitView(DokumentvorlageVM pVM, long? tabelle)
         {
             InitializeComponent();
 
             ViewModel = pVM;
+            _ViewModel = pVM;
             DataContext = pVM;
 
+            if(pVM.Name != null)
+            {
+                TextEdit_Vorlagenname.EditValue = pVM.Name;
+                TextEdit_Vorlagenname.DataContext = pVM.Name;
+                TextEdit_Vorlagenname.Text = pVM.Name;
+            }
+            if (pVM.Beschreibung != null)
+            {
+                TextEdit_Beschreibung.EditValue = pVM.Beschreibung;
+                TextEdit_Beschreibung.DataContext = pVM.Beschreibung;
+                TextEdit_Beschreibung.Text = pVM.Beschreibung;
+            }
+            if (pVM.Text != null)
+                richEditControl1.Text = pVM.Text;
+
+            List<string> templates = new List<string>();
+
+            switch(tabelle)
+            {
+                case 1: templates = TemplatesForSupportConcepts();break;
+                case 2: templates = TemplatesForCustomers();break;
+                case 3: templates = TemplatesForEmployee();break;
+            }
+
+            combobox_templates.ItemsSource = templates;
 
             Focus();
         }
 
+        private List<string> TemplatesForSupportConcepts()
+        {
+            List<string> templates = new List<string>();
+
+
+
+            return templates;
+        }
+
+        private List<string> TemplatesForCustomers()
+        {
+            List<string> templates = new List<string>();
+            var platzhalterDCs = ServiceFacade.DoOperationsServiceSync(s => s.GetPlatzhalterForCustomer());
+
+            foreach (var item in platzhalterDCs)
+            {
+                templates.Add("-" + item.Bezeichnung + "-");
+                foreach (var item2 in item.Children)
+                {
+                    templates.Add(item2.Bezeichnung);
+                }
+            }
+
+            return templates;
+        }
+
+        private List<string> TemplatesForEmployee()
+        {
+            List<string> templates = new List<string>();
+            
+            return templates;
+        }
+
+        private void combobox_templates_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (combobox_templates.SelectedItem == null)
+                return;
+            var selected = combobox_templates.SelectedItem;
+
+            richEditControl1.Text += "[" + selected + "]";
+
+            combobox_templates.SelectedItem = null;
+        }
+
         private void richEditControl1_ContentChanged(object sender, EventArgs e)
         {
             ViewModel.Text = richEditControl1.Text;
@@ -101,7 +171,7 @@ namespace BeWo.View.Detail
         }
         private void TextEdit_Vorlagenname_EditValueChanged(object sender, DevExpress.Xpf.Editors.EditValueChangedEventArgs e)
         {
-            if(TextEdit_Vorlagenname.EditValue != null)
+            if (TextEdit_Vorlagenname.EditValue != null)
                 ViewModel.Name = TextEdit_Vorlagenname.EditValue.ToString();
         }
         private void TextEdit_Beschreibung_EditValueChanged(object sender, DevExpress.Xpf.Editors.EditValueChangedEventArgs e)
@@ -109,5 +179,7 @@ namespace BeWo.View.Detail
             if (TextEdit_Beschreibung.EditValue != null)
                 ViewModel.Beschreibung = TextEdit_Beschreibung.EditValue.ToString();
         }
+
+        
     }
 }

BeWo/View/Master/DokumenteView.xaml

@@ -299,7 +299,7 @@
                                     <dxg:GridColumn FieldName="FileName" Header="" FixedWidth="True" Width="24" ReadOnly="True">
                                         <dxg:GridColumn.CellTemplate>
                                             <DataTemplate>
-                                                <Button Content="r" FontFamily="Webdings" Click="DeleteButton_Click" Width="18" Height="18" VerticalAlignment="Center" />
+                                                <Button Content="r" FontFamily="Webdings" Click="DeleteButton_Click" Width="20" Height="20" VerticalAlignment="Center" Margin="1"/>
                                             </DataTemplate>
                                         </dxg:GridColumn.CellTemplate>
                                     </dxg:GridColumn>
@@ -316,6 +316,13 @@
                                             </DataTemplate>
                                         </dxg:GridColumn.CellTemplate>
                                     </dxg:GridColumn>-->
+                                    <dxg:GridColumn FieldName="FileEdit" Header="" FixedWidth="True" Width="24" ReadOnly="True">
+                                        <dxg:GridColumn.CellTemplate>
+                                            <DataTemplate>
+                                                <Button Content="N" FontFamily="Webdings" Click="EditTemplate_Click"  Width="20" Height="20" VerticalAlignment="Center" />
+                                            </DataTemplate>
+                                        </dxg:GridColumn.CellTemplate>
+                                    </dxg:GridColumn>
                                 </dxg:GridControl.Columns>
                                 <dxg:GridControl.View>
                                     <dxg:TableView AutoWidth="false" ShowGroupPanel="False" ShowGroupedColumns="false" ShowTotalSummary="False" NavigationStyle="Cell" x:Name="TemplateTableView"/>

BeWo/View/Master/DokumenteView.xaml.cs

@@ -1243,10 +1243,10 @@ namespace BeWo.View.Master
                 else if (twi.Header.Equals("Neue Vorlage"))
                 {
                     var vm = new DokumentvorlageVM(new DokumentvorlageDC());
-                    BeWoFolderDC folder = ServiceFacade.DoOperationsServiceSync(s => s.GetFolderById((long)row.DocTreeItemOid));
+                    
-                    VorlagentabelleDC tabelle = ServiceFacade.DoOperationsServiceSync(s => s.GetVorlagentabelleById((long)folder.ObjectOid));
+                    VorlagentabelleDC tabelle = ServiceFacade.DoOperationsServiceSync(s => s.GetVorlagentabelleById((long)row.DataContract.BeWoFolderDC.ObjectOid));
                     vm.Tabellenzugehoerigkeit = (long)tabelle.VorlagentabelleObjectTid;
-                    vm.Parent = folder.BeWoFolderOid;
+                    vm.Parent = row.DataContract.BeWoFolderDC.BeWoFolderOid;
 
                     var savedTemplate = EditTemplate(vm);
                     if(savedTemplate != null)   
@@ -1258,8 +1258,13 @@ namespace BeWo.View.Master
 
         private DokumentvorlageVM EditTemplate(DokumentvorlageVM vm)
         {
+            var row = TemplateTreeView.SelectedRows[0] as DocumentTreeItemVM;
+            var folder = ServiceFacade.DoOperationsServiceSync(s => s.GetFolderById((long)row.DocTreeItemOid));
+            long? tabelle = folder.ObjectOid;
+
             var control = new VorlageEditView();
-            control.InitView(vm);
+
+            control.InitView(vm, tabelle);
             var beWoWindow = new BeWoWindow
             {
                 rootGroupBox = { Header = "Vorlage bearbeiten" },
@@ -1346,16 +1351,20 @@ namespace BeWo.View.Master
         {
             var row = TemplateTreeView.SelectedRows[0] as DocumentTreeItemVM;
 
-            if (folder.Files.Count > 0)
-            {
-                for (int i = folder.Files.Count - 1; i >= 0; i--)
-                {
-                    var file = folder.Files[i];
-                    ServiceFacade.DoOperationsServiceAsync(s => s.DeleteFileAttachment(file.FileAttachmentOid.Value, file.FileAttachmentVersion.Value));
-                    row.DataContract.FilesInFolder.Remove(file);
-                }
-            }
 
+            var templatesInFolder = datagrid_templates.ItemsSource as List<DokumentvorlageVM>;
+            List<DokumentvorlageDC> dcs = new List<DokumentvorlageDC>();
+            if (templatesInFolder == null)
+                return;
+            else if(templatesInFolder.Count != 0)
+            {
+                foreach (var t in templatesInFolder)
+                {
+                    dcs.Add(t.DataContract);
+                }
+                ServiceFacade.DoOperationsServiceSync(s => s.DeleteTemplates(dcs));
+            }
+            
             if (folder.SubFolders.Count != 0)
             {
                 for (int i = folder.SubFolders.Count - 1; i >= 0; i--)
@@ -1375,34 +1384,39 @@ namespace BeWo.View.Master
             {
                 var selected = source.SelectedRows[0] as DocumentTreeItemVM;
 
-                if (selected == null)
+                if (selected == null || selected.Name.Equals("Alle Ordner"))
                     return;
 
                 var vmList = new List<DokumentvorlageVM>();
-                BeWoFolderDC folderDC = ServiceFacade.DoOperationsServiceSync(s => s.GetFolderById((long)selected.DocTreeItemOid));
+
-                if(folderDC != null)
+                //BeWoFolderDC folderDC = ServiceFacade.DoOperationsServiceSync(s => s.GetFolderById((long)selected.DocTreeItemOid));
-                {
+                //var folderDC_Oid = folderDC.BeWoFolderOid;
-                    var folderOid = folderDC.BeWoFolderOid;
+                if (selected.DataContract.BeWoFolderDC == null)
+                    return;
+                var maybeRightOid = selected.DataContract.BeWoFolderDC.BeWoFolderOid;
+                //if(folderDC != null)
+                //{
+                    var folderOid = maybeRightOid;
 
                     var vorlagenInOrdner = ServiceFacade.DoOperationsServiceSync(s => s.GetDokumentvorlagenInFolder((long)folderOid));
                     foreach(DokumentvorlageDC dc in vorlagenInOrdner)
                     {
                         vmList.Add(new DokumentvorlageVM(dc));
                     }
+                    datagrid_templates.ItemsSource = vmList;
+
+                //}
 
-                    //if (selected.DataContract.FilesInFolder != null)
-                    //{
-                    //    List<FileAttachmentDC> list = selected.DataContract.FilesInFolder;
-                    //    foreach (var file in list)
-                    //    {
-                    //        vmList.Add(new FileAttachmentVM(file));
-                    //    }
-                    //}
 
-                    datagrid_documents.ItemsSource = vmList;
-                }
-                
             }
         }
+
+        private void EditTemplate_Click(object sender, RoutedEventArgs e)
+        {
+            var templateVM = datagrid_templates.SelectedItem as DokumentvorlageVM;
+            EditTemplate(templateVM);
+            if(templateVM.IsDirty)
+                SaveInDatabase(templateVM);
+        }
     }
 }

Data/Access/SearchDAO.cs

@@ -3933,7 +3933,7 @@ namespace BeWo.Data.Access
         {
             var crit = CreateCriteria<Dokumentvorlage>();
             crit.Add(Restrictions.Eq("Parent", folderOid));
-
+            
             return crit.List<Dokumentvorlage>();
         }
 

ReportImp/MVZMedikusGmbH/MVZMedikusGmbH.csproj

@@ -0,0 +1,105 @@
+<?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>{D71875ED-CD52-43D9-B066-843E891EDA0E}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>MVZMedikusGmbH</RootNamespace>
+    <AssemblyName>4152581290_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="Quittierungsbeleg.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Quittierungsbeleg.Designer.cs">
+      <DependentUpon>Quittierungsbeleg.cs</DependentUpon>
+    </Compile>
+    <Compile Include="ServiceInvoiceReport.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ServiceInvoiceReport.Designer.cs">
+      <DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
+    </Compile>
+    <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="Quittierungsbeleg.resx">
+      <DependentUpon>Quittierungsbeleg.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ServiceInvoiceReport.resx">
+      <DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="SettlementReport.resx">
+      <DependentUpon>SettlementReport.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>

ReportImp/MVZMedikusGmbH/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")]

ReportImp/MVZMedikusGmbH/Properties/licenses.licx

@@ -0,0 +1 @@
+DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

ReportImp/MVZMedikusGmbH/Quittierungsbeleg.cs

@@ -0,0 +1,134 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+using System.Text.RegularExpressions;
+using BeWo.Report.ReportObjects;
+using BS.Shared.Core;
+using DevExpress.XtraReports.UI;
+
+namespace BeWo.Report.DefaultReports
+{
+    public partial class Quittierungsbeleg : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<ServicesOverviewRO>
+    {
+        public Quittierungsbeleg()
+        {
+            InitializeComponent();
+        }
+
+        public void SetReportDataSource(ServicesOverviewRO pRO)
+        {
+            bool hatGruppen = false;
+
+            //if (pRO == null)
+            //    return;
+
+            if (pRO.Services != null)
+            {
+                List<ServicesOverviewRO.ServiceDetail> servicesBillable = new List<ServicesOverviewRO.ServiceDetail>();
+
+                foreach (var sd in pRO.Services)
+                {
+                    if (sd.IsBillable)
+                    {
+                        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)
+                {
+                    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;
+        }
+    }
+}

ReportImp/MVZMedikusGmbH/ServiceInvoiceReport.Designer.cs

@@ -0,0 +1,898 @@
+using BeWo.Report.ReportObjects;
+namespace BeWo.Report.DefaultReports
+{
+    partial class ServiceInvoiceReport
+    {
+        /// <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);
+        }
+
+        	
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ServiceInvoiceReport));
+            this.Detail = new DevExpress.XtraReports.UI.DetailBand();
+            this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
+            this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
+            this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
+            this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+            this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+            this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblAbrechnungszeitraum = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow14 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
+            this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
+            this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
+            this.xrTable5 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow23 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.DetailReport2 = new DevExpress.XtraReports.UI.DetailReportBand();
+            this.Detail3 = new DevExpress.XtraReports.UI.DetailBand();
+            this.xrTable6 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow25 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell42 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell46 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
+            this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).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;
+            // 
+            // ReportHeader
+            // 
+            this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrPictureBox1});
+            this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F);
+            this.ReportHeader.HeightF = 138.1667F;
+            this.ReportHeader.Name = "ReportHeader";
+            this.ReportHeader.StylePriority.UseFont = false;
+            // 
+            // ruleRateFactorNull
+            // 
+            this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?";
+            this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
+            this.ruleRateFactorNull.Name = "ruleRateFactorNull";
+            // 
+            // topMarginBand1
+            // 
+            this.topMarginBand1.HeightF = 88.75002F;
+            this.topMarginBand1.Name = "topMarginBand1";
+            // 
+            // bottomMarginBand1
+            // 
+            this.bottomMarginBand1.HeightF = 50F;
+            this.bottomMarginBand1.Name = "bottomMarginBand1";
+            // 
+            // Page1
+            // 
+            this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel7,
+            this.xrLabel4,
+            this.xrLabel3,
+            this.xrLabel2,
+            this.xrLabel5,
+            this.xrLabel8,
+            this.lblAbrechnungszeitraum,
+            this.xrTable2});
+            this.Page1.Font = new System.Drawing.Font("Verdana", 10F);
+            this.Page1.HeightF = 354.0833F;
+            this.Page1.Name = "Page1";
+            this.Page1.StylePriority.UseFont = false;
+            // 
+            // xrLabel7
+            // 
+            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrLabel7.Multiline = true;
+            this.xrLabel7.Name = "xrLabel7";
+            this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel7.SizeF = new System.Drawing.SizeF(317F, 111.5F);
+            this.xrLabel7.StylePriority.UseFont = false;
+            this.xrLabel7.Text = "[RecipientOrganisation]\r\n[RecipientContactPerson]\r\n[RecipientDivision]\r\n[Recipien" +
+    "tStreet]\r\n[RecipientPostCodeAndTown]";
+            // 
+            // xrLabel4
+            // 
+            this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel4.CanShrink = true;
+            this.xrLabel4.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 235F);
+            this.xrLabel4.Multiline = true;
+            this.xrLabel4.Name = "xrLabel4";
+            this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel4.SizeF = new System.Drawing.SizeF(650F, 20F);
+            this.xrLabel4.StylePriority.UseBackColor = false;
+            this.xrLabel4.StylePriority.UseFont = false;
+            this.xrLabel4.Text = "[CustomerReferenceNumber]";
+            this.xrLabel4.WordWrap = false;
+            // 
+            // xrLabel3
+            // 
+            this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel3.CanShrink = true;
+            this.xrLabel3.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 215F);
+            this.xrLabel3.Name = "xrLabel3";
+            this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel3.SizeF = new System.Drawing.SizeF(650F, 20F);
+            this.xrLabel3.StylePriority.UseBackColor = false;
+            this.xrLabel3.StylePriority.UseFont = false;
+            this.xrLabel3.Text = "Abrechnung Betreuungsleistungen für [CustomerSalutation] [CustomerName]";
+            this.xrLabel3.WordWrap = false;
+            // 
+            // xrLabel2
+            // 
+            this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel2.CanShrink = true;
+            this.xrLabel2.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 195F);
+            this.xrLabel2.Name = "xrLabel2";
+            this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel2.SizeF = new System.Drawing.SizeF(650F, 20F);
+            this.xrLabel2.StylePriority.UseBackColor = false;
+            this.xrLabel2.StylePriority.UseFont = false;
+            this.xrLabel2.Text = "Rechnung Nr. [InvoiceNumber]";
+            this.xrLabel2.WordWrap = false;
+            // 
+            // xrLabel5
+            // 
+            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 297.5F);
+            this.xrLabel5.Name = "xrLabel5";
+            this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel5.SizeF = new System.Drawing.SizeF(317F, 17F);
+            this.xrLabel5.StylePriority.UseFont = false;
+            this.xrLabel5.Text = "Sehr geehrte Damen und Herren,";
+            // 
+            // xrLabel8
+            // 
+            this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")});
+            this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(362.5F, 172F);
+            this.xrLabel8.Name = "xrLabel8";
+            this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel8.SizeF = new System.Drawing.SizeF(283F, 23F);
+            this.xrLabel8.StylePriority.UseTextAlignment = false;
+            this.xrLabel8.Text = "xrLabel8";
+            this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            // 
+            // lblAbrechnungszeitraum
+            // 
+            this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 322.5F);
+            this.lblAbrechnungszeitraum.Multiline = true;
+            this.lblAbrechnungszeitraum.Name = "lblAbrechnungszeitraum";
+            this.lblAbrechnungszeitraum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblAbrechnungszeitraum.SizeF = new System.Drawing.SizeF(642F, 31.58334F);
+            this.lblAbrechnungszeitraum.StylePriority.UseFont = false;
+            this.lblAbrechnungszeitraum.Text = "hiermit berechnen wir für den ... folgende erbrachte Tätigkeiten:";
+            // 
+            // xrTable2
+            // 
+            this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(362.5F, 0F);
+            this.xrTable2.Name = "xrTable2";
+            this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow2,
+            this.xrTableRow5,
+            this.xrTableRow4,
+            this.xrTableRow3,
+            this.xrTableRow1,
+            this.xrTableRow6,
+            this.xrTableRow8});
+            this.xrTable2.SizeF = new System.Drawing.SizeF(283F, 134F);
+            // 
+            // xrTableRow2
+            // 
+            this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell4});
+            this.xrTableRow2.Name = "xrTableRow2";
+            this.xrTableRow2.Weight = 0.13245033112582783D;
+            // 
+            // xrTableCell4
+            // 
+            this.xrTableCell4.CanShrink = true;
+            this.xrTableCell4.Name = "xrTableCell4";
+            this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell4.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+            this.xrTableCell4.StylePriority.UseFont = false;
+            this.xrTableCell4.StylePriority.UseTextAlignment = false;
+            this.xrTableCell4.Text = "Ihr(e) Ansprechpartner(in):";
+            this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            this.xrTableCell4.Weight = 1D;
+            // 
+            // xrTableRow5
+            // 
+            this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell13});
+            this.xrTableRow5.Name = "xrTableRow5";
+            this.xrTableRow5.Weight = 0.13245033112582783D;
+            // 
+            // xrTableCell13
+            // 
+            this.xrTableCell13.CanShrink = true;
+            this.xrTableCell13.Name = "xrTableCell13";
+            this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell13.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+            this.xrTableCell13.StylePriority.UseFont = false;
+            this.xrTableCell13.StylePriority.UseTextAlignment = false;
+            this.xrTableCell13.Text = "[SenderContactPerson]";
+            this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            this.xrTableCell13.Weight = 1D;
+            // 
+            // xrTableRow4
+            // 
+            this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell11});
+            this.xrTableRow4.Name = "xrTableRow4";
+            this.xrTableRow4.Weight = 0.13245033112582783D;
+            // 
+            // xrTableCell11
+            // 
+            this.xrTableCell11.CanShrink = true;
+            this.xrTableCell11.Name = "xrTableCell11";
+            this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell11.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+            this.xrTableCell11.StylePriority.UseFont = false;
+            this.xrTableCell11.StylePriority.UseTextAlignment = false;
+            this.xrTableCell11.Text = "[SenderContactPersonDivision]";
+            this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            this.xrTableCell11.Weight = 1D;
+            // 
+            // xrTableRow3
+            // 
+            this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell8});
+            this.xrTableRow3.Name = "xrTableRow3";
+            this.xrTableRow3.Weight = 0.13245033112582783D;
+            // 
+            // xrTableCell8
+            // 
+            this.xrTableCell8.CanShrink = true;
+            this.xrTableCell8.Name = "xrTableCell8";
+            this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell8.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+            this.xrTableCell8.StylePriority.UseFont = false;
+            this.xrTableCell8.StylePriority.UseTextAlignment = false;
+            this.xrTableCell8.Text = "[SenderContactPersonMail]";
+            this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            this.xrTableCell8.Weight = 1D;
+            // 
+            // xrTableRow1
+            // 
+            this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell1});
+            this.xrTableRow1.Name = "xrTableRow1";
+            this.xrTableRow1.Weight = 0.13245033112582783D;
+            // 
+            // xrTableCell1
+            // 
+            this.xrTableCell1.CanShrink = true;
+            this.xrTableCell1.Name = "xrTableCell1";
+            this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell1.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+            this.xrTableCell1.StylePriority.UseFont = false;
+            this.xrTableCell1.StylePriority.UseTextAlignment = false;
+            this.xrTableCell1.Text = "[SenderContactPersonPhone]";
+            this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            this.xrTableCell1.Weight = 1D;
+            // 
+            // xrTableRow6
+            // 
+            this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell2});
+            this.xrTableRow6.Name = "xrTableRow6";
+            this.xrTableRow6.Weight = 0.11258278145695365D;
+            // 
+            // xrTableCell2
+            // 
+            this.xrTableCell2.CanShrink = true;
+            this.xrTableCell2.Name = "xrTableCell2";
+            this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell2.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+            this.xrTableCell2.StylePriority.UseFont = false;
+            this.xrTableCell2.StylePriority.UseTextAlignment = false;
+            this.xrTableCell2.Text = "[SenderContactPersonFax]";
+            this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            this.xrTableCell2.Weight = 1D;
+            // 
+            // xrTableRow8
+            // 
+            this.xrTableRow8.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell5});
+            this.xrTableRow8.Name = "xrTableRow8";
+            this.xrTableRow8.Weight = 0.11258278145695365D;
+            // 
+            // xrTableCell5
+            // 
+            this.xrTableCell5.Name = "xrTableCell5";
+            this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell5.Weight = 1D;
+            // 
+            // xrLabel15
+            // 
+            this.xrLabel15.Font = new System.Drawing.Font("Verdana", 10F);
+            this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 114.5833F);
+            this.xrLabel15.Name = "xrLabel15";
+            this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel15.SizeF = new System.Drawing.SizeF(175F, 17F);
+            this.xrLabel15.StylePriority.UseFont = false;
+            this.xrLabel15.Text = "Mit freundlichen Grüßen";
+            // 
+            // xrTable4
+            // 
+            this.xrTable4.Font = new System.Drawing.Font("Verdana", 10F);
+            this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 68.75F);
+            this.xrTable4.Name = "xrTable4";
+            this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow10,
+            this.xrTableRow14});
+            this.xrTable4.SizeF = new System.Drawing.SizeF(650F, 26F);
+            this.xrTable4.StylePriority.UseFont = false;
+            // 
+            // xrTableRow10
+            // 
+            this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell9});
+            this.xrTableRow10.Name = "xrTableRow10";
+            this.xrTableRow10.Weight = 0.38095238095238093D;
+            // 
+            // xrTableCell9
+            // 
+            this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Notice")});
+            this.xrTableCell9.Name = "xrTableCell9";
+            this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell9.StylePriority.UsePadding = false;
+            this.xrTableCell9.Text = "xrTableCell1";
+            this.xrTableCell9.Weight = 3D;
+            // 
+            // xrTableRow14
+            // 
+            this.xrTableRow14.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell12});
+            this.xrTableRow14.Name = "xrTableRow14";
+            this.xrTableRow14.Weight = 0.23809523809523808D;
+            // 
+            // xrTableCell12
+            // 
+            this.xrTableCell12.Name = "xrTableCell12";
+            this.xrTableCell12.Weight = 3D;
+            // 
+            // xrLabel14
+            // 
+            this.xrLabel14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "CreatorName")});
+            this.xrLabel14.Font = new System.Drawing.Font("Verdana", 10F);
+            this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 189.5833F);
+            this.xrLabel14.Name = "xrLabel14";
+            this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel14.SizeF = new System.Drawing.SizeF(225F, 17F);
+            this.xrLabel14.StylePriority.UseFont = false;
+            this.xrLabel14.Text = "[CreatorName]";
+            // 
+            // xrLabel9
+            // 
+            this.xrLabel9.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Italic);
+            this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 43.75F);
+            this.xrLabel9.Name = "xrLabel9";
+            this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel9.SizeF = new System.Drawing.SizeF(250F, 17F);
+            this.xrLabel9.StylePriority.UseFont = false;
+            this.xrLabel9.Text = "Abschließende Bemerkungen:";
+            // 
+            // DetailReport
+            // 
+            this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail1,
+            this.DetailReport2});
+            this.DetailReport.DataMember = "ServiceInvoicePeriods";
+            this.DetailReport.DataSource = this.bindingSource1;
+            this.DetailReport.Level = 0;
+            this.DetailReport.Name = "DetailReport";
+            // 
+            // Detail1
+            // 
+            this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable5});
+            this.Detail1.HeightF = 25F;
+            this.Detail1.Name = "Detail1";
+            // 
+            // xrTable5
+            // 
+            this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTable5.Name = "xrTable5";
+            this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow23});
+            this.xrTable5.SizeF = new System.Drawing.SizeF(677F, 25F);
+            // 
+            // xrTableRow23
+            // 
+            this.xrTableRow23.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell32,
+            this.xrTableCell37,
+            this.xrTableCell35,
+            this.xrTableCell33,
+            this.xrTableCell36,
+            this.xrTableCell38,
+            this.xrTableCell34});
+            this.xrTableRow23.Name = "xrTableRow23";
+            this.xrTableRow23.Weight = 1D;
+            // 
+            // xrTableCell32
+            // 
+            this.xrTableCell32.BackColor = System.Drawing.Color.Gainsboro;
+            this.xrTableCell32.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell32.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell32.Name = "xrTableCell32";
+            this.xrTableCell32.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell32.StylePriority.UseBackColor = false;
+            this.xrTableCell32.StylePriority.UseBorderColor = false;
+            this.xrTableCell32.StylePriority.UseBorders = false;
+            this.xrTableCell32.StylePriority.UsePadding = false;
+            this.xrTableCell32.StylePriority.UseTextAlignment = false;
+            this.xrTableCell32.Text = "Zeitraum";
+            this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell32.Weight = 0.62463077449375981D;
+            // 
+            // xrTableCell37
+            // 
+            this.xrTableCell37.BackColor = System.Drawing.Color.Gainsboro;
+            this.xrTableCell37.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell37.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell37.Name = "xrTableCell37";
+            this.xrTableCell37.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell37.StylePriority.UseBackColor = false;
+            this.xrTableCell37.StylePriority.UseBorderColor = false;
+            this.xrTableCell37.StylePriority.UseBorders = false;
+            this.xrTableCell37.StylePriority.UsePadding = false;
+            this.xrTableCell37.StylePriority.UseTextAlignment = false;
+            this.xrTableCell37.Text = "Leistung";
+            this.xrTableCell37.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell37.Weight = 0.85081236260328186D;
+            // 
+            // xrTableCell35
+            // 
+            this.xrTableCell35.BackColor = System.Drawing.Color.Gainsboro;
+            this.xrTableCell35.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell35.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell35.Name = "xrTableCell35";
+            this.xrTableCell35.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell35.StylePriority.UseBackColor = false;
+            this.xrTableCell35.StylePriority.UseBorderColor = false;
+            this.xrTableCell35.StylePriority.UseBorders = false;
+            this.xrTableCell35.StylePriority.UsePadding = false;
+            this.xrTableCell35.StylePriority.UseTextAlignment = false;
+            this.xrTableCell35.Text = "Satz";
+            this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell35.Weight = 0.23245943032832414D;
+            // 
+            // xrTableCell33
+            // 
+            this.xrTableCell33.BackColor = System.Drawing.Color.Gainsboro;
+            this.xrTableCell33.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell33.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell33.Name = "xrTableCell33";
+            this.xrTableCell33.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell33.StylePriority.UseBackColor = false;
+            this.xrTableCell33.StylePriority.UseBorderColor = false;
+            this.xrTableCell33.StylePriority.UseBorders = false;
+            this.xrTableCell33.StylePriority.UsePadding = false;
+            this.xrTableCell33.StylePriority.UseTextAlignment = false;
+            this.xrTableCell33.Text = "Stunden";
+            this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell33.Weight = 0.2893277257020575D;
+            // 
+            // xrTableCell36
+            // 
+            this.xrTableCell36.BackColor = System.Drawing.Color.Gainsboro;
+            this.xrTableCell36.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell36.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell36.Name = "xrTableCell36";
+            this.xrTableCell36.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell36.StylePriority.UseBackColor = false;
+            this.xrTableCell36.StylePriority.UseBorderColor = false;
+            this.xrTableCell36.StylePriority.UseBorders = false;
+            this.xrTableCell36.StylePriority.UsePadding = false;
+            this.xrTableCell36.StylePriority.UseTextAlignment = false;
+            this.xrTableCell36.Text = "Betrag";
+            this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell36.Weight = 0.26310971709438763D;
+            // 
+            // xrTableCell38
+            // 
+            this.xrTableCell38.BackColor = System.Drawing.Color.Gainsboro;
+            this.xrTableCell38.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell38.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell38.Name = "xrTableCell38";
+            this.xrTableCell38.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell38.StylePriority.UseBackColor = false;
+            this.xrTableCell38.StylePriority.UseBorderColor = false;
+            this.xrTableCell38.StylePriority.UseBorders = false;
+            this.xrTableCell38.StylePriority.UsePadding = false;
+            this.xrTableCell38.StylePriority.UseTextAlignment = false;
+            this.xrTableCell38.Text = "pausch Fakt.";
+            this.xrTableCell38.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell38.Weight = 0.42042083402151886D;
+            // 
+            // xrTableCell34
+            // 
+            this.xrTableCell34.BackColor = System.Drawing.Color.Gainsboro;
+            this.xrTableCell34.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell34.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell34.Name = "xrTableCell34";
+            this.xrTableCell34.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell34.StylePriority.UseBackColor = false;
+            this.xrTableCell34.StylePriority.UseBorderColor = false;
+            this.xrTableCell34.StylePriority.UseBorders = false;
+            this.xrTableCell34.StylePriority.UsePadding = false;
+            this.xrTableCell34.StylePriority.UseTextAlignment = false;
+            this.xrTableCell34.Text = "Gesamt";
+            this.xrTableCell34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell34.Weight = 0.31923915575667006D;
+            // 
+            // DetailReport2
+            // 
+            this.DetailReport2.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail3,
+            this.GroupFooter1});
+            this.DetailReport2.DataMember = "ServiceInvoicePeriods.ServiceInvoiceItems";
+            this.DetailReport2.DataSource = this.bindingSource1;
+            this.DetailReport2.Level = 0;
+            this.DetailReport2.Name = "DetailReport2";
+            this.DetailReport2.PageBreak = DevExpress.XtraReports.UI.PageBreak.AfterBand;
+            // 
+            // Detail3
+            // 
+            this.Detail3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable6});
+            this.Detail3.HeightF = 25F;
+            this.Detail3.Name = "Detail3";
+            // 
+            // xrTable6
+            // 
+            this.xrTable6.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTable6.Name = "xrTable6";
+            this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow25});
+            this.xrTable6.SizeF = new System.Drawing.SizeF(677F, 25F);
+            this.xrTable6.StylePriority.UseFont = false;
+            // 
+            // xrTableRow25
+            // 
+            this.xrTableRow25.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell40,
+            this.xrTableCell42,
+            this.xrTableCell43,
+            this.xrTableCell44,
+            this.xrTableCell45,
+            this.xrTableCell46,
+            this.xrTableCell47});
+            this.xrTableRow25.Name = "xrTableRow25";
+            this.xrTableRow25.Weight = 1D;
+            // 
+            // xrTableCell40
+            // 
+            this.xrTableCell40.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell40.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell40.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.Duration")});
+            this.xrTableCell40.Name = "xrTableCell40";
+            this.xrTableCell40.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell40.StylePriority.UseBorderColor = false;
+            this.xrTableCell40.StylePriority.UseBorders = false;
+            this.xrTableCell40.StylePriority.UsePadding = false;
+            this.xrTableCell40.StylePriority.UseTextAlignment = false;
+            this.xrTableCell40.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell40.Weight = 0.62463084211025488D;
+            // 
+            // xrTableCell42
+            // 
+            this.xrTableCell42.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell42.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell42.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.ServiceDescription")});
+            this.xrTableCell42.Name = "xrTableCell42";
+            this.xrTableCell42.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell42.StylePriority.UseBorderColor = false;
+            this.xrTableCell42.StylePriority.UseBorders = false;
+            this.xrTableCell42.StylePriority.UsePadding = false;
+            this.xrTableCell42.StylePriority.UseTextAlignment = false;
+            this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell42.Weight = 0.85081229498678679D;
+            // 
+            // xrTableCell43
+            // 
+            this.xrTableCell43.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell43.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell43.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.HourlyRate", "{0:0.00}")});
+            this.xrTableCell43.Name = "xrTableCell43";
+            this.xrTableCell43.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell43.StylePriority.UseBorderColor = false;
+            this.xrTableCell43.StylePriority.UseBorders = false;
+            this.xrTableCell43.StylePriority.UsePadding = false;
+            this.xrTableCell43.StylePriority.UseTextAlignment = false;
+            this.xrTableCell43.Text = "xrTableCell43";
+            this.xrTableCell43.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell43.Weight = 0.23245943032832414D;
+            // 
+            // xrTableCell44
+            // 
+            this.xrTableCell44.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell44.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell44.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.Hours", "{0:0.##}")});
+            this.xrTableCell44.Name = "xrTableCell44";
+            this.xrTableCell44.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell44.StylePriority.UseBorderColor = false;
+            this.xrTableCell44.StylePriority.UseBorders = false;
+            this.xrTableCell44.StylePriority.UsePadding = false;
+            this.xrTableCell44.StylePriority.UseTextAlignment = false;
+            this.xrTableCell44.Text = "xrTableCell44";
+            this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell44.Weight = 0.2893277257020575D;
+            // 
+            // xrTableCell45
+            // 
+            this.xrTableCell45.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell45.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell45.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.NetAmount", "{0:0.00}")});
+            this.xrTableCell45.Name = "xrTableCell45";
+            this.xrTableCell45.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell45.StylePriority.UseBorderColor = false;
+            this.xrTableCell45.StylePriority.UseBorders = false;
+            this.xrTableCell45.StylePriority.UsePadding = false;
+            this.xrTableCell45.StylePriority.UseTextAlignment = false;
+            this.xrTableCell45.Text = "xrTableCell45";
+            this.xrTableCell45.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell45.Weight = 0.26310971709438763D;
+            // 
+            // xrTableCell46
+            // 
+            this.xrTableCell46.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell46.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell46.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.RateFactor")});
+            this.xrTableCell46.Name = "xrTableCell46";
+            this.xrTableCell46.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell46.StylePriority.UseBorderColor = false;
+            this.xrTableCell46.StylePriority.UseBorders = false;
+            this.xrTableCell46.StylePriority.UsePadding = false;
+            this.xrTableCell46.StylePriority.UseTextAlignment = false;
+            this.xrTableCell46.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell46.Weight = 0.42042083402151886D;
+            // 
+            // xrTableCell47
+            // 
+            this.xrTableCell47.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell47.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell47.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.GrossAmount")});
+            this.xrTableCell47.Name = "xrTableCell47";
+            this.xrTableCell47.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell47.StylePriority.UseBorderColor = false;
+            this.xrTableCell47.StylePriority.UseBorders = false;
+            this.xrTableCell47.StylePriority.UsePadding = false;
+            this.xrTableCell47.StylePriority.UseTextAlignment = false;
+            this.xrTableCell47.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell47.Weight = 0.31923915575667006D;
+            // 
+            // GroupFooter1
+            // 
+            this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel1,
+            this.xrLabel9,
+            this.xrTable4,
+            this.xrLabel14,
+            this.xrLabel15});
+            this.GroupFooter1.HeightF = 206.5833F;
+            this.GroupFooter1.Name = "GroupFooter1";
+            // 
+            // xrLabel1
+            // 
+            this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim", "Gesamtsumme: {0}")});
+            this.xrLabel1.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Bold);
+            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(420.9999F, 0F);
+            this.xrLabel1.Name = "xrLabel1";
+            this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
+            this.xrLabel1.SizeF = new System.Drawing.SizeF(255.8333F, 25F);
+            this.xrLabel1.StylePriority.UseFont = false;
+            this.xrLabel1.StylePriority.UsePadding = false;
+            this.xrLabel1.StylePriority.UseTextAlignment = false;
+            this.xrLabel1.Text = "xrLabel1";
+            this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
+            // 
+            // xrPictureBox1
+            // 
+            this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
+            this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(432.5735F, 0F);
+            this.xrPictureBox1.Name = "xrPictureBox1";
+            this.xrPictureBox1.SizeF = new System.Drawing.SizeF(244.2598F, 111.0834F);
+            this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
+            // 
+            // ServiceInvoiceReport
+            // 
+            this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail,
+            this.ReportHeader,
+            this.topMarginBand1,
+            this.bottomMarginBand1,
+            this.Page1,
+            this.DetailReport});
+            this.DataSource = this.bindingSource1;
+            this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
+            this.Font = new System.Drawing.Font("Verdana", 10F);
+            this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
+            this.ruleRateFactorNull});
+            this.Margins = new System.Drawing.Printing.Margins(75, 75, 89, 50);
+            this.PageHeight = 1169;
+            this.PageWidth = 827;
+            this.PaperKind = System.Drawing.Printing.PaperKind.A4;
+            this.Version = "17.1";
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
+
+        }
+
+        
+        private DevExpress.XtraReports.UI.DetailBand Detail;
+        private System.Windows.Forms.BindingSource bindingSource1;
+        private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
+        private DevExpress.XtraReports.UI.FormattingRule ruleRateFactorNull;
+        private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
+		private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
+        private DevExpress.XtraReports.UI.GroupHeaderBand Page1;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel4;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel3;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel2;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel5;
+		private DevExpress.XtraReports.UI.XRLabel xrLabel8;
+        private DevExpress.XtraReports.UI.XRLabel lblAbrechnungszeitraum;
+        private DevExpress.XtraReports.UI.XRTable xrTable2;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow5;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow4;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow6;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow8;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel15;
+        private DevExpress.XtraReports.UI.XRTable xrTable4;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow10;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow14;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel14;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel9;
+        private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
+		private DevExpress.XtraReports.UI.DetailBand Detail1;
+        private DevExpress.XtraReports.UI.XRTable xrTable5;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow23;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell32;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell37;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell35;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell33;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell36;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell38;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell34;
+        private DevExpress.XtraReports.UI.DetailReportBand DetailReport2;
+        private DevExpress.XtraReports.UI.DetailBand Detail3;
+        private DevExpress.XtraReports.UI.XRTable xrTable6;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow25;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell40;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell42;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell43;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell44;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell45;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell46;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell47;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel7;
+		private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
+		private DevExpress.XtraReports.UI.XRLabel xrLabel1;
+        private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
+    }
+}

ReportImp/MVZMedikusGmbH/ServiceInvoiceReport.cs

@@ -0,0 +1,31 @@
+using System;
+using BeWo.Report.ReportObjects;
+
+using DevExpress.XtraReports.UI;
+
+namespace BeWo.Report.DefaultReports
+{
+    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;
+        }
+    }
+}

ReportImp/MVZMedikusGmbH/SettlementReport.cs

@@ -0,0 +1,222 @@
+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);
+						}
+					}
+				}
+	        }
+	        
+
+	        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);
+			}
+		}
+    }
+}

ReportImp/MVZMedikusGmbH/obj/Debug/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs

@@ -0,0 +1,4 @@
+// <autogenerated />
+using System;
+using System.Reflection;
+[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.7.2", FrameworkDisplayName = ".NET Framework 4.7.2")]

ReportImp/MVZMedikusGmbH/obj/Debug/MVZMedikusGmbH.csproj.CoreCompileInputs.cache

@@ -0,0 +1 @@
+e41d2cb24fc06c89543581db1bb90c53530e98a8

ReportImp/MVZMedikusGmbH/obj/Debug/MVZMedikusGmbH.csproj.FileListAbsolute.txt

@@ -0,0 +1,13 @@
+D:\Projects\beyondSoft\BeWoPlaner\BeWo\Host\bin\ICD10\icd10.xml
+D:\Projects\beyondSoft\BeWoPlaner\BeWo\Host\bin\4152581290_Reports.dll
+D:\Projects\beyondSoft\BeWoPlaner\BeWo\Host\bin\4152581290_Reports.pdb
+D:\Projects\beyondSoft\BeWoPlaner\BeWo\ReportImp\MVZMedikusGmbH\obj\Debug\MVZMedikusGmbH.csprojAssemblyReference.cache
+D:\Projects\beyondSoft\BeWoPlaner\BeWo\ReportImp\MVZMedikusGmbH\obj\Debug\BeWo.Report.DefaultReports.Quittierungsbeleg.resources
+D:\Projects\beyondSoft\BeWoPlaner\BeWo\ReportImp\MVZMedikusGmbH\obj\Debug\BeWo.Report.DefaultReports.ServiceInvoiceReport.resources
+D:\Projects\beyondSoft\BeWoPlaner\BeWo\ReportImp\MVZMedikusGmbH\obj\Debug\BeWo.Report.DefaultReports.Alt.Spitzabrechnung.resources
+D:\Projects\beyondSoft\BeWoPlaner\BeWo\ReportImp\MVZMedikusGmbH\obj\Debug\MVZMedikusGmbH.csproj.GenerateResource.cache
+D:\Projects\beyondSoft\BeWoPlaner\BeWo\ReportImp\MVZMedikusGmbH\obj\Debug\4152581290_Reports.dll.licenses
+D:\Projects\beyondSoft\BeWoPlaner\BeWo\ReportImp\MVZMedikusGmbH\obj\Debug\MVZMedikusGmbH.csproj.CoreCompileInputs.cache
+D:\Projects\beyondSoft\BeWoPlaner\BeWo\ReportImp\MVZMedikusGmbH\obj\Debug\MVZMedikusGmbH.csproj.CopyComplete
+D:\Projects\beyondSoft\BeWoPlaner\BeWo\ReportImp\MVZMedikusGmbH\obj\Debug\4152581290_Reports.dll
+D:\Projects\beyondSoft\BeWoPlaner\BeWo\ReportImp\MVZMedikusGmbH\obj\Debug\4152581290_Reports.pdb

Service/Plugins/PluginLoader.cs

@@ -249,6 +249,7 @@ namespace BeWo.Service.Plugins
                 //t = "7419804320"; // Gender Bewo
                 //t = "4500422855"; // BeWo Nordeifel
                 //t = "3565931805"; // Betreuungsbüro Frank Röhrig
+                //t = "4152581290"; // MVZ Medikus GmbH (Stoffwechsel Betreutes wohnen)
 
                 return t;
 #else

Service/ServiceContracts/IOperationsService.cs

@@ -1011,5 +1011,10 @@ namespace BeWo.Service.ServiceContracts
         [FaultContract(typeof(BeWoFault))]
         [OperationContract]
         List<SupportConceptDC> GetSupportConceptsById(IEnumerable<long> supportConceptOids);
+
+        [FaultContract(typeof(BeWoFault))]
+        [OperationContract]
+        void DeleteTemplates(List<DokumentvorlageDC> vorlagen);
+
     }
 }

Service/ServiceImplementations/OperationsServiceImp.cs

@@ -1,15 +1,4 @@
-using System;
+using BeWo.Data;
-using System.Collections.Generic;
-using System.Configuration;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.ServiceModel;
-using System.Text;
-using System.Threading;
-using System.Web;
-using System.Windows;
-using BeWo.Data;
 using BeWo.Data.Access;
 using BeWo.Data.Entities;
 using BeWo.Data.ICD10;
@@ -23,7 +12,6 @@ using BeWo.Service.Plugins;
 using BeWo.Service.SBD;
 using BeWo.Service.Security;
 using BeWo.Service.ServiceContracts;
-
 using BS.Shared;
 using BS.Shared.Core;
 using BS.Shared.DataContracts;
@@ -33,6 +21,17 @@ using BS.Shared.Extensions;
 using BS.Shared.Services;
 using Newtonsoft.Json;
 using RestSharp;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.ServiceModel;
+using System.Text;
+using System.Threading;
+using System.Web;
+using System.Windows;
 using Utils = BeWo.Service.Core.Utils;
 
 namespace BeWo.Service.ServiceImplementations
@@ -320,13 +319,13 @@ namespace BeWo.Service.ServiceImplementations
                     MakeServiceRecordHistoryEntry(srListToDelete, null, StatementType.Delete);
 
                     // ConfirmationReceiptSignatures mit den zu löschenden ServiceRecords suchen und die ServiceRecords aus der Liste entfernen
-                    foreach(var item in lOriginals)
+                    foreach (var item in lOriginals)
                     {
-                        if(item.Oid.HasValue)
+                        if (item.Oid.HasValue)
                         {
                             var confirmationReceiptSignatures = DAOFactory.SearchDAO.GetConfirmationReceiptSignaturesByServiceRecord(item.Oid.Value);
 
-                            foreach(var confirmationReceiptSignature in confirmationReceiptSignatures)
+                            foreach (var confirmationReceiptSignature in confirmationReceiptSignatures)
                             {
                                 confirmationReceiptSignature.ServiceRecords.Remove(item);
                                 DAOFactory.GenericDAO.Update(confirmationReceiptSignature);
@@ -473,17 +472,17 @@ namespace BeWo.Service.ServiceImplementations
                 //}
                 //else
                 //{
-                    dcList.Sort((a, b) =>
+                dcList.Sort((a, b) =>
+                {
+                    if (a.Position == b.Position)
                     {
-                        if (a.Position == b.Position)
+                        return a.ServiceCategoryOid.Value.CompareTo(b.ServiceCategoryOid.Value);
-                        {
+                    }
-                            return a.ServiceCategoryOid.Value.CompareTo(b.ServiceCategoryOid.Value);
+                    else
-                        }
+                    {
-                        else
+                        return a.Position.CompareTo(b.Position);
-                        {
+                    }
-                            return a.Position.CompareTo(b.Position);
+                });
-                        }
-                    });
                 //}
 
                 return dcList;
@@ -6430,11 +6429,11 @@ namespace BeWo.Service.ServiceImplementations
                     if (filter.EmploymentType != null)
                         if (!emp.Contracts.Any(x => x.EmploymentType != null && filter.EmploymentType.Contains(x.EmploymentType.Oid.Value)))
                             continue;
-                        
+
 
                     var dict = vs.BerechneUrlaubskonto(emp, filter.Year);
 
-                    if(filter.AbsenceReasons != null)
+                    if (filter.AbsenceReasons != null)
                         emp.AbsenceTimes.RemoveRange(x => !filter.AbsenceReasons.Contains(x.AbsenceReason.Oid.Value));
 
                     var empDC = MapperFactory.EmployeeDC_Employee.MapToNewDC(emp);
@@ -6472,7 +6471,7 @@ namespace BeWo.Service.ServiceImplementations
             {
                 return MapperFactory.ConfirmationReceiptSignatureDC_ConfirmationReceiptSignature.MapToNewDCs(DAOFactory.GenericDAO.GetAllActive<ConfirmationReceiptSignature>());
             }
-            catch(Exception exception)
+            catch (Exception exception)
             {
                 throw Utils.CreateBeWoFaultException(exception);
             }
@@ -6484,7 +6483,7 @@ namespace BeWo.Service.ServiceImplementations
             {
                 return MapperFactory.ServiceRecordDC_ServiceRecord.MapToNewDCs(DAOFactory.GenericDAO.LoadByIDs<ServiceRecord>(serviceRecordOids));
             }
-            catch(Exception exception)
+            catch (Exception exception)
             {
                 throw Utils.CreateBeWoFaultException(exception);
             }
@@ -6499,15 +6498,15 @@ namespace BeWo.Service.ServiceImplementations
             //return url;
 
             return "http://www.bewoplaner.de";
-				}
+        }
-				
+
         public bool HasConfirmationReceiptSignaturesByEmployeeAndServiceRecords(long employeeOid, IEnumerable<long> serviceRecordOids)
         {
             try
             {
                 return DAOFactory.SearchDAO.HasConfirmationReceiptSignaturesByEmployeeAndServiceRecords(employeeOid, serviceRecordOids);
             }
-            catch(Exception exception)
+            catch (Exception exception)
             {
                 throw Utils.CreateBeWoFaultException(exception);
             }
@@ -6519,7 +6518,7 @@ namespace BeWo.Service.ServiceImplementations
             {
                 return DAOFactory.SearchDAO.HasConfirmationReceiptSignatureByDateAndCustomer(customerOid, timeSpan);
             }
-            catch(Exception exception)
+            catch (Exception exception)
             {
                 throw Utils.CreateBeWoFaultException(exception);
             }
@@ -6533,7 +6532,7 @@ namespace BeWo.Service.ServiceImplementations
 
                 return MapperFactory.ServiceCategoryDC_ServiceCategory.MapToNewDC(serviceCategory);
             }
-            catch(Exception e)
+            catch (Exception e)
             {
                 throw Utils.CreateBeWoFaultException(e);
             }
@@ -6547,7 +6546,7 @@ namespace BeWo.Service.ServiceImplementations
 
                 return MapperFactory.ConfirmationReceiptSignatureDC_ConfirmationReceiptSignature.MapToNewDCs(confirmationReceiptSignatureEntities);
             }
-            catch(Exception e)
+            catch (Exception e)
             {
                 throw Utils.CreateBeWoFaultException(e);
             }
@@ -6573,8 +6572,17 @@ namespace BeWo.Service.ServiceImplementations
         {
             try
             {
-                var entity = MapperFactory.DokumentvorlageDC_Dokumentvorlage.MapToNewEntity(dc);
+                if (dc.DokumentvorlageOid == null)
-                DAOFactory.GenericDAO.Insert(entity);
+                {
+                    var entity = MapperFactory.DokumentvorlageDC_Dokumentvorlage.MapToNewEntity(dc);
+                    DAOFactory.GenericDAO.Insert(entity);
+                }
+                else
+                {
+                    var origTemplate = DAOFactory.GenericDAO.LoadByID<Dokumentvorlage>((long)dc.DokumentvorlageOid);
+                    MapperFactory.DokumentvorlageDC_Dokumentvorlage.MergeWithEntity(dc, origTemplate);
+                    DAOFactory.GenericDAO.Update(origTemplate);
+                }
             }
             catch (Exception ex)
             {
@@ -6586,10 +6594,127 @@ namespace BeWo.Service.ServiceImplementations
             try
             {
                 List<PlatzhalterDC> liste = new List<PlatzhalterDC>();
+                //Personendaten
+                PlatzhalterDC personendaten = new PlatzhalterDC()
+                {
+                    Bezeichnung = "Personendaten",
+                    Children = new List<PlatzhalterDC>()
+                };
+                #region Children Personendaten
+                PlatzhalterDC anrede = new PlatzhalterDC() { Bezeichnung = "Anrede" };
+                personendaten.Children.Add(anrede);
+                PlatzhalterDC vorname = new PlatzhalterDC() { Bezeichnung = "Vorname" };
+                personendaten.Children.Add(vorname);
+                PlatzhalterDC nachname = new PlatzhalterDC() { Bezeichnung = "Nachname" };
+                personendaten.Children.Add(nachname);
+                PlatzhalterDC gebDatum = new PlatzhalterDC() { Bezeichnung = "Geburtsdatum" };
+                personendaten.Children.Add(gebDatum);
+                PlatzhalterDC gebOrt = new PlatzhalterDC() { Bezeichnung = "Geburtsort" };
+                personendaten.Children.Add(gebOrt);
+                PlatzhalterDC telefonnummer = new PlatzhalterDC() { Bezeichnung = "Telefonnummer" };
+                personendaten.Children.Add(telefonnummer);
+                PlatzhalterDC email = new PlatzhalterDC() { Bezeichnung = "E-Mail-Adresse" };
+                personendaten.Children.Add(email);
+                PlatzhalterDC berufsbezeichnung = new PlatzhalterDC() { Bezeichnung = "Berufsbezeichnung" };
+                personendaten.Children.Add(berufsbezeichnung);
+                #endregion Children Personendaten
+                PlatzhalterDC adressdatenKlient = new PlatzhalterDC()
+                {
+                    Bezeichnung = "Adressdaten Klient",
+                    Children = new List<PlatzhalterDC>()
+                };
+                #region Children Adressdaten Klient
+                PlatzhalterDC strasse = new PlatzhalterDC() { Bezeichnung = "Straße" };
+                adressdatenKlient.Children.Add(strasse);
+                PlatzhalterDC hausnr = new PlatzhalterDC() { Bezeichnung = "Hausnummer" };
+                adressdatenKlient.Children.Add(hausnr);
+                PlatzhalterDC plz = new PlatzhalterDC() { Bezeichnung = "PLZ" };
+                adressdatenKlient.Children.Add(plz);
+                PlatzhalterDC ort = new PlatzhalterDC() { Bezeichnung = "Ort" };
+                adressdatenKlient.Children.Add(ort);
+                #endregion
+                PlatzhalterDC adressdatenOrganisation = new PlatzhalterDC()
+                {
+                    Bezeichnung = "Adressdaten Organisation",
+                    Children = new List<PlatzhalterDC>()
+                };
+                #region Children Adressdaten Organisation
+                PlatzhalterDC adressat = new PlatzhalterDC() { Bezeichnung = "Adressat" };
+                adressdatenOrganisation.Children.Add(adressat);
+                PlatzhalterDC strasseOrga = new PlatzhalterDC() { Bezeichnung = "Straße" };
+                adressdatenOrganisation.Children.Add(strasseOrga);
+                PlatzhalterDC hausnrOrga = new PlatzhalterDC() { Bezeichnung = "Hausnummer" };
+                adressdatenOrganisation.Children.Add(hausnrOrga);
+                PlatzhalterDC plzOrga = new PlatzhalterDC() { Bezeichnung = "PLZ" };
+                adressdatenOrganisation.Children.Add(plzOrga);
+                PlatzhalterDC ortOrga = new PlatzhalterDC() { Bezeichnung = "Ort" };
+                adressdatenOrganisation.Children.Add(ortOrga);
+                #endregion
+
+                liste.Add(personendaten);
+                liste.Add(adressdatenKlient);
+                liste.Add(adressdatenOrganisation);
+
+                return liste;
+                /*
+                 *--Personendaten
+                 * Anrede
+                 * Vorname
+                 * Nachname
+                 * Geburtsdatum
+                 * Geburtsort
+                 * Telefonnummer
+                 * E-Mail
+                 * Berufsbezeichnung
+                 * 
+                 * --Adressdaten Klient
+                 * Straße
+                 * Hausnummer
+                 * PLZ
+                 * Ort
+                 * 
+                 * --Adressdaten Organisation
+                 * Adressat
+                 * Straße
+                 * Hausnummer
+                 * PLZ
+                 * Ort
+                 * 
+                 * --Sonstiges
+                 * Datum
+                 * Ort
+                 * 
+                */
 
                 return liste;
             }
-            catch(Exception ex)
+            catch (Exception ex)
+            {
+                throw Utils.CreateBeWoFaultException(ex);
+            }
+        }
+        public List<PlatzhalterDC> GetPlatzhalterForSupportConcept()
+        {
+            try
+            {
+                List<PlatzhalterDC> liste = new List<PlatzhalterDC>();
+
+                return liste;
+            }
+            catch (Exception ex)
+            {
+                throw Utils.CreateBeWoFaultException(ex);
+            }
+        }
+        public List<PlatzhalterDC> GetPlatzhalterForEmployee()
+        {
+            try
+            {
+                List<PlatzhalterDC> liste = new List<PlatzhalterDC>();
+
+                return liste;
+            }
+            catch (Exception ex)
             {
                 throw Utils.CreateBeWoFaultException(ex);
             }
@@ -6632,10 +6757,29 @@ namespace BeWo.Service.ServiceImplementations
 
                 return MapperFactory.SupportConceptDC_SupportConcept.MapToNewDCs(supportConcepts);
             }
-            catch(Exception e)
+            catch (Exception e)
+            {
+                throw Utils.CreateBeWoFaultException(e);
+            }
+        }
+        public void DeleteTemplates(List<DokumentvorlageDC> vorlagen)
+        {
+            try
+            {
+                for (int i = vorlagen.Count - 1; i >= 0; i--)
+                {
+                    var origTemplate = DAOFactory.GenericDAO.LoadByID<Dokumentvorlage>((long)vorlagen[i].DokumentvorlageOid);
+                    MapperFactory.DokumentvorlageDC_Dokumentvorlage.ConcurrencyCheck(vorlagen[i].DokumentvorlageVersion, origTemplate);
+
+                    DAOFactory.GenericDAO.Delete(origTemplate);
+                }
+            }
+            catch (Exception e)
             {
                 throw Utils.CreateBeWoFaultException(e);
             }
         }
     }
+
+
 }

Shared/DataContracts/PlatzhalterDC.cs

@@ -8,6 +8,7 @@ namespace BS.Shared.DataContracts
 {
     public class PlatzhalterDC
     {
-
+        public string Bezeichnung { get; set; }
+        public List<PlatzhalterDC> Children {get;set;}       
     }
 }