Index: vhUnitTest/AXimpl/Formatter/FormatADUPriceContrMargineId/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/AXimpl/Formatter/FormatADUPriceContrMargineId/Test.cls.xml	(revision 0)
+++ vhUnitTest/AXimpl/Formatter/FormatADUPriceContrMargineId/Test.cls.xml	(revision 46109)
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.AXimpl.Formatter.FormatADUPriceContrMargineId.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: In ADUPriceContrMargineId wordt het punt vervangen door een komma zonder afronding of afkapping ongeacht aantal decimalen">
+<Implementation><![CDATA[
+	Set Formatter = ##class(AXimpl.Formatter).%New()
+	#dim ADUPriceContrMargineId As %String
+	
+	Set ADUPriceContrMargineId = Formatter.FormatADUPriceContrMargineId("-25.123456")
+	Do $$$AssertEquals(ADUPriceContrMargineId,"-25,123456")
+	
+	Set ADUPriceContrMargineId = Formatter.FormatADUPriceContrMargineId(".123456")
+	Do $$$AssertEquals(ADUPriceContrMargineId,",123456")
+	
+	Set ADUPriceContrMargineId = Formatter.FormatADUPriceContrMargineId("25.0")
+	Do $$$AssertEquals(ADUPriceContrMargineId,"25,0")
+	
+	Set ADUPriceContrMargineId = Formatter.FormatADUPriceContrMargineId("25.1")
+	Do $$$AssertEquals(ADUPriceContrMargineId,"25,1")
+	
+	Set ADUPriceContrMargineId = Formatter.FormatADUPriceContrMargineId("25.12345")
+	Do $$$AssertEquals(ADUPriceContrMargineId,"25,12345")
+	
+	Set ADUPriceContrMargineId = Formatter.FormatADUPriceContrMargineId("25.123456789012345678901234567890123456789")
+	Do $$$AssertEquals(ADUPriceContrMargineId,"25,123456789012345678901234567890123456789")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Aan ADUPriceContrMargineId wordt komma 00 toegevoegd indien het een geheel getal is">
+<Implementation><![CDATA[
+	Set Formatter = ##class(AXimpl.Formatter).%New()
+	#dim ADUPriceContrMargineId As %String
+	
+	Set ADUPriceContrMargineId = Formatter.FormatADUPriceContrMargineId("-25")
+	Do $$$AssertEquals(ADUPriceContrMargineId,"-25,00")
+	
+	Set ADUPriceContrMargineId = Formatter.FormatADUPriceContrMargineId("25")
+	Do $$$AssertEquals(ADUPriceContrMargineId,"25,00")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Als ADUPriceContrMargineId een komma bevat wordt komma 00 niet toegevoegd">
+<Implementation><![CDATA[
+	Set Formatter = ##class(AXimpl.Formatter).%New()
+	#dim ADUPriceContrMargineId As %String
+	
+	Set ADUPriceContrMargineId = Formatter.FormatADUPriceContrMargineId("25,123456")
+	Do $$$AssertEquals(ADUPriceContrMargineId,"25,123456")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/AX/Uitgaand/PM/VrijgegProduct/impl/VrijgegProductDixfConverter/Test.cls.xml
===================================================================
diff -u -r46086 -r46109
--- vhUnitTest/AX/Uitgaand/PM/VrijgegProduct/impl/VrijgegProductDixfConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 46086)
+++ vhUnitTest/AX/Uitgaand/PM/VrijgegProduct/impl/VrijgegProductDixfConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 46109)
@@ -1079,42 +1079,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: ADUPriceContrMargineId is Product Prijs DBPerc met punt vervangen door komma zonder afronding of afkapping ongeacht aantal decimalen">
-<Implementation><![CDATA[
-	#dim LegacyProductAPIStub As vhTest.Mock.DOM.PM.LegacyProductAPI = ##class(vhTest.Mock.DOM.PM.LegacyProductAPI).MockInstance()
-	do LegacyProductAPIStub.IndienMethodCall("GeefLeverancierNummer",$$$ElkeWaarde).DanReturn(6332)
-	
-	#dim Firma As AXimpl.InterneFirmaInitialen = ##class(AXimpl.InterneFirmaInitialen).VanHoeckeNv()
-	
-	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterProduct()
-	Set AxProduct.Prijs.DBPerc = "25.15284"
-	
-	#dim Converter As AX.Uitgaand.PM.VrijgegProduct.impl.VrijgegProductDixfConverter = ..GeefConverter()
-	
-	#dim ConvertedProduct As %String = Converter.Convert(AxProduct,Firma)
-	
-	Do $$$AssertEquals(ConvertedProduct.ADUPriceContrMargineId,"25,15284")
-]]></Implementation>
-</Method>
-
-<Method name="Test: ADUPriceContrMargineId is Product Prijs DBPerc met uitzonderlijk komma 00 eraan toegevoegd indien DBPerc een geheel getal is">
-<Implementation><![CDATA[
-	#dim LegacyProductAPIStub As vhTest.Mock.DOM.PM.LegacyProductAPI = ##class(vhTest.Mock.DOM.PM.LegacyProductAPI).MockInstance()
-	do LegacyProductAPIStub.IndienMethodCall("GeefLeverancierNummer",$$$ElkeWaarde).DanReturn(6332)
-	
-	#dim Firma As AXimpl.InterneFirmaInitialen = ##class(AXimpl.InterneFirmaInitialen).VanHoeckeNv()
-	
-	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterProduct()
-	Set AxProduct.Prijs.DBPerc = "35"
-	
-	#dim Converter As AX.Uitgaand.PM.VrijgegProduct.impl.VrijgegProductDixfConverter = ..GeefConverter()
-	
-	#dim ConvertedProduct As %String = Converter.Convert(AxProduct,Firma)
-	
-	Do $$$AssertEquals(ConvertedProduct.ADUPriceContrMargineId,"35,00")
-]]></Implementation>
-</Method>
-
 <Method name="Test: ADUPriceContrMargineId is hardcoded min 100 komma 00 als het over product 790386 gaat">
 <Implementation><![CDATA[
 	#dim LegacyProductAPIStub As vhTest.Mock.DOM.PM.LegacyProductAPI = ##class(vhTest.Mock.DOM.PM.LegacyProductAPI).MockInstance()
Index: AXimpl/Formatter.cls.xml
===================================================================
diff -u -r42121 -r46109
--- AXimpl/Formatter.cls.xml	(.../Formatter.cls.xml)	(revision 42121)
+++ AXimpl/Formatter.cls.xml	(.../Formatter.cls.xml)	(revision 46109)
@@ -156,6 +156,13 @@
 	Quit Resultaat
 ]]></Implementation>
 </Method>
+
+<Method name="FormatADUPriceContrMargineId">
+<FormalSpec>Ingave:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit $$$If(##class(TECH.StringUtils).Contains(Ingave,".",","),$Replace(Ingave,".",","),Ingave_",00")
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: AX/Uitgaand/PM/VrijgegProduct/impl/VrijgegProductDixfConverter.cls.xml
===================================================================
diff -u -r46086 -r46109
--- AX/Uitgaand/PM/VrijgegProduct/impl/VrijgegProductDixfConverter.cls.xml	(.../VrijgegProductDixfConverter.cls.xml)	(revision 46086)
+++ AX/Uitgaand/PM/VrijgegProduct/impl/VrijgegProductDixfConverter.cls.xml	(.../VrijgegProductDixfConverter.cls.xml)	(revision 46109)
@@ -755,14 +755,9 @@
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim ADUPriceContrMargineId As %String = Product.Prijs.DBPerc
 	#dim ProductNr As %Integer = Product.Basis.ProductNr
 	
-	If ##class(TECH.StringUtils).Contains(ADUPriceContrMargineId,".") {
-		Set ADUPriceContrMargineId = $Replace(ADUPriceContrMargineId,".",",")
-	} Else {
-		Set ADUPriceContrMargineId = ADUPriceContrMargineId_",00"
-	}
+	#dim ADUPriceContrMargineId As %String = ##class(AXimpl.Formatter).%New().FormatADUPriceContrMargineId(Product.Prijs.DBPerc)
 	
 	If (ProductNr = 790386) {
 		Set ADUPriceContrMargineId = "-100,00"