Index: vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter/TestBase.cls.xml
===================================================================
diff -u -r42201 -r42230
--- vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 42201)
+++ vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 42230)
@@ -43,7 +43,7 @@
 	Set FirmaBepaler = ##class(vhTest.Mock.AXimpl.InterneFirmaBepaler).%New()
 	Do FirmaBepaler.IndienMethodCall("GeefInitialen").DanReturn(..Firma)
 	
-	set AifConverter = ##class(AXimpl.AifMessage.Converter.CustomerCreateConverter).%New(PartijAPI,VerkoopAPI,FirmaBepaler)
+	set AifConverter = ##class(AXimpl.Dynamics.CustomerUpsertOut.Converter.CustomerCreateConverter).%New(PartijAPI,VerkoopAPI,FirmaBepaler)
 	quit AifConverter.Convert(##class(AXimpl.Request).%New("Customer/Create",..Partij.GeefID())).Customer
 ]]></Implementation>
 </Method>
Index: vhTest/Fake/AXimpl/AifMessage/Converter/CustomerCreateConverter.cls.xml
===================================================================
diff -u -r42127 -r42230
--- vhTest/Fake/AXimpl/AifMessage/Converter/CustomerCreateConverter.cls.xml	(.../CustomerCreateConverter.cls.xml)	(revision 42127)
+++ vhTest/Fake/AXimpl/AifMessage/Converter/CustomerCreateConverter.cls.xml	(.../CustomerCreateConverter.cls.xml)	(revision 42230)
@@ -5,7 +5,7 @@
 Deze klasse werd automatisch gegenereerd en onderhouden, nieuwe methodes worden automatisch bijgevoegd, bestaande blijven zoals ze zijn.
 Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>AXimpl.AifMessage.Converter.CustomerCreateConverter</Super>
+<Super>AXimpl.Dynamics.CustomerUpsertOut.Converter.CustomerCreateConverter</Super>
 
 <Method name="Convert">
 <FormalSpec>Command:AXimpl.Request</FormalSpec>
Index: vhTest/Mock/AXimpl/AifMessage/Converter/CustomerCreateConverter.cls.xml
===================================================================
diff -u -r42127 -r42230
--- vhTest/Mock/AXimpl/AifMessage/Converter/CustomerCreateConverter.cls.xml	(.../CustomerCreateConverter.cls.xml)	(revision 42127)
+++ vhTest/Mock/AXimpl/AifMessage/Converter/CustomerCreateConverter.cls.xml	(.../CustomerCreateConverter.cls.xml)	(revision 42230)
@@ -6,7 +6,7 @@
 Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
 Inheritance van meerdere TECH.Interface interfaces resulteert nog niet in een mockklasse met overeenkomstige inheritance-structuur.</Description>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>AXimpl.AifMessage.Converter.CustomerCreateConverter,Tools.Mock.MockClassBase</Super>
+<Super>AXimpl.Dynamics.CustomerUpsertOut.Converter.CustomerCreateConverter,Tools.Mock.MockClassBase</Super>
 <Inheritance>right</Inheritance>
 
 <Method name="Convert">
Index: AXimpl/AifMessage/Converter/CustomerUpdatePart2Converter.cls.xml
===================================================================
diff -u -r42203 -r42230
--- AXimpl/AifMessage/Converter/CustomerUpdatePart2Converter.cls.xml	(.../CustomerUpdatePart2Converter.cls.xml)	(revision 42203)
+++ AXimpl/AifMessage/Converter/CustomerUpdatePart2Converter.cls.xml	(.../CustomerUpdatePart2Converter.cls.xml)	(revision 42230)
@@ -4,7 +4,7 @@
 <Super>TECH.RegisteredObject</Super>
 
 <Property name="CustomerCreator">
-<Type>AXimpl.AifMessage.Converter.CustomerCreateConverter</Type>
+<Type>AXimpl.Dynamics.CustomerUpsertOut.Converter.CustomerCreateConverter</Type>
 <Private>1</Private>
 </Property>
 
