Index: vhUnitTest/AXimpl/Utils/ConvertKlantTaxGroup/Test.cls.xml
===================================================================
diff -u -r41790 -r41793
--- vhUnitTest/AXimpl/Utils/ConvertKlantTaxGroup/Test.cls.xml	(.../Test.cls.xml)	(revision 41790)
+++ vhUnitTest/AXimpl/Utils/ConvertKlantTaxGroup/Test.cls.xml	(.../Test.cls.xml)	(revision 41793)
@@ -3,11 +3,6 @@
 <Class name="vhUnitTest.AXimpl.Utils.ConvertKlantTaxGroup.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Property name="FirmaBepaler">
-<Type>AX.common.impl.FirmaBepaler</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="PartijApi">
 <Type>DOM.PARTIJ.PartijAPI</Type>
 <Private>1</Private>
@@ -17,7 +12,6 @@
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
 	Do ##super(aTestName)
-	Set ..FirmaBepaler = ##class(vhTest.Mock.AX.common.impl.FirmaBepaler).%New()
 	Set ..PartijApi = ##class(vhTest.Mock.DOM.PARTIJ.PartijAPI).%New()
 ]]></Implementation>
 </Method>
@@ -27,8 +21,6 @@
 	#dim KlantId As %String = "K||7587"
 	#dim Firma As %String = "VHBE"
 	
-	Do ..FirmaBepaler.IndienMethodCall("GeefInitialen").DanReturn("VHBE")
-	
 	Set PartijStub = ##class(vhTest.Mock.DOM.PARTIJ.Partij).%New()
 	Do PartijStub.IndienMethodCall("GeefID").DanReturn(KlantId)
 	
@@ -37,8 +29,8 @@
 	#dim KlantStub As vhTest.Mock.DOM.VKP.VanHoeckeKlant = ##class(vhTest.Utils.DOM.VKP.VanHoeckeKlant).StandaardKlant()
 	Do KlantStub.IndienMethodCall("GeefID").DanReturn(KlantId)
 	
-	#dim Util As AXimpl.Utils = ##class(AXimpl.Utils).%New(..FirmaBepaler,..PartijApi)
-	#dim KlantTaxGroup As %String = Util.ConvertKlantTaxGroup(KlantStub)
+	#dim Util As AXimpl.Utils = ##class(AXimpl.Utils).%New(..PartijApi)
+	#dim KlantTaxGroup As %String = Util.ConvertKlantTaxGroup(Firma,KlantStub)
 	
 	Do $$$AssertEquals(KlantTaxGroup,"BUNIT")
 ]]></Implementation>
@@ -49,8 +41,6 @@
 	#dim KlantId As %String = "K||4682"
 	#dim Firma As %String = "VHBE"
 	
-	Do ..FirmaBepaler.IndienMethodCall("GeefInitialen").DanReturn("VHBE")
-	
 	Set PartijStub = ##class(vhTest.Mock.DOM.PARTIJ.Partij).%New()
 	Do PartijStub.IndienMethodCall("GeefID").DanReturn(KlantId)
 	
@@ -59,8 +49,8 @@
 	#dim KlantStub As vhTest.Mock.DOM.VKP.VanHoeckeKlant = ##class(vhTest.Utils.DOM.VKP.VanHoeckeKlant).StandaardKlant()
 	Do KlantStub.IndienMethodCall("GeefID").DanReturn(KlantId)
 	
-	#dim Util As AXimpl.Utils = ##class(AXimpl.Utils).%New(..FirmaBepaler,..PartijApi)
-	#dim KlantTaxGroup As %String = Util.ConvertKlantTaxGroup(KlantStub)
+	#dim Util As AXimpl.Utils = ##class(AXimpl.Utils).%New(..PartijApi)
+	#dim KlantTaxGroup As %String = Util.ConvertKlantTaxGroup(Firma,KlantStub)
 	
 	Do $$$AssertEquals(KlantTaxGroup,"BUNIT")
 ]]></Implementation>
@@ -71,8 +61,6 @@
 	#dim KlantId As %String = "K||1000"
 	#dim Firma As %String = "VHBE"
 	
-	Do ..FirmaBepaler.IndienMethodCall("GeefInitialen").DanReturn("VHBE")
-	
 	Set PartijStub = ##class(vhTest.Mock.DOM.PARTIJ.Partij).%New()
 	Do PartijStub.IndienMethodCall("GeefID").DanReturn(KlantId)
 	
@@ -81,8 +69,8 @@
 	#dim KlantStub As vhTest.Mock.DOM.VKP.VanHoeckeKlant = ##class(vhTest.Utils.DOM.VKP.VanHoeckeKlant).StandaardKlant()
 	Do KlantStub.IndienMethodCall("GeefID").DanReturn(KlantId)
 	
