Index: AX/Uitgaand/AKP/Leverancier/impl/DixfConverter.cls.xml
===================================================================
diff -u -r34311 -r34334
--- AX/Uitgaand/AKP/Leverancier/impl/DixfConverter.cls.xml	(.../DixfConverter.cls.xml)	(revision 34311)
+++ AX/Uitgaand/AKP/Leverancier/impl/DixfConverter.cls.xml	(.../DixfConverter.cls.xml)	(revision 34334)
@@ -39,6 +39,8 @@
 	Set:Leverancier.GeefTelefax()'="" AxLeverancier.TeleFaxName = "Fax"
 	Set AxLeverancier.TeleFax = $$$Trim(Leverancier.GeefTelefax())
 	Set AxLeverancier.Currency = Leverancier.GeefMuntkode()
+	set AxLeverancier.EnterpriseNumber = ..Formatter.FormatEnterpriseNumber(Leverancier.GeefBTWnr())
+	set AxLeverancier.VATNum = ..Formatter.FormatVATNum(Leverancier.GeefBTWnr())
 	
 	Quit AxLeverancier
 ]]></Implementation>
Index: AXdixf/Vendor/Vendor.cls.xml
===================================================================
diff -u -r34311 -r34334
--- AXdixf/Vendor/Vendor.cls.xml	(.../Vendor.cls.xml)	(revision 34311)
+++ AXdixf/Vendor/Vendor.cls.xml	(.../Vendor.cls.xml)	(revision 34334)
@@ -66,6 +66,14 @@
 <Property name="Currency">
 <Type>%String</Type>
 </Property>
+
+<Property name="EnterpriseNumber">
+<Type>%String</Type>
+</Property>
+
+<Property name="VATNum">
+<Type>%String</Type>
+</Property>
 </Class>
 
 
Index: vhUnitTest/AX/Uitgaand/AKP/Leverancier/impl/DixfConverter/Convert.cls.xml
===================================================================
diff -u -r34311 -r34334
--- vhUnitTest/AX/Uitgaand/AKP/Leverancier/impl/DixfConverter/Convert.cls.xml	(.../Convert.cls.xml)	(revision 34311)
+++ vhUnitTest/AX/Uitgaand/AKP/Leverancier/impl/DixfConverter/Convert.cls.xml	(.../Convert.cls.xml)	(revision 34334)
@@ -34,6 +34,7 @@
 	Do ..Leverancier.IndienMethodCall("GeefEmail").DanReturn("everyone@example.com")
 	Do ..Leverancier.IndienMethodCall("GeefTelefax").DanReturn(" 03/112.101")
 	Do ..Leverancier.IndienMethodCall("GeefMuntkode").DanReturn("EUR")
+	Do ..Leverancier.IndienMethodCall("GeefBTWnr").DanReturn("BE0402775276")
 ]]></Implementation>
 </Method>
 
@@ -349,6 +350,78 @@
 	Do $$$AssertEquals(..AxLeverancier.Currency,"EUR")
 ]]></Implementation>
 </Method>
+
+<Method name="Test: BTW variaties - Belgisch BTW-Nr">
+<Implementation><![CDATA[
+	Do ..Leverancier.IndienMethodCall("GeefBTWnr").DanReturn("BE0402775276")
+	
+	set Converter = ##class(AX.Uitgaand.AKP.Leverancier.impl.DixfConverter).%New()
+	Set ..AxLeverancier = Converter.Convert(..Leverancier)
+	
+	Do $$$AssertEquals(..AxLeverancier.EnterpriseNumber,"BTW BE 0402.775.276")
+	Do $$$AssertEquals(..AxLeverancier.VATNum,"")
+]]></Implementation>
+</Method>
+
+<Method name="Test: BTW variaties - Geen BTW-Nr">
+<Implementation><![CDATA[
+	Do ..Leverancier.IndienMethodCall("GeefBTWnr").DanReturn("")
+	
+	Set Converter = ##class(AX.Uitgaand.AKP.Leverancier.impl.DixfConverter).%New()
+	Set ..AxLeverancier = Converter.Convert(..Leverancier)
+	
+	Do $$$AssertEquals(..AxLeverancier.EnterpriseNumber,"")
+	Do $$$AssertEquals(..AxLeverancier.VATNum,"")
+]]></Implementation>
+</Method>
+
+<Method name="Test: BTW variaties - Buitenlands BTW-Nr">
+<Implementation><![CDATA[
+	Do ..Leverancier.IndienMethodCall("GeefBTWnr").DanReturn("NL814120313B01")
+	
+	Set Converter = ##class(AX.Uitgaand.AKP.Leverancier.impl.DixfConverter).%New()
+	Set ..AxLeverancier = Converter.Convert(..Leverancier)
+	
+	Do $$$AssertEquals(..AxLeverancier.EnterpriseNumber,"")
+	Do $$$AssertEquals(..AxLeverancier.VATNum,"814120313B01")
+]]></Implementation>
+</Method>
+
+<Method name="Test: BTW variaties - G">
+<Implementation><![CDATA[
+	Do ..Leverancier.IndienMethodCall("GeefBTWnr").DanReturn("G")
+	
+	Set Converter = ##class(AX.Uitgaand.AKP.Leverancier.impl.DixfConverter).%New()
+	Set ..AxLeverancier = Converter.Convert(..Leverancier)
+	
+	Do $$$AssertEquals(..AxLeverancier.EnterpriseNumber,"")
+	Do $$$AssertEquals(..AxLeverancier.VATNum,"")
+]]></Implementation>
+</Method>
+
+<Method name="Test: BTW variaties - GEEN">
+<Implementation><![CDATA[
+	Do ..Leverancier.IndienMethodCall("GeefBTWnr").DanReturn("GEEN")
+	
+	Set Converter = ##class(AX.Uitgaand.AKP.Leverancier.impl.DixfConverter).%New()
+	Set ..AxLeverancier = Converter.Convert(..Leverancier)
+	
+	Do $$$AssertEquals(..AxLeverancier.EnterpriseNumber,"")
+	Do $$$AssertEquals(..AxLeverancier.VATNum,"")
+]]></Implementation>
+</Method>
+
+<Method name="Test: BTW variaties - BE met nullen">
+<Implementation><![CDATA[
+	Do ..Leverancier.IndienMethodCall("GeefBTWnr").DanReturn("BE0000000000")
+	
+	Set Converter = ##class(AX.Uitgaand.AKP.Leverancier.impl.DixfConverter).%New()
+	Set ..AxLeverancier = Converter.Convert(..Leverancier)
+	
+	Do $$$AssertEquals(..AxLeverancier.EnterpriseNumber,"BE 0000.000.097")
+	Do $$$AssertEquals(..AxLeverancier.VATNum,"")
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml
===================================================================
diff -u -r34299 -r34334
--- AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 34299)
+++ AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 34334)
@@ -35,8 +35,8 @@
 	set Custable.CustClassificationId = "R"_##class(TECH.StringUtils).AlignRight(Klant.GeefRegio(),0,2)
 	set Custable.CustGroup = ..ConvertCustGroup(Partij,Klant)
 	
