Index: APPS/EC/impl/ConfiguratorService/CheckoutTypeBepaler.cls.xml
===================================================================
diff -u -r37231 -r37434
--- APPS/EC/impl/ConfiguratorService/CheckoutTypeBepaler.cls.xml	(.../CheckoutTypeBepaler.cls.xml)	(revision 37231)
+++ APPS/EC/impl/ConfiguratorService/CheckoutTypeBepaler.cls.xml	(.../CheckoutTypeBepaler.cls.xml)	(revision 37434)
@@ -27,41 +27,49 @@
 	
 	Quit:..IsTransportKeuzePersonality(PersonalityID) ##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze()
 
-	Quit:..IsGeenVanHoeckePersonality(PersonalityID) ##class(APPS.EC.Unishop.enu.CheckoutType).Standaard() 	
+	Quit:..IsTaxExport(PersonalityID,KlantID) ##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze()
 
+	Quit ##class(APPS.EC.Unishop.enu.CheckoutType).Standaard()
+]]></Implementation>
+</Method>
+
+<Method name="IsTaxExport">
+<FormalSpec>PersonalityID:DOM.common.enu.Personality,KlantID:DOM.VKP.KlantID</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
 	#dim Klant As DOM.VKP.VanHoeckeKlant = ..VerkoopAPI.GeefKlant(KlantID)
 	#dim Land As DOM.common.impl.Land = Klant.GeefAdres().GeefLand()
 	
-	Quit:..IsStandaardKlant(KlantID) ##class(APPS.EC.Unishop.enu.CheckoutType).Standaard()
+	#dim IsTaxExport As %Boolean = ..TAXExportActief()
+	Set IsTaxExport = IsTaxExport && ..IsVanHoeckePersonality(PersonalityID)
+	Set IsTaxExport = IsTaxExport && ..IsGeenStandaardKlant(KlantID)
+	Set IsTaxExport = IsTaxExport && 'Land.IsBENELUX()
 	
-	Quit:Land.IsBENELUX() ##class(APPS.EC.Unishop.enu.CheckoutType).Standaard()
-	
-	Quit:..TAXExportNietActief() ##class(APPS.EC.Unishop.enu.CheckoutType).Standaard()
-
-	Quit ##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze()
+	Quit IsTaxExport
 ]]></Implementation>
 </Method>
 
-<Method name="IsStandaardKlant">
-<FormalSpec>KlantID:%String</FormalSpec>
+<Method name="IsGeenStandaardKlant">
+<FormalSpec>KlantID:DOM.VKP.KlantID</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.CheckoutTypeStandaardKlant).IsValid(KlantID)
+<Implementation><![CDATA[	Quit '##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.CheckoutTypeStandaardKlant).IsValid(KlantID)
 ]]></Implementation>
 </Method>
 
-<Method name="TAXExportNietActief">
+<Method name="TAXExportActief">
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit (##class(TECH.Config.ConfigMgr).Instance().GeefString("ActivatieVlagTAXExport") = "0")
+<Implementation><![CDATA[	Quit (##class(TECH.Config.ConfigMgr).Instance().GeefString("ActivatieVlagTAXExport") '= "0")
 ]]></Implementation>
 </Method>
 
-<Method name="IsGeenVanHoeckePersonality">
+<Method name="IsVanHoeckePersonality">
 <FormalSpec>PersonalityID:DOM.common.enu.Personality</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit (PersonalityID '= ##class(DOM.common.enu.Personality).VanHoecke())
+<Implementation><![CDATA[	Quit (PersonalityID = ##class(DOM.common.enu.Personality).VanHoecke())
 ]]></Implementation>
 </Method>