diff --git a/BeWo/ServiceProxy/Generated.cs b/BeWo/ServiceProxy/Generated.cs
index 3c02aa316..c07394566 100644
--- a/BeWo/ServiceProxy/Generated.cs
+++ b/BeWo/ServiceProxy/Generated.cs
@@ -9389,10 +9389,6 @@ namespace BeWo.ServiceProxy
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAccountingService/GetFilteredGkvAbrechnungenBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         System.Collections.Generic.List<BS.Shared.DataContracts.GkvAbrechnungDC> GetFilteredGkvAbrechnungen(BS.Shared.DataContracts.GkvAbrechnungViewFilterDC gkvAbrechnungViewFilter);
         
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAccountingService/MakeNewGkvAbrechnung", ReplyAction="http://tempuri.org/IAccountingService/MakeNewGkvAbrechnungResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAccountingService/MakeNewGkvAbrechnungBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        BS.Shared.DataContracts.GkvAbrechnungDC MakeNewGkvAbrechnung(BS.Shared.DataContracts.GkvAbrechnungRequestDC abrechnungFilterDC);
-        
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAccountingService/CreateNewGkvAbrechnung", ReplyAction="http://tempuri.org/IAccountingService/CreateNewGkvAbrechnungResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAccountingService/CreateNewGkvAbrechnungBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         BS.Shared.DataContracts.GkvAbrechnungResponseDC CreateNewGkvAbrechnung(BS.Shared.DataContracts.GkvAbrechnungRequestDC request);
@@ -9607,11 +9603,6 @@ namespace BeWo.ServiceProxy
             return base.Channel.GetFilteredGkvAbrechnungen(gkvAbrechnungViewFilter);
         }
         