-	#dim Util As AXimpl.Utils = ##class(AXimpl.Utils).%New(..FirmaBepaler,..PartijApi)
-	#dim KlantTaxGroup As %String = Util.ConvertKlantTaxGroup(KlantStub)
+	#dim Util As AXimpl.Utils = ##class(AXimpl.Utils).%New(..PartijApi)
+	#dim KlantTaxGroup As %String = Util.ConvertKlantTaxGroup(Firma,KlantStub)
 	
 	Do $$$AssertEquals(KlantTaxGroup,"BUNIT")
 ]]></Implementation>
@@ -93,8 +81,6 @@
 	#dim KlantId As %String = "K||5069"
 	#dim Firma As %String = "VHBE"
 	
-	Do ..FirmaBepaler.IndienMethodCall("GeefInitialen").DanReturn("VHBE")
-	
 	Set PartijStub = ##class(vhTest.Mock.DOM.PARTIJ.Partij).%New()
 	Do PartijStub.IndienMethodCall("GeefID").DanReturn(KlantId)
 	
@@ -103,8 +89,8 @@
 	#dim KlantStub As vhTest.Mock.DOM.VKP.VanHoeckeKlant = ##class(vhTest.Utils.DOM.VKP.VanHoeckeKlant).StandaardKlant()
 	Do KlantStub.IndienMethodCall("GeefID").DanReturn(KlantId)
 	
-	#dim Util As AXimpl.Utils = ##class(AXimpl.Utils).%New(..FirmaBepaler,..PartijApi)
-	#dim KlantTaxGroup As %String = Util.ConvertKlantTaxGroup(KlantStub)
+	#dim Util As AXimpl.Utils = ##class(AXimpl.Utils).%New(..PartijApi)
+	#dim KlantTaxGroup As %String = Util.ConvertKlantTaxGroup(Firma,KlantStub)
 	
 	Do $$$AssertEquals(KlantTaxGroup,"BUNIT")
 ]]></Implementation>
@@ -115,8 +101,6 @@
 	#dim KlantId As %String = "K||9544"
 	#dim Firma As %String = "VHBE"
 	
-	Do ..FirmaBepaler.IndienMethodCall("GeefInitialen").DanReturn("VHBE")
-	
 	Set PartijStub = ##class(vhTest.Mock.DOM.PARTIJ.Partij).%New()
 	Do PartijStub.IndienMethodCall("GeefID").DanReturn(KlantId)
 	
@@ -125,8 +109,8 @@
 	#dim KlantStub As vhTest.Mock.DOM.VKP.VanHoeckeKlant = ##class(vhTest.Utils.DOM.VKP.VanHoeckeKlant).StandaardKlant()
 	Do KlantStub.IndienMethodCall("GeefID").DanReturn(KlantId)
 	
-	#dim Util As AXimpl.Utils = ##class(AXimpl.Utils).%New(..FirmaBepaler,..PartijApi)
-	#dim KlantTaxGroup As %String = Util.ConvertKlantTaxGroup(KlantStub)
+	#dim Util As AXimpl.Utils = ##class(AXimpl.Utils).%New(..PartijApi)
+	#dim KlantTaxGroup As %String = Util.ConvertKlantTaxGroup(Firma,KlantStub)
 	
 	Do $$$AssertEquals(KlantTaxGroup,"BIC")
 ]]></Implementation>
@@ -137,8 +121,6 @@
 	#dim KlantId As %String = "K||21643"
 	#dim Firma As %String = "VHBE"
 	
-	Do ..FirmaBepaler.IndienMethodCall("GeefInitialen").DanReturn("VHBE")
-	
 	Set PartijStub = ##class(vhTest.Mock.DOM.PARTIJ.Partij).%New()
 	Do PartijStub.IndienMethodCall("GeefID").DanReturn(KlantId)
 	
@@ -147,8 +129,8 @@
 	#dim KlantStub As vhTest.Mock.DOM.VKP.VanHoeckeKlant = ##class(vhTest.Utils.DOM.VKP.VanHoeckeKlant).StandaardKlant()
 	Do KlantStub.IndienMethodCall("GeefID").DanReturn(KlantId)
 	
-	#dim Util As AXimpl.Utils = ##class(AXimpl.Utils).%New(..FirmaBepaler,..PartijApi)
-	#dim KlantTaxGroup As %String = Util.ConvertKlantTaxGroup(KlantStub)
+	#dim Util As AXimpl.Utils = ##class(AXimpl.Utils).%New(..PartijApi)
+	#dim KlantTaxGroup As %String = Util.ConvertKlantTaxGroup(Firma,KlantStub)
 	
 	Do $$$AssertEquals(KlantTaxGroup,"BSCHIP")
 ]]></Implementation>
@@ -159,8 +141,6 @@
 	#dim KlantId As %String = "K||1389"
 	#dim Firma As %String = "HLX"
 	
