Index: vhUnitTest/AX/Uitgaand/Klant/impl/AifConverter.cls.xml
===================================================================
diff -u -r33756 -r33787
--- vhUnitTest/AX/Uitgaand/Klant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 33756)
+++ vhUnitTest/AX/Uitgaand/Klant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 33787)
@@ -329,7 +329,7 @@
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	do $$$AssertEquals(CustTable.EnterpriseNumber,"BTW BE 0402.775.276")
-	do $$$AssertEquals(CustTable.VATNum,"0402.775.276")
+	do $$$AssertEquals(CustTable.VATNum,"0402775276")
 ]]></Implementation>
 </Method>
 
@@ -394,7 +394,7 @@
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	do $$$AssertEquals(CustTable.EnterpriseNumber,"")
-	do $$$AssertEquals(CustTable.VATNum,"0000.000.000")
+	do $$$AssertEquals(CustTable.VATNum,"")
 ]]></Implementation>
 </Method>
 
@@ -715,6 +715,20 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test Betalingwijze -Betalingwijze - Termijn - 8D">
+<Implementation><![CDATA[
+	do ..Klant.IndienMethodCall("GeefBetalingwijze").DanReturn(##class(DOM.VKP.enu.Betalingwijze).Betalingstermijn())
+	do ..Klant.IndienMethodCall("GeefBetalingTermijn").DanReturn("8D")
+	
+	set Converter = ##class(AX.Uitgaand.Klant.impl.AifConverter).%New()
+	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
+	
+	do $$$AssertEquals(CustTable.PaymTermId,"NET08")
+	do $$$AssertEquals(CustTable.PaymMode,"OVER")
+]]></Implementation>
+</Method>
+
 <Method name="Test Betalingwijze -Betalingwijze - Termijn - 30DEM">
 <Implementation><![CDATA[
 	do ..Klant.IndienMethodCall("GeefBetalingwijze").DanReturn(##class(DOM.VKP.enu.Betalingwijze).Betalingstermijn())
Index: AX/Uitgaand/Klant/impl/AifConverter.cls.xml
===================================================================
diff -u -r33756 -r33787
--- AX/Uitgaand/Klant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 33756)
+++ AX/Uitgaand/Klant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 33787)
@@ -88,10 +88,10 @@
 	#dim BetalingTermijn As %String = Klant.GeefBetalingTermijn()
 	
 	if BetalingTermijn'="" {
-		quit:##class(TECH.StringUtils).EndsWith(BetalingTermijn,"D") "NET"_+BetalingTermijn
-		quit:##class(TECH.StringUtils).EndsWith(BetalingTermijn,"DEM") "EOM"_+BetalingTermijn
-		quit:##class(TECH.StringUtils).EndsWith(BetalingTermijn,"MEM") "EOM"_(+BetalingTermijn*30)
-		quit:##class(TECH.StringUtils).EndsWith(BetalingTermijn,"M") "NET"_(+BetalingTermijn*30)
+		quit:##class(TECH.StringUtils).EndsWith(BetalingTermijn,"D") "NET"_##class(TECH.StringUtils).AlignRight(+BetalingTermijn,0,2)
+		quit:##class(TECH.StringUtils).EndsWith(BetalingTermijn,"DEM") "EOM"_##class(TECH.StringUtils).AlignRight(+BetalingTermijn,0,2)
+		quit:##class(TECH.StringUtils).EndsWith(BetalingTermijn,"MEM") "EOM"_##class(TECH.StringUtils).AlignRight((+BetalingTermijn*30),0,2)
+		quit:##class(TECH.StringUtils).EndsWith(BetalingTermijn,"M") "NET"_##class(TECH.StringUtils).AlignRight((+BetalingTermijn*30),0,2)
 	}
 	
 	quit "NET00"
@@ -175,8 +175,8 @@
 	quit:BTWNr="" ""
 	quit:BTWNr="GEEN" ""
 	quit:BTWNr="G" ""
-	quit:$$$Not($$$StartsWith(BTWNr,"BE")) $extract(BTWNr,3,*)
-	quit $extract(BTWNr,3,6)_"."_$extract(BTWNr,7,9)_"."_$extract(BTWNr,10,12)
+	quit:+$extract(BTWNr,3,*)=0 ""
+	quit $extract(BTWNr,3,*)
 ]]></Implementation>
 </Method>