From 4fe579fb1f23664d2ad2081d71f927c6243043f8 Mon Sep 17 00:00:00 2001
From: Rene Evertz <rene.evertz@ownsoft.de>
Date: Wed, 9 Oct 2024 15:48:19 +0200
Subject: [PATCH] GkvAbrechnung Verfahrensstufe

---
 BeWo/Converter/EnumTranslationConverter.cs    |   8 +-
 BeWo/View/BeWoWindowBuilder.cs                |   4 +-
 .../Controls/GkvAbrechnungDetailControl.xaml  | 503 +++++++++++++----
 .../Accounting/GkvAbrechnungOverview.xaml     |  24 +-
 .../Accounting/GkvAbrechnungOverview.xaml.cs  |  21 -
 BeWo/View/Master/DokumenteView.xaml           | 514 ++++++++++++++----
 BeWo/ViewModel/GkvAbrechnungVM.cs             |  32 ++
 Dakota/Logic/DakotaInfoCreator.cs             |   5 +-
 Dakota/Logic/DakotaManager.cs                 |   9 +-
 .../Schlüssels/SchlüsselTestindikator.cs      |  29 +-
 Data/Entities/GkvAbrechnung.cs                |   1 +
 Data/Mappings/GkvAbrechnung.hbm.xml           |   1 +
 ...24_10_09 GkvAbrechnung Verfahrensstufe.txt |   5 +-
 .../GkvAbrechnungDC_GkvAbrechnung.cs          |   2 +
 .../AccountingServiceImp.cs                   |   6 +-
 .../GkvAbrechnung/GkvAbrechnungDC.cs          |   3 +
 Shared/Extensions/GkvAbrechnungExtensions.cs  |   5 +
 17 files changed, 900 insertions(+), 272 deletions(-)

diff --git a/BeWo/Converter/EnumTranslationConverter.cs b/BeWo/Converter/EnumTranslationConverter.cs
index 3c03c0e9f..a9b8f0630 100644
--- a/BeWo/Converter/EnumTranslationConverter.cs
+++ b/BeWo/Converter/EnumTranslationConverter.cs
@@ -19,12 +19,18 @@ namespace BeWo.Converter
                 {
                     return v;
                 }
+                // RE:
+                // EnumTranslationConverter, aber betrachtet nicht alle?
+                // Brauche hier eig nur EnumTranslations.Gkv2Translation
+                if (EnumTranslations.AllTranslations.TryGetValue(e, out string vv))
+                {
+                    return vv;
+                }
 
                 return e;
             }
 
             return null;
-            throw new NotImplementedException();
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
diff --git a/BeWo/View/BeWoWindowBuilder.cs b/BeWo/View/BeWoWindowBuilder.cs
index 4ded5d01a..9e593b68c 100644
--- a/BeWo/View/BeWoWindowBuilder.cs
+++ b/BeWo/View/BeWoWindowBuilder.cs
@@ -36,11 +36,11 @@ namespace BeWo.View
             return beWoWindow;
         }
 
-        public static BeWoWindow GetGkvAbrechnungDetailWindow(GkvAbrechnungVM vM, double height = 600, double width = 1200)
+        public static BeWoWindow GetGkvAbrechnungDetailWindow(GkvAbrechnungVM vM, double height = 800, double width = 600)
         {
             var detail = new GkvAbrechnungDetailControl(vM);
 
-            var beWoWindow = GetGenericBeWoWindow("GKV-Abrechnung Nr. " + vM.GkvAbrechnungOid + ": Details", 100, height, 1000, 100, width, 1600);
+            var beWoWindow = GetGenericBeWoWindow("GKV-Abrechnung Nr. " + vM.GkvAbrechnungOid + ": Details", 100, height, 1000, 400, width, 1600);
             beWoWindow.GroupBoxContent = detail;
 
             return beWoWindow;
diff --git a/BeWo/View/Controls/GkvAbrechnungDetailControl.xaml b/BeWo/View/Controls/GkvAbrechnungDetailControl.xaml
index 3b97da5cd..0cafc0443 100644
--- a/BeWo/View/Controls/GkvAbrechnungDetailControl.xaml
+++ b/BeWo/View/Controls/GkvAbrechnungDetailControl.xaml
@@ -1,145 +1,452 @@
-<UserControl x:Class="BeWo.View.Controls.GkvAbrechnungDetailControl"
-                    xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup" 
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:BeWo.View.Controls"
-             xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
-             xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" xmlns:viewmodel="clr-namespace:BeWo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:GkvAbrechnungVM}"
-             mc:Ignorable="d">
+<UserControl
+    x:Class="BeWo.View.Controls.GkvAbrechnungDetailControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
+    xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
+    xmlns:local="clr-namespace:BeWo.View.Controls"
+    xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:viewmodel="clr-namespace:BeWo.ViewModel"
+    d:DataContext="{d:DesignInstance Type=viewmodel:GkvAbrechnungVM}"
+    mc:Ignorable="d">
     <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
-            <RowDefinition Height="*"/>
+            <RowDefinition Height="*" />
         </Grid.RowDefinitions>
         <TabControl Background="#eeeeee" BorderThickness="0">
             <TabItem Header="Allgemein">
-                <Grid Background="#eeeeee" Margin="0" HorizontalAlignment="Stretch" MaxWidth="700">
+                <Grid
+                    MaxWidth="700"
+                    Margin="0"
+                    HorizontalAlignment="Stretch"
+                    Background="#eeeeee">
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="auto"/>
-                        <ColumnDefinition Width="*"/>
-                        <ColumnDefinition Width="3*"/>
+                        <ColumnDefinition Width="auto" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="3*" />
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
-                        <RowDefinition Height="auto"/>
-                        <RowDefinition Height="auto"/>
-                        <RowDefinition Height="auto"/>
-                        <RowDefinition Height="auto"/>
-                        <RowDefinition Height="auto"/>
-                        <RowDefinition Height="auto"/>
-                        <RowDefinition Height="auto"/>
-                        <RowDefinition Height="auto"/>
-                        <RowDefinition Height="auto"/>
-                        <RowDefinition Height="auto"/>
-                        <RowDefinition Height="auto"/>
-                        <RowDefinition Height="auto"/>
-                        <RowDefinition Height="auto"/>
-                        <RowDefinition Height="auto"/>
-                        <RowDefinition Height="auto"/>
-                        <RowDefinition Height="auto"/>
-                        <RowDefinition Height="*"/>
+                        <RowDefinition Height="auto" />
+                        <RowDefinition Height="auto" />
+                        <RowDefinition Height="auto" />
+                        <RowDefinition Height="auto" />
+                        <RowDefinition Height="auto" />
+                        <RowDefinition Height="auto" />
+                        <RowDefinition Height="auto" />
+                        <RowDefinition Height="auto" />
+                        <RowDefinition Height="auto" />
+                        <RowDefinition Height="auto" />
+                        <RowDefinition Height="auto" />
+                        <RowDefinition Height="auto" />
+                        <RowDefinition Height="auto" />
+                        <RowDefinition Height="auto" />
+                        <RowDefinition Height="auto" />
+                        <RowDefinition Height="auto" />
+                        <RowDefinition Height="*" />
                     </Grid.RowDefinitions>
-                    <Label Grid.Row="0" Grid.Column="0" Margin="3" Content="GKV-Abrechnung Nr.:"/>
-                    <TextBox Grid.Row="0" Grid.Column="2" Margin="3" IsReadOnly="True" Text="{Binding GkvAbrechnungOid}"/>
-                    <Label Grid.Row="5" Grid.Column="0" Margin="3" Content="Abrechnungsbeginn:"/>
-                    <TextBox Grid.Row="5" Grid.Column="2" Margin="3" IsReadOnly="True" Text="{Binding AbrechnungsZeitraumStart}"/>
-                    <Label Grid.Row="6" Grid.Column="0" Margin="3" Content="Abrechnungsende:"/>
-                    <TextBox Grid.Row="6" Grid.Column="2" Margin="3" IsReadOnly="True" Text="{Binding AbrechnungsZeitraumEnde}"/>
-                    <Label Grid.Row="9" Grid.Column="0" Margin="3" Content="Erstellt am:"/>
-                    <TextBox Grid.Row="9" Grid.Column="2" Margin="3" IsReadOnly="True" Text="{Binding ErstelltAm}"/>
-                    <Label      Grid.Row="13" Grid.Column="0" Margin="3" Content="Urbelege Gesendet:"/>
-                    <CheckBox Grid.Row="13" Grid.Column="2" Margin="3" HorizontalAlignment="Left" x:Name="Checkbox_Urbelege" IsChecked="{Binding UrbelegeGesendet}"/>
-                    <Label      Grid.Row="14" Grid.Column="0" Margin="3" Content="Bezahlt:"/>
-                    <CheckBox Grid.Row="14" Grid.Column="2" Margin="3" HorizontalAlignment="Left" x:Name="Checkbox_Bezahlt" IsChecked="{Binding Bezahlt}"/>
-                    <Label      Grid.Row="15" Grid.Column="0" Margin="3" Content="Betrag:"/>
-                    <TextBox    Grid.Row="15" Grid.Column="2" Margin="3" IsReadOnly="True" Text="{Binding Betrag, StringFormat={}{0:0.00 €}}"/>
+                    <Label
+                        Grid.Row="0"
+                        Grid.Column="0"
+                        Margin="3"
+                        Content="GKV-Abrechnung Nr.:" />
+                    <TextBox
+                        Grid.Row="0"
+                        Grid.Column="2"
+                        Margin="3"
+                        IsReadOnly="True"
+                        Text="{Binding GkvAbrechnungOid}" />
+                    <Label
+                        Grid.Row="5"
+                        Grid.Column="0"
+                        Margin="3"
+                        Content="Abrechnungsbeginn:" />
+                    <TextBox
+                        Grid.Row="5"
+                        Grid.Column="2"
+                        Margin="3"
+                        IsReadOnly="True"
+                        Text="{Binding AbrechnungsZeitraumStart}" />
+                    <Label
+                        Grid.Row="6"
+                        Grid.Column="0"
+                        Margin="3"
+                        Content="Abrechnungsende:" />
+                    <TextBox
+                        Grid.Row="6"
+                        Grid.Column="2"
+                        Margin="3"
+                        IsReadOnly="True"
+                        Text="{Binding AbrechnungsZeitraumEnde}" />
+                    <Label
+                        Grid.Row="9"
+                        Grid.Column="0"
+                        Margin="3"
+                        Content="Erstellt am:" />
+                    <TextBox
+                        Grid.Row="9"
+                        Grid.Column="2"
+                        Margin="3"
+                        IsReadOnly="True"
+                        Text="{Binding ErstelltAm}" />
+                    <Label
+                        Grid.Row="10"
+                        Grid.Column="0"
+                        Margin="3"
+                        Content="Verfahrensstufe:" />
+
+                    <StackPanel
+                        Grid.Row="10"
+                        Grid.Column="2"
+                        Margin="3"
+                        Orientation="Horizontal">
+                        <RadioButton
+                            Margin="3"
+                            GroupName="a"
+                            IsChecked="{Binding Path=VerfahrensstufeInt, Converter={StaticResource RadioBoolToIntConverter}, ConverterParameter=0}">
+                            Test
+                        </RadioButton>
+                        <RadioButton
+                            Margin="3"
+                            GroupName="a"
+                            IsChecked="{Binding Path=VerfahrensstufeInt, Converter={StaticResource RadioBoolToIntConverter}, ConverterParameter=1}">
+                            Erprobung
+                        </RadioButton>
+                        <RadioButton
+                            Margin="3"
+                            GroupName="a"
+                            IsChecked="{Binding Path=VerfahrensstufeInt, Converter={StaticResource RadioBoolToIntConverter}, ConverterParameter=2}">
+                            Echt
+                        </RadioButton>
+                    </StackPanel>
+
+                    <Label
+                        Grid.Row="13"
+                        Grid.Column="0"
+                        Margin="3"
+                        Content="Urbelege Gesendet:" />
+                    <CheckBox
+                        x:Name="Checkbox_Urbelege"
+                        Grid.Row="13"
+                        Grid.Column="2"
+                        Margin="3"
+                        HorizontalAlignment="Left"
+                        IsChecked="{Binding UrbelegeGesendet}" />
+                    <Label
+                        Grid.Row="14"
+                        Grid.Column="0"
+                        Margin="3"
+                        Content="Bezahlt:" />
+                    <CheckBox
+                        x:Name="Checkbox_Bezahlt"
+                        Grid.Row="14"
+                        Grid.Column="2"
+                        Margin="3"
+                        HorizontalAlignment="Left"
+                        IsChecked="{Binding Bezahlt}" />
+                    <Label
+                        Grid.Row="15"
+                        Grid.Column="0"
+                        Margin="3"
+                        Content="Betrag:" />
+                    <TextBox
+                        Grid.Row="15"
+                        Grid.Column="2"
+                        Margin="3"
+                        IsReadOnly="True"
+                        Text="{Binding Betrag, StringFormat={}{0:0.00 €}}" />
                     <!--<TextBox    Grid.Row="15" Grid.Column="2" Margin="3" IsReadOnly="True" Text="{Binding Bezahlt}"/>-->
