Index: APPS/EDI/common/impl/Validator/ZijkantLogoValidator.cls.xml
===================================================================
diff -u -r52225 -r52228
--- APPS/EDI/common/impl/Validator/ZijkantLogoValidator.cls.xml	(.../ZijkantLogoValidator.cls.xml)	(revision 52225)
+++ APPS/EDI/common/impl/Validator/ZijkantLogoValidator.cls.xml	(.../ZijkantLogoValidator.cls.xml)	(revision 52228)
@@ -25,6 +25,8 @@
 <FormalSpec><![CDATA[Product:APPS.EDI.common.dto.v001.Lade,&Exceptions:TECH.ExceptionList,Opties:TECH.KeyValue.List]]></FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
+	#dim IsValid As %Boolean = $$$True
+	
 	Set Exception = ##class(TECH.ObjectUtils.ObjectConverterCombinationException).%New()
 
 	If Opties.GetValuesForKey("KlantID").Count() > 0 {
@@ -39,24 +41,43 @@
 		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.IllegalArgumentException).%New("PersonalityID niet opgegeven"))
 	}
 
-	/*If (Product.Klasse="SY") && $$$Not(Product.RugHoogte="M") {
+	If ..IsTaxLade(Product)
+	{
+		#dim TaxLade As APPS.EDI.common.dto.v001.LadeTAX = Product
+		
+		If ..IsGeldigZijkantLogoID(TaxLade.ZijkantLogoID) {
+			Set IsValid = ..ZijkantLogoService.BestaatLogoVoorKlant(PersonalityID, KlantID, TaxLade.ZijkantLogoID)
+		}
+		
+		If $$$Not(IsValid) {
 		Set Exception = ##class(TECH.ObjectUtils.ObjectConverterCombinationException).%New()
-		Do Exception.AddCombination($classname(Product),"Klasse",Product.Klasse)
-		Do Exception.AddCombination($classname(Product),"RugHoogte",Product.RugHoogte)
+		Do Exception.AddCombination($classname(Product),"PersonalityID",PersonalityID)
+		Do Exception.AddCombination($classname(Product),"KlantID",KlantID)
+		Do Exception.AddCombination($classname(Product),"ZijkantLogoID",TaxLade.ZijkantLogoID)
 		Do Exceptions.Insert(Exception)
+		
+		}
 	}
-	If (Product.Klasse="SP") && $$$Not((Product.RugHoogte="M") || (Product.RugHoogte="C")){
-		Set Exception = ##class(TECH.ObjectUtils.ObjectConverterCombinationException).%New()
-		Do Exception.AddCombination($classname(Product),"Klasse",Product.Klasse)
-		Do Exception.AddCombination($classname(Product),"RugHoogte",Product.RugHoogte)
-		Do Exceptions.Insert(Exception)
-	}
 	
-	Quit $$$If(Exceptions.Count()>0,$$$false,$$$true)
-	*/
-	Quit 1
+	Quit IsValid
 ]]></Implementation>
 </Method>
+
+<Method name="IsGeldigZijkantLogoID">
+<FormalSpec>ZijkantLogoID:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ($$$Not(ZijkantLogoID = "") && $$$Not(ZijkantLogoID = "0"))
+]]></Implementation>
+</Method>
+
+<Method name="IsTaxLade">
+<FormalSpec>Product:APPS.EDI.common.dto.v001.Lade</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit Product.%Extends(##class(APPS.EDI.common.dto.v001.LadeTAX).%ClassName($$$True))
+]]></Implementation>
+</Method>
 </Class>