Index: AX/Uitgaand/AKP/Leverancier/impl/DixfConverter.cls.xml
===================================================================
diff -u -r34305 -r34307
--- AX/Uitgaand/AKP/Leverancier/impl/DixfConverter.cls.xml	(.../DixfConverter.cls.xml)	(revision 34305)
+++ AX/Uitgaand/AKP/Leverancier/impl/DixfConverter.cls.xml	(.../DixfConverter.cls.xml)	(revision 34307)
@@ -34,6 +34,9 @@
 	Set AxLeverancier.City = Leverancier.GeefWoonplaats()
 	Set AxLeverancier.Street = Leverancier.GeefStraatNrBus()
 	Do ..ConvertPhone(Leverancier, AxLeverancier)
+	Set:Leverancier.GeefEmail()'="" AxLeverancier.EmailName = "E-mail adres"
+	Set AxLeverancier.Email = Leverancier.GeefEmail()
+	
 	Quit AxLeverancier
 ]]></Implementation>
 </Method>
Index: vhUnitTest/AX/Uitgaand/AKP/Leverancier/impl/DixfConverter/Convert.cls.xml
===================================================================
diff -u -r34305 -r34307
--- vhUnitTest/AX/Uitgaand/AKP/Leverancier/impl/DixfConverter/Convert.cls.xml	(.../Convert.cls.xml)	(revision 34305)
+++ vhUnitTest/AX/Uitgaand/AKP/Leverancier/impl/DixfConverter/Convert.cls.xml	(.../Convert.cls.xml)	(revision 34307)
@@ -31,6 +31,7 @@
 	Do ..Leverancier.IndienMethodCall("GeefStraatNrBus").DanReturn("Esdoornlaan 1234 A")
 	Do ..Leverancier.IndienMethodCall("GeefTelefoon1").DanReturn(" 03/123.45.67")
 	Do ..Leverancier.IndienMethodCall("GeefTelefoon2").DanReturn(" 03/765.43.21")
+	Do ..Leverancier.IndienMethodCall("GeefEmail").DanReturn("everyone@example.com")
 ]]></Implementation>
 </Method>
 
@@ -274,6 +275,30 @@
 	Do $$$AssertEquals(..AxLeverancier.Phone,"03/123.45.67,03/765.43.21")
 ]]></Implementation>
 </Method>
+
+<Method name="Test EmailName en Email - email adres gekend">
+<Implementation><![CDATA[
+	Do ..Leverancier.IndienMethodCall("GeefEmail").DanReturn("everyone@example.com")
+
+	Set Converter = ##class(AX.Uitgaand.AKP.Leverancier.impl.DixfConverter).%New()
+	Set ..AxLeverancier = Converter.Convert(..Leverancier)
+		
+	Do $$$AssertEquals(..AxLeverancier.EmailName,"E-mail adres")
+	Do $$$AssertEquals(..AxLeverancier.Email,"everyone@example.com")
+]]></Implementation>
+</Method>
+
+<Method name="Test EmailName en Email - email adres niet gekend">
+<Implementation><![CDATA[
+	Do ..Leverancier.IndienMethodCall("GeefEmail").DanReturn("")
+
+	Set Converter = ##class(AX.Uitgaand.AKP.Leverancier.impl.DixfConverter).%New()
+	Set ..AxLeverancier = Converter.Convert(..Leverancier)
+		
+	Do $$$AssertEquals(..AxLeverancier.EmailName,"")
+	Do $$$AssertEquals(..AxLeverancier.Email,"")
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: AXdixf/Vendor/Vendor.cls.xml
===================================================================
diff -u -r34305 -r34307
--- AXdixf/Vendor/Vendor.cls.xml	(.../Vendor.cls.xml)	(revision 34305)
+++ AXdixf/Vendor/Vendor.cls.xml	(.../Vendor.cls.xml)	(revision 34307)
@@ -46,6 +46,14 @@
 <Property name="Phone">
 <Type>%String</Type>
 </Property>
+
+<Property name="EmailName">
+<Type>%String</Type>
+</Property>
+
+<Property name="Email">
+<Type>%String</Type>
+</Property>
 </Class>