Index: AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml
===================================================================
diff -u -r50242 -r50540
--- AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml	(.../CustomerInConverter.cls.xml)	(revision 50242)
+++ AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml	(.../CustomerInConverter.cls.xml)	(revision 50540)
@@ -8,6 +8,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="LegacyPartijApi">
+<Type>DOM.PARTIJ.LegacyPartijAPI</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="PartijApi">
 <Type>DOM.PARTIJ.PartijAPI</Type>
 <Private>1</Private>
@@ -39,7 +44,7 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>PartijApi:DOM.PARTIJ.PartijAPI,VerkoopApi:DOM.VKP.VerkoopAPI,KlantLevenCyclusService:APPS.KlantBeheer.KlantLevenCyclusService,LandRepository:DOM.common.Locatie.impl.LandRepository,LeverAdresUtils:AXimpl.Dynamics.CustomerIn.Converter.LeverAdresUtils,Logger:vhLib.Logger</FormalSpec>
+<FormalSpec>PartijApi:DOM.PARTIJ.PartijAPI,VerkoopApi:DOM.VKP.VerkoopAPI,KlantLevenCyclusService:APPS.KlantBeheer.KlantLevenCyclusService,LandRepository:DOM.common.Locatie.impl.LandRepository,LeverAdresUtils:AXimpl.Dynamics.CustomerIn.Converter.LeverAdresUtils,Logger:vhLib.Logger,LegacyPartijApi:DOM.PARTIJ.LegacyPartijAPI</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -52,6 +57,7 @@
 	Set ..LandRepository  = $$$Inject(LandRepository,##class(DOM.common.Locatie.impl.LandRepository).%New())
 	Set ..LeverAdresUtils = $$$Inject(LeverAdresUtils,##class(AXimpl.Dynamics.CustomerIn.Converter.LeverAdresUtils).%New())
 	Set ..Logger = $$$Inject(Logger,##class(vhLib.Logger).%New())
+	Set ..LegacyPartijApi = $$$Inject(LegacyPartijApi, ##class(DOM.PARTIJ.impl.LegacyPartijAPI).%New())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -93,6 +99,7 @@
 	
 	Do ..ZetGemeenschappelijkeKlantProperties(.Klant, Cust)
 	Do Klant.Save()
+	Do ..ForceerFacturatieWijzeOndanksCRMeventInKlantSave(KlantId, Klant.GeefKlantIndexKKL(), Cust.InclTax)
 	
 	Do ..LeverAdresUtils.ZetLeverAdressen(Klant, Cust)
 ]]></Implementation>
@@ -127,6 +134,7 @@
 	#Dim Klant as DOM.VKP.VanHoeckeKlant = ..VerkoopApi.GeefKlant(PartijID)	
 	Do ..ZetGemeenschappelijkeKlantProperties(.Klant, Cust)
 	Do Klant.Save()
+	Do ..ForceerFacturatieWijzeOndanksCRMeventInKlantSave(PartijID, Klant.GeefKlantIndexKKL(), Cust.InclTax)
 	
 	Do ..LeverAdresUtils.ZetLeverAdressen(Klant, Cust)
 ]]></Implementation>
@@ -242,13 +250,31 @@
 <Implementation><![CDATA[
 	Do Klant.ZetHandelsregisterNr(Cust.TaxRegistrationNumber)
 	Do Klant.ZetActiviteit($$$If(Cust.IsConsumer="Yes",##class(DOM.VKP.enu.KlantActiviteit).Consument(),##class(DOM.VKP.enu.KlantActiviteit).Onbepaald()))
-	Do Klant.ZetBusinessType($$$If(Cust.InclTax="Yes",##class(DOM.VKP.enu.BusinessType).B2C(),##class(DOM.VKP.enu.BusinessType).B2B()))
+	Do Klant.ZetBusinessType($$$If(Cust.IsConsumer="Yes",##class(DOM.VKP.enu.BusinessType).B2C(),##class(DOM.VKP.enu.BusinessType).B2B()))
+	Do Klant.ZetFacturatieWijze($$$If(Cust.InclTax="Yes",##class(DOM.VKP.enu.FacturatieWijze).Incl(),##class(DOM.VKP.enu.FacturatieWijze).Excl()))
 	Do Klant.ZetBTWRegime(..AxToAdminUtils.ConvertTaxGroupToBTWRegime(Cust.TaxGroup))
 	Do Klant.ZetRegio(..AxToAdminUtils.ConvertCustClassificationIdToRegio(Cust.CustClassificationId))
 	Do ..VerwerkPaymTermId(.Klant, Cust.PaymTermId)
 ]]></Implementation>
 </Method>
 
+<Method name="ForceerFacturatieWijzeOndanksCRMeventInKlantSave">
+<FormalSpec>KlantId:%String,KlantIndexKKL:%String,InclTax:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim KlantNummer As %Integer = ..LegacyPartijApi.GeefKlantNummerVoorPartijID(KlantId)
+	If (InclTax = "Yes") {
+		Set $Piece(^KKL(KlantIndexKKL,0),"\",55) = "Incl"
+		Set $Piece(^DKL("K","KL.A",KlantNummer,0),"\",55) = "Incl"
+	} Else {
+		Set $Piece(^KKL(KlantIndexKKL,0),"\",55) = "Excl"
+		Set $Piece(^DKL("K","KL.A",KlantNummer,0),"\",55) = "Excl"
+	}
+	
+	Quit
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkPaymTermId">
 <FormalSpec><![CDATA[&Klant:DOM.VKP.VanHoeckeKlant,PaymTermId:%String]]></FormalSpec>
 <Private>1</Private>