Index: ECONimpl/PM/Maatwerk/KenmerkenConverter/AppsNaarEcon/Tax.cls.xml
===================================================================
diff -u -r52347 -r52353
--- ECONimpl/PM/Maatwerk/KenmerkenConverter/AppsNaarEcon/Tax.cls.xml	(.../Tax.cls.xml)	(revision 52347)
+++ ECONimpl/PM/Maatwerk/KenmerkenConverter/AppsNaarEcon/Tax.cls.xml	(.../Tax.cls.xml)	(revision 52353)
@@ -34,12 +34,21 @@
 	
 	#dim Property As %String = ""
 	For { set Property = $order(Properties(Property)) quit:Property=""
-		
+
 		Continue:(Property["ZijkantLogoIds")
-		
-		If '(Property["ExplicietGekozenKenmerken")&&'(Property["GekoppeldeIngegevenKenmerken")&&'(Property["GlijderType")&&'(Property["NietIngegeven")&&'(Property["NietMeeleveren")&&'(Property["Omschrijving")&&'(Property["Uittrekbaarheid")&&'(Property["Validator")&&'(Property["VersieNr")&&'(##class(TECH.StringUtils).StartsWith(Property,"Mat")){
-			Do %code.WriteLine($$$TAB_"Set TaxKenmerken."_Property_" = Kenmerken."_Property)
-		}
+		Continue:(Property["ExplicietGekozenKenmerken")
+		Continue:(Property["GekoppeldeIngegevenKenmerken")
+		Continue:(Property["GlijderType")
+		Continue:(Property["NietIngegeven")
+		Continue:(Property["NietMeeleveren")
+		Continue:(Property["Omschrijving")
+		Continue:(Property["Uittrekbaarheid")
+		Continue:(Property["Validator")
+		Continue:(Property["VersieNr")
+		Continue:(##class(TECH.StringUtils).StartsWith(Property,"Mat"))
+
+		Do %code.WriteLine($$$TAB_"Set TaxKenmerken."_Property_" = Kenmerken."_Property)
+
 	}
 	
 	Do %code.WriteLine($$$TAB_"Quit TaxKenmerken")