Index: AX/Uitgaand/Klant/impl/AifConverter.cls.xml
===================================================================
diff -u -r33708 -r33712
--- AX/Uitgaand/Klant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 33708)
+++ AX/Uitgaand/Klant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 33712)
@@ -63,8 +63,6 @@
 <ReturnType>AXaif.Shared.AxdExtTypeCustPaymTermId</ReturnType>
 <Implementation><![CDATA[
 	quit:Klant.GeefBetalingwijze()=##class(DOM.VKP.enu.Betalingwijze).Incasso() "SEPA DD"
-	quit:Klant.GeefBetalingwijze()=##class(DOM.VKP.enu.Betalingwijze).Vooruitbetaling() "VOORUIT"
-	quit:Klant.GeefBetalingwijze()=##class(DOM.VKP.enu.Betalingwijze).Rembours() "REMBOURS"
 	quit "OVER"
 ]]></Implementation>
 </Method>
@@ -74,6 +72,9 @@
 <Private>1</Private>
 <ReturnType>AXaif.Shared.AxdExtTypeCustPaymTermId</ReturnType>
 <Implementation><![CDATA[
+	quit:Klant.GeefBetalingwijze()=##class(DOM.VKP.enu.Betalingwijze).Vooruitbetaling() "VOORUIT"
+	quit:Klant.GeefBetalingwijze()=##class(DOM.VKP.enu.Betalingwijze).Rembours() "REMBOURS"
+
 	#dim BetalingTermijn As %String = Klant.GeefBetalingTermijn()
 	
 	if BetalingTermijn'="" {
Index: vhUnitTest/AX/Uitgaand/Klant/impl/AifConverter.cls.xml
===================================================================
diff -u -r33708 -r33712
--- vhUnitTest/AX/Uitgaand/Klant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 33708)
+++ vhUnitTest/AX/Uitgaand/Klant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 33712)
@@ -682,8 +682,8 @@
 	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
-	do $$$AssertEquals(CustTable.PaymTermId,"NET00")
-	do $$$AssertEquals(CustTable.PaymMode,"VOORUIT")
+	do $$$AssertEquals(CustTable.PaymTermId,"VOORUIT")
+	do $$$AssertEquals(CustTable.PaymMode,"OVER")
 ]]></Implementation>
 </Method>
 
@@ -697,8 +697,8 @@
 	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
-	do $$$AssertEquals(CustTable.PaymTermId,"NET00")
-	do $$$AssertEquals(CustTable.PaymMode,"REMBOURS")
+	do $$$AssertEquals(CustTable.PaymTermId,"REMBOURS")
+	do $$$AssertEquals(CustTable.PaymMode,"OVER")
 ]]></Implementation>
 </Method>