Index: vhUnitTest/AX/Uitgaand/AKP/Leverancier/impl/AxLeverancierIterator/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/AX/Uitgaand/AKP/Leverancier/impl/AxLeverancierIterator/Test.cls.xml	(revision 0)
+++ vhUnitTest/AX/Uitgaand/AKP/Leverancier/impl/AxLeverancierIterator/Test.cls.xml	(revision 34465)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.AX.Uitgaand.AKP.Leverancier.impl.AxLeverancierIterator.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test">
+<Implementation><![CDATA[
+	Set Leverancier1 = ##class(vhTest.Fake.DOM.AKP.Leverancier).%New()
+	#dim LeverancierIterator As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(Leverancier1)
+	
+	Set Partij1 = ##class(vhTest.Fake.DOM.PARTIJ.Partij).%New()
+	#dim PartijIterator As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(Partij1)
+	
+	#dim PartijAPIStub As vhTest.Mock.DOM.PARTIJ.PartijAPI = ##class(vhTest.Mock.DOM.PARTIJ.PartijAPI).MockInstance()
+	Do PartijAPIStub.IndienMethodCall("GeefPartij","L||5002").DanReturn(Partij1)
+	
+	Set DixfConverterMock = ##class(vhTest.Mock.AX.Uitgaand.AKP.Leverancier.impl.DixfConverter).%New()
+	Do DixfConverterMock.VerwachtMethodCall("Convert",Partij1,Leverancier1).DanReturn(##class(AXdixf.Vendor.Vendor).%New()).ExactAantalKeer(1)
+	
+	Set AxLeverancierIterator = ##class(AX.Uitgaand.AKP.Leverancier.impl.AxLeverancierIterator).%New(LeverancierIterator, DixfConverterMock,PartijAPIStub)
+	While AxLeverancierIterator.HasNext() {
+		Do $$$AssertEquals($classname(AxLeverancierIterator.Next()),"AXdixf.Vendor.Vendor")
+	}
+	
+	Do DixfConverterMock.Verifieer()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AX/Uitgaand/AKP/Leverancier/impl/AxLeverancierIterator.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/AKP/Leverancier/impl/AxLeverancierIterator.cls.xml	(revision 0)
+++ AX/Uitgaand/AKP/Leverancier/impl/AxLeverancierIterator.cls.xml	(revision 34465)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.AKP.Leverancier.impl.AxLeverancierIterator">
+<Super>TECH.RegisteredObject,TECH.Iterator</Super>
+
+<Property name="LeverancierIterator">
+<Type>TECH.Iterator</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Converter">
+<Type>AX.Uitgaand.AKP.Leverancier.impl.DixfConverter</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="PartijAPI">
+<Type>DOM.PARTIJ.PartijAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>LeverancierIterator:TECH.Iterator,Converter:AX.Uitgaand.AKP.Leverancier.impl.DixfConverter,PartijAPI:DOM.PARTIJ.PartijAPI</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..LeverancierIterator = $$$Inject(LeverancierIterator,##class(DOM.DomeinContext).Instance().GeefAankoopAPI().GeefLeverancierIterator())
+	Set ..Converter = $$$Inject(Converter,##class(AX.Uitgaand.AKP.Leverancier.impl.DixfConverter).%New())
+	Set ..PartijAPI = $$$Inject(PartijAPI, ##class(DOM.DomeinContext).Instance().GeefPartijAPI())
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="HasNext">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	quit ..LeverancierIterator.HasNext()
+]]></Implementation>
+</Method>
+
+<Method name="Next">
+<ReturnType>AXdixf.Vendor.Vendor</ReturnType>
+<Implementation><![CDATA[
+	#dim NextLeverancier As DOM.AKP.Leverancier
+	Set NextLeverancier = ..LeverancierIterator.Next()
+	
+	#dim NextPartij As DOM.PARTIJ.Partij
+	Set NextPartij = ..PartijAPI.GeefPartij(NextLeverancier.GeefID())
+	
+	quit ..Converter.Convert(NextPartij,NextLeverancier)
+]]></Implementation>
+</Method>
+
+<Method name="Reset">
+<Implementation><![CDATA[	quit ..LeverancierIterator.Reset()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: DOM/PARTIJ/impl/DataM/DataMLeverancier.cls.xml
===================================================================
diff -u -r29059 -r34465
--- DOM/PARTIJ/impl/DataM/DataMLeverancier.cls.xml	(.../DataMLeverancier.cls.xml)	(revision 29059)
+++ DOM/PARTIJ/impl/DataM/DataMLeverancier.cls.xml	(.../DataMLeverancier.cls.xml)	(revision 34465)
@@ -243,6 +243,36 @@
 	Quit i%Data0
 ]]></Implementation>
 </Method>
+
+<Method name="GeefAanspreking">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit $Piece(..Data0,"\",4)
+]]></Implementation>
+</Method>
+
+<Method name="GeefBTWNr">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit $Piece(..Data0,"\",16)
+]]></Implementation>
+</Method>
+
+<Method name="GeefEmail">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit $Piece(..Data0,"\",19)
+]]></Implementation>
+</Method>
+
+<Method name="GeefTelefax">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit $Piece(..Data0,"\",18)
+]]></Implementation>
+</Method>
+
+<Method name="GeefToenaam">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit $Piece(..Data0,"\",3)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhTest/Fake/DOM/PARTIJ/Partij.cls.xml
===================================================================
diff -u
--- vhTest/Fake/DOM/PARTIJ/Partij.cls.xml	(revision 0)
+++ vhTest/Fake/DOM/PARTIJ/Partij.cls.xml	(revision 34465)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.DOM.PARTIJ.Partij">
+<Super>TECH.RegisteredObject,DOM.PARTIJ.Partij</Super>
+
+<Method name="GeefCode">
+<Abstract>1</Abstract>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit "L||100"
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AX/Uitgaand/AKP/Leverancier/impl/DixfGenerator.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/AKP/Leverancier/impl/DixfGenerator.cls.xml	(revision 0)
+++ AX/Uitgaand/AKP/Leverancier/impl/DixfGenerator.cls.xml	(revision 34465)
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.AKP.Leverancier.impl.DixfGenerator">
+<Super>TECH.RegisteredObject</Super>
+
+<Property name="BestandGenerator">
+<Type>APPS.common.Rapport.impl.BestandGenerator</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="Generate">
+<Implementation><![CDATA[
+	Set AxLeverancierIterator = ##class(AX.Uitgaand.AKP.Leverancier.impl.AxLeverancierIterator).%New()
+		
+	Set Headers = ##class(TECH.KeyValue.List).%New() 
+	Do Headers.InsertKeyValue("AXdixf.Vendor.Vendor", "AccountNum")
+	Do Headers.InsertKeyValue("AXdixf.Vendor.Vendor", "PartyType")
+	Do Headers.InsertKeyValue("AXdixf.Vendor.Vendor", "Name")
+	Do Headers.InsertKeyValue("AXdixf.Vendor.Vendor", "LanguageID")
+	Do Headers.InsertKeyValue("AXdixf.Vendor.Vendor", "LocationRole")
+	Do Headers.InsertKeyValue("AXdixf.Vendor.Vendor", "CountryRegionId")
+	Do Headers.InsertKeyValue("AXdixf.Vendor.Vendor", "ZipCode")
+	Do Headers.InsertKeyValue("AXdixf.Vendor.Vendor", "City")
+	Do Headers.InsertKeyValue("AXdixf.Vendor.Vendor", "Street")
+	Do Headers.InsertKeyValue("AXdixf.Vendor.Vendor", "PhoneName")
+	Do Headers.InsertKeyValue("AXdixf.Vendor.Vendor", "Phone")
+	Do Headers.InsertKeyValue("AXdixf.Vendor.Vendor", "EmailName")
+	Do Headers.InsertKeyValue("AXdixf.Vendor.Vendor", "Email")
+	Do Headers.InsertKeyValue("AXdixf.Vendor.Vendor", "TeleFaxName")
+	Do Headers.InsertKeyValue("AXdixf.Vendor.Vendor", "TeleFax")
+	Do Headers.InsertKeyValue("AXdixf.Vendor.Vendor", "Currency")
+	Do Headers.InsertKeyValue("AXdixf.Vendor.Vendor", "EnterpriseNumber")
+	Do Headers.InsertKeyValue("AXdixf.Vendor.Vendor", "VATNum")
+	Do Headers.InsertKeyValue("AXdixf.Vendor.Vendor", "PaymTermId")
+	Do Headers.InsertKeyValue("AXdixf.Vendor.Vendor", "PaymMode")
+	Do Headers.InsertKeyValue("AXdixf.Vendor.Vendor", "UseCashDisc")
+	Do Headers.InsertKeyValue("AXdixf.Vendor.Vendor", "BankAccount")
+		
+	#dim AXLeverancierData As APPS.common.Rapport.dto.BestandRapportDataObjectIteratorBased	
+	Set AXLeverancierData = ##class(APPS.common.Rapport.dto.BestandRapportDataObjectIteratorBased).%New()
+	Set AXLeverancierData.ScheidingsTeken = ";"	
+	Set AXLeverancierData.Iterator = AxLeverancierIterator
+	Set AXLeverancierData.DataVelden = Headers
+	Set AXLeverancierData.BestandVolledigeNaam = "c:\temp\lev4.csv"
+	
+	#dim BestandGenerator As APPS.common.Rapport.impl.BestandGenerator
+	Set BestandGenerator = ##class(APPS.common.Rapport.impl.BestandGenerator).%New()
+	Do BestandGenerator.MaakBestand(AXLeverancierData)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Fake/DOM/AKP/Leverancier.cls.xml
===================================================================
diff -u -r29059 -r34465
--- vhTest/Fake/DOM/AKP/Leverancier.cls.xml	(.../Leverancier.cls.xml)	(revision 29059)
+++ vhTest/Fake/DOM/AKP/Leverancier.cls.xml	(.../Leverancier.cls.xml)	(revision 34465)
@@ -11,7 +11,7 @@
 
 <Method name="GeefID">
 <ReturnType>DOM.common.PartijID</ReturnType>
-<Implementation><![CDATA[	Quit "K||1234"
+<Implementation><![CDATA[	Quit "L||5002"
 ]]></Implementation>
 </Method>
 
Index: vhTest/Mock/AX/Uitgaand/AKP/Leverancier/impl/DixfConverter.cls.xml
===================================================================
diff -u
--- vhTest/Mock/AX/Uitgaand/AKP/Leverancier/impl/DixfConverter.cls.xml	(revision 0)
+++ vhTest/Mock/AX/Uitgaand/AKP/Leverancier/impl/DixfConverter.cls.xml	(revision 34465)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.AX.Uitgaand.AKP.Leverancier.impl.DixfConverter">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
+Inheritance van meerdere TECH.Interface interfaces resulteert nog niet in een mockklasse met overeenkomstige inheritance-structuur.</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>AX.Uitgaand.AKP.Leverancier.impl.DixfConverter,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="Convert">
+<FormalSpec>Partij:DOM.PARTIJ.Partij,Leverancier:DOM.AKP.Leverancier</FormalSpec>
+<ReturnType>AXdixf.Vendor.Vendor</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("Convert",Partij,Leverancier)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Fake/AX/Uitgaand/AKP/Leverancier/impl/DixfConverter.cls.xml
===================================================================
diff -u
--- vhTest/Fake/AX/Uitgaand/AKP/Leverancier/impl/DixfConverter.cls.xml	(revision 0)
+++ vhTest/Fake/AX/Uitgaand/AKP/Leverancier/impl/DixfConverter.cls.xml	(revision 34465)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.AX.Uitgaand.AKP.Leverancier.impl.DixfConverter">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden, nieuwe methodes worden automatisch bijgevoegd, bestaande blijven zoals ze zijn.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>AX.Uitgaand.AKP.Leverancier.impl.DixfConverter</Super>
+
+<Method name="Convert">
+<FormalSpec>Partij:DOM.PARTIJ.Partij,Leverancier:DOM.AKP.Leverancier</FormalSpec>
+<ReturnType>AXdixf.Vendor.Vendor</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>