Index: vhUnitTest/DOM/PM/Maatwerk/Calc/HF/impl/TAOR/PlaatAfwerkingBepaler/GeefPlaatAfwerking/Test.cls.xml
===================================================================
diff -u -r61566 -r65286
--- vhUnitTest/DOM/PM/Maatwerk/Calc/HF/impl/TAOR/PlaatAfwerkingBepaler/GeefPlaatAfwerking/Test.cls.xml	(.../Test.cls.xml)	(revision 61566)
+++ vhUnitTest/DOM/PM/Maatwerk/Calc/HF/impl/TAOR/PlaatAfwerkingBepaler/GeefPlaatAfwerking/Test.cls.xml	(.../Test.cls.xml)	(revision 65286)
@@ -23,7 +23,7 @@
 	
 	Set ..PlaatAfwerkingBepaler = ##class(DOM.PM.Maatwerk.Calc.HF.impl.TAOR.PlaatAfwerkingBepaler).%New()
 	Set ..VerwachteFineerKleuren = ##class(TECH.ListUtils).CreateListOfDataTypes("NE", "NN", "MB", "SY", "ZY", "BE", "XE", "CA", "SE")
-	Set ..VerwachteMelamineKleuren = ##class(TECH.ListUtils).CreateListOfDataTypes("E1", "E2", "N1", "S", "W", "XG", "DA", "LA", "GF")
+	Set ..VerwachteMelamineKleuren = ##class(TECH.ListUtils).CreateListOfDataTypes("E1", "E2", "N1", "S", "W", "XG", "DA", "LA", "GF", "Z9")
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/APPS/Halux/PPS/Activiteit/impl/TAOR/common/KleurConverter/Converteer/Test.cls.xml
===================================================================
diff -u -r61979 -r65286
--- vhUnitTest/APPS/Halux/PPS/Activiteit/impl/TAOR/common/KleurConverter/Converteer/Test.cls.xml	(.../Test.cls.xml)	(revision 61979)
+++ vhUnitTest/APPS/Halux/PPS/Activiteit/impl/TAOR/common/KleurConverter/Converteer/Test.cls.xml	(.../Test.cls.xml)	(revision 65286)
@@ -16,9 +16,13 @@
 
 <Method name="TestAlleGedefinieerd">
 <Implementation><![CDATA[
+	#dim TAORLadeKleurValue As %String
+	
 	#dim Iterator As TECH.Iterator = ##class(DOM.PM.enu.TAORLadeKleur).ValueListIterator()
 	While Iterator.HasNext() {
-			Do ..AssertKleurCode(Iterator.Next())
+		Set TAORLadeKleurValue = Iterator.Next()
+		Continue:$$$Not(..AssertNodig(TAORLadeKleurValue))
+		Do ..AssertKleurCode(TAORLadeKleurValue)
 	}
 ]]></Implementation>
 </Method>
@@ -31,6 +35,21 @@
 	Do $$$AssertTrue($L(KleurCode),"KleurCode voor LadeKleur "_LadeKleur_" niet gedefinieerd.")
 ]]></Implementation>
 </Method>
+
+<Method name="AssertNodig">
+<FormalSpec>TAORLadeKleurValue:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim IsAssertNodig As %Boolean = $$$True
+	
+	If (TAORLadeKleurValue = "Z9") {
+		Set IsAssertNodig = $$$False	
+	}
+	
+	Quit IsAssertNodig
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: DOM/PM/Maatwerk/Calc/HF/impl/TAOR/PlaatAfwerkingBepaler.cls.xml
===================================================================
diff -u -r61566 -r65286
--- DOM/PM/Maatwerk/Calc/HF/impl/TAOR/PlaatAfwerkingBepaler.cls.xml	(.../PlaatAfwerkingBepaler.cls.xml)	(revision 61566)
+++ DOM/PM/Maatwerk/Calc/HF/impl/TAOR/PlaatAfwerkingBepaler.cls.xml	(.../PlaatAfwerkingBepaler.cls.xml)	(revision 65286)
@@ -25,7 +25,7 @@
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..FineerKleuren = ##class(TECH.ListUtils).CreateListOfDataTypes("NE", "NN", "ZY", "MB", "SY", "BE", "XE", "CA", "SE")
-	Set ..MelamineKleuren = ##class(TECH.ListUtils).CreateListOfDataTypes("E1", "E2", "N1", "S", "W", "XG", "DA", "LA", "GF")
+	Set ..MelamineKleuren = ##class(TECH.ListUtils).CreateListOfDataTypes("E1", "E2", "N1", "S", "W", "XG", "DA", "LA", "GF", "Z9")
 	
 	Quit $$$OK
 ]]></Implementation>
Index: vhUnitTest/DOM/PM/KorttekstUtils/BepaalKorttekstTAOR/TestBuitenKleurCode.cls.xml
===================================================================
diff -u -r61566 -r65286
--- vhUnitTest/DOM/PM/KorttekstUtils/BepaalKorttekstTAOR/TestBuitenKleurCode.cls.xml	(.../TestBuitenKleurCode.cls.xml)	(revision 61566)
+++ vhUnitTest/DOM/PM/KorttekstUtils/BepaalKorttekstTAOR/TestBuitenKleurCode.cls.xml	(.../TestBuitenKleurCode.cls.xml)	(revision 65286)
@@ -44,6 +44,8 @@
 		Set IsAssertNodig = $$$False	
 	} ElseIf ((Waarde = ..Enum.LadeKleur.Lakdraagfolie) || (Waarde = ..Enum.LadeKleur.ChalkAsh) || (Waarde = ..Enum.LadeKleur.SepiaEik)) {
 		Set IsAssertNodig = $$$False	
+	} ElseIf (Waarde = ..Enum.LadeKleur.OudZwart) {
+		Set IsAssertNodig = $$$False	
 	}
 	
 	Quit IsAssertNodig