Index: EXT/Optima/CalculPrix/dto/Request/LadeTAX.cls.xml
===================================================================
diff -u -r31844 -r31917
--- EXT/Optima/CalculPrix/dto/Request/LadeTAX.cls.xml	(.../LadeTAX.cls.xml)	(revision 31844)
+++ EXT/Optima/CalculPrix/dto/Request/LadeTAX.cls.xml	(.../LadeTAX.cls.xml)	(revision 31917)
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="EXT.Optima.CalculPrix.dto.Request.LadeTAX">
-<Super>EXT.Optima.CalculPrix.dto.Request.Lade</Super>
+<Super>%RegisteredObject,%XML.Adaptor,EXT.Optima.CalculPrix.dto.Request.Lade</Super>
 
+<Parameter name="XMLTYPE">
+<Default>Optima.CalculPrix.dto.Request.LadeTAX</Default>
+</Parameter>
+
 <Property name="LadeBinnenKleur">
 <Type>EXT.Optima.String</Type>
 </Property>
@@ -22,88 +26,6 @@
 <Property name="KoppelingType">
 <Type>EXT.Optima.String</Type>
 </Property>
-
-<Storage name="Default">
-<Type>%Library.CacheSerialState</Type>
-<Data name="LadeState">
-<Subscript>"Lade"</Subscript>
-<Value name="1">
-<Value>Klasse</Value>
-</Value>
-<Value name="2">
-<Value>LadeKleur</Value>
-</Value>
-<Value name="3">
-<Value>BodemKleur</Value>
-</Value>
-<Value name="4">
-<Value>LadeHoogte</Value>
-</Value>
-<Value name="5">
-<Value>LadeDiepte</Value>
-</Value>
-<Value name="6">
-<Value>IsBinnenlade</Value>
-</Value>
-<Value name="7">
-<Value>FrontBevestiging</Value>
-</Value>
-<Value name="8">
-<Value>CorpusBreedte</Value>
-</Value>
-<Value name="9">
-<Value>IsBinnenbreedte</Value>
-</Value>
-<Value name="10">
-<Value>CorpusWandDikte</Value>
-</Value>
-<Value name="11">
-<Value>HeeftOpvullijstLinks</Value>
-</Value>
-<Value name="12">
-<Value>HeeftOpvullijstRechts</Value>
-</Value>
-<Value name="13">
-<Value>OpvullijstKleur</Value>
-</Value>
-<Value name="14">
-<Value>Draagkracht</Value>
-</Value>
-<Value name="15">
-<Value>GeleiderTechnologie</Value>
-</Value>
-<Value name="16">
-<Value>HeeftZijstabilisering</Value>
-</Value>
-<Value name="17">
-<Value>VerpakkingType</Value>
-</Value>
-<Value name="18">
-<Value>HeeftMat</Value>
-</Value>
-<Value name="19">
-<Value>MatMateriaal</Value>
-</Value>
-<Value name="20">
-<Value>MatKleur</Value>
-</Value>
-<Value name="21">
-<Value>LadeBinnenKleur</Value>
-</Value>
-<Value name="22">
-<Value>FrontEindkapKleur</Value>
-</Value>
-<Value name="23">
-<Value>GlijderType</Value>
-</Value>
-<Value name="24">
-<Value>HeeftDiepteVerstelling</Value>
-</Value>
-<Value name="25">
-<Value>KoppelingType</Value>
-</Value>
-</Data>
-</Storage>
 </Class>
 
 
Index: EXT/Optima/CalculPrix/dto/Response.cls.xml
===================================================================
diff -u -r31868 -r31917
--- EXT/Optima/CalculPrix/dto/Response.cls.xml	(.../Response.cls.xml)	(revision 31868)
+++ EXT/Optima/CalculPrix/dto/Response.cls.xml	(.../Response.cls.xml)	(revision 31917)
@@ -1,14 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="EXT.Optima.CalculPrix.dto.Response">
-<Super>TECH.DataTransferObject,EXT.Response</Super>
+<Super>%RegisteredObject,%XML.Adaptor,EXT.Response</Super>
 
+<Parameter name="XMLTYPE">
+<Default>Optima.CalculPrix.dto.Response</Default>
+</Parameter>
+
 <Property name="KostPrijs">
 <Type>%Numeric</Type>
+<Parameter name="XMLNAME" value="Prix"/>
 </Property>
 
 <Property name="ErrorCode">
