Konflikte gelöst

This commit is contained in:
2022-12-30 16:41:42 +01:00
711 changed files with 286305 additions and 163186 deletions

View File

@@ -467,7 +467,11 @@ namespace BeWo.Service.ServiceContracts
[OperationContract]
String GetLicenseOrderUrl();
[FaultContract(typeof (BeWoFault))]
[FaultContract(typeof(BeWoFault))]
[OperationContract]
String GetLicenseOrderUrlNeu(String type);
[FaultContract(typeof (BeWoFault))]
[OperationContract]
LicenseInfoDC GetLicenseInfo();
@@ -1059,9 +1063,9 @@ namespace BeWo.Service.ServiceContracts
[OperationContract]
List<ServiceRecordDC> GetServiceRecordsByIds(List<long> serviceRecordOids);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
List<EmployeeDC> GetAbsenceOverview(AbsenceOverviewFilterDC filter);
//[FaultContract(typeof(BeWoFault))]
//[OperationContract]
//List<EmployeeDC> GetAbsenceOverview(AbsenceOverviewFilterDC filter);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
@@ -1233,9 +1237,9 @@ namespace BeWo.Service.ServiceContracts
[OperationContract]
List<RatingTypeDC> GetRatingTypesByOids(List<long> ratingTypeOids);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
UrlaubsplanerRootDC BuildUrlaubsplanerRootObject(AbsenceOverviewFilterDC filter);
//[FaultContract(typeof(BeWoFault))]
//[OperationContract]
//UrlaubsplanerRootDC BuildUrlaubsplanerRootObject(AbsenceOverviewFilterDC filter);
[FaultContract(typeof(BeWoFault))]
[OperationContract]