Index: APPS/PM/Maatwerk/impl/VhConfig/Converter/HalffabItemsBoom.cls.xml
===================================================================
diff -u -r72809 -r72865
--- APPS/PM/Maatwerk/impl/VhConfig/Converter/HalffabItemsBoom.cls.xml	(.../HalffabItemsBoom.cls.xml)	(revision 72809)
+++ APPS/PM/Maatwerk/impl/VhConfig/Converter/HalffabItemsBoom.cls.xml	(.../HalffabItemsBoom.cls.xml)	(revision 72865)
@@ -43,7 +43,7 @@
 <Method name="GeefHalffabItemsBoom">
 <ReturnType>DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom</ReturnType>
 <Implementation><![CDATA[
-	#dim HalffabrikatenListIterator = ..VhConfigHelper.GeefHalffabrikatenListIterator()
+	#dim HalffabrikatenListIterator As TECH.ListIterator = ..VhConfigHelper.GeefHalffabrikatenListIterator()
 	
 	Set ..HalffabContext = ##class(DOM.PM.Maatwerk.Calc.HF.DotNetHalffabContext).%New(..VhConfigHelper.GeefIngegevenKenmerken().GeefFamilie(), ..VhConfigHelper.GeefIngegevenKenmerken().GeefVariant())
 	Set ..HalffabItemsBoom = ##class(DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom).%New()
@@ -69,8 +69,14 @@
 	#dim HalffabItem As DOM.PM.Maatwerk.Calc.HF.ConcreetHalffabItem
 	#dim IsDeelVanSamenGesteldHalffabItem As %Boolean = $$$False
 	
-	If (##class(TECH.StringUtils).Contains(Rol, ".")) {
-		#dim SGRol As %String = $Piece(Rol, ".", 1)
+	If ((##class(TECH.StringUtils).Contains(Rol, ".")) || ..IsResultaatVanGekoppeldKenmerk(Rol)) {
+		#dim SGRol As %String = ""
+		If (..IsResultaatVanGekoppeldKenmerk(Rol)) {
+			Set SGRol = ..GeefRolnaamVanGekoppeldKenmerk(Rol)
+		} Else {
+			Set SGRol = $Piece(Rol, ".", 1)
+		}
+		
 		Set IsDeelVanSamenGesteldHalffabItem = $$$True
 		
 		If $$$Not(..HalffabItemsBoom.BevatRol(SGRol)) {
@@ -80,8 +86,12 @@
 			Set SGHalffabItem = ..HalffabItemsBoom.GeefHalffabItem(SGRol)
 		}
 		
-		Set Rol = $Piece(Rol, ".", 2)
-	} 
+		If (..IsResultaatVanGekoppeldKenmerk(Rol)) {
+			Set Rol = $Piece(Rol, ".", 1)
+		} Else {
+			Set Rol = $Piece(Rol, ".", 2)
+		}
+	}
 	
 	If (Halffabrikaat.Type = "Standaard") {
 		Set HalffabItem = ..GeefStandaardHalffabItem(Rol, Halffabrikaat)
@@ -234,6 +244,42 @@
 ]]></Implementation>
 </Method>
 
+<Method name="IsResultaatVanGekoppeldKenmerk">
+<FormalSpec>RolNaam:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim IsGekoppeldKenmerk As %Boolean = $$$False
+	
+	//IsGekoppeldeMat
+	If (RolNaam = "Mat") {
+		Set IsGekoppeldKenmerk = $$$True
+	}
+	//IsGekoppeldeSST
+	
+	
+	Quit IsGekoppeldKenmerk
+]]></Implementation>
+</Method>
+
+<Method name="GeefRolnaamVanGekoppeldKenmerk">
+<FormalSpec>RolNaam:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim RolNaamGekoppeldKenmerk As %String = ""
+	
+	//GekoppeldeMat
+	If (RolNaam = "Mat") {
+		Set RolNaamGekoppeldKenmerk = "MAT_Standaard_MatX"
+	} Else {
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.UnimplementedException).%New("Rolnaam voor gekoppeld kenmerk kan niet bepaald worden voor rol '" _ RolNaam _ "'"))	
+	}
+	
+	Quit RolNaamGekoppeldKenmerk
+]]></Implementation>
+</Method>
+
 <UDLText name="T">
 <Content><![CDATA[
 /*