+<Description><![CDATA[
+Code = 0 : Succes 
+Code > 0 : Paramètre(s) mauvais, code binaire, p.e. 37 (= 1+4+32) 
+Code < 0 : Erreur de système VH / problème de service. ]]></Description>
 <Type>%String</Type>
+<Parameter name="XMLNAME" value="CodeErreur"/>
 </Property>
 </Class>
 
Index: EXT/Optima/CalculPrix/dto/Request.cls.xml
===================================================================
diff -u -r31868 -r31917
--- EXT/Optima/CalculPrix/dto/Request.cls.xml	(.../Request.cls.xml)	(revision 31868)
+++ EXT/Optima/CalculPrix/dto/Request.cls.xml	(.../Request.cls.xml)	(revision 31917)
@@ -1,22 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="EXT.Optima.CalculPrix.dto.Request">
-<Super>TECH.DataTransferObject,EXT.Request</Super>
+<Super>%RegisteredObject,%XML.Adaptor,EXT.Request</Super>
 
+<Parameter name="XMLTYPE">
+<Default>Optima.CalculPrix.dto.Request</Default>
+</Parameter>
+
 <Property name="Aantal">
 <Type>%Numeric</Type>
+<Parameter name="XMLNAME" value="Quantite"/>
 </Property>
 
 <Property name="OfferteID">
 <Type>%Numeric</Type>
+<Parameter name="XMLNAME" value="OffreID"/>
+<Parameter name="XMLPROJECTION" value="None"/>
 </Property>
 
 <Property name="LijnID">
 <Type>%Numeric</Type>
+<Parameter name="XMLNAME" value="LigneID"/>
+<Parameter name="XMLPROJECTION" value="None"/>
 </Property>
 
-<Property name="EdiProductEigenschappen">
-<Type>zTryout.WV.APPS.EC.dto.EdiProductEigenschappen</Type>
+<Property name="Lade">
+<Type>EXT.Optima.CalculPrix.dto.Request.LadeTAX</Type>
+<Parameter name="XMLNAME" value="TiroirTAX"/>
 </Property>
 </Class>
 
Index: APPS/EDI/PrijsBerekening/dto/Resultaat.cls.xml
===================================================================
diff -u -r31833 -r31917
--- APPS/EDI/PrijsBerekening/dto/Resultaat.cls.xml	(.../Resultaat.cls.xml)	(revision 31833)
+++ APPS/EDI/PrijsBerekening/dto/Resultaat.cls.xml	(.../Resultaat.cls.xml)	(revision 31917)
@@ -6,6 +6,10 @@
 <Property name="KostPrijs">
 <Type>%Numeric</Type>
 </Property>
+
+<Property name="Exceptie">
+<Type>TECH.Exceptions.Exception</Type>
+</Property>
 </Class>
 
 
Index: vhUnitTest/EXT/Optima/CalculPrix/impl/RequestVerwerker/Verwerk/Test.cls.xml
===================================================================
diff -u -r31835 -r31917
--- vhUnitTest/EXT/Optima/CalculPrix/impl/RequestVerwerker/Verwerk/Test.cls.xml	(.../Test.cls.xml)	(revision 31835)
+++ vhUnitTest/EXT/Optima/CalculPrix/impl/RequestVerwerker/Verwerk/Test.cls.xml	(.../Test.cls.xml)	(revision 31917)
@@ -6,24 +6,39 @@
 <Method name="Test">
 <Implementation><![CDATA[
 	#dim DummyAantal As %Numeric = 33
+	#dim DummyLadeDiepte As %Numeric = 550
 	
 	Set RequestVerwerker = ##class(EXT.Optima.CalculPrix.impl.RequestVerwerker).%New()
 	Set Request = ##class(EXT.Optima.CalculPrix.dto.Request).%New()
 	Set Request.Aantal = DummyAantal
+	Set Request.Lade = ##class(EXT.Optima.CalculPrix.dto.Request.LadeTAX).%New()
+	Set Request.Lade.LadeDiepte = DummyLadeDiepte
+	
 	#dim EDIAanvraag As APPS.EDI.PrijsBerekening.dto.Aanvraag = RequestVerwerker.Verwerk(Request)
 	
+	Set VerwachteEDIProduct = ##class(APPS.EDI.common.dto.v001.LadeTAX).%New()
+	Set VerwachteEDIProduct.LadeDiepte = DummyLadeDiepte
+	Do ..AssertProductMetIK(EDIAanvraag.Product,VerwachteEDIProduct)
+
 	Set VerwachteEDIAanvraag = ##class(APPS.EDI.PrijsBerekening.dto.Aanvraag).%New()
 	Set VerwachteEDIAanvraag.KlantID = "VoorlopigKlantID"
 	Set VerwachteEDIAanvraag.Aantal = DummyAantal
+	Set VerwachteEDIAanvraag.Product = EDIAanvraag.Product   ; EDIProduct is reeds apart getest. Hier gelijkzetten want sub-object moet zelfde oref hebben! 
 	Do ..AssertAanvraag(EDIAanvraag,VerwachteEDIAanvraag)
 ]]></Implementation>
 </Method>
 
 <Method name="AssertAanvraag">
 <FormalSpec>EDIAanvraag:APPS.EDI.PrijsBerekening.dto.Aanvraag,VerwachteEDIAanvraag:APPS.EDI.PrijsBerekening.dto.Aanvraag</FormalSpec>
