Index: AX/common/impl/Formatter.cls.xml
===================================================================
diff -u -r34618 -r34621
--- AX/common/impl/Formatter.cls.xml	(.../Formatter.cls.xml)	(revision 34618)
+++ AX/common/impl/Formatter.cls.xml	(.../Formatter.cls.xml)	(revision 34621)
@@ -81,8 +81,8 @@
 	quit:BTWNr="GEEN" ""
 	quit:BTWNr="G" ""
 	quit:$$$StartsWith(BTWNr,"BE") ""
-	quit:+$extract(BTWNr,3,*)=0 ""
-	quit $extract(BTWNr,3,*)
+	quit:((+$extract(BTWNr,3,*)=0)&&($IsValidNum($extract(BTWNr,3,3)))) ""
+	quit $$$Trim($extract(BTWNr,3,*))
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/AX/Uitgaand/AKP/Leverancier/impl/DixfConverter/Convert.cls.xml
===================================================================
diff -u -r34619 -r34621
--- vhUnitTest/AX/Uitgaand/AKP/Leverancier/impl/DixfConverter/Convert.cls.xml	(.../Convert.cls.xml)	(revision 34619)
+++ vhUnitTest/AX/Uitgaand/AKP/Leverancier/impl/DixfConverter/Convert.cls.xml	(.../Convert.cls.xml)	(revision 34621)
@@ -419,6 +419,18 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: BTW variaties - Niet-Belgisch BTW-Nr met meer dan 2 letters vooraan">
+<Implementation><![CDATA[
+	Do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("AT U35695903")
+	
+	set Converter = ##class(AX.Uitgaand.AKP.Leverancier.impl.DixfConverter).%New()
+	Set ..AxLeverancier = Converter.Convert(..Partij, ..Leverancier)
+	
+	Do $$$AssertEquals(..AxLeverancier.EnterpriseNumber,"")
+	Do $$$AssertEquals(..AxLeverancier.VATNum,"U35695903")
+]]></Implementation>
+</Method>
+
 <Method name="Test: BTW variaties - G">
 <Implementation><![CDATA[
 	Do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("G")
Index: AX/Uitgaand/AKP/Leverancier/impl/DixfGenerator.cls.xml
===================================================================
diff -u -r34619 -r34621
--- AX/Uitgaand/AKP/Leverancier/impl/DixfGenerator.cls.xml	(.../DixfGenerator.cls.xml)	(revision 34619)
+++ AX/Uitgaand/AKP/Leverancier/impl/DixfGenerator.cls.xml	(.../DixfGenerator.cls.xml)	(revision 34621)
@@ -8,9 +8,17 @@
 <Private>1</Private>
 </Property>
 
+<Method name="GenerateAll">
+<Implementation><![CDATA[
+	#dim LeverancierIterator As TECH.Iterator = ##class(TECH.DynamicIterator).%New(##class(DOM.DomeinContext).Instance().GeefAankoopAPI().GeefLeverancierIterator(),,"(Item.GeefActiefNiveau()="""")")
+	do ..Generate(LeverancierIterator)
+]]></Implementation>
+</Method>
+
 <Method name="Generate">
+<FormalSpec>LeverancierIterator:TECH.Iterator</FormalSpec>
 <Implementation><![CDATA[
-	Set AxLeverancierIterator = ##class(AX.Uitgaand.AKP.Leverancier.impl.AxLeverancierIterator).%New()
+	Set AxLeverancierIterator = ##class(AX.Uitgaand.AKP.Leverancier.impl.AxLeverancierIterator).%New(LeverancierIterator)
 		
 	Set Headers = ##class(TECH.KeyValue.List).%New() 
 	Do Headers.InsertKeyValue("AXdixf.Vendor.Vendor", "AccountNum")
@@ -43,7 +51,7 @@
 	Set AXLeverancierData.ScheidingsTeken = ";"	
 	Set AXLeverancierData.Iterator = AxLeverancierIterator
 	Set AXLeverancierData.DataVelden = Headers
-	Set AXLeverancierData.BestandVolledigeNaam = "c:\temp\lev7.csv"
+	Set AXLeverancierData.BestandVolledigeNaam = "c:\temp\lev8.csv"
 	
 	#dim BestandGenerator As APPS.common.Rapport.impl.BestandGenerator
 	Set BestandGenerator = ##class(APPS.common.Rapport.impl.BestandGenerator).%New()