Index: vhUnitTest/AX/Uitgaand/VKP/OpenstaandeKlantFactuur/impl/DixfConverter/Test.cls.xml
===================================================================
diff -u -r34844 -r34845
--- vhUnitTest/AX/Uitgaand/VKP/OpenstaandeKlantFactuur/impl/DixfConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 34844)
+++ vhUnitTest/AX/Uitgaand/VKP/OpenstaandeKlantFactuur/impl/DixfConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 34845)
@@ -129,6 +129,30 @@
 	Do $$$AssertEquals(..AxUnpaidInvoice.ExchRate,"1","")
 ]]></Implementation>
 </Method>
+
+<Method name="Test: gebruik FirmaBepaler voor Company">
+<Implementation><![CDATA[
+	Set FirmaBepaler = ##class(vhTest.Mock.AX.common.impl.FirmaBepaler).%New()
+	Do FirmaBepaler.IndienMethodCall("GeefInitialen").DanReturn("test")	
+	
+	Set Converter = ##class(AX.Uitgaand.VKP.OpenstaandeKlantFactuur.impl.DixfConverter).%New(FirmaBepaler)
+	Set ..AxUnpaidInvoice = Converter.Convert(..Partij, ..Factuur)
+	
+	Do $$$AssertEquals(..AxUnpaidInvoice.Company,"test","")
+]]></Implementation>
+</Method>
+
+<Method name="Test: gebruik FirmaBepaler voor OffsetCompany">
+<Implementation><![CDATA[
+	Set FirmaBepaler = ##class(vhTest.Mock.AX.common.impl.FirmaBepaler).%New()
+	Do FirmaBepaler.IndienMethodCall("GeefInitialen").DanReturn("test")	
+	
+	Set Converter = ##class(AX.Uitgaand.VKP.OpenstaandeKlantFactuur.impl.DixfConverter).%New(FirmaBepaler)
+	Set ..AxUnpaidInvoice = Converter.Convert(..Partij, ..Factuur)
+	
+	Do $$$AssertEquals(..AxUnpaidInvoice.Company,"test","")
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: AX/Uitgaand/VKP/OpenstaandeKlantFactuur/impl/DixfConverter.cls.xml
===================================================================
diff -u -r34844 -r34845
--- AX/Uitgaand/VKP/OpenstaandeKlantFactuur/impl/DixfConverter.cls.xml	(.../DixfConverter.cls.xml)	(revision 34844)
+++ AX/Uitgaand/VKP/OpenstaandeKlantFactuur/impl/DixfConverter.cls.xml	(.../DixfConverter.cls.xml)	(revision 34845)
@@ -3,6 +3,24 @@
 <Class name="AX.Uitgaand.VKP.OpenstaandeKlantFactuur.impl.DixfConverter">
 <Super>TECH.RegisteredObject</Super>
 
+<Property name="FirmaBepaler">
+<Type>AX.common.impl.FirmaBepaler</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>FirmaBepaler:AX.common.impl.FirmaBepaler</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..FirmaBepaler = $$$Inject(FirmaBepaler, ##class(AX.common.impl.FirmaBepaler).%New())
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="Convert">
 <FormalSpec>Partij:DOM.PARTIJ.Partij,Factuur:DOM.BKH.impl.DataM.DataMFactuur</FormalSpec>
 <ReturnType>AXdixf.UnpaidInvoice.UnpaidInvoice</ReturnType>
@@ -13,11 +31,11 @@
 	Set AxUnpaidInvoice.Voucher =  "OP1234"
 	Set AxUnpaidInvoice.LineNum = "1234"
 	Set AxUnpaidInvoice.TransDate = "30/06/2016"
-	Set AxUnpaidInvoice.Company = "VHBE"
+	Set AxUnpaidInvoice.Company = ..FirmaBepaler.GeefInitialen()
 	Set AxUnpaidInvoice.AccountType = "2"
 	Set AxUnpaidInvoice.LedgerDimension = ##class(AX.common.impl.ConvertAdminToAX).ConvertCustomerID(Partij.GeefID())
 	Set AxUnpaidInvoice.Txt = "Open leverancier 30/06/2016"
-	Set AxUnpaidInvoice.OffsetCompany = "VHBE"
+	Set AxUnpaidInvoice.OffsetCompany = ..FirmaBepaler.GeefInitialen()
 	Set AxUnpaidInvoice.OffsetAccountType = "0"
 	Set AxUnpaidInvoice.OffsetLedgerDimension = "499020"
 	Set AxUnpaidInvoice.AmountCurDebit = "0"