-<Implementation><![CDATA[	Do $$$AssertObject(EDIAanvraag,VerwachteEDIAanvraag)
+<Implementation><![CDATA[	Do $$$AssertObject(EDIAanvraag,VerwachteEDIAanvraag,"EDIAanvraag-object")
 ]]></Implementation>
 </Method>
+
+<Method name="AssertProductMetIK">
+<FormalSpec>EDIProduct:APPS.EDI.common.dto.Product,VerwachteEDIProduct:APPS.EDI.common.dto.Product</FormalSpec>
+<Implementation><![CDATA[	Do $$$AssertObject(EDIProduct,VerwachteEDIProduct,"EDI ProductMetIK-object")
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/EDI/common/dto/Product.cls.xml
===================================================================
diff -u -r31870 -r31917
--- APPS/EDI/common/dto/Product.cls.xml	(.../Product.cls.xml)	(revision 31870)
+++ APPS/EDI/common/dto/Product.cls.xml	(.../Product.cls.xml)	(revision 31917)
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.EDI.common.dto.Product">
-<Super>TECH.RegisteredObject,%XML.Adaptor</Super>
+<Super>TECH.DataTransferObject</Super>
+
+<Parameter name="XMLTYPE">
+<Default>APPS.EDI.common.dto.Product</Default>
+</Parameter>
 </Class>
 
 
Index: APPS/EDI/common/dto/v001/LadeTAX.cls.xml
===================================================================
diff -u -r31870 -r31917
--- APPS/EDI/common/dto/v001/LadeTAX.cls.xml	(.../LadeTAX.cls.xml)	(revision 31870)
+++ APPS/EDI/common/dto/v001/LadeTAX.cls.xml	(.../LadeTAX.cls.xml)	(revision 31917)
@@ -3,6 +3,10 @@
 <Class name="APPS.EDI.common.dto.v001.LadeTAX">
 <Super>APPS.EDI.common.dto.v001.Lade</Super>
 
+<Parameter name="XMLTYPE">
+<Default>APPS.EDI.common.dto.v001.LadeTAX</Default>
+</Parameter>
+
 <Parameter name="XMLNAME">
 <Default>LadeTAX</Default>
 </Parameter>
Index: EXT/Optima/CalculPrix/impl/RequestVerwerker.cls.xml
===================================================================
diff -u -r31868 -r31917
--- EXT/Optima/CalculPrix/impl/RequestVerwerker.cls.xml	(.../RequestVerwerker.cls.xml)	(revision 31868)
+++ EXT/Optima/CalculPrix/impl/RequestVerwerker.cls.xml	(.../RequestVerwerker.cls.xml)	(revision 31917)
@@ -13,9 +13,21 @@
 	If EDIAanvraag.Aantal = "" {
 		Set EDIAanvraag.Aantal = 1
 	}
+	Set EDIAanvraag.Product = ..ConverteerProduct(Request.Lade)
 	Quit EDIAanvraag
 ]]></Implementation>
 </Method>
+
+<Method name="ConverteerProduct">
+<FormalSpec>Lade:EXT.Optima.CalculPrix.dto.Request.LadeTAX</FormalSpec>
+<ReturnType>APPS.EDI.common.dto.Product</ReturnType>
+<Implementation><![CDATA[
+	Set LadeTAX = ##class(APPS.EDI.common.dto.v001.LadeTAX).%New()
+	Set LadeTAX.LadeDiepte = Lade.LadeDiepte
+	
+	Quit LadeTAX
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/EDI/common/dto/v001/LadeLBX.cls.xml
===================================================================
diff -u -r31870 -r31917
--- APPS/EDI/common/dto/v001/LadeLBX.cls.xml	(.../LadeLBX.cls.xml)	(revision 31870)
+++ APPS/EDI/common/dto/v001/LadeLBX.cls.xml	(.../LadeLBX.cls.xml)	(revision 31917)
@@ -3,6 +3,10 @@
 <Class name="APPS.EDI.common.dto.v001.LadeLBX">
 <Super>APPS.EDI.common.dto.v001.Lade</Super>
 
+<Parameter name="XMLTYPE">
+<Default>APPS.EDI.common.dto.v001.LadeLBX</Default>
+</Parameter>
+
 <Parameter name="XMLNAME">
 <Default>LadeLBX</Default>
 </Parameter>
Index: APPS/EDI/common/dto/v001/Lade.cls.xml
===================================================================
diff -u -r31870 -r31917
--- APPS/EDI/common/dto/v001/Lade.cls.xml	(.../Lade.cls.xml)	(revision 31870)
+++ APPS/EDI/common/dto/v001/Lade.cls.xml	(.../Lade.cls.xml)	(revision 31917)
@@ -4,6 +4,10 @@
 <Abstract>1</Abstract>
 <Super>APPS.EDI.common.dto.Product</Super>
 
+<Parameter name="XMLTYPE">
+<Default>APPS.EDI.common.dto.v001.Lade</Default>
+</Parameter>
+
 <Property name="Klasse">
 <Type>TECH.String</Type>
 </Property>
Index: EXT/Optima/CalculPrix/dto/Request/Lade.cls.xml
===================================================================
diff -u -r31844 -r31917
--- EXT/Optima/CalculPrix/dto/Request/Lade.cls.xml	(.../Lade.cls.xml)	(revision 31844)
+++ EXT/Optima/CalculPrix/dto/Request/Lade.cls.xml	(.../Lade.cls.xml)	(revision 31917)
@@ -2,10 +2,19 @@
 <Export generator="Cache" version="24">
 <Class name="EXT.Optima.CalculPrix.dto.Request.Lade">
 <Abstract>1</Abstract>
-<Super>%SerialObject,%XML.Adaptor</Super>
 
+<UDLText name="T">
+<Content><![CDATA[
+/*
+Parameter XMLTYPE = "Optima.CalculPrix.dto.Request.Lade";
+*/
+]]></Content>
+</UDLText>
+
 <Property name="Klasse">
 <Type>EXT.Optima.String</Type>
+<Parameter name="OptimaErrorCode" value="1"/>
+<Parameter name="XMLNAME" value="CL"/>
 </Property>
 
 <Property name="LadeKleur">
@@ -83,75 +92,6 @@
 <Property name="MatKleur">
 <Type>EXT.Optima.String</Type>
 </Property>
-
-<Storage name="Default">
-<Type>%Library.CacheSerialState</Type>
-<State>LadeState</State>
-<StreamLocation>^EXT.Optima.CalculPrix7CDC.LadeS</StreamLocation>
-<Data name="LadeState">
-<Subscript>"Lade"</Subscript>
-<Value name="1">
-<Value>Klasse</Value>
-</Value>
-<Value name="2">
-<Value>LadeKleur</Value>
-</Value>
-<Value name="3">
-<Value>BodemKleur</Value>
-</Value>
-<Value name="4">
-<Value>LadeHoogte</Value>
-</Value>
-<Value name="5">
-<Value>LadeDiepte</Value>
-</Value>
-<Value name="6">
-<Value>IsBinnenlade</Value>
-</Value>
-<Value name="7">
-<Value>FrontBevestiging</Value>
-</Value>
-<Value name="8">
-<Value>CorpusBreedte</Value>
-</Value>
-<Value name="9">
-<Value>IsBinnenbreedte</Value>
-</Value>
-<Value name="10">
-<Value>CorpusWandDikte</Value>
-</Value>
-<Value name="11">
-<Value>HeeftOpvullijstLinks</Value>
-</Value>
-<Value name="12">
-<Value>HeeftOpvullijstRechts</Value>
-</Value>
-<Value name="13">
-<Value>OpvullijstKleur</Value>
-</Value>
-<Value name="14">
-<Value>Draagkracht</Value>
-</Value>
-<Value name="15">
-<Value>GeleiderTechnologie</Value>
-</Value>
-<Value name="16">
-<Value>HeeftZijstabilisering</Value>
-</Value>
-<Value name="17">
-<Value>VerpakkingType</Value>
-</Value>
-<Value name="18">
-<Value>HeeftMat</Value>
-</Value>
-<Value name="19">
-<Value>MatMateriaal</Value>
-</Value>
-<Value name="20">
-<Value>MatKleur</Value>
-</Value>
-</Data>
-</Storage>
 </Class>
 
 
Index: vhUnitTest/EXT/Optima/CalculPrix/impl/ResponseVerwerker/Verwerk/Test.cls.xml
===================================================================
diff -u -r31872 -r31917
--- vhUnitTest/EXT/Optima/CalculPrix/impl/ResponseVerwerker/Verwerk/Test.cls.xml	(.../Test.cls.xml)	(revision 31872)
+++ vhUnitTest/EXT/Optima/CalculPrix/impl/ResponseVerwerker/Verwerk/Test.cls.xml	(.../Test.cls.xml)	(revision 31917)
@@ -21,7 +21,7 @@
 
 <Method name="AssertResponse">
 <FormalSpec>Response:EXT.Optima.CalculPrix.dto.Response,VerwachteResponse:EXT.Optima.CalculPrix.dto.Response</FormalSpec>
-<Implementation><![CDATA[	;Do $$$AssertObject(Response,VerwachteResponse)
+<Implementation><![CDATA[	Do $$$AssertObject(Response,VerwachteResponse)
 ]]></Implementation>
 </Method>
 </Class>
Index: EXT/Optima/Parameters.cls.xml
===================================================================
diff -u -r31844 -r31917
--- EXT/Optima/Parameters.cls.xml	(.../Parameters.cls.xml)	(revision 31844)
+++ EXT/Optima/Parameters.cls.xml	(.../Parameters.cls.xml)	(revision 31917)
@@ -3,13 +3,9 @@
 <Class name="EXT.Optima.Parameters">
 <Abstract>1</Abstract>
 
-<Parameter name="OptiTAG">
+<Parameter name="OptimaErrorCode">
 <Type>%String</Type>
 </Parameter>
-
-<Parameter name="OptiErrorCode">
-<Type>%String</Type>
-</Parameter>
 </Class>
 
 
Index: vhUnitTest/APPS/EDI/PrijsBerekening/impl/PrijsBerekeningService/FakeForDEV/GeefPrijs/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/EDI/PrijsBerekening/impl/PrijsBerekeningService/FakeForDEV/GeefPrijs/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/EDI/PrijsBerekening/impl/PrijsBerekeningService/FakeForDEV/GeefPrijs/Test.cls.xml	(revision 31917)
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.EDI.PrijsBerekening.impl.PrijsBerekeningService.FakeForDEV.GeefPrijs.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Property name="Service">
+<Type>APPS.EDI.PrijsBerekening.PrijsBerekeningService</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	Set ..Service = ##class(APPS.EDI.PrijsBerekening.impl.PrijsBerekeningService.FakeForDEV).%New()
+]]></Implementation>
+</Method>
+
+<Method name="TestCorrecteAanvraag">
+<Implementation><![CDATA[
+	#dim EDIAanvraag As APPS.EDI.PrijsBerekening.dto.Aanvraag = ..MaakEDIAanvraagTAX(1,520)
+
+	#dim EDIResultaat As APPS.EDI.PrijsBerekening.dto.Resultaat = ..Service.GeefPrijs(EDIAanvraag)
+
+	#dim VerwachtResultaat As APPS.EDI.PrijsBerekening.dto.Resultaat = ##class(APPS.EDI.PrijsBerekening.dto.Resultaat).%New()
+	Set VerwachtResultaat.KostPrijs = 999.52
+	Do ..AssertResultaat(EDIResultaat,VerwachtResultaat)
+]]></Implementation>
+</Method>
+
+<Method name="TestFouteAanvraagOngekendeBug">
+<Implementation><![CDATA[
+	#dim EDIAanvraag As APPS.EDI.PrijsBerekening.dto.Aanvraag = ..MaakEDIAanvraagTAX(1,601)
+	
+	#dim OmschrijvingSubStrings As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("-1010;Ongekende bug bij VH")
+	Set VerwachteExceptie = ##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.GeneralErrorException",OmschrijvingSubStrings)
+	
+	Do ..AssertGeefPrijsMetFouteAanvraag(EDIAanvraag,VerwachteExceptie)
+]]></Implementation>
+</Method>
+
+<Method name="AssertGeefPrijsMetFouteAanvraag">
+<FormalSpec>EDIAanvraag:APPS.EDI.PrijsBerekening.dto.Aanvraag,VerwachteExceptie:Tools.Test.VerwachteExceptie</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim EDIResultaat As APPS.EDI.PrijsBerekening.dto.Resultaat = ..Service.GeefPrijs(EDIAanvraag)
+
+	Do ..AssertGeldigeExceptie(EDIResultaat.Exceptie,VerwachteExceptie)
+
+	#dim VerwachtResultaat As APPS.EDI.PrijsBerekening.dto.Resultaat = ##class(APPS.EDI.PrijsBerekening.dto.Resultaat).%New()
+	Set VerwachtResultaat.KostPrijs = ""
+	Set VerwachtResultaat.Exceptie = EDIResultaat.Exceptie   ; Exceptie is reeds apart getest. Hier gelijkzetten want sub-object moet zelfde oref hebben! 
+	Do ..AssertResultaat(EDIResultaat,VerwachtResultaat)
+]]></Implementation>
+</Method>
+
+<Method name="AssertGeldigeExceptie">
+<FormalSpec>Exception:TECH.Exceptions.Exception,VerwachteExceptie:Tools.Test.VerwachteExceptie</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Set Validator = ##class(Tools.Test.ExceptieValidator).%New(Exception, VerwachteExceptie)
+	#dim Message As %String = ##class(TECH.ListUtils).ListToPieces(Validator.GeefBezwaren(),"\")
+	Do $$$AssertTrue(Validator.IsGeldig(),"Exceptie-object: "_Message)
+]]></Implementation>
+</Method>
+
+<Method name="AssertResultaat">
+<FormalSpec>EDIResultaat:APPS.EDI.Resultaat,VerwachtResultaat:APPS.EDI.Resultaat</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[	Do $$$AssertObject(EDIResultaat,VerwachtResultaat,"Resultaat-object")
+]]></Implementation>
+</Method>
+
+<Method name="MaakEDIAanvraagTAX">
+<FormalSpec>Aantal:%Numeric=1,LadeDiepte:%Numeric=""</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.EDI.Aanvraag</ReturnType>
+<Implementation><![CDATA[
+	Set EDIAanvraag = ##class(APPS.EDI.PrijsBerekening.dto.Aanvraag).%New()
+	Set EDIAanvraag.Aantal = Aantal
+	Set EDIAanvraag.Product = ##class(APPS.EDI.common.dto.v001.LadeTAX).%New()
+	Set EDIAanvraag.Product.LadeDiepte = LadeDiepte
+	Quit EDIAanvraag
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/EDI/PrijsBerekening/dto/Aanvraag.cls.xml
===================================================================
diff -u -r31833 -r31917
--- APPS/EDI/PrijsBerekening/dto/Aanvraag.cls.xml	(.../Aanvraag.cls.xml)	(revision 31833)
+++ APPS/EDI/PrijsBerekening/dto/Aanvraag.cls.xml	(.../Aanvraag.cls.xml)	(revision 31917)
@@ -3,8 +3,10 @@
 <Class name="APPS.EDI.PrijsBerekening.dto.Aanvraag">
 <Super>APPS.EDI.Aanvraag</Super>
 
-<Property name="IngegevenKenmerken">
-<Type>APPS.PM.Maatwerk.dto.IngegevenKenmerken</Type>
+<Property name="Product">
+<Description>
+Property IngegevenKenmerken As APPS.PM.Maatwerk.dto.IngegevenKenmerken;</Description>
+<Type>APPS.EDI.common.dto.Product</Type>
 </Property>
 
 <Property name="Aantal">
Index: APPS/EDI/PrijsBerekening/impl/PrijsBerekeningService.cls.xml
===================================================================
diff -u -r31833 -r31917
--- APPS/EDI/PrijsBerekening/impl/PrijsBerekeningService.cls.xml	(.../PrijsBerekeningService.cls.xml)	(revision 31833)
+++ APPS/EDI/PrijsBerekening/impl/PrijsBerekeningService.cls.xml	(.../PrijsBerekeningService.cls.xml)	(revision 31917)
@@ -8,10 +8,33 @@
 <ReturnType>APPS.EDI.PrijsBerekening.dto.Resultaat</ReturnType>
 <Implementation><![CDATA[
 	Set Resultaat = ##class(APPS.EDI.PrijsBerekening.dto.Resultaat).%New()
-	Set Resultaat.KostPrijs = 99.99 * EDIAanvraag.Aantal
+	try {
+		#dim IngegevenKenmerken As APPS.PM.Maatwerk.dto.IngegevenKenmerken = ..GeefIngegevenKenmerken(EDIAanvraag)
+		Set Resultaat.KostPrijs = ..BerekenKostPrijs(IngegevenKenmerken,EDIAanvraag.Aantal)
+	} catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch("TECH.Exceptions.GeneralErrorException")
+		Set Resultaat.KostPrijs = ""
+		Set Resultaat.Exceptie = Exception
+	}
 	Quit Resultaat
 ]]></Implementation>
 </Method>
+
+<Method name="BerekenKostPrijs">
+<FormalSpec>IngegevenKenmerken:APPS.PM.Maatwerk.dto.IngegevenKenmerken,Aantal:%Numeric</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Numeric</ReturnType>
+<Implementation><![CDATA[	Quit 99.99 * Aantal
+]]></Implementation>
+</Method>
+
+<Method name="GeefIngegevenKenmerken">
+<FormalSpec>EDIAanvraag:APPS.EDI.PrijsBerekening.dto.Aanvraag</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.PM.Maatwerk.dto.IngegevenKenmerken</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/EDI/PrijsBerekening/PrijsBerekeningService.cls.xml
===================================================================
diff -u -r31833 -r31917
--- APPS/EDI/PrijsBerekening/PrijsBerekeningService.cls.xml	(.../PrijsBerekeningService.cls.xml)	(revision 31833)
+++ APPS/EDI/PrijsBerekening/PrijsBerekeningService.cls.xml	(.../PrijsBerekeningService.cls.xml)	(revision 31917)
@@ -7,8 +7,8 @@
 <Method name="GeefPrijs">
 <Description>
 EDIAanvraag bevat : IngegevenKenmerken As APPS.PM.Maatwerk.dto.IngegevenKenmerken, Klant As DOM.VKP.KlantID, Personality As DOM.common.enu.Personality</Description>
-<FormalSpec>EDIAanvraag:APPS.EDI.Aanvraag</FormalSpec>
-<ReturnType>APPS.EDI.Resultaat</ReturnType>
+<FormalSpec>EDIAanvraag:APPS.EDI.PrijsBerekening.dto.Aanvraag</FormalSpec>
+<ReturnType>APPS.EDI.PrijsBerekening.dto.Resultaat</ReturnType>
 </Method>
 </Class>
 
Index: EXT/Optima/CalculPrix/ServiceWeb.cls.xml
===================================================================
diff -u -r31868 -r31917
--- EXT/Optima/CalculPrix/ServiceWeb.cls.xml	(.../ServiceWeb.cls.xml)	(revision 31868)
+++ EXT/Optima/CalculPrix/ServiceWeb.cls.xml	(.../ServiceWeb.cls.xml)	(revision 31917)
@@ -3,45 +3,59 @@
 <Class name="EXT.Optima.CalculPrix.ServiceWeb">
 <Super>vhLib.WebService</Super>
 
+<Parameter name="SERVICENAME">
+<Default>Optima.Calculation.Service</Default>
+</Parameter>
+
 <Method name="PeekServer">
-<WebMethod>1</WebMethod>
+<Private>1</Private>
 <Implementation><![CDATA[	Quit
 ]]></Implementation>
 </Method>
 
 <Method name="CalculerTAORBOX2">
-<FormalSpec>Aantal:%Numeric,OfferteID:%Numeric,LijnID:%Numeric,PdlEdiProductEigenschappen:%String</FormalSpec>
+<FormalSpec>Aantal:%Numeric="",OfferteID:%Numeric="",LijnID:%Numeric="",pdlLadeEigenschappen:%String=""</FormalSpec>
+<Private>1</Private>
 <ReturnType>EXT.Optima.CalculPrix.dto.Response</ReturnType>
-<WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	Set Request = ##class(EXT.Optima.CalculPrix.dto.Request).%New()
-	Set Request.Aantal = Aantal
-	Set Request.OfferteID = OfferteID
-	Set Request.LijnID = LijnID
-	Set Request.EdiProductEigenschappen = ""   ; ##class(x).%New()
-
-	#dim Response As EXT.Optima.CalculPrix.dto.Response = ..CalculerTAORBOX(Request)
-	;d WLIP^vhDBG(97,"Test "_$$ObjToText^vhLib(Response))
+	#dim Request As EXT.Optima.CalculPrix.dto.Request = ..MaakRequestDto(Aantal,OfferteID,LijnID,pdlLadeEigenschappen)
+	#dim Response As EXT.Optima.CalculPrix.dto.Response = ..CalculerTiroir(Request)
 	Quit Response
 ]]></Implementation>
 </Method>
 