-                    <Label      Grid.Row="16" Grid.Column="0" Margin="3" Content="Bemerkung:"/>
-                    <TextBox Grid.Row="16" Grid.Column="2" Margin="3" Text="{Binding Notice}" x:Name="Textbox_Notice" MaxLength="1024" TextWrapping="Wrap" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto" AcceptsReturn="True"/>
+                    <Label
+                        Grid.Row="16"
+                        Grid.Column="0"
+                        Margin="3"
+                        Content="Bemerkung:" />
+                    <TextBox
+                        x:Name="Textbox_Notice"
+                        Grid.Row="16"
+                        Grid.Column="2"
+                        Margin="3"
+                        AcceptsReturn="True"
+                        HorizontalScrollBarVisibility="Disabled"
+                        MaxLength="1024"
+                        Text="{Binding Notice}"
+                        TextWrapping="Wrap"
+                        VerticalScrollBarVisibility="Auto" />
                 </Grid>
             </TabItem>
             <TabItem x:Name="tabitem_rechnungen" Header="Enthaltene Rechnungen">
-                <dxg:GridControl Margin="3" x:Name="datagrid_invoices" DataSource="{Binding InvoiceBases2}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+                <dxg:GridControl
+                    x:Name="datagrid_invoices"
+                    Margin="3"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch"
+                    DataSource="{Binding InvoiceBases2}">
                     <dxg:GridControl.Columns>
-                        <dxg:GridColumn x:Name="ColumnChecked" FieldName="IsChecked" Header=" " MinWidth="30"></dxg:GridColumn>
-                        <dxg:GridColumn x:Name="ColumnButtons"  AllowEditing="False" FieldName="ReportLink" Header=" ">
+                        <dxg:GridColumn
+                            x:Name="ColumnChecked"
+                            MinWidth="30"
+                            FieldName="IsChecked"
+                            Header=" " />
+                        <dxg:GridColumn
+                            x:Name="ColumnButtons"
+                            AllowEditing="False"
+                            FieldName="ReportLink"
+                            Header=" ">
                             <dxg:GridColumn.DisplayTemplate>
                                 <ControlTemplate>
                                     <StackPanel Orientation="Horizontal">
-                                        <Button Margin="1" ToolTip="Formular anzeigen" x:Name="btn_report" Height="20" Width="20" VerticalAlignment="Center">
+                                        <Button
+                                            x:Name="btn_report"
+                                            Width="20"
+                                            Height="20"
+                                            Margin="1"
+                                            VerticalAlignment="Center"
+                                            ToolTip="Formular anzeigen">
                                             <TextBlock Padding="0">
-												<Hyperlink TextDecorations="None" TargetName="_NewWindow" NavigateUri="{Binding DisplayText, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" RequestNavigate="Hyperlink_OnRequestNavigate">
-													<TextBlock Padding="0" Text="¥" Foreground="#FFFFFF" FontSize="15" FontFamily="Webdings" Height="17" Width="16" VerticalAlignment="Center" HorizontalAlignment="Left" />
-												</Hyperlink>
-											</TextBlock>
+                                                <Hyperlink
+                                                    NavigateUri="{Binding DisplayText, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                                    RequestNavigate="Hyperlink_OnRequestNavigate"
+                                                    TextDecorations="None"
+                                                    TargetName="_NewWindow">
+                                                    <TextBlock
+                                                        Width="16"
+                                                        Height="17"
+                                                        Padding="0"
+                                                        HorizontalAlignment="Left"
+                                                        VerticalAlignment="Center"
+                                                        FontFamily="Webdings"
+                                                        FontSize="15"
+                                                        Foreground="#FFFFFF"
+                                                        Text="¥" />
+                                                </Hyperlink>
+                                            </TextBlock>
                                         </Button>
                                     </StackPanel>
                                 </ControlTemplate>
                             </dxg:GridColumn.DisplayTemplate>
                         </dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="TypeString" Header="Art der Rechnung" Width="150" />
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="CustomerName" Header="{markup:Translate Klient/in}" Width="100" />
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="AccountingPeriodString" SortFieldName="AccountingPeriodStart" Header="Zeitraum" Width="100" />
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="InvoiceNumber" Header="Nummer" />
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="InvoiceDate" Header="Datum" EditSettings="{dxe:DateSettings DisplayFormat=d}" MinWidth="70" />
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="RecipientString" Header="{markup:Translate EmpfängerSingular}" />
+                        <dxg:GridColumn
+                            Width="150"
+                            AllowEditing="False"
+                            FieldName="TypeString"
+                            Header="Art der Rechnung"
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            Width="100"
+                            AllowEditing="False"
+                            FieldName="CustomerName"
+                            Header="{markup:Translate Klient/in}"
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            Width="100"
+                            AllowEditing="False"
+                            FieldName="AccountingPeriodString"
+                            Header="Zeitraum"
+                            ReadOnly="True"
+                            SortFieldName="AccountingPeriodStart" />
+                        <dxg:GridColumn
+                            AllowEditing="False"
+                            FieldName="InvoiceNumber"
+                            Header="Nummer"
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            MinWidth="70"
+                            AllowEditing="False"
+                            EditSettings="{dxe:DateSettings DisplayFormat=d}"
+                            FieldName="InvoiceDate"
+                            Header="Datum"
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            AllowEditing="False"
+                            FieldName="RecipientString"
+                            Header="{markup:Translate EmpfängerSingular}"
+                            ReadOnly="True" />
                         <!--<dxg:GridColumn FieldName="AccountingPeriodString" Header="Abrechnungszeitraum" />-->
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="TotalAmount" Header="Betrag" MinWidth="70">
+                        <dxg:GridColumn
+                            MinWidth="70"
+                            AllowEditing="False"
+                            FieldName="TotalAmount"
+                            Header="Betrag"
+                            ReadOnly="True">
                             <dxg:GridColumn.EditSettings>
-                                <dxe:TextEditSettings DisplayFormat="c" Mask="c" MaskType="Numeric"></dxe:TextEditSettings>
+                                <dxe:TextEditSettings
+                                    DisplayFormat="c"
+                                    Mask="c"
+                                    MaskType="Numeric" />
                             </dxg:GridColumn.EditSettings>
                         </dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Notice" Header="Bemerkung" MinWidth="200" />
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" x:Name="PaidColumn" FieldName="IsPaid" Header="Bezahlt"></dxg:GridColumn>
+                        <dxg:GridColumn
+                            MinWidth="200"
+                            AllowEditing="False"
+                            FieldName="Notice"
+                            Header="Bemerkung"
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            x:Name="PaidColumn"
+                            AllowEditing="False"
+                            FieldName="IsPaid"
+                            Header="Bezahlt"
+                            ReadOnly="True" />
                     </dxg:GridControl.Columns>
                     <dxg:GridControl.View>
-                        <dxg:TableView NavigationStyle="Cell" x:Name="gridView" BestFitMode="Smart" 
-                                       AllowBestFit="True" ShowGroupPanel="False" ScrollingMode="Smart" SnapsToDevicePixels="True"
-                                       Loaded="gridView_Loaded"
-                                       Margin="3,22,3,3" />
+                        <dxg:TableView
+                            x:Name="gridView"
+                            Margin="3,22,3,3"
+                            AllowBestFit="True"
+                            BestFitMode="Smart"
+                            Loaded="gridView_Loaded"
+                            NavigationStyle="Cell"
+                            ScrollingMode="Smart"
+                            ShowGroupPanel="False"
+                            SnapsToDevicePixels="True" />
                     </dxg:GridControl.View>
                 </dxg:GridControl>
             </TabItem>
             <TabItem Header="Protokoll">
