Index: APPS/EDI/common/impl/ProductConverter.cls.xml
===================================================================
diff -u -r36971 -r36972
--- APPS/EDI/common/impl/ProductConverter.cls.xml	(.../ProductConverter.cls.xml)	(revision 36971)
+++ APPS/EDI/common/impl/ProductConverter.cls.xml	(.../ProductConverter.cls.xml)	(revision 36972)
@@ -41,17 +41,16 @@
 <FormalSpec>Product:APPS.EDI.common.dto.Product,Opties:TECH.KeyValue.List</FormalSpec>
 <ReturnType>APPS.PM.Maatwerk.dto.IngegevenKenmerken</ReturnType>
 <Implementation><![CDATA[
-	#dim KlantID As %String
 	If Opties.GetValuesForKey("KlantID").Count() > 0 {
-		Set KlantID = Opties.GetValuesForKey("KlantID").GetAt(1)
+		#dim KlantID As %String = Opties.GetValuesForKey("KlantID").GetAt(1)
 	} Else {
-		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.IllegalArgumentException).%New("Verkeerde KlantID"))
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.IllegalArgumentException).%New("KlantID niet opgegeven"))
 	}
 	
 	If Opties.GetValuesForKey("PersonalityID").Count() > 0 {
 		Set ..PersonalityID = Opties.GetValuesForKey("PersonalityID").GetAt(1)
 	} Else {
-		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.IllegalArgumentException).%New("Verkeerde PersonalityID"))
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.IllegalArgumentException).%New("PersonalityID niet opgegeven"))
 	}
 	
 	#dim IngegevenKenmerken As APPS.PM.Maatwerk.dto.IngegevenKenmerken = ..ConverteerNaarIngegevenKenmerken(Product)
@@ -98,6 +97,34 @@
 ]]></Implementation>
 </Method>
 
+<Property name="ConvertDataTAX">
+<Type>TECH.ObjectUtils.ObjectConvertData</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="ConvertDataTAXGet">
+<Private>1</Private>
+<ReturnType>TECH.ObjectUtils.ObjectConvertData</ReturnType>
+<Implementation><![CDATA[
+	set r%ConvertDataTAX = $$$LazyLoad(r%ConvertDataTAX,..GeefConvertDataTAX())
+	quit r%ConvertDataTAX
+]]></Implementation>
+</Method>
+
+<Property name="ConvertDataLBX">
+<Type>TECH.ObjectUtils.ObjectConvertData</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="ConvertDataLBXGet">
+<Private>1</Private>
+<ReturnType>TECH.ObjectUtils.ObjectConvertData</ReturnType>
+<Implementation><![CDATA[
+	set r%ConvertDataLBX = $$$LazyLoad(r%ConvertDataLBX,..GeefConvertDataLBX())
+	quit r%ConvertDataLBX
+]]></Implementation>
+</Method>
+
 <Method name="GeefUitsparingCode">
 <FormalSpec>UitsparingBreedte:%Numeric,Product:APPS.EDI.common.dto.v001.LadeLBX</FormalSpec>
 <Private>1</Private>
@@ -224,34 +251,6 @@
 	Quit ConvertData
 ]]></Implementation>
 </Method>
