Index: vhUnitTest/APPS/Halux/PPS/Document/impl/RVG/VoorbereidingSpecialWorkshop/IngegevenKenmerkenNaarImosDataConverter/ConverteerIngegevenKenmerken/Test.cls.xml
===================================================================
diff -u -r69516 -r69528
--- vhUnitTest/APPS/Halux/PPS/Document/impl/RVG/VoorbereidingSpecialWorkshop/IngegevenKenmerkenNaarImosDataConverter/ConverteerIngegevenKenmerken/Test.cls.xml	(.../Test.cls.xml)	(revision 69516)
+++ vhUnitTest/APPS/Halux/PPS/Document/impl/RVG/VoorbereidingSpecialWorkshop/IngegevenKenmerkenNaarImosDataConverter/ConverteerIngegevenKenmerken/Test.cls.xml	(.../Test.cls.xml)	(revision 69528)
@@ -42,7 +42,7 @@
 	Set RvgKenmerken.InstelZijde = ""
 	Set RvgKenmerken.DeurSteunNaarBinnen = ""
 	
-	Do ..AssertConversieIngegegevenKenmerkNaarImosKenmerken(RvgKenmerken, "|FIXED_SHELF_THICKNESS:=18|FRONT_WIDTH:=870|FRONT_THICKNESS:=18|FRONT_HEIGHT:=1900|FRONT_PROTRUSION:=730|FRONT_PROTRUSION_LEFT:=200|FRONT_PROTRUSION_RIGHT:=314|MOUNTING_WIDTH:=876|INSTALLATION_DEPTH:=595|INSTALLATION_HEIGHT:=1928|SCUFF_GUARD:=nein|OPTIONS:=Wooden components without Fronts|NOMINAL_LENGTH:=500|POCKET_BACK_THICKNESS:=320|POCKET_DEPTH:=575|POCKET_HEIGTH:=1915|SERVICE_LEVEL:=Voorgemonteerd|APPLICATION:=801_links|TOP_GAP:=5|BOTTOM_GAP:=10|SIDE_GAP:=3")
+	Do ..AssertConversieIngegegevenKenmerkNaarImosKenmerken(RvgKenmerken, "|FIXED_SHELF_THICKNESS:=18|FRONT_WIDTH:=870|FRONT_THICKNESS:=18|FRONT_HEIGHT:=1900|FRONT_PROTRUSION:=730|FRONT_PROTRUSION_LEFT:=200|FRONT_PROTRUSION_RIGHT:=314|MOUNTING_WIDTH:=876|INSTALLATION_DEPTH:=595|INSTALLATION_HEIGHT:=1928|SCUFF_GUARD:=nein|SUPPLIER_POCKET:=unilin|OPTIONS:=Wooden components without Fronts|NOMINAL_LENGTH:=500|POCKET_BACK_THICKNESS:=320|POCKET_DEPTH:=575|POCKET_HEIGTH:=1915|SERVICE_LEVEL:=Voorgemonteerd|APPLICATION:=801_links|TOP_GAP:=5|BOTTOM_GAP:=10|SIDE_GAP:=3")
 ]]></Implementation>
 </Method>
 
@@ -124,12 +124,29 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Conversie LeverancierA en B">
+<Implementation><![CDATA[
+	Set RvgKenmerken = ##class(DOM.PM.Maatwerk.Calc.Common.impl.RVGKenmerken).%New()
+	Set RvgKenmerken.LeverancierA = "DummyLeverancierA"
+	Set RvgKenmerken.LeverancierB = "DummyLeverancierB"
+	
+	Set RvgKenmerken.MateriaalOpties = "TweeKleuren"
+	Do ..AssertConversieIngegegevenKenmerkNaarImosKenmerken(RvgKenmerken, "|SUPPLIER_FRONT:=DummyLeverancierA|SUPPLIER_POCKETS:=DummyLeverancierB|OPTIONS:=Wooden components with Fronts ? Two Colors")
+	
+	Set RvgKenmerken.MateriaalOpties = "EenKleur"
+	Do ..AssertConversieIngegegevenKenmerkNaarImosKenmerken(RvgKenmerken, "|SUPPLIER_POCKET_AND_FRONT:=DummyLeverancierA|OPTIONS:=Wooden components with Fronts ? One Color")
+	
+	Set RvgKenmerken.MateriaalOpties = "GeenFront"
+	Do ..AssertConversieIngegegevenKenmerkNaarImosKenmerken(RvgKenmerken, "|SUPPLIER_POCKET:=DummyLeverancierA|OPTIONS:=Wooden components without Fronts")
+]]></Implementation>
+</Method>
+
 <Method name="AssertConversieIngegegevenKenmerkNaarImosKenmerken">
 <FormalSpec>RvgKenmerken:DOM.PM.Maatwerk.Calc.Common.impl.RVGKenmerken,VerwachtResultaat:%String=""</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	#dim Resultaat As %String = ..Converter.ConverteerIngegevenKenmerken(RvgKenmerken)