-        public BS.Shared.DataContracts.GkvAbrechnungDC MakeNewGkvAbrechnung(BS.Shared.DataContracts.GkvAbrechnungRequestDC abrechnungFilterDC)
-        {
-            return base.Channel.MakeNewGkvAbrechnung(abrechnungFilterDC);
-        }
-        
         public BS.Shared.DataContracts.GkvAbrechnungResponseDC CreateNewGkvAbrechnung(BS.Shared.DataContracts.GkvAbrechnungRequestDC request)
         {
             return base.Channel.CreateNewGkvAbrechnung(request);
diff --git a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml
index 0926e6c34..48fe81c8e 100644
--- a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml
+++ b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml
@@ -26,21 +26,27 @@
 
 				<localView:YearMonthFilter Margin="3 0 0 3" VerticalAlignment="Bottom" HorizontalAlignment="Left" Grid.Column="0" x:Name="yearMonthFilter" FilterSpanChanged="YearMonthFilter_FilterSpanChanged" />
                 <StackPanel Orientation="Vertical" Grid.Column="1" Margin="12,5,0,0" VerticalAlignment="Center" HorizontalAlignment="Left">
-                    <RadioButton x:Name="radioFilterByInvoiceDate" Content="Nach Rechnungsdatum filtern" IsChecked="True"/>
-                    <RadioButton x:Name="radioFilterByAccountingDate" Content="Nach Abrechnungszeitraum filtern" />
+                    <RadioButton x:Name="radioFilterByInvoiceDate" Content="Nach Erstelldatum filtern" IsChecked="True" Click="radioFilterByInvoiceDate_Click"/>
+                    <RadioButton x:Name="radioFilterByAccountingDate" Content="Nach Abrechnungszeitraum filtern" Click="radioFilterByInvoiceDate_Click"/>
                 </StackPanel>
-                
-				<Button x:Name="button_reload" Grid.Column="2" Content="Aktualisieren" Margin="12,0,0,0" Click="ReloadButton_OnClick" Height="24" HorizontalAlignment="Left" VerticalAlignment="Bottom" Width="80" />
-                <Button x:Name="button_new" Grid.Column="2" Content="Neue Abrechnung" Margin="100,0,0,0" Click="NewButton_OnClick" Height="24" HorizontalAlignment="Left" VerticalAlignment="Bottom"  />
+                <Grid Grid.Column="2">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="auto"/>
+                        <ColumnDefinition Width="auto"/>
+                    </Grid.ColumnDefinitions>
+                    <Button x:Name="button_new" Grid.Column="2" Content="Neue Abrechnung" Margin="3" Click="NewButton_OnClick" Height="24" VerticalAlignment="Bottom"  />
+                    <Button x:Name="button_reload" Grid.Column="1" Content="Aktualisieren" Margin="3" Click="ReloadButton_OnClick" Height="24" VerticalAlignment="Bottom" Width="80" />
+                </Grid>
 
                 <dxg:GridControl Margin="3" Grid.ColumnSpan="3" Grid.Row="1" DataSource="{Binding VMList}" x:Name="datagrid_gkvAbrechnungen" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
 					<dxg:GridControl.Columns>
                         <dxg:GridColumn x:Name="ColumnChecked" FieldName="IsChecked" Header=" " MinWidth="30"></dxg:GridColumn>
-                        <dxg:GridColumn x:Name="ColumnButtons"  AllowEditing="False" MinWidth="135" FieldName="ReportLink" Header=" ">
+                        <dxg:GridColumn x:Name="ColumnButtons"  AllowEditing="False" Width="auto"  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 Margin="1" ToolTip="Formular anzeigen" x:Name="btn_report" Height="20" Width="20" VerticalAlignment="Center">
 											<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" />
@@ -49,46 +55,100 @@
 										</Button>
                                         <Button Click="btn_edit_Click" Content="@" Padding="0" Margin="1" ToolTip="Editieren" Foreground="#FFFFFF" FontSize="13" FontFamily="Webdings" x:Name="btn_edit" Height="20" Width="20" VerticalAlignment="Center" />
                                         <Button Click="btn_storno_Click" Content="S" Padding="0" Margin="1" ToolTip="Stornieren" Foreground="#FFFFFF" FontSize="13" x:Name="btn_storno" Height="20" Width="20" VerticalAlignment="Center" Initialized="btn_storno_Initialized"/>
-                                        <Button Click="btn_delete_Click" Content="r" Padding="0" Margin="1" ToolTip="Löschen" Foreground="#FF0000" FontSize="13" FontFamily="Webdings" x:Name="btn_delete" Height="20" Width="20" VerticalAlignment="Center" />
-                                        <Button Click="btn_nutz_Click" Content="sh" Padding="0" Margin="1" ToolTip="Nutzdatendatei" Foreground="#00FF00" FontSize="13" FontFamily="Webdings" x:Name="btn_nutz" Height="20" Width="20" VerticalAlignment="Center" />
-                                        <Button Click="btn_auf_Click" Content="sh" Padding="0" Margin="1" ToolTip="Auftragsdatei" Foreground="#00FF00" FontSize="13" FontFamily="Webdings" x:Name="btn_auf" Height="20" Width="20" VerticalAlignment="Center" />
-									</StackPanel>
+                                        <Button Click="btn_delete_Click" Content="r" Padding="0" Margin="1" ToolTip="Löschen" Foreground="#FF0000" FontSize="13" FontFamily="Webdings" x:Name="btn_delete" Height="20" Width="20" VerticalAlignment="Center" />-->
+                                        <Button Click="btn_nutz_Click" Content="¥" Padding="0" Margin="1" ToolTip="Nutzdatendatei" Foreground="#00FF00" FontSize="13" FontFamily="Webdings" x:Name="btn_nutz" Height="15" Width="20" VerticalAlignment="Center" />
+                                        <Button Click="btn_auf_Click" Content="¥" Padding="0" Margin="1" ToolTip="Auftragsdatei" Foreground="#00FF00" FontSize="13" FontFamily="Webdings" x:Name="btn_auf" Height="15" Width="20" VerticalAlignment="Center" />
+                                        <UserControl Background="Transparent" Width="10"/>
+                                    </StackPanel>
 								</ControlTemplate>
 							</dxg:GridColumn.DisplayTemplate>
                         </dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="IKDatenannahmestelle" Header="Datenannahmestelle" Width="130" />
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="IKKostenträger" Header="Kostenträger" Width="130" />
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="IKVersichertenKarte" Header="VersichertenKarte" Width="130" />
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="IKLeistungserbringer" Header="Leistungserbringer" Width="130" />
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="AbrechnungsZeitraum" SortFieldName="AbrechnungsZeitraumStart" Header="Zeitraum" Width="120" />
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="ErstelltAm" Header="Erstelldatum" Width="80">
+                            <dxg:GridColumn.EditSettings>
+                                <dxe:TextEditSettings HorizontalContentAlignment="Right"/>
+                            </dxg:GridColumn.EditSettings>
+                        </dxg:GridColumn>
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="IKDatenannahmestelle" Header="Datenannahmestelle" Width="130" >
+                            <dxg:GridColumn.EditSettings>
+                                <dxe:TextEditSettings HorizontalContentAlignment="Right"/>
+                            </dxg:GridColumn.EditSettings>
+                        </dxg:GridColumn>
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="IKKostenträger" Header="Kostenträger" Width="130" >
+                            <dxg:GridColumn.EditSettings>
+                                <dxe:TextEditSettings HorizontalContentAlignment="Right"/>
+                            </dxg:GridColumn.EditSettings>
+                        </dxg:GridColumn>
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="IKVersichertenKarte" Header="VersichertenKarte" Width="130" >
+                            <dxg:GridColumn.EditSettings>
+                                <dxe:TextEditSettings HorizontalContentAlignment="Right"/>
+                            </dxg:GridColumn.EditSettings>
+                        </dxg:GridColumn>
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="AbrechnungsZeitraumStart" Header="Abrechnungsbeginn" Width="120">
+                            <dxg:GridColumn.EditSettings>
+                                <dxe:DateEditSettings DisplayFormat="d" HorizontalContentAlignment="Right"/>
+                            </dxg:GridColumn.EditSettings>
+                        </dxg:GridColumn>
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="AbrechnungsZeitraumEnde" Header="Abrechnungsende" Width="120" >
+                            <dxg:GridColumn.EditSettings>
+                                <dxe:DateEditSettings DisplayFormat="d" HorizontalContentAlignment="Right"/>
+                            </dxg:GridColumn.EditSettings>
+                        </dxg:GridColumn>
+                        <!--<dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="IKLeistungserbringer" Header="Leistungserbringer" Width="130" >
+                            <dxg:GridColumn.EditSettings>
+                                <dxe:TextEditSettings HorizontalContentAlignment="Right"/>
+                            </dxg:GridColumn.EditSettings>
+                        </dxg:GridColumn>-->
                         <!--<dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Nutzdatendatei" Header="Nutzdatendatei" Width="80" />
                         <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Auftragsdatei" Header="Auftragsdatei" Width="80" />-->
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Transfername" Header="Transfername" Width="80" />
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Datenaustauschreferenz" Header="Datenaustauschreferenz" Width="80" />
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="ErstelltAm" Header="Erstellt" Width="80" />
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="VerschluesseltAm" Header="Verschlüsselt" Width="80" />
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="UebertragenAm" Header="Übertragen" Width="80" />
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="AntwortErhaltenAm" Header="Antwort erhalten" Width="80" />
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="AntwortEntschluesseltAm" Header="Antwort entschlüsselt" Width="80" />
-						<dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Betrag" Header="Betrag" MinWidth="70">
-							<dxg:GridColumn.EditSettings>
-								<dxe:TextEditSettings DisplayFormat="c" Mask="c" MaskType="Numeric"></dxe:TextEditSettings>
-							</dxg:GridColumn.EditSettings>
-						</dxg:GridColumn>
-						<dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Notice" Header="Bemerkung" MinWidth="200" >
-							<dxg:GridColumn.EditSettings>
-								<dxe:TextEditSettings TextWrapping="Wrap" />
-							</dxg:GridColumn.EditSettings>
-						</dxg:GridColumn>
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Transfername" Header="Transfername" Width="80" >
+                            <dxg:GridColumn.EditSettings>
+                                <dxe:TextEditSettings HorizontalContentAlignment="Right"/>
+                            </dxg:GridColumn.EditSettings>
+                        </dxg:GridColumn>
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Datenaustauschreferenz" Header="Referenz" Width="60" >
+                            <dxg:GridColumn.EditSettings>
+                                <dxe:TextEditSettings HorizontalContentAlignment="Right"/>
+                            </dxg:GridColumn.EditSettings>
+                        </dxg:GridColumn>
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Betrag" Header="Betrag" MinWidth="70">
+                            <dxg:GridColumn.EditSettings>
+                                <dxe:TextEditSettings DisplayFormat="c" Mask="c" MaskType="Numeric" HorizontalContentAlignment="Right"></dxe:TextEditSettings>
+                            </dxg:GridColumn.EditSettings>
+                        </dxg:GridColumn>
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Notice" Header="Bemerkung" MinWidth="200" >
+                            <dxg:GridColumn.EditSettings>
+                                <dxe:TextEditSettings TextWrapping="Wrap" />
+                            </dxg:GridColumn.EditSettings>
+                        </dxg:GridColumn>
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="VerschluesseltAm" Header="Verschlüsselt" Width="80" >
+                            <dxg:GridColumn.EditSettings>
+                                <dxe:TextEditSettings HorizontalContentAlignment="Right"/>
+                            </dxg:GridColumn.EditSettings>
+                        </dxg:GridColumn>
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="UebertragenAm" Header="Übertragen" Width="80" >
+                            <dxg:GridColumn.EditSettings>
+                                <dxe:TextEditSettings HorizontalContentAlignment="Right"/>
+                            </dxg:GridColumn.EditSettings>
+                        </dxg:GridColumn>
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="AntwortErhaltenAm" Header="Antwort erhalten" Width="80">
+                            <dxg:GridColumn.EditSettings>
+                                <dxe:TextEditSettings HorizontalContentAlignment="Right"/>
+                            </dxg:GridColumn.EditSettings>
+                        </dxg:GridColumn>
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="AntwortEntschluesseltAm" Header="Antwort entschlüsselt" Width="80" >
+                            <dxg:GridColumn.EditSettings>
+                                <dxe:TextEditSettings HorizontalContentAlignment="Right"/>
+                            </dxg:GridColumn.EditSettings>
+                        </dxg:GridColumn>
 
                         <dxg:GridColumn x:Name="PaidColumn" FieldName="IsPaid" Header="Bezahlt"></dxg:GridColumn>
 					</dxg:GridControl.Columns>
 					<dxg:GridControl.View>
 						<dxg:TableView NavigationStyle="Cell" Loaded="gridView_Loaded" x:Name="gridView" BestFitMode="Smart" 
-                                       AllowBestFit="True" ShowGroupPanel="False" ScrollingMode="Smart" SnapsToDevicePixels="True" 
+                                       AllowBestFit="True" ShowGroupPanel="False" ScrollingMode="Smart" SnapsToDevicePixels="True"  ShownEditor="gridView_ShownEditor"
                                        CellValueChanging="gridView_CellValueChanged" 
                                        CustomRowAppearance="TableView_OnCustomRowAppearance"
-                                       Margin="3,22,3,3" />
+                                       Margin="3,22,3,3"/>
 					</dxg:GridControl.View>
 				</dxg:GridControl>
 
@@ -105,7 +165,7 @@
 
 
                 </Grid>
-                <StackPanel Grid.Row="2" Orientation="Horizontal">
+                <!--<StackPanel Grid.Row="2" Orientation="Horizontal">
                     <Button Margin="10 3 0 0"
                                               Name="button_checkAllLeistungen" Click="button_checkAll_Click"
                                               HorizontalAlignment="Left">Alle auswählen</Button>
@@ -116,7 +176,7 @@
                                               Name="button_aufklappenAllLeistungen" Click="button_printInvoices_Click"
                                               HorizontalAlignment="Left">Ausgewählte Rechnungen drucken</Button>
                     
-                </StackPanel>
+                </StackPanel>-->
             </Grid>
 		</GroupBox>
 	</Grid>
diff --git a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs
index c18755637..584348b1d 100644
--- a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs
+++ b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs
@@ -3,6 +3,7 @@ using System.Activities.Statements;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Text;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Documents;
@@ -18,7 +19,8 @@ using BS.Shared;
 using BS.Shared.Core;
 using BS.Shared.DataContracts;
 using BS.Shared.Extensions;
-
+using DevExpress.Data.Filtering;
+using DevExpress.Mvvm;
 using DevExpress.Xpf.Editors;
 using DevExpress.Xpf.Grid;
 using Microsoft.Win32;
@@ -28,96 +30,86 @@ namespace BeWo.View.Detail.Accounting
     public partial class GkvAbrechnungOverview : BeWoView
     {
         private readonly NewGkvAbrechnungPopUpView _NewGkvAbrechnungPopUpView;
+        private readonly GkvAbrechnungListVM _Viewmodel;
 
-        private readonly EquityInvoiceItemEditView _EquityInvoiceItemEditView;
-
-        private readonly GeneralInvoiceItemEditView _GeneralInvoiceItemEditView;
-
-        private readonly SettlementInvoiceItemEditView _SettlementInvoiceItemEditView;
-
-        private readonly SettlementInvoiceItemEditView2 _SettlementInvoiceItemEditView2;
-
-        private readonly ServiceInvoiceItemEditView _ServiceInvoiceItemEditView;
-
-        private GkvAbrechnungListVM _Viewmodel;
-
-        private bool mIgnoreCheckChanges = false;
 
         public GkvAbrechnungOverview(GkvAbrechnungListVM vm)
         {
-            this.InitializeComponent();
-            this.ViewModel = vm;
-            this.DownloadLinkEngine = new DownloadLinkEngine();
+            UpdateDataGridFilterCommand = new DelegateCommand(UpdateDataGridFilter);
 
-            this.gridView.ShownEditor += this.gridView_ShownEditor;
+            InitializeComponent();
 
-            this._NewGkvAbrechnungPopUpView = new NewGkvAbrechnungPopUpView();
-            this._NewGkvAbrechnungPopUpView.CancelButtonClicked += (s, e) =>
-            {
-                this.MainControl.CloseCurrentPopUp();
-            };
-            this._NewGkvAbrechnungPopUpView.CreateButtonClicked += (s, e) =>
-            {
-                this.MainControl.CloseCurrentPopUp();
-                var checked_invoice_bases = _NewGkvAbrechnungPopUpView.ViewModel.InvoiceBases.Where(x => x.IsChecked).Select(x => x.DataContract.InvoiceBaseOid.Value).ToList();
-                var gkv_abrechnung = e.Data.First();
-                var gkv_filter = new GkvAbrechnungRequestDC(gkv_abrechnung);
+            DownloadLinkEngine = new DownloadLinkEngine();
 
-                gkv_filter.SelectedInvoiceBases = checked_invoice_bases;
+            _Viewmodel = vm;
 
-                ServiceFacade.DoAccountingServiceAsync(x => x.CreateNewGkvAbrechnung(gkv_filter),
-                    cb => Dispatcher.BeginInvoke(DispatcherPriority.Normal,
-                    (Action)delegate
-                    {
-                        if (cb.Success)
-                        {
-                            RefreshGkvAbrechnungenList();
-                        }
-                        else
-                        {
-                            BeWoWindowBuilder.ShowErrorMessageBox(cb.Error);
-                        }
-                    }));
-            };
+            DataContext = vm;
 
-            this._EquityInvoiceItemEditView = new EquityInvoiceItemEditView();
-            this._GeneralInvoiceItemEditView = new GeneralInvoiceItemEditView();
-            this._SettlementInvoiceItemEditView = new SettlementInvoiceItemEditView();
-            this._SettlementInvoiceItemEditView2 = new SettlementInvoiceItemEditView2();
-            this._ServiceInvoiceItemEditView = new ServiceInvoiceItemEditView();
+            //datagrid_gkvAbrechnungen.FixedFilter = new BinaryOperator("Datenaustauschreferenz", 1);
 
-            this.ViewModel.DateTimeSpanFilter = this.yearMonthFilter.FilterSpan;
-            RefreshGkvAbrechnungenList();
+            _NewGkvAbrechnungPopUpView = new NewGkvAbrechnungPopUpView();
+            _NewGkvAbrechnungPopUpView.CancelButtonClicked += NewGkvAbrechnungPopUpViewCancelButtonClicked;
+            _NewGkvAbrechnungPopUpView.CreateButtonClicked += NewGkvAbrechnungPopUpViewCreateButtonClicked;
+
+            _Viewmodel.DateTimeSpanFilter = yearMonthFilter.FilterSpan;
 
             CheckRights();
+
+            RefreshGkvAbrechnungenList();
         }
 
+        public DownloadLinkEngine DownloadLinkEngine { get; set; }
+        public DelegateCommand UpdateDataGridFilterCommand { get; set; }
+
+        private bool ShowAllInvoices => _Viewmodel.DateTimeSpanFilter is null;
+
         private void CheckRights()
         {
-            if (!BeWoApp.AppSettings.AllowStorno)
-            {
-                ColumnButtons.MinWidth = 67;
-            }
+            //if (!BeWoApp.AppSettings.AllowStorno)
+            //{
+            //    ColumnButtons.MinWidth = 67;
+            //}
         }
-
         private void RefreshGkvAbrechnungenList()
         {
-            if (ViewModel.DateTimeSpanFilter == null)
-            {
-                ServiceFacade.DoAccountingServiceAsync(x => x.GetAllGkvAbrechnungen(), UpdateGkvAbrechnungList);
-                return;
-            }
-
             var filter = new GkvAbrechnungViewFilterDC();
 
-            filter.FilterTime = true;
-            filter.Start = ViewModel.DateTimeSpanFilter.StartDate;
-            filter.End = ViewModel.DateTimeSpanFilter.EndDate;
+            //filter.FilterTime = ViewModel.DateTimeSpanFilter is object;
+            //filter.Start = ViewModel.DateTimeSpanFilter?.StartDate;
+            //filter.End = ViewModel.DateTimeSpanFilter?.EndDate;
 
-            filter.FilterForInvoiceDate = radioFilterByInvoiceDate.IsChecked.Value;
+            //filter.FilterForInvoiceDate = radioFilterByInvoiceDate.IsChecked.Value;
 
             ServiceFacade.DoAccountingServiceAsync(s => s.GetFilteredGkvAbrechnungen(filter), UpdateGkvAbrechnungList);
         }
+        private void UpdateDataGridFilter()
+        {
+            if(ShowAllInvoices)
+            {
+                datagrid_gkvAbrechnungen.FixedFilter = null;
+            }
+            else
+            {
+                var filterByInvoiceDate = radioFilterByInvoiceDate.IsChecked.Value;
+
+                var filter_start = _Viewmodel.DateTimeSpanFilter.StartDate;
+                var filter_ende = _Viewmodel.DateTimeSpanFilter.EndDate.AddDays(1).AddMilliseconds(-1);
+
+                if (filterByInvoiceDate)
+                {
+                    datagrid_gkvAbrechnungen.FixedFilter = CriteriaOperator.And(
+                    CriteriaOperator.FromLambda<GkvAbrechnungDC>(gkv => gkv.ErstelltAm >= filter_start),
+                    CriteriaOperator.FromLambda<GkvAbrechnungDC>(gkv => gkv.ErstelltAm <= filter_ende));
+                }
+                else
+                {
+                    datagrid_gkvAbrechnungen.FixedFilter = CriteriaOperator.Or(
+                   CriteriaOperator.FromLambda<GkvAbrechnungDC>(gkv => filter_start <= gkv.AbrechnungsZeitraumStart && gkv.AbrechnungsZeitraumStart <= filter_ende),
+                   CriteriaOperator.FromLambda<GkvAbrechnungDC>(gkv => filter_start <= gkv.AbrechnungsZeitraumEnde && gkv.AbrechnungsZeitraumEnde <= filter_ende),
+                   CriteriaOperator.FromLambda<GkvAbrechnungDC>(gkv => gkv.AbrechnungsZeitraumStart <= filter_start && filter_ende <= gkv.AbrechnungsZeitraumEnde));
+                }
+            }
+        }
 
         private void UpdateGkvAbrechnungList(IList<GkvAbrechnungDC> dcList)
         {
@@ -125,62 +117,46 @@ namespace BeWo.View.Detail.Accounting
                 DispatcherPriority.Normal,
                 (Action)delegate
                 {
-                    ViewModel.UpdateList(dcList);
+                    _Viewmodel.UpdateList(dcList);
                     this.gridView.BestFitColumns();
-                    ViewModel.UpdateList(dcList);
+                    //_Viewmodel.UpdateList(dcList);
                 });
         }
 
-        public DownloadLinkEngine DownloadLinkEngine { get; set; }
-
-        private GkvAbrechnungListVM ViewModel
+        private void NewGkvAbrechnungPopUpViewCancelButtonClicked(object sender, EventArgs e)
         {
-            get
-            {
-                return this._Viewmodel;
-            }
-
-            set
-            {
-                this.DataContext = value;
-                this._Viewmodel = value;
-            }
+            MainControl.CloseCurrentPopUp();
         }
-
-        private void RefreshItemInList(GkvAbrechnungDC cb)
+        private void NewGkvAbrechnungPopUpViewCreateButtonClicked(object sender, EventArgs<GkvAbrechnungDC> e)
         {
-            this.Dispatch(
-                delegate
+            MainControl.CloseCurrentPopUp();
+            var checked_invoice_bases = _NewGkvAbrechnungPopUpView.ViewModel.InvoiceBases.Where(x => x.IsChecked).Select(x => x.DataContract.InvoiceBaseOid.Value).ToList();
+            var gkv_abrechnung = e.Data;
+            var gkv_filter = new GkvAbrechnungRequestDC(gkv_abrechnung);
+
+            gkv_filter.SelectedInvoiceBases = checked_invoice_bases;
+
+            ServiceFacade.DoAccountingServiceAsync(x => x.CreateNewGkvAbrechnung(gkv_filter),
+                cb => Dispatcher.BeginInvoke(DispatcherPriority.Normal,
+                (Action)delegate
+                {
+                    if (cb.Success)
                     {
-                        var old = this.ViewModel.VMList.Single(i => i.DataContract.GkvAbrechnungOid.Equals(cb.GkvAbrechnungOid));
-                        var lNew = new GkvAbrechnungVM(cb);
-
-                        this.ViewModel.VMList.Remove(old);
-                        this.ViewModel.VMList.Add(lNew);
-                        this.datagrid_gkvAbrechnungen.RefreshData();
-                        this.gridView.FocusedRow = lNew;
-                    });
+                        RefreshGkvAbrechnungenList();
+                    }
+                    else
+                    {
+                        BeWoWindowBuilder.ShowErrorMessageBox(cb.Error);
+                    }
+                }));
         }
 
