Konflikte gelöst
This commit is contained in:
@@ -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]
|
||||
|
||||
Reference in New Issue
Block a user