Index: APPS/EDI/common/dto/v001/LadeTBX.cls.xml
===================================================================
diff -u -r35923 -r35934
--- APPS/EDI/common/dto/v001/LadeTBX.cls.xml	(.../LadeTBX.cls.xml)	(revision 35923)
+++ APPS/EDI/common/dto/v001/LadeTBX.cls.xml	(.../LadeTBX.cls.xml)	(revision 35934)
@@ -38,6 +38,30 @@
 <Property name="ZijwandVerhogingKleur">
 <Type>TECH.String</Type>
 </Property>
+
+<Property name="UitsparingDataAantalUitsparingen">
+<Type>TECH.Integer</Type>
+</Property>
+
+<Property name="UitsparingDataBreedteX">
+<Type>TECH.Numeric</Type>
+</Property>
+
+<Property name="UitsparingDataBreedteZ1">
+<Type>TECH.Numeric</Type>
+</Property>
+
+<Property name="UitsparingDataBreedteM">
+<Type>TECH.Numeric</Type>
+</Property>
+
+<Property name="UitsparingDataBreedteZ2">
+<Type>TECH.Numeric</Type>
+</Property>
+
+<Property name="UitsparingDataBreedteY">
+<Type>TECH.Numeric</Type>
+</Property>
 </Class>
 
 
