Index: WS/TBX/SFS/OrderServiceInternal.cls.xml
===================================================================
diff -u -r2 -r10
--- WS/TBX/SFS/OrderServiceInternal.cls.xml	(.../OrderServiceInternal.cls.xml)	(revision 2)
+++ WS/TBX/SFS/OrderServiceInternal.cls.xml	(.../OrderServiceInternal.cls.xml)	(revision 10)
@@ -4,7 +4,7 @@
 <Description>
 Web service for SFS to confirm orders
 This is the internal version, called by our proxy running in the DMZ</Description>
-<IncludeCode>vhLib.Macro</IncludeCode>
+<IncludeCode>APPS.TBXWeb</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%SOAP.WebService</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
@@ -15,20 +15,6 @@
 <Default>OrderServiceInternal</Default>
 </Parameter>
 
-<Parameter name="LOCATION">
-<Description>
-URL for invoking the WebService.</Description>
-<Default>http://iserv.vanhoecke.be/csp/hadev</Default>
-</Parameter>
-
-<Parameter name="LOCATIONxxWWW01xxHADEV">
-<Default>http://iserv.vanhoecke.be/csp/hadev</Default>
-</Parameter>
-
-<Parameter name="LOCATIONxxCACHE02xxDEVADMIN1">
-<Default>http://cache02/csp/admin1</Default>
-</Parameter>
-
 <Parameter name="NAMESPACE">
 <Description>
 SOAP Namespace for the WebService</Description>
@@ -71,9 +57,9 @@
 	If 'scSaved Do  Do ..ReturnFault(##class(WS.WSServerFault).%New("Order not saved", ..#SERVICENAME, "CO")) 
 	. Do oLogger.Error("SAVE_wsORD","EDInr: "_EDInr_" not saved : "_$$ParseStatus^vhLib.System(scSaved))
 
-	
 	Set scOrdered = ##class(APPS.TBXWeb.OrderHandling).Order(wsID,"VHEPN","SFS")
-	If 'scOrdered Do  Do ..ReturnFault(##class(WS.WSServerFault).%New("Order not confirmed", ..#SERVICENAME, "CO")) 
+	If 'scOrdered Do  Do ..ReturnFault(##class(WS.WSServerFault).%New(SFSMessage, ..#SERVICENAME, "CO")) 
+	. Set SFSMessage = ..GetSFSMessage(scOrdered)
 	. Do oLogger.Error("wsORD_ORDER","Order not confirmed : "_$$ParseStatus^vhLib.System(scOrdered))
 	
 	Do oLogger.Info("wsORD_ORDER","Order "_EDInr_" ordered")
@@ -83,5 +69,13 @@
 	//Quit ##class(ConfirmOrderResult).%New(EDInr,$$ProductieDagen^FLOWHALUX())
 ]]></Implementation>
 </Method>
+
+<Method name="GetSFSMessage">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Status:%Status</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit $select($$$GETERRORCODE(Status)=$$$errStartTypeIncorrect:"Order already confirmed",1:"Order not confirmed")
+]]></Implementation>
+</Method>
 </Class>
 </Export>