diff --git a/BeWo/DebugConfig.cs b/BeWo/DebugConfig.cs index 14f7d7b81..668901304 100644 --- a/BeWo/DebugConfig.cs +++ b/BeWo/DebugConfig.cs @@ -122,8 +122,8 @@ namespace BeWo new DebugConfig() { DebugConfigMode = DebugConfigMode.FeatureDakota, - AutoLogin = false, - SelectView = UIContext.Administration, + AutoLogin = true, + SelectView = UIContext.Finance, SelectIndex = 8, //Username = "m1", //Password = "bewobewo", diff --git a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml index 05d8d8c87..cd6ce3e36 100644 --- a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml +++ b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml @@ -142,21 +142,14 @@ Padding="0" HorizontalAlignment="Center" VerticalAlignment="Center" + VerticalContentAlignment="Center" + HorizontalContentAlignment="Center" Click="btn_details_Click" - FontFamily="Webdings" - FontSize="12" + FontFamily="Wingdings" + FontSize="8" Foreground="#FFFFFF" ToolTip="Details anzeigen"> - + 1 @@ -197,10 +190,11 @@ Padding="0" HorizontalAlignment="Center" VerticalAlignment="Center" - FontFamily="Webdings" + TextAlignment="Center" + FontFamily="Wingdings 2" FontSize="12" Foreground="#FFFFFF" - Text="¥" /> + Text="0" /> @@ -222,13 +216,13 @@ + Text="1" /> diff --git a/Service/DCEntityMapper/GkvAbrechnungDC_GkvAbrechnung.cs b/Service/DCEntityMapper/GkvAbrechnungDC_GkvAbrechnung.cs index 45a4a3f76..556d4266b 100644 --- a/Service/DCEntityMapper/GkvAbrechnungDC_GkvAbrechnung.cs +++ b/Service/DCEntityMapper/GkvAbrechnungDC_GkvAbrechnung.cs @@ -130,9 +130,6 @@ namespace BeWo.Service.DCEntityMapper MapperFactory.GkvTransferProtokollDC_GkvTransferprotokoll.MergeWithEntitys(pDataContract.TransferProtokolle, pEntity.GkvTransferProtokolle); - if (pEntity.InvoiceBases is null) - pEntity.InvoiceBases = new List(); - pEntity.InvoiceBases = DAOFactory.GenericDAO.LoadByIDs(pDataContract.InvoiceBases.Select(x => x.InvoiceBaseOid.Value)); //MapperFactory.InvoiceBaseDC_InvoiceBase.MergeWithEntitys(pDataContract.InvoiceBases, pEntity.InvoiceBases);