-	Do ..FirmaBepaler.IndienMethodCall("GeefInitialen").DanReturn("HLX")
-	
 	Set PartijStub = ##class(vhTest.Mock.DOM.PARTIJ.Partij).%New()
 	Do PartijStub.IndienMethodCall("GeefID").DanReturn(KlantId)
 	
@@ -169,8 +149,8 @@
 	#dim KlantStub As vhTest.Mock.DOM.VKP.VanHoeckeKlant = ##class(vhTest.Utils.DOM.VKP.VanHoeckeKlant).StandaardKlant()
 	Do KlantStub.IndienMethodCall("GeefID").DanReturn(KlantId)
 	
-	#dim Util As AXimpl.Utils = ##class(AXimpl.Utils).%New(..FirmaBepaler,..PartijApi)
-	#dim KlantTaxGroup As %String = Util.ConvertKlantTaxGroup(KlantStub)
+	#dim Util As AXimpl.Utils = ##class(AXimpl.Utils).%New(..PartijApi)
+	#dim KlantTaxGroup As %String = Util.ConvertKlantTaxGroup(Firma,KlantStub)
 	
 	Do $$$AssertEquals(KlantTaxGroup,"BUNIT")
 ]]></Implementation>
@@ -181,8 +161,6 @@
 	#dim KlantId As %String = "K||1377"
 	#dim Firma As %String = "HLX"
 	
-	Do ..FirmaBepaler.IndienMethodCall("GeefInitialen").DanReturn("HLX")
-	
 	Set PartijStub = ##class(vhTest.Mock.DOM.PARTIJ.Partij).%New()
 	Do PartijStub.IndienMethodCall("GeefID").DanReturn(KlantId)
 	
@@ -191,8 +169,8 @@
 	#dim KlantStub As vhTest.Mock.DOM.VKP.VanHoeckeKlant = ##class(vhTest.Utils.DOM.VKP.VanHoeckeKlant).StandaardKlant()
 	Do KlantStub.IndienMethodCall("GeefID").DanReturn(KlantId)
 	
-	#dim Util As AXimpl.Utils = ##class(AXimpl.Utils).%New(..FirmaBepaler,..PartijApi)
-	#dim KlantTaxGroup As %String = Util.ConvertKlantTaxGroup(KlantStub)
+	#dim Util As AXimpl.Utils = ##class(AXimpl.Utils).%New(..PartijApi)
+	#dim KlantTaxGroup As %String = Util.ConvertKlantTaxGroup(Firma,KlantStub)
 	
 	Do $$$AssertEquals(KlantTaxGroup,"BUNIT")
 ]]></Implementation>
@@ -203,8 +181,6 @@
 	#dim KlantId As %String = "K||1234"
 	#dim Firma As %String = "VHBE"
 	
-	Do ..FirmaBepaler.IndienMethodCall("GeefInitialen").DanReturn("VHBE")
-	
 	Set PartijStub = ##class(vhTest.Mock.DOM.PARTIJ.Partij).%New()
 	Do PartijStub.IndienMethodCall("GeefID").DanReturn(KlantId)
 	
@@ -213,8 +189,8 @@
 	#dim KlantStub As vhTest.Mock.DOM.VKP.VanHoeckeKlant = ##class(vhTest.Utils.DOM.VKP.VanHoeckeKlant).StandaardKlant()
 	Do KlantStub.IndienMethodCall("IsLidBTWEenheidVanHoecke").DanReturn(1)
 	
-	#dim Util As AXimpl.Utils = ##class(AXimpl.Utils).%New(..FirmaBepaler,..PartijApi)
-	#dim KlantTaxGroup As %String = Util.ConvertKlantTaxGroup(KlantStub)
+	#dim Util As AXimpl.Utils = ##class(AXimpl.Utils).%New(..PartijApi)
+	#dim KlantTaxGroup As %String = Util.ConvertKlantTaxGroup(Firma,KlantStub)
 	
 	Do $$$AssertEquals(KlantTaxGroup,"BUNIT")
 ]]></Implementation>
@@ -225,8 +201,6 @@
 	#dim KlantId As %String = "K||1234"
 	#dim Firma As %String = "VHBE"
 	
-	Do ..FirmaBepaler.IndienMethodCall("GeefInitialen").DanReturn("VHBE")
-	
 	Set PartijStub = ##class(vhTest.Mock.DOM.PARTIJ.Partij).%New()
 	Do PartijStub.IndienMethodCall("GeefID").DanReturn(KlantId)
 	