Index: APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/UitsparingValidator.cls.xml
===================================================================
diff -u
--- APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/UitsparingValidator.cls.xml	(revision 0)
+++ APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/UitsparingValidator.cls.xml	(revision 35934)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.UitsparingValidator">
+<Super>TECH.RegisteredObject,TECH.Validator.Validator</Super>
+
+<Property name="Product">
+<Type>APPS.EDI.common.dto.v001.LadeTBX</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>Product:APPS.EDI.common.dto.v001.LadeTBX</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..Product = Product
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="IsValid">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim HeeftUitsparingData As %Boolean = $$$HasLength(..Product.UitsparingDataBreedteM_..Product.UitsparingDataBreedteX_..Product.UitsparingDataBreedteY_..Product.UitsparingDataBreedteZ1_..Product.UitsparingDataBreedteZ2)
+	Quit:$$$Not(HeeftUitsparingData) $$$True	
+	Quit:(..Product.Klasse="L")&&(HeeftUitsparingData) $$$False
+	Quit:(..Product.Klasse="SP2")&&$$$HasLength(..Product.UitsparingDataBreedteM_..Product.UitsparingDataBreedteZ2) $$$False
+	Quit:(..Product.Klasse="SY2")&&(..Product.UitsparingDataAantalUitsparingen=1)&&$$$HasLength(..Product.UitsparingDataBreedteM_..Product.UitsparingDataBreedteZ2) $$$False
+	Quit:(..Product.Klasse="SY2")&&(..Product.UitsparingDataAantalUitsparingen=2)&&((..Product.UitsparingDataBreedteM=0)||(..Product.UitsparingDataBreedteX=0)||(..Product.UitsparingDataBreedteY=0)||(..Product.UitsparingDataBreedteZ1=0)||(..Product.UitsparingDataBreedteZ2=0)) $$$False
+	Quit $$$False
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/UitsparingValidator/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/UitsparingValidator/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/UitsparingValidator/Test.cls.xml	(revision 35934)
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.UitsparingValidator.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: Niets ingevuld">
+<Implementation><![CDATA[
+	#dim Product As APPS.EDI.common.dto.v001.LadeTBX = ##class(APPS.EDI.common.dto.v001.LadeTBX).%New()
+	
+	Set Validator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.UitsparingValidator).%New(Product)
+	
+	Do $$$AssertTrue(Validator.IsValid())
+]]></Implementation>
+</Method>
+
+<Method name="Test: Klasse = L -&gt; inValid">
+<Implementation><![CDATA[
+	#dim Product As APPS.EDI.common.dto.v001.LadeTBX = ##class(APPS.EDI.common.dto.v001.LadeTBX).%New()
+	Set Product.Klasse = "L"
+	Set Product.UitsparingDataBreedteM = 1
+	
+	Set Validator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.UitsparingValidator).%New(Product)
+	
+	Do $$$AssertFalse(Validator.IsValid())
+]]></Implementation>
+</Method>
+
+<Method name="Test: Klasse = Spoelbak -&gt; geen dataM toegelaten">
+<Implementation><![CDATA[
+	#dim Product As APPS.EDI.common.dto.v001.LadeTBX = ##class(APPS.EDI.common.dto.v001.LadeTBX).%New()
+	Set Product.Klasse = "SP2"
+	Set Product.UitsparingDataBreedteM = 1
+	
+	Set Validator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.UitsparingValidator).%New(Product)
+	
+	Do $$$AssertFalse(Validator.IsValid())
+]]></Implementation>
+</Method>
+
+<Method name="Test: Klasse = Spoelbak -&gt; geen dataZ2 toegelaten">
+<Implementation><![CDATA[
+	#dim Product As APPS.EDI.common.dto.v001.LadeTBX = ##class(APPS.EDI.common.dto.v001.LadeTBX).%New()
+	Set Product.Klasse = "SP2"
+	Set Product.UitsparingDataBreedteZ2 = 1
+	
+	Set Validator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.UitsparingValidator).%New(Product)
+	
+	Do $$$AssertFalse(Validator.IsValid())
+]]></Implementation>
+</Method>
+
+<Method name="Test: Klasse = Siffon &amp; AantalUitsparingen = 1 -&gt; geen dataM toegelaten">
+<Implementation><![CDATA[
+	#dim Product As APPS.EDI.common.dto.v001.LadeTBX = ##class(APPS.EDI.common.dto.v001.LadeTBX).%New()
+	Set Product.Klasse = "SY2"
+	Set Product.UitsparingDataAantalUitsparingen = 1
+	Set Product.UitsparingDataBreedteZ2 = 1
+	
+	Set Validator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.UitsparingValidator).%New(Product)
+	
+	Do $$$AssertFalse(Validator.IsValid())
+]]></Implementation>
+</Method>
+
+<Method name="Test: Klasse = Siffon &amp; AantalUitsparingen = 1 -&gt; geen dataZ2 toegelaten">
+<Implementation><![CDATA[
+	#dim Product As APPS.EDI.common.dto.v001.LadeTBX = ##class(APPS.EDI.common.dto.v001.LadeTBX).%New()
+	Set Product.Klasse = "SY2"
+	Set Product.UitsparingDataAantalUitsparingen = 1
+	Set Product.UitsparingDataBreedteZ2 = 1
+	
+	Set Validator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.UitsparingValidator).%New(Product)
+	
+	Do $$$AssertFalse(Validator.IsValid())
+]]></Implementation>
+</Method>
+
+<Method name="Test: Klasse = Siffon &amp; AantalUitsparingen = 2 &amp; stukje uitsparingdata niet ingevuld -&gt; invalid">
+<Implementation><![CDATA[
+	#dim Product As APPS.EDI.common.dto.v001.LadeTBX = ##class(APPS.EDI.common.dto.v001.LadeTBX).%New()
+	Set Product.Klasse = "SY2"
+	Set Product.UitsparingDataAantalUitsparingen = 2
+	Set Product.UitsparingDataBreedteM = 1
+	Set Product.UitsparingDataBreedteX = 1
+	Set Product.UitsparingDataBreedteY = 1
+	Set Product.UitsparingDataBreedteZ1 = 1
+	
+	Set Validator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.UitsparingValidator).%New(Product)
+	
+	Do $$$AssertFalse(Validator.IsValid())
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/ProductValidator.cls.xml
===================================================================
diff -u -r35922 -r35934
--- APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/ProductValidator.cls.xml	(.../ProductValidator.cls.xml)	(revision 35922)
+++ APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/ProductValidator.cls.xml	(.../ProductValidator.cls.xml)	(revision 35934)
@@ -43,6 +43,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="UitsparingValidator">
+<Type>APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.UitsparingValidator</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="IsValid">
 <FormalSpec>Product:APPS.EDI.common.dto.v001.LadeTBX</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
@@ -55,8 +60,16 @@
 	Set ..InschuifElementValidator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.InschuifElementValidator).%New(..Product)
 	Set ..MatValidator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.MatValidator).%New(..Product)
 	Set ..DwarsverdelingValidator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.DwarsverdelingValidator).%New(..Product)
+	Set ..UitsparingValidator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.UitsparingValidator).%New(..Product)
 	
-	Quit ..CorpusWandDikteValidator.IsValid() && ..OpvullijstValidator.IsValid() && ..FrontOndersteuningValidator.IsValid() && ..GreepEnMeenemerValidator.IsValid() && ..InschuifElementValidator.IsValid() && ..MatValidator.IsValid() && ..DwarsverdelingValidator.IsValid()
+	Quit ..CorpusWandDikteValidator.IsValid() && 
+		 ..OpvullijstValidator.IsValid() && 
+		 ..FrontOndersteuningValidator.IsValid() && 
+		 ..GreepEnMeenemerValidator.IsValid() && 
+		 ..InschuifElementValidator.IsValid() && 
+		 ..MatValidator.IsValid() && 
+		 ..DwarsverdelingValidator.IsValid() &&
+		 ..UitsparingValidator.IsValid()
 ]]></Implementation>
 </Method>
 </Class>