-<Method name="CalculerTAORBOX">
-<FormalSpec>Request:EXT.Optima.CalculPrix.dto.Request</FormalSpec>
+<Method name="CalculerTiroir">
+<FormalSpec>Demande: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(Request)
+	#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)
 	
+	;d WLIP^vhDBG(97,"Test "_$$ObjToText^vhLib(Response))
 	Quit Response
 ]]></Implementation>
 </Method>
+
+<Method name="MaakRequestDto">
+<FormalSpec>Aantal:%Numeric="",OfferteID:%Numeric="",LijnID:%Numeric="",pdlLadeEigenschappen:%String=""</FormalSpec>
+<Private>1</Private>
+<ReturnType>EXT.Optima.CalculPrix.dto.Request</ReturnType>
+<Implementation><![CDATA[
+	Set Request = ##class(EXT.Optima.CalculPrix.dto.Request).%New()
+	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.LadeDiepte = $P(pdlLadeEigenschappen,";",1)
+	Quit Request
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/EDI/PrijsBerekening/impl/PrijsBerekeningService/FakeForDEV.cls.xml
===================================================================
diff -u -r31871 -r31917
--- APPS/EDI/PrijsBerekening/impl/PrijsBerekeningService/FakeForDEV.cls.xml	(.../FakeForDEV.cls.xml)	(revision 31871)
+++ APPS/EDI/PrijsBerekening/impl/PrijsBerekeningService/FakeForDEV.cls.xml	(.../FakeForDEV.cls.xml)	(revision 31917)
@@ -8,13 +8,33 @@
 <ReturnType>APPS.EDI.PrijsBerekening.dto.Resultaat</ReturnType>
 <Implementation><![CDATA[
 	Set Resultaat = ##class(APPS.EDI.PrijsBerekening.dto.Resultaat).%New()
-	#dim IngegevenKenmerken As zTryout.WV.APPS.EC.dto.EdiLadeEigenschappen.TAX = EDIAanvraag.IngegevenKenmerken
+	try {
+		#dim IngegevenKenmerken As APPS.PM.Maatwerk.dto.IngegevenKenmerken = ..GeefIngegevenKenmerken(EDIAanvraag)
+		Set Resultaat.KostPrijs = ..BerekenKostPrijs(IngegevenKenmerken,EDIAanvraag.Aantal)
+	} catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch("TECH.Exceptions.GeneralErrorException")
+		Set Resultaat.KostPrijs = ""
+		Set Resultaat.Exceptie = Exception
+	}
+	
+	Quit Resultaat
+]]></Implementation>
+</Method>
+
+<Method name="BerekenKostPrijs">
+<FormalSpec>IngegevenKenmerken:APPS.PM.Maatwerk.dto.IngegevenKenmerken,Aantal:%Numeric</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Numeric</ReturnType>
+<Implementation><![CDATA[
+	If IngegevenKenmerken.LadeDiepte = 601 {
+		Do ##class(TECH.Exceptions.GeneralErrorException).Throw("-1010;Ongekende bug bij VH")
+	}
+	
 	#dim DummyKostVoorLadeDiepte As %Numeric = 0.99
 	If $IsObject(IngegevenKenmerken) {
-		Set DummyKostVoorLadeDiepte = EDIAanvraag.IngegevenKenmerken.LadeDiepte/100
+		Set DummyKostVoorLadeDiepte = IngegevenKenmerken.LadeDiepte/1000
 	}
-	Set Resultaat.KostPrijs = (999.00 + DummyKostVoorLadeDiepte) * EDIAanvraag.Aantal
-	Quit Resultaat
+	Quit (999.00 + DummyKostVoorLadeDiepte) * Aantal
 ]]></Implementation>
 </Method>
 
@@ -23,8 +43,10 @@
 <Private>1</Private>
 <ReturnType>APPS.PM.Maatwerk.dto.IngegevenKenmerken</ReturnType>
 <Implementation><![CDATA[
-	#dim IngegevenKenmerken As zTryout.WV.APPS.EC.dto.EdiLadeEigenschappen.TAX = EDIAanvraag.IngegevenKenmerken
+	#dim LadeTAX As APPS.EDI.common.dto.v001.LadeTAX = EDIAanvraag.Product
 	Set IngegevenKenmerken = ##class(APPS.PM.Maatwerk.dto.TAORKenmerken).%New()
+	Set IngegevenKenmerken.LadeDiepte = LadeTAX.LadeDiepte
+	
 	Quit IngegevenKenmerken
 ]]></Implementation>
 </Method>