Index: vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/InschuifElementValidator/Test.cls.xml
===================================================================
diff -u -r35886 -r36088
--- vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/InschuifElementValidator/Test.cls.xml	(.../Test.cls.xml)	(revision 35886)
+++ vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/InschuifElementValidator/Test.cls.xml	(.../Test.cls.xml)	(revision 36088)
@@ -9,7 +9,7 @@
 	Set Product.RugHoogte = "C"
 	Set Product.ZijwandVerhogingMateriaal = ##class(DOM.PM.enu.TBXZijwandVerhogingMateriaal).Glas()
 	Set Product.ZijwandVerhogingKleur = ##class(DOM.PM.enu.TBXZijwandVerhogingKleur).FloatHelder8mm()
-	Set Product.ZijwandVerhogingType = ##class(DOM.PM.enu.TBXZijwandVerhogingType).InschuifElement()
+	Set Product.ZijwandVerhogingType = "SimpleGallery"
 	
 	Set Validator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.InschuifElementValidator).%New(Product)
 	
@@ -21,7 +21,7 @@
 <Implementation><![CDATA[
 	#dim Product As APPS.EDI.common.dto.v001.LadeTBX = ##class(APPS.EDI.common.dto.v001.LadeTBX).%New()
 	Set Product.RugHoogte = "K"
-	Set Product.ZijwandVerhogingType = ##class(DOM.PM.enu.TBXZijwandVerhogingType).Reling()
+	Set Product.ZijwandVerhogingType = "SimpleGallery"
 	
 	Set Validator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.InschuifElementValidator).%New(Product)
 	
@@ -33,7 +33,7 @@
 <Implementation><![CDATA[
 	#dim Product As APPS.EDI.common.dto.v001.LadeTBX = ##class(APPS.EDI.common.dto.v001.LadeTBX).%New()
 	Set Product.RugHoogte = "K"
-	Set Product.ZijwandVerhogingType = ##class(DOM.PM.enu.TBXZijwandVerhogingType).InschuifElement()
+	Set Product.ZijwandVerhogingType = "DesignElement"
 	
 	Set Validator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.InschuifElementValidator).%New(Product)
 	
@@ -45,7 +45,7 @@
 <Implementation><![CDATA[
 	#dim Product As APPS.EDI.common.dto.v001.LadeTBX = ##class(APPS.EDI.common.dto.v001.LadeTBX).%New()
 	Set Product.RugHoogte = "C"
-	Set Product.ZijwandVerhogingType = ##class(DOM.PM.enu.TBXZijwandVerhogingType).InschuifElement()
+	Set Product.ZijwandVerhogingType = "DesignElement"
 	Set Product.ZijwandVerhogingMateriaal = ##class(DOM.PM.enu.TBXZijwandVerhogingMateriaal).Glas()
 	Set Product.ZijwandVerhogingKleur = ""
 	
@@ -59,7 +59,7 @@
 <Implementation><![CDATA[
 	#dim Product As APPS.EDI.common.dto.v001.LadeTBX = ##class(APPS.EDI.common.dto.v001.LadeTBX).%New()
 	Set Product.RugHoogte = "C"
-	Set Product.ZijwandVerhogingType = ##class(DOM.PM.enu.TBXZijwandVerhogingType).InschuifElement()
+	Set Product.ZijwandVerhogingType = "DesignElement"
 	Set Product.ZijwandVerhogingMateriaal = ""
 	Set Product.ZijwandVerhogingKleur = ##class(DOM.PM.enu.TBXZijwandVerhogingKleur).FloatHelder8mm()
 	
@@ -73,7 +73,7 @@
 <Implementation><![CDATA[
 	#dim Product As APPS.EDI.common.dto.v001.LadeTBX = ##class(APPS.EDI.common.dto.v001.LadeTBX).%New()
 	Set Product.RugHoogte = "C"
-	Set Product.ZijwandVerhogingType = ##class(DOM.PM.enu.TBXZijwandVerhogingType).InschuifElement()
+	Set Product.ZijwandVerhogingType = "DesignElement"
 	Set Product.ZijwandVerhogingMateriaal = ""
 	Set Product.ZijwandVerhogingKleur = ""
 	
@@ -82,6 +82,17 @@
 	Do $$$AssertFalse(Validator.IsValid())
 ]]></Implementation>
 </Method>
+
+<Method name="Test: ZijwandVerhogingType onbekend">
+<Implementation><![CDATA[
+	#dim Product As APPS.EDI.common.dto.v001.LadeTBX = ##class(APPS.EDI.common.dto.v001.LadeTBX).%New()
+	Set Product.ZijwandVerhogingType = "onbekend"
+	
+	Set Validator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.InschuifElementValidator).%New(Product)
+	
+	Do $$$AssertFalse(Validator.IsValid())
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/InschuifElementValidator.cls.xml
===================================================================
diff -u -r35883 -r36088
--- APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/InschuifElementValidator.cls.xml	(.../InschuifElementValidator.cls.xml)	(revision 35883)
+++ APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/InschuifElementValidator.cls.xml	(.../InschuifElementValidator.cls.xml)	(revision 36088)
@@ -21,14 +21,12 @@
 <Method name="IsValid">
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
-	Quit:$$$Not(##class(TECH.StringUtils).Equals(..Product.RugHoogte, "C","D")) $$$False
-	Quit:$$$Not(..Product.ZijwandVerhogingType = ##class(DOM.PM.enu.TBXZijwandVerhogingType).InschuifElement()) $$$False
+	Quit:(($$$Not(##class(TECH.StringUtils).Equals(..Product.RugHoogte, "C","D")))&&(..Product.ZijwandVerhogingType="")) $$$False
+	Quit:($$$Not(##class(TECH.StringUtils).Equals(..Product.ZijwandVerhogingType, "NoGallery","SimpleGallery","DesignElement"))) $$$False
+	Quit:((..Product.ZijwandVerhogingType="NoGallery")&&($$$HasLength(..Product.ZijwandVerhogingMateriaal) || $$$HasLength(..Product.ZijwandVerhogingKleur))) $$$False
+	Quit:($$$Not($$$HasLength(..Product.ZijwandVerhogingMateriaal) && $$$HasLength(..Product.ZijwandVerhogingKleur))) $$$False
 	
-	If ($$$HasLength(..Product.ZijwandVerhogingMateriaal) && $$$HasLength(..Product.ZijwandVerhogingKleur)) {
-		Quit $$$True
-	}
-	
-	Quit $$$False
+	Quit $$$True
 ]]></Implementation>
 </Method>
 </Class>