-        /*
-        private void SaveIsPaidChange(InvoiceBaseVM vm, bool isPaid)
-        {
-            if (!mIgnoreCheckChanges)
-            {
-                vm.IsPaid = isPaid;
-
-                ServiceFacade.DoAccountingServiceAsync(s => s.SetInvoicePaid(new[] { vm.CommitToDataContract() }.ToList(), vm.IsPaid), cb => vm.DataContract.InvoiceBaseVersion = cb[0], false);
-            }
-        }
-        */
-
         private void YearMonthFilter_FilterSpanChanged(object sender, EventArgs<DateTimeSpan> e)
         {
-            mIgnoreCheckChanges = true;
-            this.ViewModel.DateTimeSpanFilter = e.Data;
-            RefreshGkvAbrechnungenList();
-            mIgnoreCheckChanges = false;
+            _Viewmodel.DateTimeSpanFilter = e.Data;
+            UpdateDataGridFilter();
         }
+
         private void btn_nutz_Click(object sender, RoutedEventArgs e)
         {
             var vm = this.datagrid_gkvAbrechnungen.GetCurrentValue<GkvAbrechnungVM>();
@@ -193,44 +169,27 @@ namespace BeWo.View.Detail.Accounting
 
             BeWoWindowBuilder.GetTextViewer("Auftragsdatei", vm.Auftragsdatei, false).ShowDialog();
         }