-                <dxg:GridControl Margin="3" x:Name="datagrid_transfer" DataSource="{Binding TransferProtokolle}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+                <dxg:GridControl
+                    x:Name="datagrid_transfer"
+                    Margin="3"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch"
+                    DataSource="{Binding TransferProtokolle}">
                     <dxg:GridControl.Columns>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="GkvTransferProtokollOid" Header="Oid" Tag="Debug"></dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="GkvTransferProtokollVersion" Header="Version" Tag="Debug"></dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="AbsenderBezeichnung" Header="Absender"></dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="EmpfangerBezeichnung" Header="Empfänger"></dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="IKLeistungserbringer" Header="Leistungserbringer"></dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="IKKrankenkasse" Header="Krankenkasse"></dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="IKKostentrager" Header="Kostentrager"></dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Rechnungsnummer" Header="Rec.Nr."></dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Datenaustauschreferenz" Header="Dat. ref."></dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Transfernummer" Header="TNr."></dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Transfername" Header="TName"></dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="ErstelltAm" Header="Erstellt">
+                        <dxg:GridColumn
+                            AllowEditing="False"
+                            FieldName="GkvTransferProtokollOid"
+                            Header="Oid"
+                            ReadOnly="True"
+                            Tag="Debug" />
+                        <dxg:GridColumn
+                            AllowEditing="False"
+                            FieldName="GkvTransferProtokollVersion"
+                            Header="Version"
+                            ReadOnly="True"
+                            Tag="Debug" />
+                        <dxg:GridColumn
+                            AllowEditing="False"
+                            FieldName="AbsenderBezeichnung"
+                            Header="Absender"
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            AllowEditing="False"
+                            FieldName="EmpfangerBezeichnung"
+                            Header="Empfänger"
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            AllowEditing="False"
+                            FieldName="IKLeistungserbringer"
+                            Header="Leistungserbringer"
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            AllowEditing="False"
+                            FieldName="IKKrankenkasse"
+                            Header="Krankenkasse"
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            AllowEditing="False"
+                            FieldName="IKKostentrager"
+                            Header="Kostentrager"
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            AllowEditing="False"
+                            FieldName="Rechnungsnummer"
+                            Header="Rec.Nr."
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            AllowEditing="False"
+                            FieldName="Datenaustauschreferenz"
+                            Header="Dat. ref."
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            AllowEditing="False"
+                            FieldName="Transfernummer"
+                            Header="TNr."
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            AllowEditing="False"
+                            FieldName="Transfername"
+                            Header="TName"
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            AllowEditing="False"
+                            FieldName="ErstelltAm"
+                            Header="Erstellt"
+                            ReadOnly="True">
                             <dxg:GridColumn.EditSettings>
-                                <dxe:TextEditSettings DisplayFormat="g" Mask="c" MaskType="DateTime"></dxe:TextEditSettings>
+                                <dxe:TextEditSettings
+                                    DisplayFormat="g"
+                                    Mask="c"
+                                    MaskType="DateTime" />
                             </dxg:GridColumn.EditSettings>
                         </dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Dateityp" Header="Typ" Width="100"></dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Dateiname" Header="Dateiname" Width="80"></dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Dateigrosse" Header="Größe"  Width="70"></dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="SentSuccess" Header="Dakota Übertragen"></dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Fehlertitel" Header="Fehlertitel"></dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Fehlerdatum" Header="Fehlerdatum" Width="100">
+                        <dxg:GridColumn
+                            Width="100"
+                            AllowEditing="False"
+                            FieldName="Dateityp"
+                            Header="Typ"
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            Width="80"
+                            AllowEditing="False"
+                            FieldName="Dateiname"
+                            Header="Dateiname"
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            Width="70"
+                            AllowEditing="False"
+                            FieldName="Dateigrosse"
+                            Header="Größe"
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            AllowEditing="False"
+                            FieldName="SentSuccess"
+                            Header="Dakota Übertragen"
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            AllowEditing="False"
+                            FieldName="Fehlertitel"
+                            Header="Fehlertitel"
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            Width="100"
+                            AllowEditing="False"
+                            FieldName="Fehlerdatum"
+                            Header="Fehlerdatum"
+                            ReadOnly="True">
                             <dxg:GridColumn.EditSettings>
-                                <dxe:TextEditSettings DisplayFormat="g" Mask="c" MaskType="DateTime"></dxe:TextEditSettings>
+                                <dxe:TextEditSettings
+                                    DisplayFormat="g"
+                                    Mask="c"
+                                    MaskType="DateTime" />
                             </dxg:GridColumn.EditSettings>
                         </dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Fehlernachricht" Header="Fehlernachricht" MinWidth="200"></dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Fehlerlevel" Header="Fehlerlevel"></dxg:GridColumn>
+                        <dxg:GridColumn
+                            MinWidth="200"
+                            AllowEditing="False"
+                            FieldName="Fehlernachricht"
+                            Header="Fehlernachricht"
+                            ReadOnly="True" />
+                        <dxg:GridColumn
+                            AllowEditing="False"
+                            FieldName="Fehlerlevel"
+                            Header="Fehlerlevel"
+                            ReadOnly="True" />
                     </dxg:GridControl.Columns>
                     <dxg:GridControl.View>
-                        <dxg:TableView NavigationStyle="Cell" BestFitMode="Smart" x:Name="gridView2"
-                                       AllowBestFit="True" ShowGroupPanel="False" ScrollingMode="Smart" SnapsToDevicePixels="True"
-                                       Loaded="gridView_Loaded"
-                                       Margin="3,22,3,3"/>
+                        <dxg:TableView
+                            x:Name="gridView2"
+                            Margin="3,22,3,3"
+                            AllowBestFit="True"
+                            BestFitMode="Smart"
+                            Loaded="gridView_Loaded"
+                            NavigationStyle="Cell"
+                            ScrollingMode="Smart"
+                            ShowGroupPanel="False"
+                            SnapsToDevicePixels="True" />
                     </dxg:GridControl.View>
                 </dxg:GridControl>
             </TabItem>
diff --git a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml
index 877153d1f..8aace39ea 100644
--- a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml
+++ b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml
@@ -149,20 +149,6 @@
                                             FontSize="11"
                                             Foreground="#ffffff"
                                             ToolTip="Senden" />
-                                        <Button
-                                            x:Name="btn_force_send"
-                                            Width="20"
-                                            Height="18"
-                                            Margin="1"
-                                            Padding="0"
-                                            VerticalAlignment="Center"
-                                            Click="btn_force_send_Click"
-                                            Content="r"
-                                            FontFamily="Wingdings"
-                                            FontSize="11"
-                                            Foreground="#FFFF00"
-                                            ToolTip="DEBUG: Protokolle Löschen"
-                                            Visibility="Collapsed" />
                                         <Button
                                             x:Name="btn_delete"
                                             Width="20"
@@ -202,6 +188,16 @@
                                 <dxe:DateEditSettings HorizontalContentAlignment="Right" DisplayFormat="d" />
                             </dxg:GridColumn.EditSettings>
                         </dxg:GridColumn>
+                        <dxg:GridColumn
+                            Width="Auto"
+                            AllowEditing="False"
+                            FieldName="Verfahrensstufe"
+                            Header="Verfahrensstufe"
+                            ReadOnly="True">
+                            <dxg:GridColumn.EditSettings>
+                                <dxe:DateEditSettings DisplayTextConverter="{StaticResource EnumTranslationConverter}" />
+                            </dxg:GridColumn.EditSettings>
+                        </dxg:GridColumn>
                         <dxg:GridColumn
                             Width="Auto"
                             AllowEditing="False"
diff --git a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs
index f6b295286..7984bb7e3 100644
--- a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs
+++ b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs
@@ -201,27 +201,6 @@ namespace BeWo.View.Detail.Accounting
             }
         }
 
