Index: APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/InschuifElementValidator.cls.xml
===================================================================
diff -u -r36088 -r36089
--- APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/InschuifElementValidator.cls.xml	(.../InschuifElementValidator.cls.xml)	(revision 36088)
+++ APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/InschuifElementValidator.cls.xml	(.../InschuifElementValidator.cls.xml)	(revision 36089)
@@ -21,10 +21,10 @@
 <Method name="IsValid">
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
-	Quit:(($$$Not(##class(TECH.StringUtils).Equals(..Product.RugHoogte, "C","D")))&&(..Product.ZijwandVerhogingType="")) $$$False
+	Quit:(($$$Not(##class(TECH.StringUtils).Equals(..Product.RugHoogte, "C","D")))&&($$$Not(..Product.ZijwandVerhogingType="NoGallery"))) $$$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
+	Quit:$$$Not(..Product.ZijwandVerhogingType="NoGallery")&&($$$Not($$$HasLength(..Product.ZijwandVerhogingMateriaal) && $$$HasLength(..Product.ZijwandVerhogingKleur))) $$$False
 	
 	Quit $$$True
 ]]></Implementation>
Index: vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/InschuifElementValidator/Test.cls.xml
===================================================================
diff -u -r36088 -r36089
--- vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/InschuifElementValidator/Test.cls.xml	(.../Test.cls.xml)	(revision 36088)
+++ vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/InschuifElementValidator/Test.cls.xml	(.../Test.cls.xml)	(revision 36089)
@@ -41,6 +41,18 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Rughoogte verkeerd, NoGallery -&gt; ok">
+<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 = "NoGallery"
+	
+	Set Validator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.InschuifElementValidator).%New(Product)
+	
+	Do $$$AssertTrue(Validator.IsValid())
+]]></Implementation>
+</Method>
+
 <Method name="Test: wel materiaal, geen kleur -&gt; niet ok">
 <Implementation><![CDATA[
 	#dim Product As APPS.EDI.common.dto.v001.LadeTBX = ##class(APPS.EDI.common.dto.v001.LadeTBX).%New()
@@ -69,16 +81,30 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: geen materiaal, geen kleur -&gt; niet ok">
+<Method name="Test: NoGallery, geen materiaal, geen kleur -&gt; ok">
 <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 = "DesignElement"
+	Set Product.ZijwandVerhogingType = "NoGallery"
 	Set Product.ZijwandVerhogingMateriaal = ""
 	Set Product.ZijwandVerhogingKleur = ""
 	
 	Set Validator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.InschuifElementValidator).%New(Product)
 	
+	Do $$$AssertTrue(Validator.IsValid())
+]]></Implementation>
+</Method>
+
+<Method name="Test: SimpleGallery, geen materiaal, geen kleur -&gt; niet ok">
+<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 = "SimpleGallery"
+	Set Product.ZijwandVerhogingMateriaal = ""
+	Set Product.ZijwandVerhogingKleur = ""
+	
+	Set Validator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.InschuifElementValidator).%New(Product)
+	
 	Do $$$AssertFalse(Validator.IsValid())
 ]]></Implementation>
 </Method>