-	set Custable.EnterpriseNumber = ..FormatEnterpriseNumber(Partij.GeefBTWNr())
-	set Custable.VATNum = ..FormatVATNum(Partij.GeefBTWNr())
+	set Custable.EnterpriseNumber = ..Formatter.FormatEnterpriseNumber(Partij.GeefBTWNr())
+	set Custable.VATNum = ..Formatter.FormatVATNum(Partij.GeefBTWNr())
 	set Custable.TaxGroup = ..FormatTaxGroup(Partij,Klant)
 	
 	set Custable.WebSalesOrderDisplay = "All"
@@ -176,32 +176,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="FormatEnterpriseNumber">
-<FormalSpec>BTWNr:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	quit:$$$Not($$$StartsWith(BTWNr,"BE")) ""
-	quit:BTWNr="" ""
-	quit:(+$extract(BTWNr,3,*))=0 "BE 0000.000.097"
-	quit "BTW "_$extract(BTWNr,1,2)_" "_$extract(BTWNr,3,6)_"."_$extract(BTWNr,7,9)_"."_$extract(BTWNr,10,12)
-]]></Implementation>
-</Method>
-
-<Method name="FormatVATNum">
-<FormalSpec>BTWNr:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	quit:BTWNr="" ""
-	quit:BTWNr="GEEN" ""
-	quit:BTWNr="G" ""
-	quit:$$$StartsWith(BTWNr,"BE") ""
-	quit:+$extract(BTWNr,3,*)=0 ""
-	quit $extract(BTWNr,3,*)
-]]></Implementation>
-</Method>
-
 <Method name="FormatTaxGroup">
 <FormalSpec>Partij:DOM.PARTIJ.Partij,Klant:DOM.VKP.VanHoeckeKlant</FormalSpec>
 <Private>1</Private>
Index: AX/common/impl/Formatter.cls.xml
===================================================================
diff -u -r34271 -r34334
--- AX/common/impl/Formatter.cls.xml	(.../Formatter.cls.xml)	(revision 34271)
+++ AX/common/impl/Formatter.cls.xml	(.../Formatter.cls.xml)	(revision 34334)
@@ -61,6 +61,30 @@
 	quit "nl-be"
 ]]></Implementation>
 </Method>
+
+<Method name="FormatEnterpriseNumber">
+<FormalSpec>BTWNr:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	quit:$$$Not($$$StartsWith(BTWNr,"BE")) ""
+	quit:BTWNr="" ""
+	quit:(+$extract(BTWNr,3,*))=0 "BE 0000.000.097"
+	quit "BTW "_$extract(BTWNr,1,2)_" "_$extract(BTWNr,3,6)_"."_$extract(BTWNr,7,9)_"."_$extract(BTWNr,10,12)
+]]></Implementation>
+</Method>
+
+<Method name="FormatVATNum">
+<FormalSpec>BTWNr:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	quit:BTWNr="" ""
+	quit:BTWNr="GEEN" ""
+	quit:BTWNr="G" ""
+	quit:$$$StartsWith(BTWNr,"BE") ""
+	quit:+$extract(BTWNr,3,*)=0 ""
+	quit $extract(BTWNr,3,*)
+]]></Implementation>
+</Method>
 </Class>