Index: WS/TBX/OrderService/Verwerker.cls.xml
===================================================================
diff -u -r320 -r419
--- WS/TBX/OrderService/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 320)
+++ WS/TBX/OrderService/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 419)
@@ -5,6 +5,7 @@
 <IncludeCode>APPS.TBXWeb</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="OHRequester">
 <Type>APPS.TBXWeb.enu.TBXHandel</Type>
@@ -40,20 +41,20 @@
 
 <Method name="OpenWSOrder">
 <FormalSpec>EDInr:%Integer</FormalSpec>
-<ReturnType>WS.TBX.Order</ReturnType>
+<ReturnType>WS.TBX.OrderAbstract</ReturnType>
 <Implementation><![CDATA[
 	if '$length(EDInr) {
 		Do ..Logger.Error("CHK_EDI","EDI not provided")
 		Do ##class(TECH.ExceptionHandler).Throw(##class(WS.TBX.OrderService.VerwerkingException).%New("EDI not provided")) 
 	}
 	
-	Set wsID = ##class(WS.TBX.Order).IDViaEDINr(EDInr)
+	Set wsID = ##class(WS.TBX.OrderAbstract).IDViaEDINr(EDInr)
 	If wsID="" {
 		Do ..Logger.Error("CHK_EDI","EDI "_EDInr_" not existing")
 		Do ##class(TECH.ExceptionHandler).Throw(##class(WS.TBX.OrderService.VerwerkingException).%New("EDI not existing")) 
 	}
 
-	Set wsOrder = ##class(WS.TBX.Order).%OpenId(wsID)
+	Set wsOrder = ##class(WS.TBX.OrderAbstract).%OpenId(wsID)
 	If '$IsObject(wsOrder) {
 		Do ..Logger.Error("OPEN_wsORD","EDI "_EDInr_" not existing")
 		Do ##class(TECH.ExceptionHandler).Throw(##class(WS.TBX.OrderService.VerwerkingException).%New("EDI not existing")) 
@@ -66,7 +67,7 @@
 </Method>
 
 <Method name="SaveWSOrder">
-<FormalSpec>wsOrder:WS.TBX.Order</FormalSpec>
+<FormalSpec>wsOrder:WS.TBX.OrderAbstract</FormalSpec>
 <Implementation><![CDATA[
 	Set scSaved = wsOrder.%Save()
 	If 'scSaved {
@@ -77,7 +78,7 @@
 </Method>
 
 <Method name="SubmitWSOrder">
-<FormalSpec>wsOrder:WS.TBX.Order</FormalSpec>
+<FormalSpec>wsOrder:WS.TBX.OrderAbstract</FormalSpec>
 <Implementation><![CDATA[
 	Set OHShop=##class(APPS.TBXWeb.enu.TBXHandel).VanHoecke()
 	Set OHRequester=..OHRequester
Index: WS/TBX/Order.cls.xml
===================================================================
diff -u -r415 -r419
--- WS/TBX/Order.cls.xml	(.../Order.cls.xml)	(revision 415)
+++ WS/TBX/Order.cls.xml	(.../Order.cls.xml)	(revision 419)
@@ -803,17 +803,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="IDViaEDINr">
-<ClassMethod>1</ClassMethod>
-<FormalSpec>EDINr:%String,blnCheckID:%Boolean=1</FormalSpec>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	Quit:($G(EDINr)="") ""
-	Set ID=$S($IsValidNum(EDINr)&&(EDINr>1000000):(EDINr-1000000), 1:EDINr)
-	Quit $S('$G(blnCheckID,1):ID, ..%ExistsId(ID):ID, 1:"")
-]]></Implementation>
-</Method>
-
 <Method name="DomainLookUp">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>Domain:%String,lbFieldName:%List</FormalSpec>
Index: WS/TBX/OrderAbstract.cls.xml
===================================================================
diff -u -r415 -r419
--- WS/TBX/OrderAbstract.cls.xml	(.../OrderAbstract.cls.xml)	(revision 415)
+++ WS/TBX/OrderAbstract.cls.xml	(.../OrderAbstract.cls.xml)	(revision 419)
@@ -310,6 +310,17 @@
 ]]></Implementation>
 </Method>
 
+<Method name="IDViaEDINr">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>EDINr:%String,blnCheckID:%Boolean=1</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Quit:($G(EDINr)="") ""
+	Set ID=$S($IsValidNum(EDINr)&&(EDINr>1000000):(EDINr-1000000), 1:EDINr)
+	Quit $S('$G(blnCheckID,1):ID, ..%ExistsId(ID):ID, 1:"")
+]]></Implementation>
+</Method>
+
 <Method name="GeefOrderReferentie">
 <Abstract>1</Abstract>
 <ReturnType>%String</ReturnType>