Index: vhUnitTest/AX/Uitgaand/Klant/impl/AifConverter.cls.xml
===================================================================
diff -u -r33558 -r33597
--- vhUnitTest/AX/Uitgaand/Klant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 33558)
+++ vhUnitTest/AX/Uitgaand/Klant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 33597)
@@ -119,7 +119,7 @@
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
-	#dim PostalAddres As AXaif.Customer.AxdEntityDirPartyPostalAddressView = Party.DirPartyPostalAddressView.GetAt(1)
+	#dim PostalAddres As AXaif.Customer.AxdEntityDifrPartyPostalAddressView = Party.DirPartyPostalAddressView.GetAt(1)
 	
 	do $$$AssertEquals(PostalAddres.ZipCode,"1234-AA")
 ]]></Implementation>
@@ -286,7 +286,7 @@
 	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
-	do $$$AssertEquals(CustTable.CashDisc,"")
+	do $$$AssertEquals(CustTable.CashDisc,"8D1%")
 ]]></Implementation>
 </Method>
 
@@ -303,6 +303,19 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: KortingContant variaties - Korting termijn is 0D defaulten naar 8D">
+<Implementation><![CDATA[
+	do ..Klant.IndienMethodCall("GeefKortingContantPercentage").DanReturn(3)
+	do ..Klant.IndienMethodCall("GeefKortingContantTermijn").DanReturn("0D")
+
+	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.CashDisc,"8D3%")
+]]></Implementation>
+</Method>
+
 <Method name="Test: BTW variaties - Belgisch BTW-Nr">
 <Implementation><![CDATA[
 	do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("BE0402775276")
@@ -311,7 +324,7 @@
 	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
-	do $$$AssertEquals(CustTable.EnterpriseNumber,"BE 0402.775.276")
+	do $$$AssertEquals(CustTable.EnterpriseNumber,"BTW BE 0402.775.276")
 	do $$$AssertEquals(CustTable.VATNum,"0402.775.276")
 ]]></Implementation>
 </Method>
Index: AX/Uitgaand/Klant/impl/AifConverter.cls.xml
===================================================================
diff -u -r33560 -r33597
--- AX/Uitgaand/Klant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 33560)
+++ AX/Uitgaand/Klant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 33597)
@@ -99,9 +99,10 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 	quit:Klant.GeefKortingContantPercentage()=0 ""
-	quit:Klant.GeefKortingContantTermijn()="" ""
 	
-	quit ( ##class(TECH.StringUtils).AlignRight(Klant.GeefKortingContantTermijn(),0,2) ) _ ( Klant.GeefKortingContantPercentage() _"%" )
+	#dim ContantTermijn As %String = Klant.GeefKortingContantTermijn()
+	if ##class(TECH.StringUtils).Equals(ContantTermijn,"0D","") set ContantTermijn = "8D"
+	quit ( ContantTermijn ) _ Klant.GeefKortingContantPercentage() _"%"
 ]]></Implementation>
 </Method>
 
@@ -112,7 +113,7 @@
 <Implementation><![CDATA[
 	quit:$$$Not($$$StartsWith(BTWNr,"BE")) ""
 	quit:BTWNr="" ""
-	quit $extract(BTWNr,1,2)_" "_$extract(BTWNr,3,6)_"."_$extract(BTWNr,7,9)_"."_$extract(BTWNr,10,12)
+	quit "BTW "_$extract(BTWNr,1,2)_" "_$extract(BTWNr,3,6)_"."_$extract(BTWNr,7,9)_"."_$extract(BTWNr,10,12)
 ]]></Implementation>
 </Method>