Index: vhTest/Fake/AXimpl/Formatter.cls.xml
===================================================================
diff -u -r46142 -r47178
--- vhTest/Fake/AXimpl/Formatter.cls.xml	(.../Formatter.cls.xml)	(revision 46142)
+++ vhTest/Fake/AXimpl/Formatter.cls.xml	(.../Formatter.cls.xml)	(revision 47178)
@@ -21,6 +21,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="FormatVATNumToCache">
+<FormalSpec>BTWNr:%String,CountryRegionId:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
 <Method name="FormatADUPriceContrMargineId">
 <FormalSpec>Ingave:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
Index: DOM/VKP/VanHoeckeKlant.cls.xml
===================================================================
diff -u -r47154 -r47178
--- DOM/VKP/VanHoeckeKlant.cls.xml	(.../VanHoeckeKlant.cls.xml)	(revision 47154)
+++ DOM/VKP/VanHoeckeKlant.cls.xml	(.../VanHoeckeKlant.cls.xml)	(revision 47178)
@@ -541,11 +541,6 @@
 <Abstract>1</Abstract>
 <ReturnType>%ListOfDataTypes</ReturnType>
 </Method>
-
-<Method name="ZetTaal">
-<Abstract>1</Abstract>
-<FormalSpec>Taal:%String</FormalSpec>
-</Method>
 </Class>
 
 