@@ -235,8 +209,8 @@
 	#dim KlantStub As vhTest.Mock.DOM.VKP.VanHoeckeKlant = ##class(vhTest.Utils.DOM.VKP.VanHoeckeKlant).StandaardKlant()
 	Do KlantStub.IndienMethodCall("GeefBTWRegime").DanReturn(##class(DOM.VKP.enu.BTWRegimeKlant).Aanrekenen())
 	
-	#dim Util As AXimpl.Utils = ##class(AXimpl.Utils).%New(..FirmaBepaler,..PartijApi)
-	#dim KlantTaxGroup As %String = Util.ConvertKlantTaxGroup(KlantStub)
+	#dim Util As AXimpl.Utils = ##class(AXimpl.Utils).%New(..PartijApi)
+	#dim KlantTaxGroup As %String = Util.ConvertKlantTaxGroup(Firma,KlantStub)
 	
 	Do $$$AssertEquals(KlantTaxGroup,"BDOM")
 ]]></Implementation>
@@ -247,8 +221,6 @@
 	#dim KlantId As %String = "K||1234"
 	#dim Firma As %String = "VHBE"
 	
-	Do ..FirmaBepaler.IndienMethodCall("GeefInitialen").DanReturn("VHBE")
-	
 	Set PartijStub = ##class(vhTest.Mock.DOM.PARTIJ.Partij).%New()
 	Do PartijStub.IndienMethodCall("GeefID").DanReturn(KlantId)
 	
@@ -259,8 +231,8 @@
 	Do KlantStub.IndienMethodCall("GeefBTWRegime").DanReturn(##class(DOM.VKP.enu.BTWRegimeKlant).Vrijgesteld())
 	Do PartijStub.IndienMethodCall("GeefAdres").DanReturn(BelgischAdres)
 	
-	#dim Util As AXimpl.Utils = ##class(AXimpl.Utils).%New(..FirmaBepaler,..PartijApi)
-	#dim KlantTaxGroup As %String = Util.ConvertKlantTaxGroup(KlantStub)
+	#dim Util As AXimpl.Utils = ##class(AXimpl.Utils).%New(..PartijApi)
+	#dim KlantTaxGroup As %String = Util.ConvertKlantTaxGroup(Firma,KlantStub)
 	
 	Do $$$AssertEquals(KlantTaxGroup,"BDOM")
 ]]></Implementation>
@@ -271,8 +243,6 @@
 	#dim KlantId As %String = "K||1234"
 	#dim Firma As %String = "VHBE"
 	
-	Do ..FirmaBepaler.IndienMethodCall("GeefInitialen").DanReturn("VHBE")
-	
 	Set PartijStub = ##class(vhTest.Mock.DOM.PARTIJ.Partij).%New()
 	Do PartijStub.IndienMethodCall("GeefID").DanReturn(KlantId)
 	
@@ -283,8 +253,8 @@
 	Do KlantStub.IndienMethodCall("GeefBTWRegime").DanReturn(##class(DOM.VKP.enu.BTWRegimeKlant).Vrijgesteld())
 	Do PartijStub.IndienMethodCall("GeefAdres").DanReturn(EuLid)
 	
-	#dim Util As AXimpl.Utils = ##class(AXimpl.Utils).%New(..FirmaBepaler,..PartijApi)
-	#dim KlantTaxGroup As %String = Util.ConvertKlantTaxGroup(KlantStub)
+	#dim Util As AXimpl.Utils = ##class(AXimpl.Utils).%New(..PartijApi)
+	#dim KlantTaxGroup As %String = Util.ConvertKlantTaxGroup(Firma,KlantStub)
 	
 	Do $$$AssertEquals(KlantTaxGroup,"BIC")
 ]]></Implementation>
@@ -295,8 +265,6 @@
 	#dim KlantId As %String = "K||1234"
 	#dim Firma As %String = "VHBE"
 	
-	Do ..FirmaBepaler.IndienMethodCall("GeefInitialen").DanReturn("VHBE")
-	
 	Set PartijStub = ##class(vhTest.Mock.DOM.PARTIJ.Partij).%New()
 	Do PartijStub.IndienMethodCall("GeefID").DanReturn(KlantId)
 	
@@ -307,8 +275,8 @@
 	Do KlantStub.IndienMethodCall("GeefBTWRegime").DanReturn(##class(DOM.VKP.enu.BTWRegimeKlant).Vrijgesteld())
 	Do PartijStub.IndienMethodCall("GeefAdres").DanReturn(NietEuLid)
 	
-	#dim Util As AXimpl.Utils = ##class(AXimpl.Utils).%New(..FirmaBepaler,..PartijApi)
-	#dim KlantTaxGroup As %String = Util.ConvertKlantTaxGroup(KlantStub)
+	#dim Util As AXimpl.Utils = ##class(AXimpl.Utils).%New(..PartijApi)
+	#dim KlantTaxGroup As %String = Util.ConvertKlantTaxGroup(Firma,KlantStub)
 	
 	Do $$$AssertEquals(KlantTaxGroup,"BX")
 ]]></Implementation>