-        private void btn_delete_Click(object sender, RoutedEventArgs e)
+        private void NewButton_OnClick(object sender, RoutedEventArgs e)
         {
-            mIgnoreCheckChanges = true;
-            var vm = this.datagrid_gkvAbrechnungen.GetCurrentValue<GkvAbrechnungVM>();
-
-            if (MessageBox.Show("Sind Sie sicher, dass Sie die gewählte GKV-Abrechnung löschen möchten?", "GKV-Abrechnung löschen", MessageBoxButton.YesNo, MessageBoxImage.Warning) == MessageBoxResult.Yes)
-            {
-                this.ViewModel.VMList.Remove(vm);
-                //ServiceFacade.DoAccountingServiceAsync(s => s.DeactivateInvoiceBases(new[] { vm.DataContract }.ToList()));
-            }
-            mIgnoreCheckChanges = false;
+            GkvAbrechnungDC gkvAbrechnungDC = new GkvAbrechnungDC();
+            int year = DateTime.Now.Year;
+            int month = DateTime.Now.Month - 1;
+            gkvAbrechnungDC.AbrechnungsZeitraumStart = new DateTime(year, month, 1);
+            gkvAbrechnungDC.AbrechnungsZeitraumEnde = new DateTime(year, month, DateTime.DaysInMonth(year, month));
+            GkvAbrechnungVM gkvAbrechnungVM = new GkvAbrechnungVM(gkvAbrechnungDC);
+            _NewGkvAbrechnungPopUpView.Clear();
+            _NewGkvAbrechnungPopUpView.ViewModel = gkvAbrechnungVM;
+            this.MainControl.ShowControlAsModalPopup(this._NewGkvAbrechnungPopUpView);
         }