Index: vhUnitTest/AXimpl/Formatter/FormatVATNumToCache/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/AXimpl/Formatter/FormatVATNumToCache/Test.cls.xml	(revision 0)
+++ vhUnitTest/AXimpl/Formatter/FormatVATNumToCache/Test.cls.xml	(revision 47178)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.AXimpl.Formatter.FormatVATNumToCache.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: Als VATNum leeg is dan moet BTWNr leeg zijn">
+<Implementation><![CDATA[
+	#dim VATNum As %String = ""
+	
+	#dim BTWNr As %String = ##class(AXimpl.Formatter).%New().FormatVATNumToCache(VATNum,$$$ElkeWaarde)
+	
+	Do $$$AssertEquals(BTWNr,"")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Als VATNum 0000 puntje 000 puntje 097 is dan moet BTWNr het CountryRegionId gevolgd door 10 nullen zijn">
+<Implementation><![CDATA[
+	#dim VATNum As %String = "0000.000.097"
+	#dim CountryRegionId As %String = "BE"
+	
+	#dim BTWNr As %String = ##class(AXimpl.Formatter).%New().FormatVATNumToCache(VATNum,CountryRegionId)
+	
+	Do $$$AssertEquals(BTWNr,"BE0000000000")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Per default is het BTWNr het CountryRegionId gevolgd door het VATNum zonder puntjes">
+<Implementation><![CDATA[
+	#dim VATNum As %String = "0123.456.789"
+	#dim CountryRegionId As %String = "BE"
+	
+	#dim BTWNr As %String = ##class(AXimpl.Formatter).%New().FormatVATNumToCache(VATNum,CountryRegionId)
+	
+	Do $$$AssertEquals(BTWNr,"BE0123456789")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Utils/DOM/VKP/VanHoeckeKlant.cls.xml
===================================================================
diff -u -r44165 -r47178
--- vhTest/Utils/DOM/VKP/VanHoeckeKlant.cls.xml	(.../VanHoeckeKlant.cls.xml)	(revision 44165)
+++ vhTest/Utils/DOM/VKP/VanHoeckeKlant.cls.xml	(.../VanHoeckeKlant.cls.xml)	(revision 47178)
@@ -7,25 +7,25 @@
 <ClassMethod>1</ClassMethod>
 <ReturnType>DOM.VKP.VanHoeckeKlant</ReturnType>
 <Implementation><![CDATA[
-	set Klant = ##class(vhTest.Mock.DOM.VKP.VanHoeckeKlant).%New()
+	Set Klant = ##class(vhTest.Mock.DOM.VKP.VanHoeckeKlant).%New()
 	
-	do Klant.IndienMethodCall("GeefNaam").DanReturn("DE NAAM")
-	do Klant.IndienMethodCall("IsLidBTWEenheidVanHoecke").DanReturn($$$false)
-	do Klant.IndienMethodCall("GeefID").DanReturn("K||1234")
-	do Klant.IndienMethodCall("GeefCode").DanReturn("1234")
-	do Klant.IndienMethodCall("GeefCommercieleStatus").DanReturn(##class(DOM.CRM.enu.CommercieleStatus).Actief())
-	do Klant.IndienMethodCall("GeefKortingContantPercentage").DanReturn(3)
-	do Klant.IndienMethodCall("GeefKortingContantTermijn").DanReturn("10D")
-	do Klant.IndienMethodCall("GeefBTWRegime").DanReturn(##class(DOM.VKP.enu.BTWRegimeKlant).Aanrekenen())
-	do Klant.IndienMethodCall("GeefRegio").DanReturn(9)
-	do Klant.IndienMethodCall("GeefBetalingwijze").DanReturn(##class(DOM.VKP.enu.Betalingwijze).Betalingstermijn())
-	do Klant.IndienMethodCall("GeefBetalingTermijn").DanReturn("30D")
-	Do Klant.IndienMethodCall("GeefTaal").DanReturn("N")
+	Do Klant.IndienMethodCall("GeefNaam").DanReturn("DE NAAM")
+	Do Klant.IndienMethodCall("IsLidBTWEenheidVanHoecke").DanReturn($$$false)
+	Do Klant.IndienMethodCall("GeefID").DanReturn("K||1234")
+	Do Klant.IndienMethodCall("GeefCode").DanReturn("1234")
+	Do Klant.IndienMethodCall("GeefCommercieleStatus").DanReturn(##class(DOM.CRM.enu.CommercieleStatus).Actief())
+	Do Klant.IndienMethodCall("GeefKortingContantPercentage").DanReturn(3)
+	Do Klant.IndienMethodCall("GeefKortingContantTermijn").DanReturn("10D")
+	Do Klant.IndienMethodCall("GeefBTWRegime").DanReturn(##class(DOM.VKP.enu.BTWRegimeKlant).Aanrekenen())
+	Do Klant.IndienMethodCall("GeefRegio").DanReturn(9)
+	Do Klant.IndienMethodCall("GeefBetalingwijze").DanReturn(##class(DOM.VKP.enu.Betalingwijze).Betalingstermijn())
+	Do Klant.IndienMethodCall("GeefBetalingTermijn").DanReturn("30D")
+	Do Klant.IndienMethodCall("GeefTaal").DanReturn(##class(DOM.enu.Taal).Nederlands())
 	Do Klant.IndienMethodCall("GeefEmail").DanReturn("someone@example.com")
 	Do Klant.IndienMethodCall("GeefKredietlimiet").DanReturn("2000")
 	Do Klant.IndienMethodCall("GeefAdres").DanReturn(##class(vhTest.Utils.DOM.common.Adres).StandaardAdres())
 	
-	quit Klant
+	Quit Klant
 ]]></Implementation>
 </Method>
 </Class>
Index: vhTest/Mock/DOM/VKP/VanHoeckeKlant.cls.xml
===================================================================
diff -u -r47154 -r47178
--- vhTest/Mock/DOM/VKP/VanHoeckeKlant.cls.xml	(.../VanHoeckeKlant.cls.xml)	(revision 47154)
+++ vhTest/Mock/DOM/VKP/VanHoeckeKlant.cls.xml	(.../VanHoeckeKlant.cls.xml)	(revision 47178)
@@ -544,12 +544,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="ZetTaal">
-<FormalSpec>Taal:%String</FormalSpec>
-<Implementation><![CDATA[	do ..VerwerkMethodCall("ZetTaal",Taal)
-]]></Implementation>
-</Method>
-
 <Method name="ZetURL">
 <FormalSpec>URL:%String</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("ZetURL",URL)
Index: AXimpl/Formatter.cls.xml
===================================================================
diff -u -r46904 -r47178
--- AXimpl/Formatter.cls.xml	(.../Formatter.cls.xml)	(revision 46904)
+++ AXimpl/Formatter.cls.xml	(.../Formatter.cls.xml)	(revision 47178)
@@ -171,6 +171,16 @@
 <Implementation><![CDATA[	Quit $$$If(+Quantity > 0,$this.FormatNumber(##class(TECH.Math).Floor(+Quantity,2),2), $this.FormatNumber(##class(TECH.Math).Floor(0,2),2))
 ]]></Implementation>
 </Method>
+
+<Method name="FormatVATNumToCache">
+<FormalSpec>VATNum:%String,CountryRegionId:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Quit:VATNum="" ""
+	Quit:VATNum="0000.000.097" CountryRegionId_"0000000000"
+	Quit CountryRegionId_##class(TECH.StringUtils).VerwijderKarakterUitString(VATNum,".")
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter/Test.cls.xml
===================================================================
diff -u -r47155 -r47178
--- vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 47155)
+++ vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 47178)
@@ -57,21 +57,41 @@
 	Set VerkoopApiMock = ##class(vhTest.Mock.DOM.VKP.VerkoopAPI).%New()
 	Do VerkoopApiMock.IndienMethodCall("BestaatKlant","K||1111").DanReturn($$$True)
 	
-	#dim Klant As DOM.VKP.VanHoeckeKlant = ##class(vhTest.Fake.DOM.VKP.VanHoeckeKlant).%New()
-	Do Klant.ZetTaal("D")
+	#dim Partij As DOM.PARTIJ.Partij = ##class(vhTest.Fake.DOM.PARTIJ.Partij).%New()
+	Do Partij.ZetTaal("D")
 	
 	Set PartijApiMock = ##class(vhTest.Mock.DOM.PARTIJ.PartijAPI).%New()
-	Do PartijApiMock.IndienMethodCall("GeefPartij","K||1111").DanReturn(Klant)
+	Do PartijApiMock.IndienMethodCall("GeefPartij","K||1111").DanReturn(Partij)
 	
 	Set ..VerkoopApi = VerkoopApiMock
 	Set ..PartijApi = PartijApiMock
 	
-	Do $$$AssertEquals(Klant.GeefTaal(),"D")
+	Do $$$AssertEquals(Partij.GeefTaal(),"D")
 	Do ..GeefConverter().Convert(..GeefBerichtMetEenKlant())
-	Do $$$AssertEquals(Klant.GeefTaal(),"F")
+	Do $$$AssertEquals(Partij.GeefTaal(),"F")
 ]]></Implementation>
 </Method>
 
+<Method name="Test: VATNum is het BTWNr">
+<Implementation><![CDATA[
+	Set VerkoopApiMock = ##class(vhTest.Mock.DOM.VKP.VerkoopAPI).%New()
+	Do VerkoopApiMock.IndienMethodCall("BestaatKlant","K||1111").DanReturn($$$True)
+	
+	#dim Partij As DOM.PARTIJ.Partij = ##class(vhTest.Fake.DOM.PARTIJ.Partij).%New()
+	Do Partij.ZetBTWNr("9876.543.210")
+	
+	Set PartijApiMock = ##class(vhTest.Mock.DOM.PARTIJ.PartijAPI).%New()
+	Do PartijApiMock.IndienMethodCall("GeefPartij","K||1111").DanReturn(Partij)
+	
+	Set ..VerkoopApi = VerkoopApiMock
+	Set ..PartijApi = PartijApiMock
+	
+	Do $$$AssertEquals(Partij.GeefBTWNr(),"9876.543.210")
+	Do ..GeefConverter().Convert(..GeefBerichtMetEenKlant())
+	Do $$$AssertEquals(Partij.GeefBTWNr(),"BE0123456789")
+]]></Implementation>
+</Method>
+
 <Method name="GeefConverter">
 <Private>1</Private>
 <ReturnType>AXimpl.Dynamics.CustomerIn.Converter.CustomerInConverter</ReturnType>
@@ -83,10 +103,23 @@
 <Private>1</Private>
 <ReturnType>AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</ReturnType>
 <Implementation><![CDATA[
+	Set Roles = ##class(%ListOfDataTypes).%New()
+	Set AxdEntityRole = ##class(AXif.Dynamics.CustomerIn.MessageParts.AxdEntityRole).%New()
+	Set AxdEntityRole.Name = "Business"
+	Do Roles.Insert(AxdEntityRole)
+	
+	Set Addresses = ##class(%ListOfDataTypes).%New()
+	Set PostalAddress = ##class(AXif.Dynamics.CustomerIn.MessageParts.AxdEntityPostalAddress).%New()
+	Set PostalAddress.CountryRegionId = "BE"
+	Set PostalAddress.Role = Roles
+	Do Addresses.Insert(PostalAddress)
+	
 	Set Cust = ##class(AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust).%New()
 	Set Cust.CustAccount = 01111
 	Set Cust.Name = "Klant1"
 	Set Cust.LanguageId = "fr"
+	Set Cust.VATNum = "0123.456.789"
+	Set Cust.PostalAddress = Addresses
 	
 	Set CustOutQuery = ##class(AXif.Dynamics.CustomerIn.MessageParts.AxdADUMsgCustOutQuery).%New()
 	Do CustOutQuery.Cust.Insert(Cust)
Index: vhTest/Fake/DOM/PARTIJ/Partij.cls.xml
===================================================================
diff -u -r34465 -r47178
--- vhTest/Fake/DOM/PARTIJ/Partij.cls.xml	(.../Partij.cls.xml)	(revision 34465)
+++ vhTest/Fake/DOM/PARTIJ/Partij.cls.xml	(.../Partij.cls.xml)	(revision 47178)
@@ -3,12 +3,197 @@
 <Class name="vhTest.Fake.DOM.PARTIJ.Partij">
 <Super>TECH.RegisteredObject,DOM.PARTIJ.Partij</Super>
 
+<Property name="Aanspreking">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Adres">
+<Type>DOM.VKP.LeverAdres</Type>
+<InitialExpression>##class(vhTest.Dummy.DOM.VKP.LeverAdres).%New()</InitialExpression>
+<Private>1</Private>
+</Property>
+
+<Property name="BTWNr">
+<Type>%String</Type>
+<InitialExpression>"0123.456.789"</InitialExpression>
+<Private>1</Private>
+</Property>
+
+<Property name="Code">
+<Type>%String</Type>
+<InitialExpression>"1234"</InitialExpression>
+<Private>1</Private>
+</Property>
+
+<Property name="Gsm">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="HandelRegisterNr">
+<Type>%String</Type>
+<InitialExpression>"123456789"</InitialExpression>
+<Private>1</Private>
+</Property>
+
+<Property name="ID">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Naam">
+<Type>%String</Type>
+<InitialExpression>"DE NAAM"</InitialExpression>
+<Private>1</Private>
+</Property>
+
+<Property name="Taal">
+<Type>%String</Type>
+<InitialExpression>##class(DOM.enu.Taal).Nederlands()</InitialExpression>
+<Private>1</Private>
+</Property>
+
+<Property name="Telefax">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Telefoon1">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Telefoon2">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Toenaam">
+<Type>%String</Type>
+<InitialExpression>"Toenaam"</InitialExpression>
+<Private>1</Private>
+</Property>
+
+<Property name="VerkortNummer">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Webstek">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>KlantID:%String="K||1234"</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..ID = KlantID
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="GeefAanspreking">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..Aanspreking
+]]></Implementation>
+</Method>
+
+<Method name="GeefAdres">
+<ReturnType>DOM.VKP.LeverAdres</ReturnType>
+<Implementation><![CDATA[	Quit ..Adres
+]]></Implementation>
+</Method>
+
+<Method name="GeefBTWNr">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..BTWNr
+]]></Implementation>
+</Method>
+
 <Method name="GeefCode">
-<Abstract>1</Abstract>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit "L||100"
+<Implementation><![CDATA[	Quit ..Code
 ]]></Implementation>
 </Method>
+
+<Method name="GeefGsm">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..Gsm
+]]></Implementation>
+</Method>
+
+<Method name="GeefHandelRegisterNr">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..HandelRegisterNr
+]]></Implementation>
+</Method>
+
+<Method name="GeefNaam">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..Naam
+]]></Implementation>
+</Method>
+
+<Method name="GeefTaal">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..Taal
+]]></Implementation>
+</Method>
+
+<Method name="GeefTelefax">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..Telefax
+]]></Implementation>
+</Method>
+
+<Method name="GeefTelefoon1">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..Telefoon1
+]]></Implementation>
+</Method>
+
+<Method name="GeefTelefoon2">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..Telefoon2
+]]></Implementation>
+</Method>
+
+<Method name="GeefToenaam">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..Toenaam
+]]></Implementation>
+</Method>
+
+<Method name="GeefVerkortNummer">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..VerkortNummer
+]]></Implementation>
+</Method>
+
+<Method name="GeefWebstek">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..Webstek
+]]></Implementation>
+</Method>
+
+<Method name="ZetBTWNr">
+<FormalSpec>BTWNr:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Set ..BTWNr = BTWNr
+]]></Implementation>
+</Method>
+
+<Method name="ZetTaal">
+<FormalSpec>Taal:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Set ..Taal = Taal
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhTest/Mock/AXimpl/Formatter.cls.xml
===================================================================
diff -u -r46904 -r47178
--- vhTest/Mock/AXimpl/Formatter.cls.xml	(.../Formatter.cls.xml)	(revision 46904)
+++ vhTest/Mock/AXimpl/Formatter.cls.xml	(.../Formatter.cls.xml)	(revision 47178)
@@ -106,6 +106,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="FormatVATNumToCache">
+<FormalSpec>VATNum:%String,CountryRegionId:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("FormatVATNumToCache",VATNum,CountryRegionId)
+]]></Implementation>
+</Method>
+
 <Method name="FormatVATNumVoorDIXF">
 <FormalSpec>BTWNr:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
