diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs index aeb9a8f7f..020a95e78 100644 --- a/BeWo/BeWoApp.xaml.cs +++ b/BeWo/BeWoApp.xaml.cs @@ -436,7 +436,10 @@ namespace BeWo showMultipleResourceColors = true; } - switch (_Mandator.BeWoClientType) + val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.AllowStorno); + AppSettings.AllowStorno = val != null && val.Equals("1"); + + switch (_Mandator.BeWoClientType) { case 1: //Die Kette diff --git a/BeWo/Core/Config/AppSettings.cs b/BeWo/Core/Config/AppSettings.cs index f7d668fe7..c10084a79 100644 --- a/BeWo/Core/Config/AppSettings.cs +++ b/BeWo/Core/Config/AppSettings.cs @@ -365,6 +365,8 @@ namespace BeWo.Core.Config public bool DontShowSpitzabrechnung { get; set; } public bool ShowDienstplanung { get; set; } + public bool AllowStorno { get; set; } + public bool ShowEmployeeSignature { get; set; } public bool SetStartTimeToEndTimeAfterSave { get; set; } diff --git a/BeWo/ServiceProxy/Generated.cs b/BeWo/ServiceProxy/Generated.cs index b0b412947..b9e694694 100644 --- a/BeWo/ServiceProxy/Generated.cs +++ b/BeWo/ServiceProxy/Generated.cs @@ -8377,6 +8377,10 @@ namespace BeWo.ServiceProxy [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAccountingService/UpdateInvoiceNumberList", ReplyAction="http://tempuri.org/IAccountingService/UpdateInvoiceNumberListResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAccountingService/UpdateInvoiceNumberListBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] System.Collections.Generic.List UpdateInvoiceNumberList(System.Collections.Generic.List dclist); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAccountingService/StorniereInvoiceBases", ReplyAction="http://tempuri.org/IAccountingService/StorniereInvoiceBasesResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAccountingService/StorniereInvoiceBasesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + void StorniereInvoiceBases(System.Collections.Generic.List invoices); } [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] @@ -8552,6 +8556,11 @@ namespace BeWo.ServiceProxy { return base.Channel.UpdateInvoiceNumberList(dclist); } + + public void StorniereInvoiceBases(System.Collections.Generic.List invoices) + { + base.Channel.StorniereInvoiceBases(invoices); + } } [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] diff --git a/BeWo/View/Detail/Accounting/InvoiceOverview.xaml b/BeWo/View/Detail/Accounting/InvoiceOverview.xaml index 8072ce729..693bdbb14 100644 --- a/BeWo/View/Detail/Accounting/InvoiceOverview.xaml +++ b/BeWo/View/Detail/Accounting/InvoiceOverview.xaml @@ -19,7 +19,7 @@ - + @@ -31,7 +31,8 @@