Index: AXimpl/AifMessage/Converter/SalesInvoiceConverter.cls.xml
===================================================================
diff -u -r35858 -r41806
--- AXimpl/AifMessage/Converter/SalesInvoiceConverter.cls.xml	(.../SalesInvoiceConverter.cls.xml)	(revision 35858)
+++ AXimpl/AifMessage/Converter/SalesInvoiceConverter.cls.xml	(.../SalesInvoiceConverter.cls.xml)	(revision 41806)
@@ -24,7 +24,7 @@
 </Property>
 
 <Property name="Utils">
-<Type>AXimpl.AifMessage.Converter.Utils</Type>
+<Type>AXimpl.Utils</Type>
 <Private>1</Private>
 </Property>
 
@@ -52,7 +52,7 @@
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	set ..FirmaBepaler = $$$Inject(FirmaBepaler,##class(AX.common.impl.FirmaBepaler).%New())
-	set ..Utils = ##class(AXimpl.AifMessage.Converter.Utils).%New(..FirmaBepaler)
+	set ..Utils = ##class(AXimpl.Utils).%New()
 	
 	set ..VerkoopAPI = $$$Inject(VerkoopAPI,##class(DOM.DomeinContext).Instance().GeefVerkoopAPI())
 	set ..OrderAPI = $$$Inject(OrderAPI,##class(DOM.DomeinContext).Instance().GeefOrderAPI())
@@ -147,7 +147,7 @@
 	set Transaction.AccountType = "Cust"
 	set Transaction.OffsetAccountType = "Ledger"
 	
-	set Transaction.TaxGroup = ..Utils.ConvertTaxGroup(Factuur.GeefKlant())
+	set Transaction.TaxGroup = ..Utils.ConvertKlantTaxGroup(..FirmaBepaler.GeefInitialen(),Factuur.GeefKlant())
 	
 	set Transaction.Listcode = $$$If(Transaction.TaxGroup="BIC","EUTrade","IncludeNot")
 	set Transaction.PaymMode = $$$If(Factuur.GeefKlant().GeefBetalingwijze()=##class(DOM.VKP.enu.Betalingwijze).Incasso(),"SEPA-DD","OVER")
@@ -184,7 +184,7 @@
 	set Transaction.class = "entity"
 	set Transaction.CurrencyCode = Factuur.GeefMuntCode()
 	
-	set Transaction.TaxGroup = ..Utils.ConvertTaxGroup(Factuur.GeefKlant())
+	set Transaction.TaxGroup = ..Utils.ConvertKlantTaxGroup(..FirmaBepaler.GeefInitialen(),Factuur.GeefKlant())
 	set Transaction.TaxItemGroup = "G3"
 	
 	set Transaction.LineNum = ..Formatter.FormatNumber(ItemIndex,10)