-        private void btn_storno_Click(object sender, RoutedEventArgs e)
+
+        private void ReloadButton_OnClick(object sender, RoutedEventArgs e)
         {
-            mIgnoreCheckChanges = true;
-            var vm = this.datagrid_gkvAbrechnungen.GetCurrentValue<GkvAbrechnungVM>();
-
-            if (MessageBox.Show("Sind Sie sicher, dass Sie die gewählte GKV-Abrechnung stornieren möchten?", "GKV-Abrechnung stornieren", MessageBoxButton.YesNo, MessageBoxImage.Warning) == MessageBoxResult.Yes)
-            {
-                /*
-                ServiceFacade.DoAccountingServiceAsync(s => s.StorniereInvoiceBases(new[] { vm.DataContract }.ToList()),
-                    () => this.Dispatch(
-                            delegate
-                            {
-                                RefreshInvoiceList();
-                            }));
-                */
-            }
-
-            mIgnoreCheckChanges = false;
-        }
-        private void btn_edit_Click(object sender, RoutedEventArgs e)
-        {
-            var vm = this.datagrid_gkvAbrechnungen.GetCurrentValue<GkvAbrechnungVM>();
+            RefreshGkvAbrechnungenList();
         }
+
         private void gridView_Loaded(object sender, RoutedEventArgs e)
         {
-            this.gridView.BestFitColumns();
+            //this.gridView.BestFitColumns();
         }
         private void gridView_ShownEditor(object sender, EditorEventArgs e)
         {
@@ -240,22 +199,6 @@ namespace BeWo.View.Detail.Accounting
                 ed.Tag = e.Row;
             }
         }
-        private void Hyperlink_OnRequestNavigate(object sender, RequestNavigateEventArgs e)
-        {
-            BeWoUtils.NavigateToReportUri(((Hyperlink)sender).NavigateUri.ToString(), "Druckvorschau");
-        }
-        private void ReloadButton_OnClick(object sender, RoutedEventArgs e)
-        {
-            RefreshGkvAbrechnungenList();
-        }
-        private void btn_storno_Initialized(object sender, EventArgs e)
-        {
-            if (!BeWoApp.AppSettings.AllowStorno)
-            {
-                Button btn = sender as Button;
-                btn.Visibility = Visibility.Collapsed;
-            }
-        }
         private void gridView_CellValueChanged(object sender, CellValueChangedEventArgs e)
         {
             if (e.Column != null && e.Column.FieldName == "IsPaid")
@@ -280,86 +223,154 @@ namespace BeWo.View.Detail.Accounting
                 */
             }
         }