-
-<Property name="ConvertDataTAX">
-<Type>TECH.ObjectUtils.ObjectConvertData</Type>
-<Private>1</Private>
-</Property>
-
-<Method name="ConvertDataTAXGet">
-<Private>1</Private>
-<ReturnType>TECH.ObjectUtils.ObjectConvertData</ReturnType>
-<Implementation><![CDATA[
-	set r%ConvertDataTAX = $$$LazyLoad(r%ConvertDataTAX,..GeefConvertDataTAX())
-	quit r%ConvertDataTAX
-]]></Implementation>
-</Method>
-
-<Property name="ConvertDataLBX">
-<Type>TECH.ObjectUtils.ObjectConvertData</Type>
-<Private>1</Private>
-</Property>
-
-<Method name="ConvertDataLBXGet">
-<Private>1</Private>
-<ReturnType>TECH.ObjectUtils.ObjectConvertData</ReturnType>
-<Implementation><![CDATA[
-	set r%ConvertDataLBX = $$$LazyLoad(r%ConvertDataLBX,..GeefConvertDataLBX())
-	quit r%ConvertDataLBX
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: APPS/EDI/PrijsBerekening/impl/PrijsBerekeningService/EDIAanvraagConvertor.cls.xml
===================================================================
diff -u -r35851 -r36972
--- APPS/EDI/PrijsBerekening/impl/PrijsBerekeningService/EDIAanvraagConvertor.cls.xml	(.../EDIAanvraagConvertor.cls.xml)	(revision 35851)
+++ APPS/EDI/PrijsBerekening/impl/PrijsBerekeningService/EDIAanvraagConvertor.cls.xml	(.../EDIAanvraagConvertor.cls.xml)	(revision 36972)
@@ -3,8 +3,8 @@
 <Class name="APPS.EDI.PrijsBerekening.impl.PrijsBerekeningService.EDIAanvraagConvertor">
 <Super>TECH.RegisteredObject,APPS.EDI.PrijsBerekening.PrijsBerekeningService</Super>
 
-<Property name="PersonalityID">
-<Type>DOM.common.enu.Personality</Type>
+<Property name="ProductConverter">
+<Type>APPS.EDI.common.impl.ProductConverter</Type>
 <Private>1</Private>
 </Property>
 
@@ -13,13 +13,19 @@
 <Private>1</Private>
 </Property>
 
+<Property name="PersonalityID">
+<Type>DOM.common.enu.Personality</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..PersonalityID = ##class(DOM.common.enu.Personality).VanHoecke()
+	Set ..ProductConverter = ##class(APPS.EDI.common.impl.ProductConverter).%New()
 	Set ..ConvertData = ..GeefConvertDataTAX()
 	Quit $$$OK
 ]]></Implementation>
@@ -38,9 +44,7 @@
 	#dim ConvertOpties As TECH.KeyValue.List = ##class(TECH.KeyValue.List).%New()
 	Do ConvertOpties.InsertKeyValue("KlantID",EDIAanvraag.KlantID)
 	Do ConvertOpties.InsertKeyValue("PersonalityID",..PersonalityID)
