Index: vhUnitTest/AX/Uitgaand/AKP/Leverancier/impl/DixfConverter/Convert.cls.xml
===================================================================
diff -u -r34621 -r34653
--- vhUnitTest/AX/Uitgaand/AKP/Leverancier/impl/DixfConverter/Convert.cls.xml	(.../Convert.cls.xml)	(revision 34621)
+++ vhUnitTest/AX/Uitgaand/AKP/Leverancier/impl/DixfConverter/Convert.cls.xml	(.../Convert.cls.xml)	(revision 34653)
@@ -626,6 +626,18 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: KortingContant variaties - DEM -&gt; EOM">
+<Implementation><![CDATA[
+	Do ..Leverancier.IndienMethodCall("GeefKortingKontant").DanReturn(5)
+	Do ..Leverancier.IndienMethodCall("GeefTermijnKortingKontant").DanReturn("10DEM")
+	
+	Set Converter = ##class(AX.Uitgaand.AKP.Leverancier.impl.DixfConverter).%New()
+	Set ..AxLeverancier = Converter.Convert(..Partij, ..Leverancier)
+	
+	Do $$$AssertEquals(..AxLeverancier.UseCashDisc,"10EOM5%")
+]]></Implementation>
+</Method>
+
 <Method name="Test: KortingContant variaties - Korting contant en geen termijn">
 <Implementation><![CDATA[
 	Do ..Leverancier.IndienMethodCall("GeefKortingKontant").DanReturn(1)
Index: AX/common/impl/Formatter.cls.xml
===================================================================
diff -u -r34621 -r34653
--- AX/common/impl/Formatter.cls.xml	(.../Formatter.cls.xml)	(revision 34621)
+++ AX/common/impl/Formatter.cls.xml	(.../Formatter.cls.xml)	(revision 34653)
@@ -46,6 +46,7 @@
 	quit:$$$Not(Percentage) ""
 	
 	#dim ContantTermijn As %String = Length
+	Set ContantTermijn = ##class(TECH.StringUtils).Replace(ContantTermijn,"DEM","EOM")
 	if ##class(TECH.StringUtils).Equals(ContantTermijn,"0D","","0") set ContantTermijn = "8D"
 	quit ( ##class(TECH.StringUtils).AlignRight(ContantTermijn,0,3) ) _ Percentage _"%"
 ]]></Implementation>