-	
+	Do ##class(Tools.Wlip).%New(26).String(Resultaat)
 	Do $$$AssertEquals(Resultaat, "PROGRAMME:=REVEGO" _ VerwachtResultaat)
 ]]></Implementation>
 </Method>
Index: APPS/Halux/PPS/Document/impl/RVG/VoorbereidingSpecialWorkshop/IngegevenKenmerkenNaarImosDataConverter.cls.xml
===================================================================
diff -u -r69521 -r69528
--- APPS/Halux/PPS/Document/impl/RVG/VoorbereidingSpecialWorkshop/IngegevenKenmerkenNaarImosDataConverter.cls.xml	(.../IngegevenKenmerkenNaarImosDataConverter.cls.xml)	(revision 69521)
+++ APPS/Halux/PPS/Document/impl/RVG/VoorbereidingSpecialWorkshop/IngegevenKenmerkenNaarImosDataConverter.cls.xml	(.../IngegevenKenmerkenNaarImosDataConverter.cls.xml)	(revision 69528)
@@ -52,7 +52,7 @@
 		#dim Property = ##class(%CompiledProperty).%OpenId($classname(RvgKenmerken)_":"_PropertyNaam)
 		#dim Value As %String = $Property(RvgKenmerken, PropertyNaam)
 				
-		#dim GeconverteerdeProperty As %String = ..ConverteerRvgProperty(PropertyNaam)
+		#dim GeconverteerdeProperty As %String = ..ConverteerRvgProperty(PropertyNaam, RvgKenmerken)
 		#dim GeconverteerdeWaarde As %String = ..ConverteerRvgValue(Value, Property)
 				
 		If ($$$HasLength(GeconverteerdeProperty) && $$$HasLength(GeconverteerdeWaarde)) {
@@ -82,7 +82,7 @@
 </Method>
 
 <Method name="ConverteerRvgProperty">
-<FormalSpec>RvgProperty:%String</FormalSpec>
+<FormalSpec>RvgProperty:%String,RvgKenmerken:DOM.PM.Maatwerk.Calc.Common.impl.RVGKenmerken</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
@@ -122,6 +122,26 @@
 	Quit:(RvgProperty = "ProductieWijze") "SERVICE_LEVEL"
 	Quit:(RvgProperty = "MateriaalOpties") "OPTIONS"
 	Quit:(RvgProperty = "Krasbescherming") "SCUFF_GUARD"
+	Quit:((RvgProperty = "LeverancierA") || (RvgProperty = "LeverancierB")) ..ConverteerRvgPropertyAOfB(RvgProperty, RvgKenmerken.MateriaalOpties)
+
+	Quit ""
+]]></Implementation>
+</Method>
+
+<Method name="ConverteerRvgPropertyAOfB">
+<FormalSpec>RvgProperty:%String,MateriaalOpties:DOM.PM.enu.RVGMateriaalOpties</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	If (MateriaalOpties = ##class(DOM.PM.enu.RVGMateriaalOpties).TweeKleuren()) {
+		Quit:(RvgProperty = "LeverancierA") "SUPPLIER_FRONT"
+		Quit:(RvgProperty = "LeverancierB") "SUPPLIER_POCKETS"
+	} ElseIf (MateriaalOpties = ##class(DOM.PM.enu.RVGMateriaalOpties).EenKleur()) {
+		Quit:(RvgProperty = "LeverancierA") "SUPPLIER_POCKET_AND_FRONT"
+		Quit:(RvgProperty = "LeverancierB") ""
+	} ElseIf (MateriaalOpties = ##class(DOM.PM.enu.RVGMateriaalOpties).GeenFront()) {
+		Quit:(RvgProperty = "LeverancierA") "SUPPLIER_POCKET"
+		Quit:(RvgProperty = "LeverancierB") ""
+	}
 	
 	Quit ""
 ]]></Implementation>