-	Set ProductConverter = ##class(APPS.EDI.common.impl.ProductConverter).%New()
-
-	Quit ProductConverter.Convert(EDIAanvraag.Product,,ConvertOpties)
+	Quit ..ProductConverter.Convert(EDIAanvraag.Product,ConvertOpties)
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/APPS/EDI/common/impl/ProductConverter/Convert/Test.cls.xml
===================================================================
diff -u -r36971 -r36972
--- vhUnitTest/APPS/EDI/common/impl/ProductConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 36971)
+++ vhUnitTest/APPS/EDI/common/impl/ProductConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 36972)
@@ -5,86 +5,85 @@
 
 <Method name="Test LBX, klant 1000">
 <Implementation><![CDATA[
-	#dim Product As APPS.EDI.common.dto.v001.LadeLBX = ##class(vhTest.Utils.APPS.EDI.common.dto.LadeLBX).StandaardLade()
+	#dim LadeLBX As APPS.EDI.common.dto.v001.LadeLBX = ##class(vhTest.Utils.APPS.EDI.common.dto.LadeLBX).StandaardLade()
 	
 	#dim ConvertOpties As TECH.KeyValue.List = ##class(TECH.KeyValue.List).%New()
 	Do ConvertOpties.InsertKeyValue("KlantID","K||1000")
 	Do ConvertOpties.InsertKeyValue("PersonalityID","1")
 	
 	Set ProductConverter = ##class(APPS.EDI.common.impl.ProductConverter).%New()
-	#dim Resultaat As APPS.PM.Maatwerk.dto.LBXKenmerken = ProductConverter.Convert(Product,ConvertOpties)
+	#dim LBXKenmerken As APPS.PM.Maatwerk.dto.LBXKenmerken = ProductConverter.Convert(LadeLBX,ConvertOpties)
 	
 	Set Enum = ##class(DOM.PM.Maatwerk.LBX.impl.BaseEnums).%New()
-	Do $$$AssertEquals(Resultaat.AantalDwarsverdelingen,"")
-	Do $$$AssertEquals(Resultaat.BodemKleur,Enum.BodemKleur.Donkergrijs)
-	Do $$$AssertEquals(Resultaat.CorpusBreedte,875)
-	Do $$$AssertEquals(Resultaat.CorpusWandDikte,16)
-	Do $$$AssertEquals(Resultaat.Draagkracht,Enum.Draagkracht.Draagkracht70)
-	Do $$$AssertEquals(Resultaat.FrontBevestiging,Enum.FrontBevestiging.Schroef)
-	Do $$$AssertEquals(Resultaat.GeleiderTechnologie,Enum.GeleiderTechnologie.BLUMOTION)
-	Do $$$AssertEquals(Resultaat.HeeftDwarsverdeling,$$$False)
-	Do $$$AssertEquals(Resultaat.HeeftOpvullijstLinks,$$$False)
-	Do $$$AssertEquals(Resultaat.HeeftOpvullijstRechts,$$$False)
-	Do $$$AssertEquals(Resultaat.HeeftZijstabilisering,$$$False)
-	Do $$$AssertEquals(Resultaat.IsBinnenbreedte,$$$False)
-	Do $$$AssertEquals(Resultaat.IsBinnenlade,$$$False)
-	Do $$$AssertEquals(Resultaat.Klasse,Enum.Klasse.Lade)
-	Do $$$AssertEquals(Resultaat.LadeDiepte,Enum.LadeDiepte.LadeDiepte550)
-	Do $$$AssertEquals(Resultaat.LadeHoogte,Enum.LadeHoogte.C)
-	Do $$$AssertEquals(Resultaat.LadeKleur,Enum.LadeKleur.Oriongrijs)
-	Do $$$AssertEquals(Resultaat.OpvullijstKleur,"")
-	Do $$$AssertEquals(Resultaat.RugHoogte,Enum.LadeHoogte.C)
-	Do $$$AssertEquals(Resultaat.RugWandMateriaal,Enum.RugWandMateriaal.Hout)
-	Do $$$AssertEquals(Resultaat.UitsparingDataAantalUitsparingen,"")
-	Do $$$AssertEquals(Resultaat.UitsparingDataBreedteM,"")
-	Do $$$AssertEquals(Resultaat.UitsparingDataBreedteX,"")
-	Do $$$AssertEquals(Resultaat.UitsparingDataBreedteY,"")
-	Do $$$AssertEquals(Resultaat.UitsparingDataCodeZ1,"")
-	Do $$$AssertEquals(Resultaat.UitsparingDataCodeZ2,"")
-	Do $$$AssertEquals(Resultaat.VerpakkingType,Enum.VerpakkingType.V1)
-	Do $$$AssertEquals(Resultaat.ZijWandType,Enum.ZijwandType.Pure)
-	Do $$$AssertEquals(Resultaat.NietMeeleveren.Count(),0)
+	Do $$$AssertEquals(LBXKenmerken.AantalDwarsverdelingen,"")
+	Do $$$AssertEquals(LBXKenmerken.BodemKleur,Enum.BodemKleur.Donkergrijs)
+	Do $$$AssertEquals(LBXKenmerken.CorpusBreedte,875)
+	Do $$$AssertEquals(LBXKenmerken.CorpusWandDikte,16)
+	Do $$$AssertEquals(LBXKenmerken.Draagkracht,Enum.Draagkracht.Draagkracht70)
+	Do $$$AssertEquals(LBXKenmerken.FrontBevestiging,Enum.FrontBevestiging.Schroef)
+	Do $$$AssertEquals(LBXKenmerken.GeleiderTechnologie,Enum.GeleiderTechnologie.BLUMOTION)
+	Do $$$AssertEquals(LBXKenmerken.HeeftDwarsverdeling,$$$False)
+	Do $$$AssertEquals(LBXKenmerken.HeeftOpvullijstLinks,$$$False)
+	Do $$$AssertEquals(LBXKenmerken.HeeftOpvullijstRechts,$$$False)
+	Do $$$AssertEquals(LBXKenmerken.HeeftZijstabilisering,$$$False)
+	Do $$$AssertEquals(LBXKenmerken.IsBinnenbreedte,$$$False)
+	Do $$$AssertEquals(LBXKenmerken.IsBinnenlade,$$$False)
+	Do $$$AssertEquals(LBXKenmerken.Klasse,Enum.Klasse.Lade)
+	Do $$$AssertEquals(LBXKenmerken.LadeDiepte,Enum.LadeDiepte.LadeDiepte550)
+	Do $$$AssertEquals(LBXKenmerken.LadeHoogte,Enum.LadeHoogte.C)
+	Do $$$AssertEquals(LBXKenmerken.LadeKleur,Enum.LadeKleur.Oriongrijs)
+	Do $$$AssertEquals(LBXKenmerken.OpvullijstKleur,"")
+	Do $$$AssertEquals(LBXKenmerken.RugHoogte,Enum.LadeHoogte.C)
+	Do $$$AssertEquals(LBXKenmerken.RugWandMateriaal,Enum.RugWandMateriaal.Hout)
+	Do $$$AssertEquals(LBXKenmerken.UitsparingDataAantalUitsparingen,"")
+	Do $$$AssertEquals(LBXKenmerken.UitsparingDataBreedteM,"")
+	Do $$$AssertEquals(LBXKenmerken.UitsparingDataBreedteX,"")
+	Do $$$AssertEquals(LBXKenmerken.UitsparingDataBreedteY,"")
+	Do $$$AssertEquals(LBXKenmerken.UitsparingDataCodeZ1,"")
+	Do $$$AssertEquals(LBXKenmerken.UitsparingDataCodeZ2,"")
+	Do $$$AssertEquals(LBXKenmerken.VerpakkingType,Enum.VerpakkingType.V1)
+	Do $$$AssertEquals(LBXKenmerken.ZijWandType,Enum.ZijwandType.Pure)
+	Do $$$AssertEquals(LBXKenmerken.NietMeeleveren.Count(),0)
 ]]></Implementation>
 </Method>
 
 <Method name="Test TAX, klant 1000">
 <Implementation><![CDATA[
-	#dim Product As APPS.EDI.common.dto.v001.LadeTAX = ##class(vhTest.Utils.APPS.EDI.common.dto.LadeTAX).StandaardLade()
-	Set Resultaat = ##class(APPS.PM.Maatwerk.dto.TAORKenmerken).%New()
+	#dim LadeTAX As APPS.EDI.common.dto.v001.LadeTAX = ##class(vhTest.Utils.APPS.EDI.common.dto.LadeTAX).StandaardLade()
 	
 	#dim ConvertOpties As TECH.KeyValue.List = ##class(TECH.KeyValue.List).%New()
 	Do ConvertOpties.InsertKeyValue("KlantID","K||1000")
 	Do ConvertOpties.InsertKeyValue("PersonalityID","1")
 	
 	Set ProductConverter = ##class(APPS.EDI.common.impl.ProductConverter).%New()
-	Set Resultaat = ProductConverter.Convert(Product,Resultaat,ConvertOpties)
+	#dim TAORKenmerken As APPS.PM.Maatwerk.dto.TAORKenmerken = ProductConverter.Convert(LadeTAX,ConvertOpties)
 	
 	Set Enum = ##class(DOM.PM.Maatwerk.TAX.impl.BaseEnums).%New()
-	Do $$$AssertEquals(Resultaat.BodemKleur,Enum.BodemKleur.NatuurNotenhout)
-	Do $$$AssertEquals(Resultaat.CorpusBreedte,600)
-	Do $$$AssertEquals(Resultaat.CorpusWandDikte,"")
-	Do $$$AssertEquals(Resultaat.Draagkracht,Enum.Draagkracht.Draagkracht40)
-	Do $$$AssertEquals(Resultaat.FrontBevestiging,Enum.FrontBevestiging.Drevel)
-	Do $$$AssertEquals(Resultaat.FrontEindkapKleur,Enum.FrontEindkapKleur.AluminiumLook)
-	Do $$$AssertEquals(Resultaat.GeleiderTechnologie,Enum.GeleiderTechnologie.BLUMOTION)
-	Do $$$AssertEquals(Resultaat.GlijderType,Enum.GlijderType.Movento)
-	Do $$$AssertEquals(Resultaat.HeeftDiepteVerstelling,$$$False)
-	Do $$$AssertEquals(Resultaat.HeeftOpvullijstLinks,$$$False)
-	Do $$$AssertEquals(Resultaat.HeeftOpvullijstRechts,$$$False)
-	Do $$$AssertEquals(Resultaat.HeeftZijstabilisering,$$$False)
-	Do $$$AssertEquals(Resultaat.IsBinnenbreedte,$$$True)
-	Do $$$AssertEquals(Resultaat.IsBinnenlade,$$$False)
-	Do $$$AssertEquals(Resultaat.KoppelingType,"Schroef")
-	Do $$$AssertEquals(Resultaat.LadeBinnenKleur,Enum.LadeKleur.NatuurNotenhout)
-	Do $$$AssertEquals(Resultaat.LadeDiepte,Enum.LadeDiepte.LadeDiepte500)
-	Do $$$AssertEquals(Resultaat.LadeHoogte,Enum.LadeHoogte.C)
-	Do $$$AssertEquals(Resultaat.LadeKleur,Enum.LadeKleur.NatuurNotenhout)
-	Do $$$AssertEquals(Resultaat.LosseComponent,"")
-	Do $$$AssertEquals(Resultaat.OpvullijstKleur,"")
-	Do $$$AssertEquals(Resultaat.VerpakkingType,Enum.VerpakkingType.V1)
-	Do $$$AssertEquals(Resultaat.RugHoogte,Enum.LadeHoogte.C)
-	Do $$$AssertEquals(Resultaat.Uittrekbaarheid,##class(DOM.PM.enu.TAORUittrekbaarheid).Volledig())
-	Do $$$AssertEquals(Resultaat.NietMeeleveren.Count(),0)
+	Do $$$AssertEquals(TAORKenmerken.BodemKleur,Enum.BodemKleur.NatuurNotenhout)
+	Do $$$AssertEquals(TAORKenmerken.CorpusBreedte,600)
+	Do $$$AssertEquals(TAORKenmerken.CorpusWandDikte,"")
+	Do $$$AssertEquals(TAORKenmerken.Draagkracht,Enum.Draagkracht.Draagkracht40)
+	Do $$$AssertEquals(TAORKenmerken.FrontBevestiging,Enum.FrontBevestiging.Drevel)
+	Do $$$AssertEquals(TAORKenmerken.FrontEindkapKleur,Enum.FrontEindkapKleur.AluminiumLook)
+	Do $$$AssertEquals(TAORKenmerken.GeleiderTechnologie,Enum.GeleiderTechnologie.BLUMOTION)
+	Do $$$AssertEquals(TAORKenmerken.GlijderType,Enum.GlijderType.Movento)
+	Do $$$AssertEquals(TAORKenmerken.HeeftDiepteVerstelling,$$$False)
+	Do $$$AssertEquals(TAORKenmerken.HeeftOpvullijstLinks,$$$False)
+	Do $$$AssertEquals(TAORKenmerken.HeeftOpvullijstRechts,$$$False)
+	Do $$$AssertEquals(TAORKenmerken.HeeftZijstabilisering,$$$False)
+	Do $$$AssertEquals(TAORKenmerken.IsBinnenbreedte,$$$True)
+	Do $$$AssertEquals(TAORKenmerken.IsBinnenlade,$$$False)
+	Do $$$AssertEquals(TAORKenmerken.KoppelingType,"Schroef")
+	Do $$$AssertEquals(TAORKenmerken.LadeBinnenKleur,Enum.LadeKleur.NatuurNotenhout)
+	Do $$$AssertEquals(TAORKenmerken.LadeDiepte,Enum.LadeDiepte.LadeDiepte500)
+	Do $$$AssertEquals(TAORKenmerken.LadeHoogte,Enum.LadeHoogte.C)
+	Do $$$AssertEquals(TAORKenmerken.LadeKleur,Enum.LadeKleur.NatuurNotenhout)
+	Do $$$AssertEquals(TAORKenmerken.LosseComponent,"")
+	Do $$$AssertEquals(TAORKenmerken.OpvullijstKleur,"")
+	Do $$$AssertEquals(TAORKenmerken.VerpakkingType,Enum.VerpakkingType.V1)
+	Do $$$AssertEquals(TAORKenmerken.RugHoogte,Enum.LadeHoogte.C)
+	Do $$$AssertEquals(TAORKenmerken.Uittrekbaarheid,##class(DOM.PM.enu.TAORUittrekbaarheid).Volledig())
+	Do $$$AssertEquals(TAORKenmerken.NietMeeleveren.Count(),0)
 ]]></Implementation>
 </Method>
 </Class>