Index: vhTest/AX/Uitgaand/common/impl/AifGenerator/Generate/Test.cls.xml
===================================================================
diff -u -r34713 -r34732
--- vhTest/AX/Uitgaand/common/impl/AifGenerator/Generate/Test.cls.xml	(.../Test.cls.xml)	(revision 34713)
+++ vhTest/AX/Uitgaand/common/impl/AifGenerator/Generate/Test.cls.xml	(.../Test.cls.xml)	(revision 34732)
@@ -44,6 +44,23 @@
 	Do $$$AssertCorrectGemaakteBestanden(..GeefBestandLocatie())
 ]]></Implementation>
 </Method>
+
+<Method name="Test: Customer - Read">
+<Implementation><![CDATA[
+	do ##class(vhTest.Fake.TECH.DateTime.DateTimeAPI).Activeer("01.05.2016")
+	
+	#dim KlantId As %String = "K||1234"
+	do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AX_AIF",..GeefBestandLocatie()_"\AIF",..#Applicatie)
+	
+	set MessageManager = ##class(vhTest.Mock.AX.Uitgaand.common.impl.MessageManager).%New()
+	do MessageManager.IndienMethodCall("GenerateID").DanReturn("{12345678-ABCD-EFGH-1234-1234567890AB}")
+
+	set Generator = ##class(AX.Uitgaand.common.impl.AifGenerator).%New(MessageManager)
+	do Generator.Generate("Customer/Read",KlantId)
+		
+	Do $$$AssertCorrectGemaakteBestanden(..GeefBestandLocatie())
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: AX/Uitgaand/common/impl/AifGenerator.cls.xml
===================================================================
diff -u -r34727 -r34732
--- AX/Uitgaand/common/impl/AifGenerator.cls.xml	(.../AifGenerator.cls.xml)	(revision 34727)
+++ AX/Uitgaand/common/impl/AifGenerator.cls.xml	(.../AifGenerator.cls.xml)	(revision 34732)
@@ -72,7 +72,8 @@
 	
 	set:Command="Customer/Create" Message.Body.MessageParts.Customer = Converter.Convert(Id)
 	set:Command="SalesInvoice/Create" Message.Body.MessageParts.LedgerGeneralJournal = Converter.Convert(Id)
-			
+	set:Command="Customer/Read" Message.Body.MessageParts.EntityKeyList = ..GeefEntityKeyList(Id)
+		
 	#dim Path As %String = ##class(TECH.Files).AppendSubPath(##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_AIF"),"Inbound")
 	#dim Filename As %String = $replace(Command,"/","-")_" "_$replace(Id,"|","")_" "_" - "_..FirmaBepaler.GeefInitialen()_" - "_##class(TECH.Files).GeefCurrentTimeStamp()_".xml"
 	#dim FullFilename As %String = ##class(TECH.Files).AppendFile(Path,Filename)
@@ -91,6 +92,7 @@
 <Implementation><![CDATA[
 	quit:Command="Customer/Create" ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
 	quit:Command="SalesInvoice/Create" ##class(AX.Uitgaand.VKP.VerkoopFactuur.impl.AifConverter).%New()
+	quit $$$NULLOREF
 ]]></Implementation>
 </Method>
 
@@ -101,8 +103,30 @@
 <Implementation><![CDATA[
 	quit:Command="Customer/Create" "http://schemas.microsoft.com/dynamics/2008/01/services/CustomerService/create"
 	quit:Command="SalesInvoice/Create" "http://schemas.microsoft.com/dynamics/2008/01/services/GeneralJournalService/create"
+	quit:Command="Customer/Read" "http://schemas.microsoft.com/dynamics/2008/01/services/CustomerService/read"
 ]]></Implementation>
 </Method>
+
+<Method name="GeefEntityKeyList">
+<FormalSpec>Id:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>AXaif.EntityKey.EntityKeyList</ReturnType>
+<Implementation><![CDATA[
+	Set axEntityKeyList = ##class(AXaif.EntityKey.EntityKeyList).%New()
+	Set axEntityKey = ##class(AXaif.EntityKey.EntityKey).%New()
+	Set axKeyData = ##class(AXaif.EntityKey.KeyData).%New()	
+	Set axKeyField = ##class(AXaif.EntityKey.KeyField).%New()
+	
+	Set axKeyField.Field = "AccountNum"
+	Set axKeyField.Value = ##class(TECH.StringUtils).AlignRight($Extract(Id,4,*),0,5)
+	
+	Do axKeyData.KeyField.Insert(axKeyField)
+	Do axEntityKey.KeyData.Insert(axKeyData)	
+	Set axEntityKeyList.EntityKey = axEntityKey
+	
+	Quit axEntityKeyList
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: AXaif/EntityKey/EntityKeyList.cls.xml
===================================================================
diff -u -r34726 -r34732
--- AXaif/EntityKey/EntityKeyList.cls.xml	(.../EntityKeyList.cls.xml)	(revision 34726)
+++ AXaif/EntityKey/EntityKeyList.cls.xml	(.../EntityKeyList.cls.xml)	(revision 34732)
@@ -37,8 +37,6 @@
 <State>EntityKeyListState</State>
 <StreamLocation>^AXaif.EntityKey.EntityKeyListS</StreamLocation>
 <Data name="EntityKeyListState">
-<Structure>listnode</Structure>
-<Subscript/>
 <Value name="1">
 <Value>EntityKey</Value>
 </Value>