-        private void button_checkAll_Click(object sender, RoutedEventArgs e)
+
+        private void radioFilterByInvoiceDate_Click(object sender, RoutedEventArgs e)
         {
-            var visible = GetVisibleVMs();
-            foreach (var item in visible)
+            UpdateDataGridFilter();
+        }
+
+        //private void btn_delete_Click(object sender, RoutedEventArgs e)
+        //{
+        //    mIgnoreCheckChanges = true;
+        //    var vm = this.datagrid_gkvAbrechnungen.GetCurrentValue<GkvAbrechnungVM>();
+
+        //    if (MessageBox.Show("Sind Sie sicher, dass Sie die gewählte GKV-Abrechnung löschen möchten?", "GKV-Abrechnung löschen", MessageBoxButton.YesNo, MessageBoxImage.Warning) == MessageBoxResult.Yes)
+        //    {
+        //        this.ViewModel.VMList.Remove(vm);
+        //        //ServiceFacade.DoAccountingServiceAsync(s => s.DeactivateInvoiceBases(new[] { vm.DataContract }.ToList()));
+        //    }
+        //    mIgnoreCheckChanges = false;
+        //}
+        //private void btn_storno_Click(object sender, RoutedEventArgs e)
+        //{
+        //    mIgnoreCheckChanges = true;
+        //    var vm = this.datagrid_gkvAbrechnungen.GetCurrentValue<GkvAbrechnungVM>();
+
+        //    if (MessageBox.Show("Sind Sie sicher, dass Sie die gewählte GKV-Abrechnung stornieren möchten?", "GKV-Abrechnung stornieren", MessageBoxButton.YesNo, MessageBoxImage.Warning) == MessageBoxResult.Yes)
+        //    {
+        //        /*
+        //        ServiceFacade.DoAccountingServiceAsync(s => s.StorniereInvoiceBases(new[] { vm.DataContract }.ToList()),
+        //            () => this.Dispatch(
+        //                    delegate
+        //                    {
+        //                        RefreshInvoiceList();
+        //                    }));
+        //        */
+        //    }
+
+        //    mIgnoreCheckChanges = false;
+        //}
+        //private void btn_edit_Click(object sender, RoutedEventArgs e)
+        //{
+        //    var vm = this.datagrid_gkvAbrechnungen.GetCurrentValue<GkvAbrechnungVM>();
+        //}
+
+
+        //private void btn_storno_Initialized(object sender, EventArgs e)
+        //{
+        //    if (!BeWoApp.AppSettings.AllowStorno)
+        //    {
+        //        Button btn = sender as Button;
+        //        btn.Visibility = Visibility.Collapsed;
+        //    }
+        //}
+
+
+        //private void RefreshItemInList(GkvAbrechnungDC cb)
+        //{
+        //    this.Dispatch(
+        //        delegate
+        //            {
+        //                var old = this.ViewModel.VMList.Single(i => i.DataContract.GkvAbrechnungOid.Equals(cb.GkvAbrechnungOid));
+        //                var lNew = new GkvAbrechnungVM(cb);
+
+        //                this.ViewModel.VMList.Remove(old);
+        //                this.ViewModel.VMList.Add(lNew);
+        //                this.datagrid_gkvAbrechnungen.RefreshData();
+        //                this.gridView.FocusedRow = lNew;
+        //            });
+        //}
+
+        /*
+        private void SaveIsPaidChange(InvoiceBaseVM vm, bool isPaid)
+        {
+            if (!mIgnoreCheckChanges)
             {
-                item.IsChecked = true;
+                vm.IsPaid = isPaid;
+
+                ServiceFacade.DoAccountingServiceAsync(s => s.SetInvoicePaid(new[] { vm.CommitToDataContract() }.ToList(), vm.IsPaid), cb => vm.DataContract.InvoiceBaseVersion = cb[0], false);
             }
         }
-        private void button_uncheckAll_Click(object sender, RoutedEventArgs e)
-        {
-            var visible = GetVisibleVMs();
-            foreach (var item in visible)
-            {
-                item.IsChecked = false;
-            }
-        }
-        private void button_printInvoices_Click(object sender, RoutedEventArgs e)
-        {
-            var list = new List<GkvAbrechnungVM>();
+        */
 
-            var items = datagrid_gkvAbrechnungen.ItemsSource as IList<GkvAbrechnungVM>;
+        //private void button_checkAll_Click(object sender, RoutedEventArgs e)
+        //{
+        //    var visible = GetVisibleVMs();
+        //    foreach (var item in visible)
+        //    {
+        //        item.IsChecked = true;
+        //    }
+        //}
+        //private void button_uncheckAll_Click(object sender, RoutedEventArgs e)
+        //{
+        //    var visible = GetVisibleVMs();
+        //    foreach (var item in visible)
+        //    {
+        //        item.IsChecked = false;
+        //    }
+        //}
+        //private void button_printInvoices_Click(object sender, RoutedEventArgs e)
+        //{
+        //    var list = new List<GkvAbrechnungVM>();
 
-            if (items != null)
-            {
-                for (int i = 0; i < items.Count; i++)
-                {
-                    var vm = datagrid_gkvAbrechnungen.GetRow(i) as GkvAbrechnungVM;
-                    /*
-                    if (vm != null && vm.IsChecked)
-                    {
-                        list.Add(vm);
-                    }
-                    */
-                }
-            }
+        //    var items = datagrid_gkvAbrechnungen.ItemsSource as IList<GkvAbrechnungVM>;
 
-            // PrintInvoices(list);
-        }
-        private void NewButton_OnClick(object sender, RoutedEventArgs e)
-        {
-            GkvAbrechnungDC gkvAbrechnungDC = new GkvAbrechnungDC();
-            int year = DateTime.Now.Year;
-            int month = DateTime.Now.Month - 1;
-            gkvAbrechnungDC.AbrechnungsZeitraumStart = new DateTime(year, month, 1);
-            gkvAbrechnungDC.AbrechnungsZeitraumEnde = new DateTime(year, month, DateTime.DaysInMonth(year, month));
-            GkvAbrechnungVM gkvAbrechnungVM = new GkvAbrechnungVM(gkvAbrechnungDC);
-            _NewGkvAbrechnungPopUpView.Clear();
-            _NewGkvAbrechnungPopUpView.ViewModel = gkvAbrechnungVM;
-            this.MainControl.ShowControlAsModalPopup(this._NewGkvAbrechnungPopUpView);
-        }
+        //    if (items != null)
+        //    {
+        //        for (int i = 0; i < items.Count; i++)
+        //        {
+        //            var vm = datagrid_gkvAbrechnungen.GetRow(i) as GkvAbrechnungVM;
+        //            /*
+        //            if (vm != null && vm.IsChecked)
+        //            {
+        //                list.Add(vm);
+        //            }
+        //            */
+        //        }
+        //    }
 
-        private void PrintInvoices(List<InvoiceBaseVM> list)
-        {
-            var oidList = list.Select(i => i.DataContract.InvoiceBaseOid.Value).ToList();
+        //    // PrintInvoices(list);
+        //}
 
-            ServiceFacade.DoReportServiceAsync(s => s.CreateInvoiceListReport(oidList), ms => BeWoApp.MainControl.Dispatch(() => BeWoUtils.ShowReportWindow(ms, "Rechnungen")));
-        }
-        private IList<GkvAbrechnungVM> GetVisibleVMs()
-        {
-            var list = new List<GkvAbrechnungVM>();
+        //private void PrintInvoices(List<InvoiceBaseVM> list)
+        //{
+        //    var oidList = list.Select(i => i.DataContract.InvoiceBaseOid.Value).ToList();
 
-            var items = datagrid_gkvAbrechnungen.ItemsSource as IList<GkvAbrechnungVM>;
+        //    ServiceFacade.DoReportServiceAsync(s => s.CreateInvoiceListReport(oidList), ms => BeWoApp.MainControl.Dispatch(() => BeWoUtils.ShowReportWindow(ms, "Rechnungen")));
+        //}
+        //private IList<GkvAbrechnungVM> GetVisibleVMs()
+        //{
+        //    var list = new List<GkvAbrechnungVM>();
 
-            if (items != null)
-            {
-                for (int i = 0; i < items.Count; i++)
-                {
-                    if (datagrid_gkvAbrechnungen.IsRowVisible(i))
-                    {
-                        var vm = datagrid_gkvAbrechnungen.GetRow(i) as GkvAbrechnungVM;
-                        if (vm != null)
-                        {
-                            list.Add(vm);
-                        }
-                    }
-                }
-            }
+        //    var items = datagrid_gkvAbrechnungen.ItemsSource as IList<GkvAbrechnungVM>;
 
-            return list;
-        }
+        //    if (items != null)
+        //    {
+        //        for (int i = 0; i < items.Count; i++)
+        //        {
+        //            if (datagrid_gkvAbrechnungen.IsRowVisible(i))
+        //            {
+        //                var vm = datagrid_gkvAbrechnungen.GetRow(i) as GkvAbrechnungVM;
+        //                if (vm != null)
+        //                {
+        //                    list.Add(vm);
+        //                }
+        //            }
+        //        }
+        //    }
+
+        //    return list;
+        //}
     }
 
 }