Index: vhTest/Fake/DOM/VKP/VanHoeckeKlant.cls.xml
===================================================================
diff -u -r47161 -r47178
--- vhTest/Fake/DOM/VKP/VanHoeckeKlant.cls.xml	(.../VanHoeckeKlant.cls.xml)	(revision 47161)
+++ vhTest/Fake/DOM/VKP/VanHoeckeKlant.cls.xml	(.../VanHoeckeKlant.cls.xml)	(revision 47178)
@@ -21,6 +21,12 @@
 <Private>1</Private>
 </Property>
 
+<Property name="BTWNr">
+<Type>%String</Type>
+<InitialExpression>"0123.456.789"</InitialExpression>
+<Private>1</Private>
+</Property>
+
 <Property name="BTWRegime">
 <Type>DOM.VKP.enu.BTWRegimeKlant</Type>
 <InitialExpression>##class(DOM.VKP.enu.BTWRegimeKlant).Aanrekenen()</InitialExpression>
@@ -94,7 +100,7 @@
 
 <Property name="Taal">
 <Type>%String</Type>
-<InitialExpression>"N"</InitialExpression>
+<InitialExpression>##class(DOM.enu.Taal).Nederlands()</InitialExpression>
 <Private>1</Private>
 </Property>
 
@@ -128,6 +134,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefBTWNr">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..BTWNr
+]]></Implementation>
+</Method>
+
 <Method name="GeefBTWRegime">
 <ReturnType>DOM.VKP.enu.BTWRegimeKlant</ReturnType>
 <Implementation><![CDATA[	Quit ..BTWRegime
@@ -217,6 +229,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ZetBTWNr">
+<FormalSpec>BTWNr:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Set ..BTWNr = BTWNr
+]]></Implementation>
+</Method>
+
 <Method name="ZetTaal">
 <FormalSpec>Taal:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
