Index: EXT/Optima/CalculPrix/ServiceWeb.cls.xml
===================================================================
diff -u -r31917 -r31932
--- EXT/Optima/CalculPrix/ServiceWeb.cls.xml	(.../ServiceWeb.cls.xml)	(revision 31917)
+++ EXT/Optima/CalculPrix/ServiceWeb.cls.xml	(.../ServiceWeb.cls.xml)	(revision 31932)
@@ -4,9 +4,13 @@
 <Super>vhLib.WebService</Super>
 
 <Parameter name="SERVICENAME">
-<Default>Optima.Calculation.Service</Default>
+<Default>Optima.CalculPrix.Service</Default>
 </Parameter>
 
+<Parameter name="NAMESPACE">
+<Default>http://vanhoecke.be</Default>
+</Parameter>
+
 <Method name="PeekServer">
 <Private>1</Private>
 <Implementation><![CDATA[	Quit
@@ -25,18 +29,25 @@
 </Method>
 
 <Method name="CalculerTiroir">
-<FormalSpec>Demande:EXT.Optima.CalculPrix.dto.Request</FormalSpec>
+<FormalSpec>Request:EXT.Optima.CalculPrix.dto.Request</FormalSpec>
 <ReturnType>EXT.Optima.CalculPrix.dto.Response</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
 	Set RequestVerwerker = ##class(EXT.Optima.CalculPrix.impl.RequestVerwerker).%New()
 	Set Service = ##class(APPS.EDI.PrijsBerekening.impl.PrijsBerekeningService.FakeForDEV).%New()
 	Set ResponseVerwerker = ##class(EXT.Optima.CalculPrix.impl.ResponseVerwerker).%New()
 
-	#dim EDIAanvraag As APPS.EDI.PrijsBerekening.dto.Aanvraag = RequestVerwerker.Verwerk(Demande)
-	#dim EDIResultaat As APPS.EDI.Resultaat = Service.GeefPrijs(EDIAanvraag)
-	#dim Response As EXT.Optima.CalculPrix.dto.Response = ResponseVerwerker.Verwerk(EDIResultaat)
+	#dim EDIAanvraag As APPS.EDI.PrijsBerekening.dto.Aanvraag = RequestVerwerker.Verwerk(Request)
+	#dim EDIResultaat As APPS.EDI.PrijsBerekening.dto.Resultaat = Service.GeefPrijs(EDIAanvraag)
 	
+	#dim Response As EXT.Optima.CalculPrix.dto.Response
+	If $IsObject(EDIResultaat.Exceptie) {
+		Set Response = ResponseVerwerker.VerwerkExceptie(EDIResultaat.Exceptie)
+	}
+	Else {
+		Set Response = ResponseVerwerker.Verwerk(EDIResultaat)		
+	}
+	
 	;d WLIP^vhDBG(97,"Test "_$$ObjToText^vhLib(Response))
 	Quit Response
 ]]></Implementation>
@@ -51,7 +62,7 @@
 	Set Request.Aantal = Aantal
 	Set Request.OfferteID = OfferteID
 	Set Request.LijnID = LijnID
-	Set Request.Lade = ##class(EXT.Optima.CalculPrix.dto.Request.LadeTAX).%New()
+	Set Request.Lade = ##class(EXT.Optima.CalculPrix.dto.Request.TiroirTAORBOX).%New()
 	Set Request.Lade.LadeDiepte = $P(pdlLadeEigenschappen,";",1)
 	Quit Request
 ]]></Implementation>