Index: WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/KleurenSchemaBepaler.cls.xml
===================================================================
diff -u -r37431 -r37442
--- WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/KleurenSchemaBepaler.cls.xml	(.../KleurenSchemaBepaler.cls.xml)	(revision 37431)
+++ WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/KleurenSchemaBepaler.cls.xml	(.../KleurenSchemaBepaler.cls.xml)	(revision 37442)
@@ -36,38 +36,39 @@
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
+	
+	Quit:..TAXExportNietActief() $$$False
+	Quit:..IsGeenVanHoeckePersonality(WebshopSessie.PersonalityID) $$$False
+	Quit:..IsStandaardKlant(WebshopSessie.VhintraSessie.GebruikerData.KlantData.ID) $$$False
+
 	#dim Klant As DOM.VKP.VanHoeckeKlant = ..VerkoopAPI.GeefKlant(WebshopSessie.VhintraSessie.GebruikerData.KlantData.ID)
 	#dim Land As DOM.common.impl.Land = Klant.GeefAdres().GeefLand()
+	Quit:Land.IsBENELUX() $$$False
 	
-	#dim IsTaxExport As %Boolean = ..TAXExportActief()
-	Set IsTaxExport = IsTaxExport && ..IsVanHoeckePersonality(WebshopSessie.PersonalityID)
-	Set IsTaxExport = IsTaxExport && ..IsGeenStandaardKlant(WebshopSessie.VhintraSessie.GebruikerData.KlantData.ID)
-	Set IsTaxExport = IsTaxExport && 'Land.IsBENELUX()
-	
-	Quit IsTaxExport
+	Quit $$$True
 ]]></Implementation>
 </Method>
 
-<Method name="IsGeenStandaardKlant">
+<Method name="IsStandaardKlant">
 <FormalSpec>KlantID:%String</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="TAXExportActief">
+<Method name="TAXExportNietActief">
 <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="IsVanHoeckePersonality">
+<Method name="IsGeenVanHoeckePersonality">
 <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>
 
Index: APPS/EC/impl/ConfiguratorService/CheckoutTypeBepaler.cls.xml
===================================================================
diff -u -r37434 -r37442
--- APPS/EC/impl/ConfiguratorService/CheckoutTypeBepaler.cls.xml	(.../CheckoutTypeBepaler.cls.xml)	(revision 37434)
+++ APPS/EC/impl/ConfiguratorService/CheckoutTypeBepaler.cls.xml	(.../CheckoutTypeBepaler.cls.xml)	(revision 37442)
@@ -38,38 +38,38 @@
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
+	Quit:..TAXExportNietActief() $$$False
+	Quit:..IsGeenVanHoeckePersonality(PersonalityID) $$$False
+	Quit:..IsStandaardKlant(KlantID) $$$False
+
 	#dim Klant As DOM.VKP.VanHoeckeKlant = ..VerkoopAPI.GeefKlant(KlantID)
 	#dim Land As DOM.common.impl.Land = Klant.GeefAdres().GeefLand()
+	Quit:Land.IsBENELUX() $$$False
 	
-	#dim IsTaxExport As %Boolean = ..TAXExportActief()
-	Set IsTaxExport = IsTaxExport && ..IsVanHoeckePersonality(PersonalityID)
-	Set IsTaxExport = IsTaxExport && ..IsGeenStandaardKlant(KlantID)
-	Set IsTaxExport = IsTaxExport && 'Land.IsBENELUX()
-	
-	Quit IsTaxExport
+	Quit $$$True
 ]]></Implementation>
 </Method>
 
-<Method name="IsGeenStandaardKlant">
+<Method name="IsStandaardKlant">
 <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="TAXExportActief">
+<Method name="TAXExportNietActief">
 <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="IsVanHoeckePersonality">
+<Method name="IsGeenVanHoeckePersonality">
 <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>