@@ -29,13 +29,13 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>CustomerCreator:AXimpl.AifMessage.Converter.CustomerCreateConverter</FormalSpec>
+<FormalSpec>CustomerCreator:AXimpl.Dynamics.CustomerUpsertOut.Converter.CustomerCreateConverter</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	set ..CustomerCreator = $$$Inject(CustomerCreator,##class(AXimpl.AifMessage.Converter.CustomerCreateConverter).%New())
+	set ..CustomerCreator = $$$Inject(CustomerCreator,##class(AXimpl.Dynamics.CustomerUpsertOut.Converter.CustomerCreateConverter).%New())
 	set ..ObjectConverter = ##class(TECH.ObjectUtils.impl.ObjectConverter).%New()
 	set ..ContactInfoViewOrder = ##class(TECH.ListUtils).CreateListOfDataTypes("Telefoon 1","Telefoon 2","Fax","E-mail","Gsm","URL")
 	set ..ContactInfoViewComparator = ##class(TECH.Comparator.PropertyBasedComparator).%New("LocationName",..ContactInfoViewOrder)
Index: AXimpl/Dynamics/CustomerUpsertOut/Converter/CustomerCreateConverter.cls.xml
===================================================================
diff -u
--- AXimpl/Dynamics/CustomerUpsertOut/Converter/CustomerCreateConverter.cls.xml	(revision 0)
+++ AXimpl/Dynamics/CustomerUpsertOut/Converter/CustomerCreateConverter.cls.xml	(revision 42230)
@@ -0,0 +1,263 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXimpl.Dynamics.CustomerUpsertOut.Converter.CustomerCreateConverter">
+<Super>TECH.Mockable</Super>
+
+<Property name="Formatter">
+<Type>AXimpl.Formatter</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Validator">
+<Type>AXimpl.Validator</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="FirmaBepaler">
+<Type>AXimpl.InterneFirmaBepaler</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="PartijAPI">
+<Type>DOM.PARTIJ.PartijAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="VerkoopAPI">
+<Type>DOM.VKP.VerkoopAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="LandRepository">
+<Type>DOM.common.Locatie.impl.LandRepository</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Utils">
+<Type>AXimpl.Utils</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>PartijAPI:DOM.PARTIJ.PartijAPI,VerkoopAPI:DOM.VKP.VerkoopAPI,FirmaBepaler:AXimpl.InterneFirmaBepaler</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..FirmaBepaler = $$$Inject(FirmaBepaler,##class(AXimpl.InterneFirmaBepaler).%New())
+	
+	set ..Formatter = ##class(AXimpl.Formatter).%New()
+	set ..Validator = ##class(AXimpl.Validator).%New()
+	
+	set ..PartijAPI = $$$Inject(PartijAPI,##class(DOM.DomeinContext).Instance().GeefPartijAPI())
+	set ..VerkoopAPI = $$$Inject(VerkoopAPI,##class(DOM.DomeinContext).Instance().GeefVerkoopAPI())
+	
+	set ..Utils = ##class(AXimpl.Utils).%New(..PartijAPI)
+	set ..LandRepository = ##class(DOM.common.Locatie.impl.LandRepository).%New()
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="Convert">
+<FormalSpec>Command:AXimpl.Request</FormalSpec>
+<ReturnType>AXaif.Message.MessageParts</ReturnType>
+<Implementation><![CDATA[
+	set MessageParts = ##class(AXaif.Message.MessageParts).%New()
+	set MessageParts.Customer = ..GetCustomer(Command.SubjectId)
+	quit MessageParts
+]]></Implementation>
+</Method>
+
+<Method name="GetCustomer">
+<FormalSpec>Id:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>AXif.Dynamics.CustomerOut.MessageParts.AxdCustomer</ReturnType>
+<Implementation><![CDATA[
+	#dim Partij As DOM.PARTIJ.Partij = ..PartijAPI.GeefPartij(Id)
+	#dim Klant As DOM.VKP.VanHoeckeKlant = ..VerkoopAPI.GeefKlant(Id)
+	
+	do:$$$Not(..IsGenerationNeeded(Partij,Klant)) ##class(TECH.ExceptionHandler).Throw(##class(AXimpl.NoConversionNeededException).%New(##this.%ClassName(),Id))
+	
+	set AxKlant = ##class(AXif.Dynamics.CustomerOut.MessageParts.AxdCustomer).%New()
+	
+	set Custable = ##class(AXif.Dynamics.CustomerOut.MessageParts.AxdEntityCustTable).%New()
+	set Custable.class = "entity"
+	set Custable.ADUImported = ##class(AXif.Dynamics.CustomerOut.MessageParts.AxdEnumNoYes).Yes()
+	set Custable.AccountNum = ..Formatter.FormatAccountNumber(Partij.GeefCode())
+	set Custable.Blocked = $$$If(Klant.GeefCommercieleStatus()=##class(DOM.CRM.enu.CommercieleStatus).Actief(),"No","Invoice")
+	set Custable.CashDisc = ..Formatter.FormatCashDiscount(Klant.GeefKortingContantPercentage(),Klant.GeefKortingContantTermijn())
+	set Custable.UseCashDisc = $$$If($length(Custable.CashDisc)>1,"Normal","Never")
+	set Custable.Currency = "EUR"
+	set Custable.CustClassificationId = ..ConvertCustClassificationId(Klant)
+	set Custable.CustGroup = ..ConvertCustGroup(Partij,Klant)
+	set Custable.Name = ..Formatter.FormatPartyName(Partij)
+	
+	set Custable.EnterpriseNumber = ..Formatter.FormatEnterpriseNumber(Partij.GeefBTWNr())
+	set Custable.VATNum = ..Formatter.FormatVATNum(Partij.GeefBTWNr())
+	
+	Set Custable.CreditMax = $fnumber($Case(Klant.GeefKredietlimiet(),"0":"","1000":"1",:Klant.GeefKredietlimiet()),"",20)
+	set Custable.TaxGroup = ..Utils.ConvertKlantTaxGroup(..FirmaBepaler.GeefInitialen(),Klant)
+	set:(Partij.GeefAdres().GeefLandNr()=##class(DOM.common.enu.Land).Nederland()) Custable.ADUTaxRegistrationNumber = ##class(TECH.StringUtils).AlignRight($Extract(##class(TECH.StringUtils).StripAllExceptNumeric(Partij.GeefHandelRegisterNr()),1,8),"0",8)
+		
+	set Custable.WebSalesOrderDisplay = "All"
+	set Custable.PaymTermId = ..Formatter.ConvertPaymTermId(Klant.GeefBetalingwijze(), Klant.GeefBetalingTermijn())
+	set Custable.PaymMode = ..Formatter.ConvertPaymMode(Klant.GeefBetalingwijze())
+	
+	set DirParty = ##class(AXif.Dynamics.CustomerOut.MessageParts.AxdEntityDirPartyDirOrganization).%New()
+	set DirParty.class = "entity"
+	set DirParty.LanguageId = ..Formatter.FormatLanguageId(Partij.GeefTaal())
+	set DirParty.Name = ..Formatter.FormatPartyName(Partij)
+	
+	set OrganizationName = ##class(AXif.Dynamics.CustomerOut.MessageParts.AxdEntityOrganizationName).%New()
+	set OrganizationName.class = "entity"
+	set OrganizationName.Name = DirParty.Name
+	do DirParty.OrganizationName.Insert(OrganizationName)
+	
+	Do ..ConvertAndAddPostalAddress(Partij, DirParty)	
+	
+	do:$length(Partij.GeefTelefoon1()) DirParty.DirPartyContactInfoView.Insert(..ConvertContactInfo("Telefoon 1",Partij.GeefTelefoon1(),"Phone"))
+	do:$length(Partij.GeefTelefoon2()) DirParty.DirPartyContactInfoView.Insert(..ConvertContactInfo("Telefoon 2",Partij.GeefTelefoon2(),"Phone",$$$IsEmptyString(Partij.GeefTelefoon1())))
+	do:$length(Partij.GeefGsm()) DirParty.DirPartyContactInfoView.Insert(..ConvertContactInfo("Gsm",Partij.GeefGsm(),"Phone"))
+	do:$length(Partij.GeefTelefax()) DirParty.DirPartyContactInfoView.Insert(..ConvertContactInfo("Fax",Partij.GeefTelefax(),"Fax"))
+	do:$length(Partij.GeefEmail()) DirParty.DirPartyContactInfoView.Insert(..ConvertContactInfo("E-mail",Partij.GeefEmail(),"Email"))
+	do:$length(Partij.GeefWebstek()) DirParty.DirPartyContactInfoView.Insert(..ConvertContactInfo("URL",Partij.GeefWebstek(),"URL"))
+		
+	do Custable.DirParty.Insert(DirParty)
+	
+	do AxKlant.CustTable.Insert(Custable)
+	
+	do ..Validator.Validate(AxKlant)
+
+	quit AxKlant
+]]></Implementation>
+</Method>
+
+<Method name="IsGenerationNeeded">
+<FormalSpec>Partij:DOM.PARTIJ.Partij,Klant:DOM.VKP.VanHoeckeKlant</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	quit $$$Not(##class(TECH.StringUtils).Equals(Klant.GeefRegio(),"98","99"))
+]]></Implementation>
+</Method>
+
+<Method name="ConvertCustGroup">
+<FormalSpec>Partij:DOM.PARTIJ.Partij,Klant:DOM.VKP.VanHoeckeKlant</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	If ..FirmaBepaler.GeefInitialen()="VHBE" {
+		Quit:Partij.GeefID()="K||7587" "IC"
+		Quit:Partij.GeefID()="K||4682" "IC"
+		Quit:Partij.GeefID()="K||1000" "IC"
+		Quit:Partij.GeefID()="K||9544" "IC"
+	} ElseIf ..FirmaBepaler.GeefInitialen()="HLX" {
+		Quit:Partij.GeefID()="K||1389" "IC"
+		Quit:Partij.GeefID()="K||1377" "IC"
+	}
+	
+	If $$$Not(..IsLandCodeInAdresGelijkAanLandInBTWnummer(Partij) || (##class(TECH.StringUtils).Equals(Partij.GeefBTWNr(),"GEEN","G",""))){
+		#dim Land As DOM.common.Land = ##class(DOM.common.impl.LocatieAPI).%New().GeefLandVoorLandCode(..LandCodeUitBTWNummer(Partij.GeefBTWNr()))
+		Quit:Land.GeefCode()="BE" "BE"
+		Quit:Land.IsLidVanEU() "EU"
+		Quit "EX"
+	}
+	
+	Quit:Partij.GeefAdres().GeefLand().GeefCode()="BE" "BE"
+	Quit:Partij.GeefAdres().GeefLand().IsLidVanEU() "EU"	
+	Quit "EX"
+]]></Implementation>
+</Method>
+
+<Method name="ConvertContactInfo">
+<FormalSpec>LocationName:%String,Locator:%String,Type:%String,IsPrimary:%Boolean=1</FormalSpec>
+<Private>1</Private>
+<ReturnType>AXif.Dynamics.CustomerOut.MessageParts.AxdEntityDirPartyContactInfoView</ReturnType>
+<Implementation><![CDATA[
+	set ContactInfo = ##class(AXif.Dynamics.CustomerOut.MessageParts.AxdEntityDirPartyContactInfoView).%New()
+	set ContactInfo.IsPrimary = ##class(AXif.Dynamics.CustomerOut.MessageParts.AxdEnumNoYes).FromBoolean(IsPrimary)
+	set ContactInfo.class = "entity"
+	set ContactInfo.LocationName = LocationName
+	set ContactInfo.Locator = Locator
+	set ContactInfo.Type = Type
+	set ContactInfo.Roles = "Business"
+	quit ContactInfo
+]]></Implementation>
+</Method>
+
+<Method name="ConvertAndAddPostalAddress">
+<FormalSpec>Partij:DOM.PARTIJ.Partij,DirParty:AXif.Dynamics.CustomerOut.MessageParts.AxdEntityDirPartyDirOrganization</FormalSpec>
+<Private>1</Private>
+<ReturnType>AXif.Dynamics.CustomerOut.MessageParts.AxdEntityDirPartyPostalAddressView</ReturnType>
+<Implementation><![CDATA[
+	#dim Adres As DOM.common.Adres = Partij.GeefAdres()
+	
+	set PostalAddres = ##class(AXif.Dynamics.CustomerOut.MessageParts.AxdEntityDirPartyPostalAddressView).%New()
+	set PostalAddres.class = "entity"
+	set PostalAddres.City = $$$UCase(Adres.GeefGemeente())
+	set PostalAddres.IsPrimary = ##class(AXif.Dynamics.CustomerOut.MessageParts.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())	
+	set PostalAddres.LocationName = DirParty.Name
+	
+	If $$$Not(..IsLandCodeInAdresGelijkAanLandInBTWnummer(Partij) || (##class(TECH.StringUtils).Equals(Partij.GeefBTWNr(),"GEEN","G",""))) {
+		
+		Set PostalAddres.IsPrimary = ##class(AXif.Dynamics.CustomerOut.MessageParts.AxdExtTypeLogisticsIsPrimaryAddress).No()
+		
+		#dim FictiefPostalAddres As AXif.Dynamics.CustomerOut.MessageParts.AxdEntityDirPartyPostalAddressView
+		Set FictiefPostalAddres = ##class(AXif.Dynamics.CustomerOut.MessageParts.AxdEntityDirPartyPostalAddressView).%New()	
+		Set FictiefPostalAddres.class = "entity"	
+		Set FictiefPostalAddres.IsPrimary = ##class(AXif.Dynamics.CustomerOut.MessageParts.AxdExtTypeLogisticsIsPrimaryAddress).Yes()		
+		Set FictiefPostalAddres.CountryRegionId = ..LandRepository.GeefViaLandCodeIso2(..LandCodeUitBTWNummer(Partij.GeefBTWNr())).GeefIso3()
+		Set FictiefPostalAddres.Roles = "Business"
+		Set FictiefPostalAddres.LocationName = DirParty.Name
+		Do DirParty.DirPartyPostalAddressView.InsertAt(FictiefPostalAddres,1)
+	}
+	
+	Do DirParty.DirPartyPostalAddressView.Insert(PostalAddres)
+]]></Implementation>
+</Method>
+
+<Method name="IsLandCodeInAdresGelijkAanLandInBTWnummer">
+<FormalSpec>Partij:DOM.PARTIJ.Partij</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim LandCodeBTWnummer As %String
+	#dim LandCodeAdres As %String	
+		
+	Set LandCodeBTWnummer = ..LandCodeUitBTWNummer(Partij.GeefBTWNr())
+	Set LandCodeAdres = Partij.GeefAdres().GeefLand().GeefCode()
+	
+	Quit LandCodeBTWnummer = LandCodeAdres
+]]></Implementation>
+</Method>
+
+<Method name="ConvertCustClassificationId">
+<FormalSpec>Klant:DOM.VKP.VanHoeckeKlant</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	If ..FirmaBepaler.GeefInitialen()="VHBE" {
+		Quit ..Formatter.FormatRegio(Klant.GeefRegio())
+	} ElseIf ..FirmaBepaler.GeefInitialen()="HLX" {
+		Quit "HLX"
+	}
+	Quit ""
+]]></Implementation>
+</Method>
+
+<Method name="LandCodeUitBTWNummer">
+<FormalSpec>BTWNummer:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim LandCode As %String = $Extract(BTWNummer,1,2)
+	Set:LandCode="UK" LandCode = "GB"
+	Quit LandCode
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>