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)