Index: AX/common/impl/Formatter.cls.xml
===================================================================
diff -u -r40861 -r40883
--- AX/common/impl/Formatter.cls.xml	(.../Formatter.cls.xml)	(revision 40861)
+++ AX/common/impl/Formatter.cls.xml	(.../Formatter.cls.xml)	(revision 40883)
@@ -114,7 +114,6 @@
 <Implementation><![CDATA[
 	Quit:Betalingwijze=##class(DOM.VKP.enu.Betalingwijze).Vooruitbetaling() "VOORUIT"
 	Quit:Betalingwijze=##class(DOM.VKP.enu.Betalingwijze).Rembours() "REMBOURS"
-	Quit:Betalingwijze=##class(DOM.VKP.enu.Betalingwijze).Incasso() "INC"_##class(TECH.StringUtils).AlignRight(+BetalingTermijn,0,2)
 	
 	If BetalingTermijn'="" {
 		Quit:##class(TECH.StringUtils).EndsWith(BetalingTermijn,"D") "NET"_##class(TECH.StringUtils).AlignRight(+BetalingTermijn,0,2)
Index: AXimpl/BizTalkMessage/Formatter.cls.xml
===================================================================
diff -u
--- AXimpl/BizTalkMessage/Formatter.cls.xml	(revision 0)
+++ AXimpl/BizTalkMessage/Formatter.cls.xml	(revision 40883)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXimpl.BizTalkMessage.Formatter">
+<Super>AX.common.impl.Formatter</Super>
+
+<Method name="ConvertPaymTermId">
+<FormalSpec>Betalingwijze:%String,BetalingTermijn:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Quit:Betalingwijze=##class(DOM.VKP.enu.Betalingwijze).Vooruitbetaling() "VOORUIT"
+	Quit:Betalingwijze=##class(DOM.VKP.enu.Betalingwijze).Rembours() "REMBOURS"
+	Quit:Betalingwijze=##class(DOM.VKP.enu.Betalingwijze).Incasso() "INC"_##class(TECH.StringUtils).AlignRight(+BetalingTermijn,0,2)
+	
+	If BetalingTermijn'="" {
+		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"
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AXimpl/BizTalkMessage/Converter/CustomerConverter.cls.xml
===================================================================
diff -u -r39825 -r40883
--- AXimpl/BizTalkMessage/Converter/CustomerConverter.cls.xml	(.../CustomerConverter.cls.xml)	(revision 39825)
+++ AXimpl/BizTalkMessage/Converter/CustomerConverter.cls.xml	(.../CustomerConverter.cls.xml)	(revision 40883)
@@ -29,7 +29,7 @@
 </Property>
 
 <Property name="Formatter">
-<Type>AX.common.impl.Formatter</Type>
+<Type>AXimpl.BizTalkMessage.Formatter</Type>
 <Private>1</Private>
 </Property>
 
@@ -39,7 +39,7 @@
 <Implementation><![CDATA[
 	Set ..PartijAPI = $$$Inject(PartijAPI,##class(DOM.DomeinContext).Instance().GeefPartijAPI())
 	Set ..VerkoopAPI = $$$Inject(VerkoopAPI,##class(DOM.DomeinContext).Instance().GeefVerkoopAPI())
-	Set ..Formatter = ##class(AX.common.impl.Formatter).%New()
+	Set ..Formatter = ##class(AXimpl.BizTalkMessage.Formatter).%New()
 	Quit $$$OK
 ]]></Implementation>
 </Method>
Index: AXimpl/BizTalkMessage/Converter/AddressUpsertConverter.cls.xml
===================================================================
diff -u -r38317 -r40883
--- AXimpl/BizTalkMessage/Converter/AddressUpsertConverter.cls.xml	(.../AddressUpsertConverter.cls.xml)	(revision 38317)
+++ AXimpl/BizTalkMessage/Converter/AddressUpsertConverter.cls.xml	(.../AddressUpsertConverter.cls.xml)	(revision 40883)
@@ -24,7 +24,7 @@
 </Property>
 
 <Property name="Formatter">
-<Type>AX.common.impl.Formatter</Type>
+<Type>AXimpl.BizTalkMessage.Formatter</Type>
 <Private>1</Private>
 </Property>
 
@@ -37,7 +37,7 @@
 <Implementation><![CDATA[
 	Set ..VerkoopAPI = $$$Inject(VerkoopAPI,##class(DOM.DomeinContext).Instance().GeefVerkoopAPI())
 	Set ..LeveradresRepository = $$$Inject(LeveradresRepository,##class(AXimpl.BizTalkMessage.Converter.AddressUpsertConverter.LeveradresRepository).%New())
-	Set ..Formatter = ##class(AX.common.impl.Formatter).%New()
+	Set ..Formatter = ##class(AXimpl.BizTalkMessage.Formatter).%New()
 	Quit $$$OK
 ]]></Implementation>
 </Method>