Index: vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml
===================================================================
diff -u -r33858 -r33859
--- vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 33858)
+++ vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 33859)
@@ -69,6 +69,7 @@
 	#dim PostalAddres As AXaif.Customer.AxdEntityDirPartyPostalAddressView = Party.DirPartyPostalAddressView.GetAt(1)
 	
 	do $$$AssertEquals(PostalAddres.IsPrimary,"Yes")
+	do $$$AssertEquals(PostalAddres.Roles,"Business")
 	do $$$AssertEquals(PostalAddres.CountryRegionId,"BEL")
 	do $$$AssertEquals(PostalAddres.Street,"Kemzekestraat 6")
 	do $$$AssertEquals(PostalAddres.ZipCode,"9170")
@@ -281,6 +282,19 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: KortingContant variaties - Geen termijn wel korting contant">
+<Implementation><![CDATA[
+	do ..Klant.IndienMethodCall("GeefKortingContantPercentage").DanReturn(2)
+	do ..Klant.IndienMethodCall("GeefKortingContantTermijn").DanReturn("0D")
+
+	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
+	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
+	
+	do $$$AssertEquals(CustTable.CashDisc,"08D2%")
+]]></Implementation>
+</Method>
+
 <Method name="Test: KortingContant variaties - Korting contant en geen termijn">
 <Implementation><![CDATA[
 	do ..Klant.IndienMethodCall("GeefKortingContantPercentage").DanReturn(1)
@@ -657,7 +671,7 @@
 	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
-	do $$$AssertEquals(CustTable.Blocked,$$$false)
+	do $$$AssertEquals(CustTable.Blocked,"")
 ]]></Implementation>
 </Method>
 
@@ -668,7 +682,7 @@
 	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
-	do $$$AssertEquals(CustTable.Blocked,$$$True)
+	do $$$AssertEquals(CustTable.Blocked,"Invoice")
 ]]></Implementation>
 </Method>
 
Index: AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml
===================================================================
diff -u -r33858 -r33859
--- AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 33858)
+++ AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 33859)
@@ -12,7 +12,7 @@
 	set Custable = ##class(AXaif.Customer.AxdEntityCustTable).%New()
 	set Custable.class = "entity"
 	set Custable.AccountNum = ##class(TECH.StringUtils).AlignRight(Partij.GeefCode(),0,5)
-	set Custable.Blocked = $$$If(Klant.GeefCommercieleStatus()=##class(DOM.CRM.enu.CommercieleStatus).Actief(),$$$false,$$$true)
+	set Custable.Blocked = $$$If(Klant.GeefCommercieleStatus()=##class(DOM.CRM.enu.CommercieleStatus).Actief(),"","Invoice")
 	set Custable.CashDisc = ..FormatCashDisc(Klant)
 	set Custable.Currency = "EUR"
 	set Custable.CustClassificationId = "R"_##class(TECH.StringUtils).AlignRight(Klant.GeefRegio(),0,2)
@@ -60,6 +60,7 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 	quit:Klant.IsLidBTWEenheidVanHoecke() "IC"
+	quit:Partij.GeefID()="K||4682" "IC"
 	quit:Partij.GeefID()="K||9544" "IC"
 	quit:Partij.GeefAdres().GeefLand().GeefCode()="BE" "BE"
 	quit:Partij.GeefAdres().GeefLand().IsLidVanEU() "EU"
@@ -72,7 +73,7 @@
 <Private>1</Private>
 <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).Incasso() "SEPADD"
 	quit "OVER"
 ]]></Implementation>
 </Method>
@@ -124,6 +125,7 @@
 	#dim Adres As DOM.common.Adres = Partij.GeefAdres()
 	set PostalAddres.City = $$$UCase(Adres.GeefGemeente())
 	set PostalAddres.IsPrimary = ##class(AXaif.Shared.AxdExtTypeLogisticsIsPrimaryAddress).Yes()
+	set PostalAddres.Roles = "Business"
 	set PostalAddres.CountryRegionId = Adres.GeefLand().GeefIso3()
 	set PostalAddres.Street = Adres.GeefStraat()
 	set PostalAddres.ZipCode = ##class(DOM.common.impl.AdresUtils).CorrigeerPostcode(Adres.GeefPostcode(),Adres.GeefLandNr())