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 9a75e6159..50987243c 100644 --- a/BeWo/ServiceProxy/Generated.cs +++ b/BeWo/ServiceProxy/Generated.cs @@ -1972,6 +1972,11 @@ namespace BeWo.ServiceProxy [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/UpdateQuittierungsbelegsstatusBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] BS.Shared.DataContracts.QuittierungsbelegsstatusDC UpdateQuittierungsbelegsstatus(BS.Shared.DataContracts.QuittierungsbelegsstatusDC quittierungsbelegsstatusDC); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetActiveMedVerListOidForCustomer", ReplyAction="http://tempuri.org/ICustomerService/GetActiveMedVerListOidForCustomerResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetActiveMedVerListOidForCustomerBeWoFaultFau" + + "lt", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + System.Nullable GetActiveMedVerListOidForCustomer(long customerOid); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/UpdateCustomersAbsenceTimes", ReplyAction="http://tempuri.org/ICustomerService/UpdateCustomersAbsenceTimesResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/UpdateCustomersAbsenceTimesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] void UpdateCustomersAbsenceTimes(long pCustomerOid, System.Collections.Generic.List pAbsenceTimes); @@ -2815,6 +2820,11 @@ namespace BeWo.ServiceProxy return base.Channel.UpdateQuittierungsbelegsstatus(quittierungsbelegsstatusDC); } + public System.Nullable GetActiveMedVerListOidForCustomer(long customerOid) + { + return base.Channel.GetActiveMedVerListOidForCustomer(customerOid); + } + public void UpdateCustomersAbsenceTimes(long pCustomerOid, System.Collections.Generic.List pAbsenceTimes) { base.Channel.UpdateCustomersAbsenceTimes(pCustomerOid, pAbsenceTimes); @@ -4737,6 +4747,10 @@ namespace BeWo.ServiceProxy [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IResourceService/LoadFilteredAllActiveAppointmentsBeWoFaultFau" + "lt", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] System.Collections.Generic.List LoadFilteredAllActiveAppointments(long employeeOid, System.DateTime start, System.DateTime end, System.Collections.Generic.List customerOids); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IResourceService/LoadOccurrencesByRecurrenceId", ReplyAction="http://tempuri.org/IResourceService/LoadOccurrencesByRecurrenceIdResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IResourceService/LoadOccurrencesByRecurrenceIdBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + System.Collections.Generic.List LoadOccurrencesByRecurrenceId(string recurrenceId); } [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] @@ -5037,6 +5051,11 @@ namespace BeWo.ServiceProxy { return base.Channel.LoadFilteredAllActiveAppointments(employeeOid, start, end, customerOids); } + + public System.Collections.Generic.List LoadOccurrencesByRecurrenceId(string recurrenceId) + { + return base.Channel.LoadOccurrencesByRecurrenceId(recurrenceId); + } } [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] @@ -8332,6 +8351,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")] @@ -8507,6 +8530,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 @@