-        private void btn_force_send_Click(object sender, RoutedEventArgs e)
-        {
-#if DEBUG
-
-#else
-            return;
-#endif
-
-            var vm = datagrid_gkvAbrechnungen.GetCurrentValue<GkvAbrechnungVM>();
-
-            if(vm.TransferProtokolle is object && vm.TransferProtokolle.Any())
-            {
-                vm.TransferProtokolle.Clear();
-
-                var result_dc = ServiceFacade.DoAccountingServiceSync(x => x.UpdateGkvAbrechnung(vm.CommitToDataContract()));
-
-                vm.TransferProtokolle = result_dc.TransferProtokolle?.ToList();
-                vm.GkvAbrechnungVersion = result_dc.GkvAbrechnungVersion;
-            }
-        }
-
         private void btn_send_Click(object sender, RoutedEventArgs e)
         {
             var vm = datagrid_gkvAbrechnungen.GetCurrentValue<GkvAbrechnungVM>();
diff --git a/BeWo/View/Master/DokumenteView.xaml b/BeWo/View/Master/DokumenteView.xaml
index 373b48a6c..5df9795ee 100644
--- a/BeWo/View/Master/DokumenteView.xaml
+++ b/BeWo/View/Master/DokumenteView.xaml
@@ -1,17 +1,22 @@
-<localView:BeWoView x:Class="BeWo.View.Master.DokumenteView" 
-                    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
-                    xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
-                    xmlns:localView="clr-namespace:BeWo.View"
-                    xmlns:master="clr-namespace:BeWo.View.Master"
-                    xmlns:dxa="http://schemas.devexpress.com/winfx/2008/xaml/accordion"
-                    xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
-                    xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
-                    xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
-                    xmlns:dxgt="http://schemas.devexpress.com/winfx/2008/xaml/grid/themekeys"
-                    xmlns:dxlc="http://schemas.devexpress.com/winfx/2008/xaml/layoutcontrol" 
-                    xmlns:controls="clr-namespace:BeWo.View.Controls"
-                    Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True">
+<localView:BeWoView
+    x:Class="BeWo.View.Master.DokumenteView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:BeWo.View.Controls"
+    xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
+    xmlns:dxa="http://schemas.devexpress.com/winfx/2008/xaml/accordion"
+    xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
+    xmlns:dxgt="http://schemas.devexpress.com/winfx/2008/xaml/grid/themekeys"
+    xmlns:dxlc="http://schemas.devexpress.com/winfx/2008/xaml/layoutcontrol"
+    xmlns:localView="clr-namespace:BeWo.View"
+    xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
+    xmlns:master="clr-namespace:BeWo.View.Master"
+    xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
+    Width="Auto"
+    Height="Auto"
+    HorizontalAlignment="Stretch"
+    VerticalAlignment="Stretch"
+    Focusable="True">
 
     <localView:BeWoView.Resources>
         <Style TargetType="dxg:RowControl">
@@ -22,64 +27,78 @@
                 </Trigger>
             </Style.Triggers>
         </Style>
-        <ContextMenu x:Name="contextMenu" x:Key="cm" MenuItem.Click="ContextMenu_Click" Opened="ContextMenu_Opened">
-            <MenuItem Header="Neuer Ordner" >
+        <ContextMenu
+            x:Key="cm"
+            x:Name="contextMenu"
+            MenuItem.Click="ContextMenu_Click"
+            Opened="ContextMenu_Opened">
+            <MenuItem Header="Neuer Ordner">
                 <MenuItem.Icon>
-                    <Image Source="..\Ressources\Icons\new.png"/>
+                    <Image Source="..\Ressources\Icons\new.png" />
                 </MenuItem.Icon>
             </MenuItem>
             <MenuItem Header="Umbenennen">
                 <MenuItem.Icon>
-                    <Image Source="..\Ressources\Icons\Rename24.png"/>
+                    <Image Source="..\Ressources\Icons\Rename24.png" />
                 </MenuItem.Icon>
             </MenuItem>
             <Separator />
-            <MenuItem Header="Löschen" >
+            <MenuItem Header="Löschen">
                 <MenuItem.Icon>
-                    <Image Source="..\Ressources\Icons\Delete24.png"/>
+                    <Image Source="..\Ressources\Icons\Delete24.png" />
                 </MenuItem.Icon>
             </MenuItem>
         </ContextMenu>
-        
-        
-        <ContextMenu x:Name="TemplateContextMenu" x:Key="templatecm" MenuItem.Click="TemplateContextMenu_Click"  Opened="TemplateContextMenu_Opened">
-            <MenuItem Header="Neuer Ordner" >
+
+
+        <ContextMenu
+            x:Key="templatecm"
+            x:Name="TemplateContextMenu"
+            MenuItem.Click="TemplateContextMenu_Click"
+            Opened="TemplateContextMenu_Opened">
+            <MenuItem Header="Neuer Ordner">
                 <MenuItem.Icon>
-                    <Image Source="..\Ressources\Icons\Add24.png"/>
+                    <Image Source="..\Ressources\Icons\Add24.png" />
                 </MenuItem.Icon>
             </MenuItem>
             <MenuItem Header="Umbenennen">
                 <MenuItem.Icon>
-                    <Image Source="..\Ressources\Icons\Rename24.png"/>
+                    <Image Source="..\Ressources\Icons\Rename24.png" />
                 </MenuItem.Icon>
             </MenuItem>
             <Separator />
-            <MenuItem Header="Neue Vorlage" >
+            <MenuItem Header="Neue Vorlage">
                 <MenuItem.Icon>
-                    <Image Source="..\Ressources\Icons\DocumentWithAdd.png"/>
+                    <Image Source="..\Ressources\Icons\DocumentWithAdd.png" />
                 </MenuItem.Icon>
             </MenuItem>
             <Separator />
-            <MenuItem Header="Löschen" >
+            <MenuItem Header="Löschen">
                 <MenuItem.Icon>
-                    <Image Source="..\Ressources\Icons\Delete24.png"/>
+                    <Image Source="..\Ressources\Icons\Delete24.png" />
                 </MenuItem.Icon>
             </MenuItem>
         </ContextMenu>
         <master:DeleteButtonVisibilityConverter x:Key="DeleteButtonVisibilityConverter" />
         <master:EditButtonVisibilityConverter x:Key="EditButtonVisibilityConverter" />
-        
+
     </localView:BeWoView.Resources>
 
-    
 
 
-     <Grid>
+
+    <Grid>
         <uc:ShadowChrome>
             <GroupBox Style="{StaticResource MainContentGroupBoxStyle}">
                 <GroupBox.Header>
-                    <StackPanel Orientation="Horizontal" VerticalAlignment="Bottom" Margin="0,11,0,0">
-                        <Image Source="..\..\Ressources\Icons\Folder.png" RenderTransformOrigin="0.5,0.5" Width="32">
+                    <StackPanel
+                        Margin="0,11,0,0"
+                        VerticalAlignment="Bottom"
+                        Orientation="Horizontal">
+                        <Image
+                            Width="32"
+                            RenderTransformOrigin="0.5,0.5"
+                            Source="..\..\Ressources\Icons\Folder.png">
                             <Image.RenderTransform>
                                 <TransformGroup>
                                     <ScaleTransform ScaleX="1.3" ScaleY="1.3" />
@@ -89,34 +108,66 @@
                                 </TransformGroup>
                             </Image.RenderTransform>
                         </Image>
-                        <TextBox Text="Dokumente" Margin="10,0,0,0" Background="{x:Null}" Foreground="{DynamicResource MainGroupBoxForegroundBrush}" FontSize="22" BorderBrush="{x:Null}" VerticalAlignment="Stretch" Padding="0,0,0,0" BorderThickness="0,0,0,0" />
+                        <TextBox
+                            Margin="10,0,0,0"
+                            Padding="0,0,0,0"
+                            VerticalAlignment="Stretch"
+                            Background="{x:Null}"
+                            BorderBrush="{x:Null}"
+                            BorderThickness="0,0,0,0"
+                            FontSize="22"
+                            Foreground="{DynamicResource MainGroupBoxForegroundBrush}"
+                            Text="Dokumente" />
                     </StackPanel>
                 </GroupBox.Header>
                 <Grid Background="{StaticResource ObjectEditBackgroundBrush}">
                     <TabControl Visibility="Visible">
                         <TabItem Visibility="Visible">
                             <TabItem.Header>
-                                <TextBlock Text="{markup:Translate Alle Dokumente}" TextElement.FontSize="16" TextElement.Foreground="{StaticResource TabItemHotTextBrush}" TextElement.FontFamily="Microsoft Sans Serif" Padding="3"></TextBlock>
+                                <TextBlock
+                                    Padding="3"
+                                    Text="{markup:Translate Alle Dokumente}"
+                                    TextElement.FontFamily="Microsoft Sans Serif"
+                                    TextElement.FontSize="16"
+                                    TextElement.Foreground="{StaticResource TabItemHotTextBrush}" />
                             </TabItem.Header>
 
                             <dxlc:LayoutControl Orientation="Horizontal">
-                                <dxlc:LayoutGroup dxlc:LayoutControl.AllowHorizontalSizing="True" Width="300">
+                                <dxlc:LayoutGroup Width="300" dxlc:LayoutControl.AllowHorizontalSizing="True">
                                     <Grid Margin="0,0,0,0">
                                         <Grid.RowDefinitions>
                                             <RowDefinition Height="auto" />
                                             <RowDefinition Height="*" />
                                         </Grid.RowDefinitions>
                                         <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="Auto"></ColumnDefinition>
-                                            <ColumnDefinition Width="*"></ColumnDefinition>
+                                            <ColumnDefinition Width="Auto" />
+                                            <ColumnDefinition Width="*" />
                                         </Grid.ColumnDefinitions>
 
-                                        <Label Content="Suche" Margin="0,0,0,0" />
-                                        <TextBox Height="20" Grid.Column="1" x:Name="textbox_searchForFileName" Margin="3,2,0,5" HorizontalContentAlignment="Stretch" TabIndex="0" Template="{DynamicResource SearchTextBoxTemplate}" BorderThickness="0,0,0,0" KeyDown="TextBox_KeyDown"/>
+                                        <Label Margin="0,0,0,0" Content="Suche" />
+                                        <TextBox
+                                            x:Name="textbox_searchForFileName"
+                                            Grid.Column="1"
+                                            Height="20"
+                                            Margin="3,2,0,5"
+                                            HorizontalContentAlignment="Stretch"
+                                            BorderThickness="0,0,0,0"
+                                            KeyDown="TextBox_KeyDown"
+                                            TabIndex="0"
+                                            Template="{DynamicResource SearchTextBoxTemplate}" />
 
-                                        <dxg:TreeListControl Grid.Row="1" Grid.ColumnSpan="2" x:Name="documents_treeview_control" Margin="0 0 2 4" VerticalAlignment="Stretch" dx:ThemeManager.ThemeName="Office2010Black">
+                                        <dxg:TreeListControl
+                                            x:Name="documents_treeview_control"
+                                            Grid.Row="1"
+                                            Grid.ColumnSpan="2"
+                                            Margin="0,0,2,4"
+                                            VerticalAlignment="Stretch"
+                                            dx:ThemeManager.ThemeName="Office2010Black">
                                             <dxg:TreeListControl.Columns>
-                                                <dxg:TreeListColumn FieldName="Name" AllowSorting="False" Width="300">
+                                                <dxg:TreeListColumn
+                                                    Width="300"
+                                                    AllowSorting="False"
+                                                    FieldName="Name">
                                                     <!--<dxg:TreeListColumn.CellStyle>
                                                     <Style TargetType="dxg:LightweightCellEditor" BasedOn="{StaticResource {dxgt:GridRowThemeKey ResourceKey=LightweightCellStyle}}">
                                                         <Style.Triggers>
@@ -130,10 +181,25 @@
                                                 </dxg:TreeListColumn>
                                             </dxg:TreeListControl.Columns>
                                             <dxg:TreeListControl.View>
-                                                <dxg:TreeListView x:Name="DocumentsTreeView" PreviewMouseLeftButtonDown="DocumentsTreeView_PreviewMouseLeftButtonDown" ShowColumnHeaders="False" ShowIndicator="False" ShowHorizontalLines="False" ShowVerticalLines="False"    
-                                                  FocusedRowChanged="DocumentsTreeView_FocusedRowChanged" LostFocus="DocumentsTreeView_LostFocus"
-                                                  NodeExpanding="DocumentsTreeView_NodeExpanding" AllowEditing="False" ShowNodeImages="True" PrintNodeImages="True" AutoWidth="True"
-                                                  KeyFieldName="{Binding DocumentTreeItemVM.DocTreeItemOid}" ParentFieldName="Binding DocumentTreeItemVM.ParentOid" ContextMenu="{StaticResource cm}" VerticalScrollbarVisibility="Auto" HorizontalScrollbarVisibility="Auto">
+                                                <dxg:TreeListView
+                                                    x:Name="DocumentsTreeView"
+                                                    AllowEditing="False"
+                                                    AutoWidth="True"
+                                                    ContextMenu="{StaticResource cm}"
+                                                    FocusedRowChanged="DocumentsTreeView_FocusedRowChanged"
+                                                    HorizontalScrollbarVisibility="Auto"
+                                                    KeyFieldName="{Binding DocumentTreeItemVM.DocTreeItemOid}"
+                                                    LostFocus="DocumentsTreeView_LostFocus"
+                                                    NodeExpanding="DocumentsTreeView_NodeExpanding"
+                                                    ParentFieldName="Binding DocumentTreeItemVM.ParentOid"
+                                                    PreviewMouseLeftButtonDown="DocumentsTreeView_PreviewMouseLeftButtonDown"
+                                                    PrintNodeImages="True"
+                                                    ShowColumnHeaders="False"
+                                                    ShowHorizontalLines="False"
+                                                    ShowIndicator="False"
+                                                    ShowNodeImages="True"
+                                                    ShowVerticalLines="False"
+                                                    VerticalScrollbarVisibility="Auto">
                                                     <!--<dxg:TreeListView.RowStyle>
                                                     <Style BasedOn="{StaticResource {dxgt:GridRowThemeKey ResourceKey=RowStyle}}" TargetType="dxg:rows">
                                                         <Style.Triggers>
@@ -151,7 +217,10 @@
                                     </Grid>
                                 </dxlc:LayoutGroup>
                                 <dxlc:LayoutGroup dxlc:LayoutControl.AllowHorizontalSizing="True">
-                                    <Grid Grid.Column="1" Grid.Row="0" Grid.RowSpan="2">
+                                    <Grid
+                                        Grid.Row="0"
+                                        Grid.RowSpan="2"
+                                        Grid.Column="1">
                                         <Grid.RowDefinitions>
                                             <RowDefinition Height="Auto" />
                                             <RowDefinition Height="*" />
@@ -160,7 +229,12 @@
                                             <ColumnDefinition Width="Auto" />
                                             <ColumnDefinition Width="*" />
                                         </Grid.ColumnDefinitions>
-                                        <GroupBox x:Name="GroupBoxDokumentenListe" Grid.ColumnSpan="2" Padding="5" Style="{StaticResource ObjectEditGroupBox}" Header="">
+                                        <GroupBox
+                                            x:Name="GroupBoxDokumentenListe"
+                                            Grid.ColumnSpan="2"
+                                            Padding="5"
+                                            Header=""
+                                            Style="{StaticResource ObjectEditGroupBox}">
 
                                             <Grid>
                                                 <Grid.ColumnDefinitions>
@@ -176,10 +250,29 @@
                                                     <RowDefinition Height="Auto" />
                                                 </Grid.RowDefinitions>
 
-                                                <Button Name="button_uploadDocument" Click="button_OpenUploadDocument_Click"  Grid.Column="0" Grid.Row="0">Datei hochladen</Button>
-                                                <controls:PopupNonTopmost Grid.Row="0" Topmost="False" x:Name="popup_UploadFiles" Width="350" StaysOpen="True" Placement="MousePoint">
-                                                    <Border Background="White" Padding="3" BorderThickness="1" BorderBrush="Gray">
-                                                        <GroupBox x:Name="groupbox_uploadDocument" Header="Dokument hochladen" Style="{StaticResource ObjectEditGroupBox}">
+                                                <Button
+                                                    Name="button_uploadDocument"
+                                                    Grid.Row="0"
+                                                    Grid.Column="0"
+                                                    Click="button_OpenUploadDocument_Click">
+                                                    Datei hochladen
+                                                </Button>
+                                                <controls:PopupNonTopmost
+                                                    x:Name="popup_UploadFiles"
+                                                    Grid.Row="0"
+                                                    Width="350"
+                                                    Placement="MousePoint"
+                                                    StaysOpen="True"
+                                                    Topmost="False">
+                                                    <Border
+                                                        Padding="3"
+                                                        Background="White"
+                                                        BorderBrush="Gray"
+                                                        BorderThickness="1">
+                                                        <GroupBox
+                                                            x:Name="groupbox_uploadDocument"
+                                                            Header="Dokument hochladen"
+                                                            Style="{StaticResource ObjectEditGroupBox}">
                                                             <Grid>
                                                                 <Grid.RowDefinitions>
                                                                     <RowDefinition Height="Auto" />
@@ -195,15 +288,49 @@
 
                                                                 </Grid.ColumnDefinitions>
                                                                 <Label VerticalAlignment="Center" Content="{markup:Translate Datei}" />
-                                                                <uc:PopUpEdit IsReadOnly="True" DeleteButtonVisibility="Collapsed"
-                                                                    Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="2" Margin="3" Height="23" x:Name="popupedit_file"
-                                                                    PopUpClick="popupedit_file_PopUpClick_1" Cursor="Arrow" />
-                                                                <Label Content="Beschreibung" Grid.Row="2" Grid.Column="0" VerticalAlignment="Top" />
-                                                                <TextBox x:Name="textbox_beschreibung" Grid.Row="2" Grid.Column="1" Height="50" Margin="3" Grid.ColumnSpan="2" />
-                                                                <Button Grid.Row="4" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Bottom" Height="25"
-                                                                  Margin="3" Content="Hochladen" x:Name="button_uploadFile" Click="button_uploadDocument_Click" />
-                                                                <Button Grid.Row="4" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="25"
-                                                                    Margin="3" Content="Abbrechen" x:Name="button_cancelFileUpload" Click="button_cancelFileUpload_Click" />
+                                                                <uc:PopUpEdit
+                                                                    x:Name="popupedit_file"
+                                                                    Grid.Row="0"
+                                                                    Grid.Column="1"
+                                                                    Grid.ColumnSpan="2"
+                                                                    Height="23"
+                                                                    Margin="3"
+                                                                    Cursor="Arrow"
+                                                                    DeleteButtonVisibility="Collapsed"
+                                                                    IsReadOnly="True"
+                                                                    PopUpClick="popupedit_file_PopUpClick_1" />
+                                                                <Label
+                                                                    Grid.Row="2"
+                                                                    Grid.Column="0"
+                                                                    VerticalAlignment="Top"
+                                                                    Content="Beschreibung" />
+                                                                <TextBox
+                                                                    x:Name="textbox_beschreibung"
+                                                                    Grid.Row="2"
+                                                                    Grid.Column="1"
+                                                                    Grid.ColumnSpan="2"
+                                                                    Height="50"
+                                                                    Margin="3" />
+                                                                <Button
+                                                                    x:Name="button_uploadFile"
+                                                                    Grid.Row="4"
+                                                                    Grid.Column="1"
+                                                                    Height="25"
+                                                                    Margin="3"
+                                                                    HorizontalAlignment="Right"
+                                                                    VerticalAlignment="Bottom"
+                                                                    Click="button_uploadDocument_Click"
+                                                                    Content="Hochladen" />
+                                                                <Button
+                                                                    x:Name="button_cancelFileUpload"
+                                                                    Grid.Row="4"
+                                                                    Grid.Column="2"
+                                                                    Height="25"
+                                                                    Margin="3"
+                                                                    HorizontalAlignment="Stretch"
+                                                                    VerticalAlignment="Bottom"
+                                                                    Click="button_cancelFileUpload_Click"
+                                                                    Content="Abbrechen" />
                                                             </Grid>
                                                         </GroupBox>
                                                     </Border>
@@ -211,8 +338,20 @@
                                                 <!--<Label Grid.Column="1" Margin="25 1 0 0" FontSize="13">Beschreibung</Label>
                                             <TextBox Name="textbox_fileNotice" Margin="3" Height="23" Grid.Column="2" Grid.Row="0" />-->
 
-                                                <ProgressBar Height="20" Margin="2" Name="progressbar_upload" Grid.Row="1" Grid.ColumnSpan="3" Minimum="0" Maximum="1" />
-                                                <Label HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Row="2" Grid.ColumnSpan="3" Name="text_progress" />
+                                                <ProgressBar
+                                                    Name="progressbar_upload"
+                                                    Grid.Row="1"
+                                                    Grid.ColumnSpan="3"
+                                                    Height="20"
+                                                    Margin="2"
+                                                    Maximum="1"
+                                                    Minimum="0" />
+                                                <Label
+                                                    Name="text_progress"
+                                                    Grid.Row="2"
+                                                    Grid.ColumnSpan="3"
+                                                    HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center" />
                                             </Grid>
 
 
@@ -242,46 +381,106 @@
                                     </Grid>-->
 
                                         </GroupBox>
-                                        <dxg:GridControl Grid.Row="1" Margin="2,3,5,5" DataSource="{Binding SelectedItem.Files, ElementName=treeview}" x:Name="datagrid_documents" Grid.Column="1">
+                                        <dxg:GridControl
+                                            x:Name="datagrid_documents"
+                                            Grid.Row="1"
+                                            Grid.Column="1"
+                                            Margin="2,3,5,5"
+                                            DataSource="{Binding SelectedItem.Files, ElementName=treeview}">
                                             <dxg:GridControl.Columns>
-                                                <dxg:GridColumn FieldName="FileName" Header="" FixedWidth="True" Width="24" ReadOnly="True" Visible="{Binding Converter={StaticResource DeleteButtonVisibilityConverter}}">
+                                                <dxg:GridColumn
+                                                    Width="24"
+                                                    FieldName="FileName"
+                                                    FixedWidth="True"
+                                                    Header=""
+                                                    ReadOnly="True"
+                                                    Visible="{Binding Converter={StaticResource DeleteButtonVisibilityConverter}}">
                                                     <dxg:GridColumn.CellTemplate>
                                                         <DataTemplate>
-                                                            <Button Content="r" FontFamily="Webdings" Click="DeleteButton_Click" Width="20" Height="20" VerticalAlignment="Center" ToolTip="Löschen" />
+                                                            <Button
+                                                                Width="20"
+                                                                Height="20"
+                                                                VerticalAlignment="Center"
+                                                                Click="DeleteButton_Click"
+                                                                Content="r"
+                                                                FontFamily="Webdings"
+                                                                ToolTip="Löschen" />
                                                         </DataTemplate>
                                                     </dxg:GridColumn.CellTemplate>
                                                 </dxg:GridColumn>
-                                                <dxg:GridColumn Header="" FixedWidth="True" Width="24" ReadOnly="True" Visible="{Binding Converter={StaticResource EditButtonVisibilityConverter}}">
+                                                <dxg:GridColumn
+                                                    Width="24"
+                                                    FixedWidth="True"
+                                                    Header=""
+                                                    ReadOnly="True"
+                                                    Visible="{Binding Converter={StaticResource EditButtonVisibilityConverter}}">
                                                     <dxg:GridColumn.CellTemplate>
                                                         <DataTemplate>
-                                                            <Button Content="!" FontFamily="Wingdings" Click="EditButton_Click" Width="20" Height="20" VerticalAlignment="Center" ToolTip="Bearbeiten"/>
+                                                            <Button
+                                                                Width="20"
+                                                                Height="20"
+                                                                VerticalAlignment="Center"
+                                                                Click="EditButton_Click"
+                                                                Content="!"
+                                                                FontFamily="Wingdings"
+                                                                ToolTip="Bearbeiten" />
                                                         </DataTemplate>
                                                     </dxg:GridColumn.CellTemplate>
                                                 </dxg:GridColumn>
-                                                <dxg:GridColumn FieldName="InsertedOn" AllowEditing="False" Header="hinterlegt am" Width="*" />
-                                                <dxg:GridColumn FieldName="InsertedBy" AllowEditing="False" Header="hinterlegt von" Width="*" />
-                                                <dxg:GridColumn FieldName="FileName" AllowEditing="False" Header="Dateiname" Width="*" />
-                                                <dxg:GridColumn FieldName="Description" AllowEditing="False" Header="Beschreibung" Width="*" />
-                                                <dxg:GridColumn FieldName="URL" Header="Herunterladen" Width="100" MinWidth="90" x:Name="ColumnDownload">
+                                                <dxg:GridColumn
+                                                    Width="*"
+                                                    AllowEditing="False"
+                                                    FieldName="InsertedOn"
+                                                    Header="hinterlegt am" />
+                                                <dxg:GridColumn
+                                                    Width="*"
+                                                    AllowEditing="False"
+                                                    FieldName="InsertedBy"
+                                                    Header="hinterlegt von" />
+                                                <dxg:GridColumn
+                                                    Width="*"
+                                                    AllowEditing="False"
+                                                    FieldName="FileName"
+                                                    Header="Dateiname" />
+                                                <dxg:GridColumn
+                                                    Width="*"
+                                                    AllowEditing="False"
+                                                    FieldName="Description"
+                                                    Header="Beschreibung" />
+                                                <dxg:GridColumn
+                                                    x:Name="ColumnDownload"
+                                                    Width="100"
+                                                    MinWidth="90"
+                                                    FieldName="URL"
+                                                    Header="Herunterladen">
                                                     <dxg:GridColumn.CellTemplate>
                                                         <DataTemplate>
                                                             <TextBlock>
-									            <Hyperlink TargetName="inexistent" NavigateUri="{Binding Path=Value, Converter={StaticResource DownloadURLConverter}}" RequestNavigate="Hyperlink_OnRequestNavigate">
-										            <TextBlock Text="herunterladen" />
-									            </Hyperlink>    
-								            </TextBlock>
+                                                                <Hyperlink
+                                                                    NavigateUri="{Binding Path=Value, Converter={StaticResource DownloadURLConverter}}"
+                                                                    RequestNavigate="Hyperlink_OnRequestNavigate"
+                                                                    TargetName="inexistent">
+                                                                    <TextBlock Text="herunterladen" />
+                                                                </Hyperlink>
+                                                            </TextBlock>
                                                         </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="DocumentTableView"/>
+                                                <dxg:TableView
+                                                    x:Name="DocumentTableView"
+                                                    AutoWidth="false"
+                                                    NavigationStyle="Cell"
+                                                    ShowGroupPanel="False"
+                                                    ShowGroupedColumns="false"
+                                                    ShowTotalSummary="False" />
                                             </dxg:GridControl.View>
                                         </dxg:GridControl>
                                     </Grid>
                                 </dxlc:LayoutGroup>
                             </dxlc:LayoutControl>
-                            <!-- Hier kommt das Dokumentenzeug hin wenn Templates wieder angeschaltet werden/-->
+                            <!--  Hier kommt das Dokumentenzeug hin wenn Templates wieder angeschaltet werden/  -->
 
                         </TabItem>
 
@@ -289,33 +488,57 @@
 
                         <TabItem Selector.IsSelected="True">
                             <TabItem.Header>
-                                <TextBlock Text="{markup:Translate Vorlagen}" TextElement.FontSize="16" TextElement.Foreground="{StaticResource TabItemHotTextBrush}" TextElement.FontFamily="Microsoft Sans Serif" Padding="3"></TextBlock>
+                                <TextBlock
+                                    Padding="3"
+                                    Text="{markup:Translate Vorlagen}"
+                                    TextElement.FontFamily="Microsoft Sans Serif"
+                                    TextElement.FontSize="16"
+                                    TextElement.Foreground="{StaticResource TabItemHotTextBrush}" />
                             </TabItem.Header>
                             <dxlc:LayoutControl Orientation="Horizontal">
-                                <dxlc:LayoutGroup dxlc:LayoutControl.AllowHorizontalSizing="True" Width="300">
-                                    <Grid Margin="0,0,0,0" >
-                                <Grid.RowDefinitions>
+                                <dxlc:LayoutGroup Width="300" dxlc:LayoutControl.AllowHorizontalSizing="True">
+                                    <Grid Margin="0,0,0,0">
+                                        <Grid.RowDefinitions>
                                             <RowDefinition Height="*" />
                                         </Grid.RowDefinitions>
                                         <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="*"></ColumnDefinition>
-                                </Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="*" />
+                                        </Grid.ColumnDefinitions>
 
 
-                                <dxg:TreeListControl x:Name="template_treeview_control" Grid.Column="0" DefaultSorting="Name" Margin="2,3,2,5" VerticalAlignment="Stretch" dx:ThemeManager.ThemeName="Office2010Black">
-                                    <dxg:TreeListControl.Columns>
-                                        <dxg:TreeListColumn FieldName="Name" AllowSorting="True"/>
-                                    </dxg:TreeListControl.Columns>
-                                    <dxg:TreeListControl.View>
-                                                <dxg:TreeListView x:Name="TemplateTreeView" PreviewMouseLeftButtonDown="TemplateTreeView_PreviewMouseLeftButtonDown"  ShowColumnHeaders="False" AutoWidth="True"
-                                                  ShowIndicator="False" ShowHorizontalLines="False" ShowVerticalLines="False" FocusedRowChanged="TemplateTreeView_FocusedRowChanged" 
-                                                  LostFocus="TemplateTreeView_LostFocus" NodeExpanding="templateTreeListView_NodeExpanding" AllowEditing="False" ShowNodeImages="True" PrintNodeImages="True"
-                                                  KeyFieldName="{Binding DocumentTreeItemVM.DocTreeItemOid}" ParentFieldName="Binding DocumentTreeItemVM.ParentOid" ContextMenu="{StaticResource templatecm}"
-                                                          VerticalScrollbarVisibility="Auto" HorizontalScrollbarVisibility="Auto">
-                                        </dxg:TreeListView>
-                                    </dxg:TreeListControl.View>
-                                </dxg:TreeListControl>
-                                <!--
+                                        <dxg:TreeListControl
+                                            x:Name="template_treeview_control"
+                                            Grid.Column="0"
+                                            Margin="2,3,2,5"
+                                            VerticalAlignment="Stretch"
+                                            dx:ThemeManager.ThemeName="Office2010Black"
+                                            DefaultSorting="Name">
+                                            <dxg:TreeListControl.Columns>
+                                                <dxg:TreeListColumn AllowSorting="True" FieldName="Name" />
+                                            </dxg:TreeListControl.Columns>
+                                            <dxg:TreeListControl.View>
+                                                <dxg:TreeListView
+                                                    x:Name="TemplateTreeView"
+                                                    AllowEditing="False"
+                                                    AutoWidth="True"
+                                                    ContextMenu="{StaticResource templatecm}"
+                                                    FocusedRowChanged="TemplateTreeView_FocusedRowChanged"
+                                                    HorizontalScrollbarVisibility="Auto"
+                                                    KeyFieldName="{Binding DocumentTreeItemVM.DocTreeItemOid}"
+                                                    LostFocus="TemplateTreeView_LostFocus"
+                                                    NodeExpanding="templateTreeListView_NodeExpanding"
+                                                    ParentFieldName="Binding DocumentTreeItemVM.ParentOid"
+                                                    PreviewMouseLeftButtonDown="TemplateTreeView_PreviewMouseLeftButtonDown"
+                                                    PrintNodeImages="True"
+                                                    ShowColumnHeaders="False"
+                                                    ShowHorizontalLines="False"
+                                                    ShowIndicator="False"
+                                                    ShowNodeImages="True"
+                                                    ShowVerticalLines="False"
+                                                    VerticalScrollbarVisibility="Auto" />
+                                            </dxg:TreeListControl.View>
+                                        </dxg:TreeListControl>
+                                        <!--
                                 <Grid Grid.Column="2" Grid.Row="0">
                                     <Grid.RowDefinitions>
                                         <RowDefinition Height="Auto" />
@@ -348,9 +571,9 @@
                                             <ProgressBar Height="20" Margin="2" Name="progressbar_upload" Grid.Row="1" Grid.ColumnSpan="3" Minimum="0" Maximum="1" />
                                             <Label HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Row="2" Grid.ColumnSpan="3" Name="text_progress" />
                                         </Grid>
-                                    -->
+                                        -->
 
-                                <!--
+                                        <!--
                                         <Grid>
                                             <Grid.ColumnDefinitions>
                                                 <ColumnDefinition Width="Auto" />
@@ -374,42 +597,93 @@
                                             <ProgressBar Height="20" Margin="3" Name="progressbar_upload" Grid.Row="2" Grid.ColumnSpan="5" Minimum="0" Maximum="1" />
                                             <Label VerticalAlignment="Center" Grid.Row="2" Grid.ColumnSpan="5" HorizontalAlignment="Center" Name="text_progress" />
                                         </Grid>
-                                
-                            
+
+
                                     </GroupBox>
-                                    -->
-                                
-                            </Grid>
+                                        -->
+
+                                    </Grid>
                                 </dxlc:LayoutGroup>
                                 <dxlc:LayoutGroup dxlc:LayoutControl.AllowHorizontalSizing="True">
-                                    <dxg:GridControl Grid.Row="0" Margin="2,3,5,5" DataSource="{Binding SelectedItem.Files, ElementName=treeview}" x:Name="datagrid_templates" Grid.Column="1">
+                                    <dxg:GridControl
+                                        x:Name="datagrid_templates"
+                                        Grid.Row="0"
+                                        Grid.Column="1"
+                                        Margin="2,3,5,5"
+                                        DataSource="{Binding SelectedItem.Files, ElementName=treeview}">
                                         <dxg:GridControl.Columns>
-                                            <dxg:GridColumn FieldName="FileName" Header="" FixedWidth="True" Width="24" ReadOnly="True">
+                                            <dxg:GridColumn
+                                                Width="24"
+                                                FieldName="FileName"
+                                                FixedWidth="True"
+                                                Header=""
+                                                ReadOnly="True">
                                                 <dxg:GridColumn.CellTemplate>
                                                     <DataTemplate>
-                                                        <Button Content="r" FontFamily="Webdings" Click="TemplateDeleteButton_Click" Width="20" Height="20" VerticalAlignment="Center" Margin="1"/>
+                                                        <Button
+                                                            Width="20"
+                                                            Height="20"
+                                                            Margin="1"
+                                                            VerticalAlignment="Center"
+                                                            Click="TemplateDeleteButton_Click"
+                                                            Content="r"
+                                                            FontFamily="Webdings" />
                                                     </DataTemplate>
                                                 </dxg:GridColumn.CellTemplate>
                                             </dxg:GridColumn>
-                                            <dxg:GridColumn FieldName="Name" AllowEditing="False" Header="Dateiname" Width="*" />
-                                            <dxg:GridColumn FieldName="Beschreibung" AllowEditing="False" Header="Beschreibung" Width="*" />
-                                            <dxg:GridColumn FieldName="FileEdit" Header="" FixedWidth="True" Width="80" ReadOnly="True">
+                                            <dxg:GridColumn
+                                                Width="*"
+                                                AllowEditing="False"
+                                                FieldName="Name"
+                                                Header="Dateiname" />
+                                            <dxg:GridColumn
+                                                Width="*"
+                                                AllowEditing="False"
+                                                FieldName="Beschreibung"
+                                                Header="Beschreibung" />
+                                            <dxg:GridColumn
+                                                Width="80"
+                                                FieldName="FileEdit"
+                                                FixedWidth="True"
+                                                Header=""
+                                                ReadOnly="True">
                                                 <dxg:GridColumn.CellTemplate>
                                                     <DataTemplate>
-                                                        <Button Content="Bearbeiten" Click="EditTemplate_Click"  Width="75" Height="20" VerticalAlignment="Center" />
+                                                        <Button
+                                                            Width="75"
+                                                            Height="20"
+                                                            VerticalAlignment="Center"
+                                                            Click="EditTemplate_Click"
+                                                            Content="Bearbeiten" />
                                                     </DataTemplate>
                                                 </dxg:GridColumn.CellTemplate>
                                             </dxg:GridColumn>
-                                            <dxg:GridColumn FieldName="PrintFile" Header="" FixedWidth="True" Width="80" ReadOnly="True">
+                                            <dxg:GridColumn
+                                                Width="80"
+                                                FieldName="PrintFile"
+                                                FixedWidth="True"
+                                                Header=""
+                                                ReadOnly="True">
                                                 <dxg:GridColumn.CellTemplate>
                                                     <DataTemplate>
-                                                        <Button Content="Drucken" Click="PrintTemplate_Click"  Width="75" Height="20" VerticalAlignment="Center" />
+                                                        <Button
+                                                            Width="75"
+                                                            Height="20"
+                                                            VerticalAlignment="Center"
+                                                            Click="PrintTemplate_Click"
+                                                            Content="Drucken" />
                                                     </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"/>
+                                            <dxg:TableView
+                                                x:Name="TemplateTableView"
+                                                AutoWidth="false"
+                                                NavigationStyle="Cell"
+                                                ShowGroupPanel="False"
+                                                ShowGroupedColumns="false"
+                                                ShowTotalSummary="False" />
                                         </dxg:GridControl.View>
                                     </dxg:GridControl>
                                 </dxlc:LayoutGroup>
@@ -418,9 +692,9 @@
                     </TabControl>
                 </Grid>
             </GroupBox>
-              
+
         </uc:ShadowChrome>
 
     </Grid>
-       
+
 </localView:BeWoView>
\ No newline at end of file
diff --git a/BeWo/ViewModel/GkvAbrechnungVM.cs b/BeWo/ViewModel/GkvAbrechnungVM.cs
index 1214b412a..ff7f227e4 100644
--- a/BeWo/ViewModel/GkvAbrechnungVM.cs
+++ b/BeWo/ViewModel/GkvAbrechnungVM.cs
@@ -35,6 +35,7 @@ namespace BeWo.ViewModel
 		private decimal _Betrag;
 		private bool _Bezahlt;
 		private bool _UrbelegeGesendet;
+		private GkvVerfahrensstufe _Verfahrensstufe;
 
 		internal bool _IsChecked;
 
@@ -262,6 +263,35 @@ namespace BeWo.ViewModel
 				}
 			}
 		}
