Index: APPS/PM/Maatwerk/impl/VhConfigHelper.cls.xml
===================================================================
diff -u -r72876 -r74924
--- APPS/PM/Maatwerk/impl/VhConfigHelper.cls.xml	(.../VhConfigHelper.cls.xml)	(revision 72876)
+++ APPS/PM/Maatwerk/impl/VhConfigHelper.cls.xml	(.../VhConfigHelper.cls.xml)	(revision 74924)
@@ -13,11 +13,9 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>VhConfig:APPS.PM.Maatwerk.dto.VhConfig=""</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Set ..VhConfig = VhConfig
-	Set ..ProductAPI = $$$Inject(ProductAPI, ##class(DOM.PM.impl.ProductAPI).%New())
+	Set ..ProductAPI = ##class(DOM.PM.impl.ProductAPI).%New()
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -30,7 +28,6 @@
 </Method>
 
 <Method name="GeefHalffabItemsBoom">
-<FormalSpec>Rol:%String</FormalSpec>
 <ReturnType>DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom</ReturnType>
 <Implementation><![CDATA[
 	Set Converter = ##class(APPS.PM.Maatwerk.impl.VhConfig.Converter.HalffabItemsBoom).%New(..VhConfig)
@@ -42,17 +39,17 @@
 <Method name="GeefHalffabrikatenListIterator">
 <ReturnType>TECH.ListIterator</ReturnType>
 <Implementation><![CDATA[
-	If $$$Not($$$HasLength(..VhConfig.MaatwerkDetails.Halffabrikaten)) {
+	If $$$Not($$$HasLength(..VhConfig.ConfiguredProductDetails.SemiFinishedProducts)) {
 		Quit ##class(TECH.ListIterator).%New(##class(%ArrayOfObjects).%New())
 	}
 	
-	Quit ##class(TECH.ListIterator).%New(..VhConfig.MaatwerkDetails.Halffabrikaten)
+	Quit ##class(TECH.ListIterator).%New(..VhConfig.ConfiguredProductDetails.SemiFinishedProducts)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefVerwijderdeHalffabItems">
 <ReturnType>%ListOfDataTypes</ReturnType>
-<Implementation><![CDATA[	Quit ..VhConfig.MaatwerkDetails.VerwijderdeHalffabItems
+<Implementation><![CDATA[	Quit ..VhConfig.ConfiguredProductDetails.RemovedSemiFinishedProducts
 ]]></Implementation>
 </Method>
 
@@ -64,6 +61,12 @@
 	If (..VhConfig.Model = "M_LBX") {
 		Set LbxConverter = ##class(APPS.PM.Maatwerk.impl.VhConfig.Converter.EncowayNaarDom.LbxKenmerken).%New()
 		Set IngegevenKenmerken = LbxConverter.Converteer(..VhConfig)
+	} ElseIf (..VhConfig.Model = "M_MVX") {
+		Set MvxConverter = ##class(APPS.PM.Maatwerk.impl.VhConfig.Converter.EncowayNaarDom.MvxKenmerken).%New()
+		Set IngegevenKenmerken = MvxConverter.Converteer(..VhConfig)
+	} ElseIf (..VhConfig.Model = "M_TBX") {
+		Set TbxConverter = ##class(APPS.PM.Maatwerk.impl.VhConfig.Converter.EncowayNaarDom.TbxKenmerken).%New()
+		Set IngegevenKenmerken = TbxConverter.Converteer(..VhConfig)
 	} Else {
 		Do ##class(TECH.ExceptionHandler).Throw("Er is nog geen implementatie voor het ophalen van de kenmerken van model " _ ..VhConfig.Model _ ".")	
 	}
@@ -73,11 +76,11 @@
 </Method>
 
 <Method name="GeefLangtekst">
-<FormalSpec>Taal:%String="nl-BE"</FormalSpec>
+<FormalSpec>Taal:DOM.enu.TaalCodeLandCode="nl-BE"</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim LangtekstInTaal As %String = ""
-	Set TaalIterator = ##class(TECH.ListIterator).%New(..VhConfig.BerekendeKenmerken.Langtekst)
+	Set TaalIterator = ##class(TECH.ListIterator).%New(..VhConfig.CalculatedCharacteristics.DescriptionLong)
 	
 	While (TaalIterator.HasNext() && (LangtekstInTaal = ""))
 	{
@@ -94,7 +97,7 @@
 
 <Method name="GeefKorttekst">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ..VhConfig.BerekendeKenmerken.Korttekst
+<Implementation><![CDATA[	Quit ..VhConfig.CalculatedCharacteristics.DescriptionShort
 ]]></Implementation>
 </Method>
 
@@ -136,25 +139,25 @@
 
 <Method name="GeefGenerischProductId">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ..GeefIdentNummerVanHalffab(..VhConfig.BerekendeKenmerken.ItemId)
+<Implementation><![CDATA[	Quit ..GeefIdentNummerVanHalffab(..VhConfig.CalculatedCharacteristics.GenericProductId)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefAfbeeldingCode">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ..VhConfig.BerekendeKenmerken.AfbeeldingCode
+<Implementation><![CDATA[	Quit ..VhConfig.CalculatedCharacteristics.ImageCode
 ]]></Implementation>
 </Method>
 
 <Method name="GeefGTIN">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ..VhConfig.BerekendeKenmerken.GTIN
+<Implementation><![CDATA[	Quit ..VhConfig.CalculatedCharacteristics.GTIN
 ]]></Implementation>
 </Method>
 
 <Method name="GeefDossierCode">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ..VhConfig.BerekendeKenmerken.DossierCode
+<Implementation><![CDATA[	Quit ..VhConfig.CalculatedCharacteristics.ConfiguredProductCode
 ]]></Implementation>
 </Method>