Index: vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter/Test.cls.xml
===================================================================
diff -u -r50030 -r50117
--- vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 50030)
+++ vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 50117)
@@ -51,7 +51,8 @@
 	DO ..VerkoopApiMock.VerwachtMethodCall("GeefKlant","K||1111").DanReturn(KlantMock)
 
 	Do ..VerwachtZetNawGegevens(PartijMock, ..GeefAdres())
-
+	
+	Do KlantMock.VerwachtMethodCall("ZetHandelsregisterNr","159753").DanDoeNiks()
 	Do KlantMock.VerwachtMethodCall("Save").DanDoeNiks()
 	
 	Do ..LeverAdresUtilsMock.IndienMethodCall("MaakPrimairAdres",KlantMock,$$$True).DanReturn(..GeefAdres())
@@ -82,7 +83,8 @@
 	DO ..VerkoopApiMock.VerwachtMethodCall("GeefKlant","K||1111").DanReturn(KlantMock)
 
 	Do ..VerwachtZetNawGegevensIndienGeenHoofdadres(PartijMock, ..GeefLeegAdres())
-
+	
+	Do KlantMock.VerwachtMethodCall("ZetHandelsregisterNr","159753").DanDoeNiks()
 	Do KlantMock.VerwachtMethodCall("Save").DanDoeNiks()
 	
 	#dim LandMock As vhTest.Mock.DOM.common.Land = ##class(vhTest.Mock.DOM.common.Land).%New()
@@ -115,7 +117,8 @@
 	Do Adres.ZetVerzendingWijze("")
 
 	Do ..VerwachtZetNawGegevens(PartijMock, Adres)
-
+	
+	Do KlantMock.VerwachtMethodCall("ZetHandelsregisterNr","159753").DanDoeNiks()
 	Do KlantMock.VerwachtMethodCall("Save").DanDoeNiks()
 	
 	Do ..LeverAdresUtilsMock.IndienMethodCall("MaakPrimairAdres",KlantMock,$$$True).DanReturn(..GeefAdres())
@@ -227,6 +230,7 @@
 	#dim LeverAdres As DOM.VKP.LeverAdres = ..GeefAdres()
 	
 	DO ..VerkoopApiMock.VerwachtMethodCall("GeefKlant","K||1111").DanReturn(KlantMock)
+	Do KlantMock.VerwachtMethodCall("ZetHandelsregisterNr","159753").DanDoeNiks()
 	Do KlantMock.VerwachtMethodCall("Save").DanDoeNiks()
 ]]></Implementation>
 </Method>
@@ -290,17 +294,7 @@
 <Private>1</Private>
 <ReturnType>AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</ReturnType>
 <Implementation><![CDATA[
-	Set Cust = ##class(AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust).%New()
-	Set Cust.CustAccount = CustAccount
-	Set Cust.LanguageId = "nl-be"	
-	Set Cust.Name = Name
-	Set Cust.LastName = ""
-	Set Cust.PartyNumber = "000000922"
-    Set Cust.PriceException = "No"
-	Set Cust.VATNum = "0430.459.769"
-	Do Cust.ElectronicAddress.Insert(..GeefTelefoon1())	
-	Do Cust.ElectronicAddress.Insert(..GeefFax())	
-	Do Cust.ElectronicAddress.Insert(..GeefEmail())	
+	#dim Cust As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust = ..GeefCustZonderHoofdadres(CustAccount, Name)
 	Do Cust.PostalAddress.Insert(..GeefPrimaryAddress())
 	Quit Cust
 ]]></Implementation>
@@ -319,6 +313,7 @@
 	Set Cust.PartyNumber = "000000922"
     Set Cust.PriceException = "No"
 	Set Cust.VATNum = "0430.459.769"
+	Set Cust.TaxRegistrationNumber = "159753"
 	Do Cust.ElectronicAddress.Insert(..GeefTelefoon1())	
 	Do Cust.ElectronicAddress.Insert(..GeefFax())	
 	Do Cust.ElectronicAddress.Insert(..GeefEmail())