\ No newline at end of file
diff --git a/BeWo/View/Detail/Accounting/NewGkvAbrechnungPopUpView .xaml b/BeWo/View/Detail/Accounting/NewGkvAbrechnungPopUpView .xaml
index d77e76f6e..5ac05bf6f 100644
--- a/BeWo/View/Detail/Accounting/NewGkvAbrechnungPopUpView .xaml	
+++ b/BeWo/View/Detail/Accounting/NewGkvAbrechnungPopUpView .xaml	
@@ -52,20 +52,20 @@
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
-                        <Label Content="Rechnungsdatum von" Grid.Row="0" Grid.Column="0" />
-                        <dxe:DateEdit MaskType="DateTimeAdvancingCaret" BorderThickness="1" Height="23" Margin="3" Grid.Row="0" Grid.Column="1" EditValue="{val:ValidationBinding Path=AbrechnungsZeitraumStart}" />
-                        <Label Content="Rechnungsdatum bis" Grid.Row="1" Grid.Column="0" />
-                        <dxe:DateEdit MaskType="DateTimeAdvancingCaret" BorderThickness="1" Height="23" Margin="3" Grid.Row="1" Grid.Column="1" EditValue="{val:ValidationBinding Path=AbrechnungsZeitraumEnde}" />
-                        <Label Content="Annahmestelle" Grid.Row="0" Grid.Column="2" />
+                        <Label Content="Rechnungszeitraum von" Grid.Row="0" Grid.Column="0" />
+                        <dxe:DateEdit MaskType="DateTimeAdvancingCaret" BorderThickness="1" Height="23" Margin="3" Grid.Row="0" Grid.Column="1" EditValue="{val:ValidationBinding Path=AbrechnungsZeitraumStart}" EditValueChanged="DateEdit_EditValueChanged"/>
+                        <Label Content="Rechnungszeitraum bis" Grid.Row="1" Grid.Column="0" />
+                        <dxe:DateEdit MaskType="DateTimeAdvancingCaret" BorderThickness="1" Height="23" Margin="3" Grid.Row="1" Grid.Column="1" EditValue="{val:ValidationBinding Path=AbrechnungsZeitraumEnde}" EditValueChanged="DateEdit2_EditValueChanged"/>
+                        <!--<Label Content="Annahmestelle" Grid.Row="0" Grid.Column="2" />
                         <uc:PopUpEdit IsReadOnly="True"
                                       x:Name="popupedit_DatenannahmestelleSearch"
                                       Grid.Column="3" Margin="3" Height="23" Grid.Row="0"
                                       DeleteButtonVisibility="Collapsed"
-                                      PopUpClick="popupedit_DatenannahmestelleSearch_PopUpClick" />
-                        <Label Content="GKV" Grid.Row="1" Grid.Column="2" />
+                                      PopUpClick="popupedit_DatenannahmestelleSearch_PopUpClick" />-->
+                        <Label Content="Organisation" Grid.Row="0" Grid.Column="2" />
                         <uc:PopUpEdit IsReadOnly="True"
                                       x:Name="popupedit_GkvSearch"
-                                      Grid.Column="3" Margin="3" Height="23" Grid.Row="1"
+                                      Grid.Column="3" Margin="3" Height="23" Grid.Row="0"
                                       DeleteButtonVisibility="Collapsed"
                                       PopUpClick="popupedit_GkvSearch_PopUpClick" />
                         <Label Content="Bemerkung" Grid.Row="0" Grid.Column="4" />
@@ -76,11 +76,11 @@
                         <dxg:GridControl.Columns>
                             <dxg:GridColumn x:Name="ColumnChecked" FieldName="IsChecked" Header=" " MinWidth="30"></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 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="RecipientString" Header="{markup:Translate EmpfängerSingular}" />-->
                             <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="TotalAmount" Header="Betrag" MinWidth="70">
                                 <dxg:GridColumn.EditSettings>
                                     <dxe:TextEditSettings DisplayFormat="c" Mask="c" MaskType="Numeric"></dxe:TextEditSettings>
diff --git a/BeWo/View/Detail/Accounting/NewGkvAbrechnungPopUpView .xaml.cs b/BeWo/View/Detail/Accounting/NewGkvAbrechnungPopUpView .xaml.cs
index 4be9b6dd8..d517b9e32 100644
--- a/BeWo/View/Detail/Accounting/NewGkvAbrechnungPopUpView .xaml.cs	
+++ b/BeWo/View/Detail/Accounting/NewGkvAbrechnungPopUpView .xaml.cs	
@@ -17,13 +17,15 @@ namespace BeWo.View.Detail.Accounting
 {
     public partial class NewGkvAbrechnungPopUpView : BeWoView
     {
+        private long? _LoadedInvoiceBaseOid;
+
         private List<InvoiceBaseDC> _InvoiceBaseDCs;
 
         private List<string> _InvoiceNumbers;
 
         private GkvAbrechnungVM _Viewmodel;
 
-        public event EventHandler<EventArgs<List<GkvAbrechnungDC>>> CreateButtonClicked;
+        public event EventHandler<EventArgs<GkvAbrechnungDC>> CreateButtonClicked;
 
         public event EventHandler CancelButtonClicked;
 
@@ -79,15 +81,14 @@ namespace BeWo.View.Detail.Accounting
                     _InvoiceBaseDCs[i].InvoiceNumber = this._InvoiceNumbers[i];
                 }
 
-                List<GkvAbrechnungDC> gkvAbrechnungen = new List<GkvAbrechnungDC>();
-                gkvAbrechnungen.Add(ViewModel.CommitToDataContract());
+                var gkvAbrechnung = ViewModel.CommitToDataContract();
 
-                this.CreateButtonClicked(this, new EventArgs<List<GkvAbrechnungDC>>(new List<GkvAbrechnungDC>(gkvAbrechnungen)));
+                this.CreateButtonClicked(this, new EventArgs<GkvAbrechnungDC>(gkvAbrechnung));
             }
         }
-
         public void Clear()
         {
+            _LoadedInvoiceBaseOid = null;
             popupedit_GkvSearch.Text = string.Empty;
             popupedit_GkvSearch.Focus();
         }
