Index: vhUnitTest/APPS/EC/Winkelkar/impl/DoorHandelMeeleverenBepalerFactory/GeefDoorHandelMeeleverenBepaler.cls.xml
===================================================================
diff -u -r55725 -r56102
--- vhUnitTest/APPS/EC/Winkelkar/impl/DoorHandelMeeleverenBepalerFactory/GeefDoorHandelMeeleverenBepaler.cls.xml	(.../GeefDoorHandelMeeleverenBepaler.cls.xml)	(revision 55725)
+++ vhUnitTest/APPS/EC/Winkelkar/impl/DoorHandelMeeleverenBepalerFactory/GeefDoorHandelMeeleverenBepaler.cls.xml	(.../GeefDoorHandelMeeleverenBepaler.cls.xml)	(revision 56102)
@@ -3,8 +3,29 @@
 <Class name="vhUnitTest.APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepalerFactory.GeefDoorHandelMeeleverenBepaler">
 <Super>vhUnitTest.TestCase</Super>
 
+<Property name="BackupDaroExcludedFromDelivery">
+<Type>%Boolean</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+	Do ##super()
+	Set ..BackupDaroExcludedFromDelivery = ##class(TECH.Config.ConfigMgr).Instance().GetBoolean("DOM.common.ProjectSettingsAPI_DaroExcludeFromDeliveryEnabled")
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<Implementation><![CDATA[
+	Do ##class(TECH.Config.ConfigMgr).Instance().SetBoolean("DOM.common.ProjectSettingsAPI_DaroExcludeFromDeliveryEnabled",..BackupDaroExcludedFromDelivery)
+	Do ##super()
+]]></Implementation>
+</Method>
+
 <Method name="Test geeft altijd een bepaler terug">
 <Implementation><![CDATA[
+	Do ##class(TECH.Config.ConfigMgr).Instance().SetBoolean("DOM.common.ProjectSettingsAPI_DaroExcludeFromDeliveryEnabled","0")
+
 	Set Factory = ##class(APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepalerFactory).%New()
 	
 	#dim Bepaler as APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler = Factory.GeefDoorHandelMeeleverenBepaler()
@@ -23,6 +44,7 @@
 
 <Method name="Test geeft voor alle personalities de juiste bepaler terug">
 <Implementation><![CDATA[
+	Do ##class(TECH.Config.ConfigMgr).Instance().SetBoolean("DOM.common.ProjectSettingsAPI_DaroExcludeFromDeliveryEnabled","0")
 	Set Factory = ##class(APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepalerFactory).%New()
 	
 	#dim PersonalityIdIterator As TECH.ListIterator = ##class(DOM.common.enu.Personality).ValueListIterator()
@@ -44,6 +66,33 @@
 	}
 ]]></Implementation>
 </Method>
+
+<Method name="Test geeft voor alle personalities de juiste bepaler terug DaroExcludedFromDeliveryEnabled">
+<Implementation><![CDATA[
+	Do ##class(TECH.Config.ConfigMgr).Instance().SetBoolean("DOM.common.ProjectSettingsAPI_DaroExcludeFromDeliveryEnabled","1")
+	Set Factory = ##class(APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepalerFactory).%New()
+	
+	#dim PersonalityIdIterator As TECH.ListIterator = ##class(DOM.common.enu.Personality).ValueListIterator()
+	
+	while PersonalityIdIterator.HasNext() {
+		#dim PersonalityId as DOM.common.enu.Personality = PersonalityIdIterator.Next()
+		#dim Bepaler as APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler = Factory.GeefDoorHandelMeeleverenBepaler(PersonalityId)
+		if (PersonalityId = 10){
+			Do $$$AssertTrue(Bepaler.%IsA("APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler.NietBenelux"))			
+		} elseif (PersonalityId = 14) {		
+			Do $$$AssertTrue(Bepaler.%IsA("APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler.NietBenelux"))			
+		} elseif (PersonalityId = 17) {	
+			Do $$$AssertTrue(Bepaler.%IsA("APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler.NietBenelux"))
+		} elseif (PersonalityId = 18) {	
+			Do $$$AssertTrue(Bepaler.%IsA("APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler.NietBenelux"))
+		} elseif (PersonalityId = 19) {	
+			Do $$$AssertTrue(Bepaler.%IsA("APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler.NietBenelux"))
+		} else {
+			Do $$$AssertTrue(Bepaler.%IsA("APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler.Geen"))
+		}
+	}
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/EC/Winkelkar/impl/DoorHandelMeeleverenBepalerFactory.cls.xml
===================================================================
diff -u -r55725 -r56102
--- APPS/EC/Winkelkar/impl/DoorHandelMeeleverenBepalerFactory.cls.xml	(.../DoorHandelMeeleverenBepalerFactory.cls.xml)	(revision 55725)
+++ APPS/EC/Winkelkar/impl/DoorHandelMeeleverenBepalerFactory.cls.xml	(.../DoorHandelMeeleverenBepalerFactory.cls.xml)	(revision 56102)
@@ -7,12 +7,23 @@
 <FormalSpec>PersonalityId:DOM.common.enu.Personality=""</FormalSpec>
 <ReturnType>APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler</ReturnType>
 <Implementation><![CDATA[
-	If ##class(TECH.StringUtils).Contains(PersonalityId,##class(DOM.common.enu.Personality).BeslagDesign(),##class(DOM.common.enu.Personality).Galimberti(),##class(DOM.common.enu.Personality).Pavanello(),##class(DOM.common.enu.Personality).Ferexpert()){
-		Quit ##class(APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler.NietBenelux).%New()
+	Quit:(PersonalityId = ##class(DOM.common.enu.Personality).BeslagDesign()) ..GeefNietBeneluxBepaler()
+	Quit:(PersonalityId = ##class(DOM.common.enu.Personality).Galimberti()) ..GeefNietBeneluxBepaler()
+	Quit:(PersonalityId = ##class(DOM.common.enu.Personality).Pavanello()) ..GeefNietBeneluxBepaler()
+	Quit:(PersonalityId = ##class(DOM.common.enu.Personality).Ferexpert()) ..GeefNietBeneluxBepaler()
+	if (##class(DOM.DomeinContext).Instance().GeefProjectSettingsAPI().IsDaroExcludeFromDeliveryEnabled()){
+		Quit:(PersonalityId = ##class(DOM.common.enu.Personality).Daro()) ..GeefNietBeneluxBepaler()
 	}
 	Quit ##class(APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler.Geen).%New()
 ]]></Implementation>
 </Method>
+
+<Method name="GeefNietBeneluxBepaler">
+<Private>1</Private>
+<ReturnType>APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler</ReturnType>
+<Implementation><![CDATA[	Quit ##class(APPS.EC.Winkelkar.impl.DoorHandelMeeleverenBepaler.NietBenelux).%New()
+]]></Implementation>
+</Method>
 </Class>