Index: vhUnitTest/AX/Uitgaand/Klant/KlantNaarBestand/Test.cls.xml
===================================================================
diff -u -r33529 -r33533
--- vhUnitTest/AX/Uitgaand/Klant/KlantNaarBestand/Test.cls.xml	(.../Test.cls.xml)	(revision 33529)
+++ vhUnitTest/AX/Uitgaand/Klant/KlantNaarBestand/Test.cls.xml	(.../Test.cls.xml)	(revision 33533)
@@ -27,8 +27,6 @@
 <Method name="Test: Standaard data">
 <Implementation><![CDATA[
 	do ..Klant.IndienMethodCall("GeefCode").DanReturn(4682)
-	do ..Klant.IndienMethodCall("GeefKortingContantPercentage").DanReturn(3)
-	do ..Klant.IndienMethodCall("GeefKortingContantTermijn").DanReturn("10D")
 	do ..Klant.IndienMethodCall("GeefRegio").DanReturn(9)
 	
 	set Converter = ##class(AX.Uitgaand.Klant.impl.AifConverter).%New()
@@ -38,13 +36,64 @@
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	do $$$AssertEquals(CustTable.AccountNum,"000004682")
-	do $$$AssertEquals(CustTable.CashDisc,"10D3%")
 	do $$$AssertEquals(CustTable.Currency,"EUR")
 	do $$$AssertEquals(CustTable.CustClassificationId,"R09")
 	do $$$AssertEquals(CustTable.CustGroup,"10")
 ]]></Implementation>
 </Method>
 
+<Method name="Test: KortingContant variaties - Geen korting contant CashDisc is leeg">
+<Implementation><![CDATA[
+	do ..Klant.IndienMethodCall("GeefKortingContantPercentage").DanReturn(0)
+	do ..Klant.IndienMethodCall("GeefKortingContantTermijn").DanReturn("")
+
+	set Converter = ##class(AX.Uitgaand.Klant.impl.AifConverter).%New()
+	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Klant)
+	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
+	
+	do $$$AssertEquals(CustTable.CashDisc,"")
+]]></Implementation>
+</Method>
+
+<Method name="Test: KortingContant variaties - Geen korting contant wel termijn CashDisc is leeg">
+<Implementation><![CDATA[
+	do ..Klant.IndienMethodCall("GeefKortingContantPercentage").DanReturn(0)
+	do ..Klant.IndienMethodCall("GeefKortingContantTermijn").DanReturn("10D")
+
+	set Converter = ##class(AX.Uitgaand.Klant.impl.AifConverter).%New()
+	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Klant)
+	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
+	
+	do $$$AssertEquals(CustTable.CashDisc,"")
+]]></Implementation>
+</Method>
+
+<Method name="Test: KortingContant variaties - Korting contant en geen termijn">
+<Implementation><![CDATA[
+	do ..Klant.IndienMethodCall("GeefKortingContantPercentage").DanReturn(1)
+	do ..Klant.IndienMethodCall("GeefKortingContantTermijn").DanReturn("")
+
+	set Converter = ##class(AX.Uitgaand.Klant.impl.AifConverter).%New()
+	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Klant)
+	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
+	
+	do $$$AssertEquals(CustTable.CashDisc,"")
+]]></Implementation>
+</Method>
+
+<Method name="Test: KortingContant variaties - Korting contant en termijn">
+<Implementation><![CDATA[
+	do ..Klant.IndienMethodCall("GeefKortingContantPercentage").DanReturn(3)
+	do ..Klant.IndienMethodCall("GeefKortingContantTermijn").DanReturn("10D")
+
+	set Converter = ##class(AX.Uitgaand.Klant.impl.AifConverter).%New()
+	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Klant)
+	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
+	
+	do $$$AssertEquals(CustTable.CashDisc,"10D3%")
+]]></Implementation>
+</Method>
+
 <Method name="Test: Belgisch BTW-Nr">
 <Implementation><![CDATA[
 	do ..Klant.IndienMethodCall("GeefBTWNr").DanReturn("BE0402775276")