Index: APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/DwarsverdelingValidator.cls.xml
===================================================================
diff -u -r36094 -r36127
--- APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/DwarsverdelingValidator.cls.xml	(.../DwarsverdelingValidator.cls.xml)	(revision 36094)
+++ APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/DwarsverdelingValidator.cls.xml	(.../DwarsverdelingValidator.cls.xml)	(revision 36127)
@@ -21,8 +21,12 @@
 <Method name="IsValid">
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
-	Quit:($$$Not(..Product.HeeftDwarsverdeling)&&(..Product.AantalDwarsverdelingen="")) $$$True
-	Quit ..Product.HeeftDwarsverdeling && (..Product.HeeftDwarsverdeling <= 3)
+	Quit:(..Product.HeeftDwarsverdeling)&&(..Product.AantalDwarsverdelingen="") $$$False
+	Quit:$$$Not(..Product.HeeftDwarsverdeling)&&$$$HasLength(..Product.AantalDwarsverdelingen) $$$False
+	Quit:(..Product.HeeftDwarsverdeling &&(..Product.AantalDwarsverdelingen>3)&&($$$Not(..Product.Klasse="SP2")||$$$Not(..Product.RugHoogte="C"))) $$$False
+	Quit:(..Product.HeeftDwarsverdeling &&(..Product.AantalDwarsverdelingen>4)) $$$False
+	
+	Quit $$$True
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/DwarsverdelingValidator/Test.cls.xml
===================================================================
diff -u -r35921 -r36127
--- vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/DwarsverdelingValidator/Test.cls.xml	(.../Test.cls.xml)	(revision 35921)
+++ vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/DwarsverdelingValidator/Test.cls.xml	(.../Test.cls.xml)	(revision 36127)
@@ -35,10 +35,51 @@
 	
 	Set Validator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.DwarsverdelingValidator).%New(Product)
 	
+	Do $$$AssertFalse(Validator.IsValid())
+]]></Implementation>
+</Method>
+
+<Method name="Test: HeeftDwarsverdeling is true, aantal = 4 voor SP2 met hoogte C">
+<Implementation><![CDATA[
+	#dim Product As APPS.EDI.common.dto.v001.LadeTBX = ##class(APPS.EDI.common.dto.v001.LadeTBX).%New()
+	Set Product.HeeftDwarsverdeling = $$$True
+	Set Product.AantalDwarsverdelingen = 4
+	Set Product.Klasse = "SP2"
+	Set Product.RugHoogte = "C"
+	
+	Set Validator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.DwarsverdelingValidator).%New(Product)
+	
 	Do $$$AssertTrue(Validator.IsValid())
 ]]></Implementation>
 </Method>
 
+<Method name="Test: HeeftDwarsverdeling is true, aantal = 4 voor SP2 met hoogte K">
+<Implementation><![CDATA[
+	#dim Product As APPS.EDI.common.dto.v001.LadeTBX = ##class(APPS.EDI.common.dto.v001.LadeTBX).%New()
+	Set Product.HeeftDwarsverdeling = $$$True
+	Set Product.AantalDwarsverdelingen = 4
+	Set Product.Klasse = "SP2"
+	Set Product.RugHoogte = "K"
+	
+	Set Validator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.DwarsverdelingValidator).%New(Product)
+	
+	Do $$$AssertFalse(Validator.IsValid())
+]]></Implementation>
+</Method>
+
+<Method name="Test: HeeftDwarsverdeling is true, aantal = 4 voor klasse L">
+<Implementation><![CDATA[
+	#dim Product As APPS.EDI.common.dto.v001.LadeTBX = ##class(APPS.EDI.common.dto.v001.LadeTBX).%New()
+	Set Product.HeeftDwarsverdeling = $$$True
+	Set Product.AantalDwarsverdelingen = 4
+	Set Product.Klasse = "L"
+	
+	Set Validator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.DwarsverdelingValidator).%New(Product)
+	
+	Do $$$AssertFalse(Validator.IsValid())
+]]></Implementation>
+</Method>
+
 <Method name="Test: Niets ingevuld">
 <Implementation><![CDATA[
 	#dim Product As APPS.EDI.common.dto.v001.LadeTBX = ##class(APPS.EDI.common.dto.v001.LadeTBX).%New()