Index: AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml
===================================================================
diff -u -r47154 -r47178
--- AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml	(.../CustomerInConverter.cls.xml)	(revision 47154)
+++ AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml	(.../CustomerInConverter.cls.xml)	(revision 47178)
@@ -57,13 +57,39 @@
 	#dim Klant As DOM.PARTIJ.Partij = ..PartijApi.GeefPartij(KlantId)
 	
 	Do Klant.ZetTaal(..AxToAdminUtils.ConvertLanguageId(Cust.LanguageId))
+	Do Klant.ZetBTWNr(..ZetBTWNr(Cust))
 ]]></Implementation>
 </Method>
 
 <Method name="CreëerKlant">
 <FormalSpec>Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</FormalSpec>
 <Private>1</Private>
 </Method>
+
+<Method name="ZetBTWNr">
+<FormalSpec>Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim CountryRegionId As %String = ""
+	#dim VATNum As %String = Cust.VATNum
+	
+	Set PostalAddressIterator = ##class(TECH.ListIterator).%New(Cust.PostalAddress)
+	While PostalAddressIterator.HasNext() {
+		#dim Address As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityPostalAddress = PostalAddressIterator.Next()
+		Set RoleIterator = ##class(TECH.ListIterator).%New(Address.Role)
+		While RoleIterator.HasNext() {
+			#dim Role As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityRole = RoleIterator.Next()
+			If ((Role.Name = "Business") && $$$Not(Address.CountryRegionId = "")) {
+				Set CountryRegionId = Address.CountryRegionId
+			} Else {
+				// Error wegens geen Role = "Business" of geen CountryRegionId
+			}
+		}
+	}
+	
+	Quit ##class(AXimpl.Formatter).%New().FormatVATNumToCache(VATNum,CountryRegionId)
+]]></Implementation>
+</Method>
 </Class>