+
+		public GkvVerfahrensstufe Verfahrensstufe
+		{
+			get { return this._Verfahrensstufe; }
+
+			set
+			{
+				if (this.AreDifferent(this._Verfahrensstufe, value))
+				{
+					this._Verfahrensstufe = value;
+					this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Verfahrensstufe, value), nameof(Verfahrensstufe));
+					this.FirePropertyChanged(nameof(Verfahrensstufe));
+				}
+			}
+		}
+
+		public int VerfahrensstufeInt
+		{
+			get { return (int)Verfahrensstufe; }
+
+			set
+			{
+				if (!AreDifferent(this.VerfahrensstufeInt, value))
+					return;
+
+				Verfahrensstufe = (GkvVerfahrensstufe)value;
+				//FirePropertyChanged(nameof(VerfahrensstufeInt));
+			}
+		}
 		#endregion
 
 		public string RecipientString
@@ -334,6 +364,7 @@ namespace BeWo.ViewModel
 			_Betrag = pDataContract.Betrag;
 			_Bezahlt = pDataContract.Bezahlt;
 			_UrbelegeGesendet = pDataContract.UrbelegeGesendet;
+			_Verfahrensstufe = pDataContract.Verfahrensstufe;
 
 			if (pDataContract.InvoiceBases != null)
 			{
@@ -362,6 +393,7 @@ namespace BeWo.ViewModel
 			pDataContract.Betrag = _Betrag;
 			pDataContract.Bezahlt = _Bezahlt;
 			pDataContract.UrbelegeGesendet = _UrbelegeGesendet;
+			pDataContract.Verfahrensstufe = _Verfahrensstufe;
 
 			if (_InvoiceBases != null && _InvoiceBases.Any())
 				pDataContract.InvoiceBases = _InvoiceBases.Where(x => x.IsChecked).Select(vm => vm.CommitToDataContract()).ToList();
diff --git a/Dakota/Logic/DakotaInfoCreator.cs b/Dakota/Logic/DakotaInfoCreator.cs
index 2c8eb8c2e..433d0f333 100644
--- a/Dakota/Logic/DakotaInfoCreator.cs
+++ b/Dakota/Logic/DakotaInfoCreator.cs
@@ -1,4 +1,5 @@
 using BeWo.Data.Entities;
+using BS.Shared;
 using BS.Shared.DataContracts;
 using Dakota.Models.Infos;
 using Dakota.Models.Schlüssels;
@@ -46,7 +47,7 @@ namespace Dakota.Logic
         //    return info;
         //}
 
-        internal InfoDateiNutzdaten GetEmptyInfoNutzdatendatei(string absender, string empfang, string logischerDateiname, int datenaustauschreferenz)
+        internal InfoDateiNutzdaten GetEmptyInfoNutzdatendatei(string absender, string empfang, int verfahrensstufe, string logischerDateiname, int datenaustauschreferenz)
         {
             var info = new InfoDateiNutzdaten();
 
@@ -57,7 +58,7 @@ namespace Dakota.Logic
             info.Datenaustauschreferenz = datenaustauschreferenz;
             info.Leistungsbereich = SchlüsselLeistungserbringerSammelgruppenschlussel.SoziotherapeutischerLeistungserbringer;
             info.Anwendungsreferenz = logischerDateiname;
-            info.Testindikator = SchlüsselTestindikator.Testdatei;
+            info.Testindikator = SchlüsselTestindikator.GetSchlüsselTestindikator((GkvVerfahrensstufe)verfahrensstufe);
 
             return info;
         }
diff --git a/Dakota/Logic/DakotaManager.cs b/Dakota/Logic/DakotaManager.cs
index 11f22b913..02c0d729d 100644
--- a/Dakota/Logic/DakotaManager.cs
+++ b/Dakota/Logic/DakotaManager.cs
@@ -49,15 +49,18 @@ namespace Dakota.Logic
 
                 if (!success)
                 {
+                    var verfahrensstufe = organisation.Verfahrensstufe;
+
                     // Verfahrenkennung
                     // Erste Stelle:
                     //      "E" - Echtdaten
                     //      "T" - Testdaten
-
-                    var verfahrenkennung = "TSOL0";
+                    // Annahme: "E" auch für Erprobungsverfahrenstufe
+                    
+                    var verfahrenkennung = verfahrensstufe == 0 ? "TSOL0" : "ESOL0";
                     var logischer_dateiname = DakotaConfig.GetLogischerDateiname(Month).Trim();
 
-                    var info_nutz_add = DakotaInfoCreator.GetEmptyInfoNutzdatendatei(DakotaConfig.IKAbsender, organisation.IKDatenannahmestelle, logischer_dateiname, datenaustauschreferenz);
+                    var info_nutz_add = DakotaInfoCreator.GetEmptyInfoNutzdatendatei(DakotaConfig.IKAbsender, organisation.IKDatenannahmestelle, (int)verfahrensstufe, logischer_dateiname, datenaustauschreferenz);
                     var info_auf_add = DakotaInfoCreator.GetEmptyInfoAuftragsdatei(organisation.IKDatenannahmestelle, logischer_dateiname, verfahrenkennung, transfernummer);
 
                     DakotaInfoNutzDict.Add(ik_datenannahmestelle, info_nutz_add);
diff --git a/Dakota/Models/Schlüssels/SchlüsselTestindikator.cs b/Dakota/Models/Schlüssels/SchlüsselTestindikator.cs
index 1d841e8fa..1b77878f3 100644
--- a/Dakota/Models/Schlüssels/SchlüsselTestindikator.cs
+++ b/Dakota/Models/Schlüssels/SchlüsselTestindikator.cs
@@ -1,4 +1,5 @@
-using System;
+using BS.Shared;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -6,12 +7,24 @@ using System.Threading.Tasks;
 
 namespace Dakota.Models.Schlüssels
 {
-    public class SchlüsselTestindikator : Schlüssel
-    {
-        public SchlüsselTestindikator(string val) : base(val) { }
+	public class SchlüsselTestindikator : Schlüssel
+	{
+		public SchlüsselTestindikator(string val) : base(val) { }
 
-        public static SchlüsselTestindikator Testdatei => new SchlüsselTestindikator("0");
-        public static SchlüsselTestindikator Erprobungsdatei => new SchlüsselTestindikator("1");
-        public static SchlüsselTestindikator Echtdatei => new SchlüsselTestindikator("2");
-    }
+		public static SchlüsselTestindikator Testdatei => new SchlüsselTestindikator("0");
+		public static SchlüsselTestindikator Erprobungsdatei => new SchlüsselTestindikator("1");
+		public static SchlüsselTestindikator Echtdatei => new SchlüsselTestindikator("2");
+
+		public static SchlüsselTestindikator GetSchlüsselTestindikator(GkvVerfahrensstufe verfahrensstufe)
+		{
+			switch (verfahrensstufe)
+			{
+				case GkvVerfahrensstufe.Test: return Testdatei;
+				case GkvVerfahrensstufe.Erprobung: return Erprobungsdatei;
+				case GkvVerfahrensstufe.Echt: return Echtdatei;
+			}
+
+			throw new ArgumentOutOfRangeException(nameof(verfahrensstufe));
+		}
+	}
 }
diff --git a/Data/Entities/GkvAbrechnung.cs b/Data/Entities/GkvAbrechnung.cs
index f90842e9c..99fcb7b86 100644
--- a/Data/Entities/GkvAbrechnung.cs
+++ b/Data/Entities/GkvAbrechnung.cs
@@ -20,6 +20,7 @@ namespace BeWo.Data.Entities
         public virtual decimal Betrag { get; set; }
         public virtual bool Bezahlt { get; set; }
         public virtual bool UrbelegeGesendet { get; set; }
+        public virtual GkvVerfahrensstufe Verfahrensstufe { get; set; }
 
         public virtual IList<InvoiceBase> InvoiceBases { get; set; }
         public virtual IList<GkvTransferProtokoll> GkvTransferProtokolle { get; set; }
diff --git a/Data/Mappings/GkvAbrechnung.hbm.xml b/Data/Mappings/GkvAbrechnung.hbm.xml
index 997710ffd..3c0f904f0 100644
--- a/Data/Mappings/GkvAbrechnung.hbm.xml
+++ b/Data/Mappings/GkvAbrechnung.hbm.xml
@@ -23,6 +23,7 @@
 		<property column="UrbelegeGesendet" type="bool" name="UrbelegeGesendet" />
 
 		<property column="ErstelltAm" type="DateTime" name="ErstelltAm" />
+    <property column="Verfahrensstufe" type="BS.Shared.GkvVerfahrensstufe, BS.Shared" name="Verfahrensstufe"/>
 
 		<bag name="InvoiceBases" table="gkvabrechnung2invoicebase" generic="true" cascade="none" batch-size="250">
 			<key column="gkvabrechnungoid" />
diff --git a/Model/Changes_2024_10_09 GkvAbrechnung Verfahrensstufe.txt b/Model/Changes_2024_10_09 GkvAbrechnung Verfahrensstufe.txt
index f608bac9c..d3b839674 100644
--- a/Model/Changes_2024_10_09 GkvAbrechnung Verfahrensstufe.txt	
+++ b/Model/Changes_2024_10_09 GkvAbrechnung Verfahrensstufe.txt	
@@ -1,2 +1,5 @@
+ALTER TABLE `organisation` 
+ADD COLUMN `Verfahrensstufe` INT NULL DEFAULT 0 AFTER `BusinessPartnerId`;
+
 ALTER TABLE `gkvabrechnung` 
-ADD COLUMN `UrbelegeGesendet` TINYINT NULL DEFAULT NULL AFTER `Bezahlt`;
+ADD COLUMN `Verfahrensstufe` INT NULL DEFAULT 0 AFTER `ErstelltAm`;
diff --git a/Service/DCEntityMapper/GkvAbrechnungDC_GkvAbrechnung.cs b/Service/DCEntityMapper/GkvAbrechnungDC_GkvAbrechnung.cs
index c7bc02288..67e4c47a4 100644
--- a/Service/DCEntityMapper/GkvAbrechnungDC_GkvAbrechnung.cs
+++ b/Service/DCEntityMapper/GkvAbrechnungDC_GkvAbrechnung.cs
@@ -30,6 +30,7 @@ namespace BeWo.Service.DCEntityMapper
             pDataContract.Bezahlt = pEntity.Bezahlt;
             pDataContract.UrbelegeGesendet = pEntity.UrbelegeGesendet;
             pDataContract.ErstelltAm = pEntity.ErstelltAm;
+            pDataContract.Verfahrensstufe = pEntity.Verfahrensstufe;
 
             pDataContract.InvoiceBases = MapperFactory.InvoiceBaseDC_InvoiceBase.MapToNewDCs(pEntity.InvoiceBases);
 
@@ -54,6 +55,7 @@ namespace BeWo.Service.DCEntityMapper
             pEntity.Betrag = pDataContract.Betrag;
             pEntity.Bezahlt = pDataContract.Bezahlt;
             pEntity.UrbelegeGesendet = pDataContract.UrbelegeGesendet;
+            pEntity.Verfahrensstufe = pDataContract.Verfahrensstufe;
 
             pEntity.ErstelltAm = pDataContract.ErstelltAm;
 
diff --git a/Service/ServiceImplementations/AccountingServiceImp.cs b/Service/ServiceImplementations/AccountingServiceImp.cs
index 26c5d0749..bf3a1c9a6 100644
--- a/Service/ServiceImplementations/AccountingServiceImp.cs
+++ b/Service/ServiceImplementations/AccountingServiceImp.cs
@@ -783,13 +783,15 @@ namespace BeWo.Service.ServiceImplementations
                     gkv_abrechnung.AbrechnungsZeitraumEnde = gkv_abrechnung.AbrechnungsZeitraumEnde.Value.Date.AddDays(1).AddMilliseconds(-1);
                 }
 
+                var orga = gkv_abrechnung.GetOrganisation();
+
+                gkv_abrechnung.Verfahrensstufe = orga.Verfahrensstufe;
+
                 decimal gesamt = 0;
                 foreach (var invoicebase_oid in request.SelectedInvoiceBases)
                 {
                     var service = DAOFactory.SearchDAO.GetServiceInvoiceByInvoiceBaseOid(invoicebase_oid);
                     var invoicebase = DAOFactory.GenericDAO.GetByID<InvoiceBase>(invoicebase_oid);
-                    var orga = invoicebase.CostBearer2SupportConcept.CostBearer.Organisation;
-                    var customer = invoicebase.CostBearer2SupportConcept.SupportConcept.Customer;
 
                     var invoicebase_dc = MapperFactory.InvoiceBaseDC_InvoiceBase.MapToNewDC(invoicebase);
 
diff --git a/Shared/DataContracts/GkvAbrechnung/GkvAbrechnungDC.cs b/Shared/DataContracts/GkvAbrechnung/GkvAbrechnungDC.cs
index c466b2385..10ec4b164 100644
--- a/Shared/DataContracts/GkvAbrechnung/GkvAbrechnungDC.cs
+++ b/Shared/DataContracts/GkvAbrechnung/GkvAbrechnungDC.cs
@@ -35,6 +35,9 @@ namespace BS.Shared.DataContracts.GkvAbrechnung
         [DataMember]
         public DateTime ErstelltAm { get; set; }
 
+        [DataMember]
+        public GkvVerfahrensstufe Verfahrensstufe { get; set; }
+
         [DataMember]
         public IList<InvoiceBaseDC> InvoiceBases { get; set; }
 
diff --git a/Shared/Extensions/GkvAbrechnungExtensions.cs b/Shared/Extensions/GkvAbrechnungExtensions.cs
index c8a6502cb..1dd49ab53 100644
--- a/Shared/Extensions/GkvAbrechnungExtensions.cs
+++ b/Shared/Extensions/GkvAbrechnungExtensions.cs
@@ -9,6 +9,11 @@ namespace BS.Shared.Extensions
 {
     public static class GkvAbrechnungExtensions
     {
+        /// <summary>
+        /// Lässt sich besser über Interface lösen....
+        /// </summary>
+        /// <param name="gkvAbrechnungDC"></param>
+        /// <returns></returns>
         public static GkvState GetState(this GkvAbrechnungDC gkvAbrechnungDC) => GetState(
             gkvAbrechnungDC,
                 () => gkvAbrechnungDC.Bezahlt,