Index: AX/Uitgaand/AKP/Leverancier/impl/DixfConverter.cls.xml
===================================================================
diff -u -r34618 -r34619
--- AX/Uitgaand/AKP/Leverancier/impl/DixfConverter.cls.xml	(.../DixfConverter.cls.xml)	(revision 34618)
+++ AX/Uitgaand/AKP/Leverancier/impl/DixfConverter.cls.xml	(.../DixfConverter.cls.xml)	(revision 34619)
@@ -55,6 +55,7 @@
 	Set AxLeverancier.PaymMode = ..ConvertPaymentMode(Partij)
 	Set AxLeverancier.UseCashDisc = ..Formatter.FormatCashDiscount(Leverancier.GeefKortingKontant(),Leverancier.GeefTermijnKortingKontant())
 	Set:$$$HasLength(Leverancier.GeefBankRekeningNr()) AxLeverancier.BankAccount = "1"
+	Set AxLeverancier.TaxGroup = ..ConvertTaxGroup(Partij)
 	
 	Quit AxLeverancier
 ]]></Implementation>
@@ -110,6 +111,23 @@
 	Quit "SWIFT"
 ]]></Implementation>
 </Method>
+
+<Method name="ConvertTaxGroup">
+<FormalSpec>Partij:DOM.PARTIJ.Partij</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	If ..FirmaBepaler.GeefInitialen()="VH" {
+		Quit:Partij.GeefID()="L||6332" "BUNIT"
+		Quit:Partij.GeefID()="L||6051" "BUNIT"
+		Quit:Partij.GeefID()="L||5908" "BUNIT"
+	} ElseIf ..FirmaBepaler.GeefInitialen()="HX" {
+		Quit:Partij.GeefID()="L||5497" "BUNIT"
+	}
+	Quit:Partij.GeefAdres().GeefLand().GeefCode()="BE" "BDOM"
+	Quit:Partij.GeefAdres().GeefLand().IsLidVanEU() "BIC"
+	Quit "BX"
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: AXdixf/Vendor/Vendor.cls.xml
===================================================================
diff -u -r34483 -r34619
--- AXdixf/Vendor/Vendor.cls.xml	(.../Vendor.cls.xml)	(revision 34483)
+++ AXdixf/Vendor/Vendor.cls.xml	(.../Vendor.cls.xml)	(revision 34619)
@@ -94,6 +94,10 @@
 <Property name="BankAccount">
 <Type>%String</Type>
 </Property>
+
+<Property name="TaxGroup">
+<Type>%String</Type>
+</Property>
 </Class>
 
 
Index: AX/Uitgaand/AKP/Leverancier/impl/DixfGenerator.cls.xml
===================================================================
diff -u -r34483 -r34619
--- AX/Uitgaand/AKP/Leverancier/impl/DixfGenerator.cls.xml	(.../DixfGenerator.cls.xml)	(revision 34483)
+++ AX/Uitgaand/AKP/Leverancier/impl/DixfGenerator.cls.xml	(.../DixfGenerator.cls.xml)	(revision 34619)
@@ -30,6 +30,7 @@
 	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", "TaxGroup")
 	Do Headers.InsertKeyValue("AXdixf.Vendor.Vendor", "EnterpriseNumber")
 	Do Headers.InsertKeyValue("AXdixf.Vendor.Vendor", "VATNum")
 	Do Headers.InsertKeyValue("AXdixf.Vendor.Vendor", "PaymTermId")
@@ -42,7 +43,7 @@
 	Set AXLeverancierData.ScheidingsTeken = ";"	
 	Set AXLeverancierData.Iterator = AxLeverancierIterator
 	Set AXLeverancierData.DataVelden = Headers
-	Set AXLeverancierData.BestandVolledigeNaam = "c:\temp\lev4.csv"
+	Set AXLeverancierData.BestandVolledigeNaam = "c:\temp\lev7.csv"
 	
 	#dim BestandGenerator As APPS.common.Rapport.impl.BestandGenerator
 	Set BestandGenerator = ##class(APPS.common.Rapport.impl.BestandGenerator).%New()
Index: vhUnitTest/AX/Uitgaand/AKP/Leverancier/impl/DixfConverter/Convert.cls.xml
===================================================================
diff -u -r34618 -r34619
--- vhUnitTest/AX/Uitgaand/AKP/Leverancier/impl/DixfConverter/Convert.cls.xml	(.../Convert.cls.xml)	(revision 34618)
+++ vhUnitTest/AX/Uitgaand/AKP/Leverancier/impl/DixfConverter/Convert.cls.xml	(.../Convert.cls.xml)	(revision 34619)
@@ -744,6 +744,45 @@
 	Do $$$AssertEquals(..AxLeverancier.VendGroup,"EX")
 ]]></Implementation>
 </Method>
+
+<Method name="Test: TaxGroup werkmaatschappij VH en ID 6051 geeft BUNIT">
+<Implementation><![CDATA[
+	Set FirmaBepaler = ##class(vhTest.Mock.AX.common.impl.FirmaBepaler).%New()
+	Do FirmaBepaler.IndienMethodCall("GeefInitialen").DanReturn("VH")	
+	Do ..Partij.IndienMethodCall("GeefID").DanReturn("L||6051")
+	
+	Set Converter = ##class(AX.Uitgaand.AKP.Leverancier.impl.DixfConverter).%New(FirmaBepaler)
+	Set ..AxLeverancier = Converter.Convert(..Partij, ..Leverancier)
+		
+	Do $$$AssertEquals(..AxLeverancier.TaxGroup,"BUNIT")
+]]></Implementation>
+</Method>
+
+<Method name="Test: TaxGroup werkmaatschappij HX en ID 5497 geeft BUNIT">
+<Implementation><![CDATA[
+	Set FirmaBepaler = ##class(vhTest.Mock.AX.common.impl.FirmaBepaler).%New()
+	Do FirmaBepaler.IndienMethodCall("GeefInitialen").DanReturn("HX")	
+	Do ..Partij.IndienMethodCall("GeefID").DanReturn("L||5497")
+	
+	Set Converter = ##class(AX.Uitgaand.AKP.Leverancier.impl.DixfConverter).%New(FirmaBepaler)
+	Set ..AxLeverancier = Converter.Convert(..Partij, ..Leverancier)
+		
+	Do $$$AssertEquals(..AxLeverancier.TaxGroup,"BUNIT")
+]]></Implementation>
+</Method>
+
+<Method name="Test: TaxGroup werkmaatschappij VH euro adres geeft BIC">
+<Implementation><![CDATA[
+	Set FirmaBepaler = ##class(vhTest.Mock.AX.common.impl.FirmaBepaler).%New()
+	Do FirmaBepaler.IndienMethodCall("GeefInitialen").DanReturn("HX")
+	Do ..Partij.IndienMethodCall("GeefAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).EuLid())
+	
+	Set Converter = ##class(AX.Uitgaand.AKP.Leverancier.impl.DixfConverter).%New(FirmaBepaler)
+	Set ..AxLeverancier = Converter.Convert(..Partij, ..Leverancier)
+		
+	Do $$$AssertEquals(..AxLeverancier.TaxGroup,"BIC")
+]]></Implementation>
+</Method>
 </Class>