@@ -98,7 +99,6 @@ namespace BeWo.View.Detail.Accounting
                 ViewModel.InvoiceBases.Clear();
             this.CancelButtonClicked(this, e);
         }
-
         private void btn_create_Click(object sender, RoutedEventArgs e)
         {
             this.Fire();
@@ -130,12 +130,12 @@ namespace BeWo.View.Detail.Accounting
             gkvsearchview.ItemSelected += gkvsearchview_OrganisationSelected;
             popup_organisation.IsOpen = true;
         }
-
         private void gkvsearchview_OrganisationSelected(object sender, EventArgs<CompactOrganisationDC> e)
         {
             popup_organisation.IsOpen = false;
             gkvsearchview.ItemSelected -= gkvsearchview_OrganisationSelected;
 
+            ViewModel.IKKostenträger = e.Data.IKKostentrager;
             ViewModel.IKVersichertenKarte = e.Data.IKKrankenkasse;
             ViewModel.IKDatenannahmestelle = e.Data.IKDatenannahmestelle;
 
@@ -145,13 +145,16 @@ namespace BeWo.View.Detail.Accounting
             RefreshInvoiceBases(e.Data.OrganisationOid);
         }
 
-        private void RefreshInvoiceBases(long? gkvOid)
+        private void RefreshInvoiceBases() => RefreshInvoiceBases(_LoadedInvoiceBaseOid);
+        private void RefreshInvoiceBases(DateTime? start, DateTime? ende) => RefreshInvoiceBases(_LoadedInvoiceBaseOid, start ?? ViewModel?.AbrechnungsZeitraumStart, ende ?? ViewModel?.AbrechnungsZeitraumEnde);
+        private void RefreshInvoiceBases(long? costOid) => RefreshInvoiceBases(costOid, ViewModel?.AbrechnungsZeitraumStart, ViewModel?.AbrechnungsZeitraumEnde);
+        private void RefreshInvoiceBases(long? costOid, DateTime? start, DateTime? ende)
         {
-            var start = ViewModel.AbrechnungsZeitraumStart;
-            var ende = ViewModel.AbrechnungsZeitraumEnde;
-            if (gkvOid != null && start != null && ende != null && ende > start)
+            if (costOid != null && start != null && ende != null && ende >= start)
             {
-                ServiceFacade.DoAccountingServiceAsync(s => s.GetInvoiceBasesForCostBearerAndId(start, ende, (long) gkvOid, "RechnungSoziotherapie"), UpdateInvoiceList);
+                _LoadedInvoiceBaseOid = costOid;
+
+                ServiceFacade.DoAccountingServiceAsync(s => s.GetInvoiceBasesForCostBearerAndId(start, ende, (long)costOid, "RechnungSoziotherapie"), UpdateInvoiceList);
             }
         }
 
@@ -165,7 +168,7 @@ namespace BeWo.View.Detail.Accounting
                     foreach (var invoiceBaseDC in dcList)
                     {
                         InvoiceBaseVM invoiceBaseVM = new InvoiceBaseVM(invoiceBaseDC);
-                        invoiceBaseVM.IsChecked = true;
+                        invoiceBaseVM.IsChecked = false;
                         invoiceBaseVMs.Add(invoiceBaseVM);
                     }
                     ViewModel.InvoiceBases = invoiceBaseVMs;
@@ -220,5 +223,15 @@ namespace BeWo.View.Detail.Accounting
 
             return list;
         }
+
+        private void DateEdit_EditValueChanged(object sender, DevExpress.Xpf.Editors.EditValueChangedEventArgs e)
+        {
+            RefreshInvoiceBases((DateTime)e.NewValue, null);
+        }
+
+        private void DateEdit2_EditValueChanged(object sender, DevExpress.Xpf.Editors.EditValueChangedEventArgs e)
+        {
+            RefreshInvoiceBases(null, (DateTime)e.NewValue);
+        }
     }
 }
\ No newline at end of file
diff --git a/Dakota/Logic/DakotaManager.cs b/Dakota/Logic/DakotaManager.cs
index b3f8c49b9..f7ea852a6 100644
--- a/Dakota/Logic/DakotaManager.cs
+++ b/Dakota/Logic/DakotaManager.cs
@@ -19,6 +19,10 @@ namespace Dakota.Logic
         public Dictionary<string, InfoDateiNutzdaten> DakotaInfoNutzDict { get; set; }
         public Dictionary<string, InfoDateiAuftrags> DakotaInfoAufDict { get; set; }
 
+        public DakotaManager() : this(DateTime.Now.Month, DateTime.Now)
+        {
+
+        }
         public DakotaManager(int month, DateTime dateTime)
         {
             Month = month;
diff --git a/Service/ServiceContracts/IAccountingService.cs b/Service/ServiceContracts/IAccountingService.cs
index 86632a5fb..b0fac330e 100644
--- a/Service/ServiceContracts/IAccountingService.cs
+++ b/Service/ServiceContracts/IAccountingService.cs
@@ -152,10 +152,6 @@ namespace BeWo.Service.ServiceContracts
         [OperationContract]
         List<GkvAbrechnungDC> GetFilteredGkvAbrechnungen(GkvAbrechnungViewFilterDC gkvAbrechnungViewFilter);
 
-        [FaultContract(typeof(BeWoFault))]
-        [OperationContract]
-        GkvAbrechnungDC MakeNewGkvAbrechnung(GkvAbrechnungRequestDC abrechnungFilterDC);
-
         [FaultContract(typeof(BeWoFault))]
         [OperationContract]
         GkvAbrechnungResponseDC CreateNewGkvAbrechnung(GkvAbrechnungRequestDC request);
diff --git a/Service/ServiceImplementations/AccountingServiceImp.cs b/Service/ServiceImplementations/AccountingServiceImp.cs
index f4cd7c606..11414d8a4 100644
--- a/Service/ServiceImplementations/AccountingServiceImp.cs
+++ b/Service/ServiceImplementations/AccountingServiceImp.cs
@@ -729,9 +729,7 @@ namespace BeWo.Service.ServiceImplementations
             {
                 var gkv_abrechnung_dc = request.GkvAbrechnungDC;
 
-                var test_datetime = gkv_abrechnung_dc.AbrechnungsZeitraumStart.Value;
-
-                var manager = new DakotaManager(test_datetime.Month, DateTime.Now);
+                var manager = new DakotaManager();
 
                 var mandatordc = new OperationsServiceImp().GetMandator();
 
@@ -818,11 +816,6 @@ namespace BeWo.Service.ServiceImplementations
             return response;
         }
 
-        public GkvAbrechnungDC MakeNewGkvAbrechnung(GkvAbrechnungRequestDC abrechnungFilterDC)
-        {
-            return null;
-        }
-
         public List<long> InsertNewGkvAbrechnungen(List<GkvAbrechnungDC> dcList)
         {
             try