Index: AXimpl/AifMessage/Converter/CustomerCreateConverter.cls.xml
===================================================================
diff -u
--- AXimpl/AifMessage/Converter/CustomerCreateConverter.cls.xml	(revision 0)
+++ AXimpl/AifMessage/Converter/CustomerCreateConverter.cls.xml	(revision 35377)
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXimpl.AifMessage.Converter.CustomerCreateConverter">
+<Super>TECH.RegisteredObject</Super>
+
+<Property name="Formatter">
+<Type>AX.common.impl.Formatter</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Validator">
+<Type>AX.common.impl.Validator</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="FirmaBepaler">
+<Type>AX.common.impl.FirmaBepaler</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="Utils">
+<Type>AX.Uitgaand.VKP.VanHoeckeKlant.impl.Utils</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>PartijAPI:DOM.PARTIJ.PartijAPI,VerkoopAPI:DOM.VKP.VerkoopAPI,FirmaBepaler:AX.common.impl.FirmaBepaler</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..FirmaBepaler = $$$Inject(FirmaBepaler,##class(AX.common.impl.FirmaBepaler).%New())
+	
+	
+	set ..Formatter = ##class(AX.common.impl.Formatter).%New()
+	set ..Validator = ##class(AX.common.impl.Validator).%New()
+	
+	set ..PartijAPI = $$$Inject(PartijAPI,##class(DOM.DomeinContext).Instance().GeefPartijAPI())
+	set ..VerkoopAPI = $$$Inject(VerkoopAPI,##class(DOM.DomeinContext).Instance().GeefVerkoopAPI())
+	
+	set ..Utils = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.Utils).%New(..FirmaBepaler,..PartijAPI)
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="Convert">
+<FormalSpec>Id:%String</FormalSpec>
+<ReturnType>AXaif.Customer.AxdCustomer</ReturnType>
+<Implementation><![CDATA[
+	#dim Partij As DOM.PARTIJ.Partij = ..PartijAPI.GeefPartij(Id)
+	#dim Klant As DOM.VKP.VanHoeckeKlant = ..VerkoopAPI.GeefKlant(Id)
+	
+	set AxKlant = ##class(AXaif.Customer.AxdCustomer).%New()
+	
+	set Custable = ##class(AXaif.Customer.AxdEntityCustTable).%New()
+	set Custable.class = "entity"
+	set Custable.ADUImported = ##class(AXaif.Shared.AxdEnumNoYes).Yes()
+	set Custable.AccountNum = ..Formatter.FormatAccountNumber(Partij.GeefCode())
+	set Custable.Blocked = $$$If(Klant.GeefCommercieleStatus()=##class(DOM.CRM.enu.CommercieleStatus).Actief(),"","Invoice")
+	set Custable.CashDisc = ..Formatter.FormatCashDiscount(Klant.GeefKortingContantPercentage(),Klant.GeefKortingContantTermijn())
+	set Custable.Currency = "EUR"
+	set Custable.CustClassificationId = ..ConvertCustClassificationId(Klant)
+	set Custable.CustGroup = ..ConvertCustGroup(Partij,Klant)
+	
+	set Custable.EnterpriseNumber = ..Formatter.FormatEnterpriseNumber(Partij.GeefBTWNr())
+	set Custable.VATNum = ..Formatter.FormatVATNum(Partij.GeefBTWNr())
+	
+	set Custable.TaxGroup = ..Utils.ConvertTaxGroup(Klant)
+		
+	set Custable.WebSalesOrderDisplay = "All"
+	set Custable.PaymTermId = ..Formatter.ConvertPaymTermId(Klant.GeefBetalingwijze(), Klant.GeefBetalingTermijn())
+	set Custable.PaymMode = ..Formatter.ConvertPaymMode(Klant.GeefBetalingwijze())
+	
+	set DirParty = ##class(AXaif.Customer.AxdEntityDirPartyDirOrganization).%New()
+	set DirParty.class = "entity"
+	set DirParty.LanguageId = ..Formatter.FormatLanguageId(Partij.GeefTaal())
+	set DirParty.Name = ..Formatter.FormatPartyName(Partij)
+	set:(Partij.GeefAdres().GeefLandNr()=##class(DOM.common.enu.Land).Nederland()) DirParty.DunsNumberRecId = Partij.GeefHandelRegisterNr()
+	
+	set OrganizationName = ##class(AXaif.Customer.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="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>AXaif.Customer.AxdEntityDirPartyContactInfoView</ReturnType>
+<Implementation><![CDATA[
+	set ContactInfo = ##class(AXaif.Customer.AxdEntityDirPartyContactInfoView).%New()
+	set ContactInfo.IsPrimary = ##class(AXaif.Shared.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:AXaif.Customer.AxdEntityDirPartyDirOrganization</FormalSpec>
+<Private>1</Private>
+<ReturnType>AXaif.Customer.AxdEntityDirPartyPostalAddressView</ReturnType>
+<Implementation><![CDATA[
+	set PostalAddres = ##class(AXaif.Customer.AxdEntityDirPartyPostalAddressView).%New()
+	set PostalAddres.class = "entity"
+	#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())	
+	set PostalAddres.LocationName = DirParty.Name
+	Do DirParty.DirPartyPostalAddressView.Insert(PostalAddres)
+	
+	If $$$Not(..IsLandCodeInAdresGelijkAanLandInBTWnummer(Partij) || (##class(TECH.StringUtils).Equals(Partij.GeefBTWNr(),"GEEN","G",""))) {
+		#dim FictiefPostalAddres As AXaif.Customer.AxdEntityDirPartyPostalAddressView
+		Set FictiefPostalAddres = ##class(AXaif.Customer.AxdEntityDirPartyPostalAddressView).%New()	
+		Set FictiefPostalAddres.class = "entity"	
+		Set FictiefPostalAddres.IsPrimary = ##class(AXaif.Shared.AxdExtTypeLogisticsIsPrimaryAddress).Yes()		
+		Set FictiefPostalAddres.CountryRegionId = ..Formatter.FormatLandCode2naar3(..LandCodeUitBTWNummer(Partij.GeefBTWNr()))
+		Set FictiefPostalAddres.Roles = "Business"
+		Set FictiefPostalAddres.LocationName = DirParty.Name
+		Set PostalAddres.LocationName = DirParty.Name
+		Set PostalAddres.IsPrimary = ##class(AXaif.Shared.AxdExtTypeLogisticsIsPrimaryAddress).No()
+		Do DirParty.DirPartyPostalAddressView.InsertAt(FictiefPostalAddres,1)
+	}
+]]></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 "R"_##class(TECH.StringUtils).AlignRight(Klant.GeefRegio(),0,2)
+	} 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>
Index: AXimpl/AifMessage/RequestComposer.cls.xml
===================================================================
diff -u -r35034 -r35377
--- AXimpl/AifMessage/RequestComposer.cls.xml	(.../RequestComposer.cls.xml)	(revision 35034)
+++ AXimpl/AifMessage/RequestComposer.cls.xml	(.../RequestComposer.cls.xml)	(revision 35377)
@@ -44,7 +44,7 @@
 	set:Command="SalesInvoice/Create" Request.Body.MessageParts.LedgerGeneralJournal = Converter.Convert(Id)
 	set:Command="PurchaseInvoice/Create" Request.Body.MessageParts.LedgerGeneralJournal = Converter.Convert(Id)
 	set:Command="Customer/Read" Request.Body.MessageParts.EntityKeyList = ..GeefEntityKeyList(Id)
-	
+
 	quit Request
 ]]></Implementation>
 </Method>
@@ -54,7 +54,7 @@
 <Private>1</Private>
 <ReturnType>AX.Uitgaand.common.AifConverter</ReturnType>
 <Implementation><![CDATA[
-	quit:Command="Customer/Create" ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
+	quit:Command="Customer/Create" ##class(AXimpl.AifMessage.Converter.CustomerCreateConverter).%New()
 	quit:Command="SalesInvoice/Create" ##class(AX.Uitgaand.VKP.VerkoopFactuur.impl.AifConverter).%New()
 	quit:Command="PurchaseInvoice/Create" ##class(AX.Uitgaand.BKH.AankoopFactuur.impl.AifConverter).%New()
 	quit $$$NULLOREF
Index: vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter/TestBase.cls.xml
===================================================================
diff -u -r34727 -r35377
--- vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 34727)
+++ vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 35377)
@@ -43,7 +43,7 @@
 	Set FirmaBepaler = ##class(vhTest.Mock.AX.common.impl.FirmaBepaler).%New()
 	Do FirmaBepaler.IndienMethodCall("GeefInitialen").DanReturn(..Firma)
 	
-	set AifConverter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New(PartijAPI,VerkoopAPI,FirmaBepaler)
+	set AifConverter = ##class(AXimpl.AifMessage.Converter.CustomerCreateConverter).%New(PartijAPI,VerkoopAPI,FirmaBepaler)
 	quit AifConverter.Convert(..Partij.GeefID())
 ]]></Implementation>
 </Method>