Index: APPS/EC/impl/KlantInstellingenServiceDaro.cls.xml
===================================================================
diff -u -r30231 -r53127
--- APPS/EC/impl/KlantInstellingenServiceDaro.cls.xml	(.../KlantInstellingenServiceDaro.cls.xml)	(revision 30231)
+++ APPS/EC/impl/KlantInstellingenServiceDaro.cls.xml	(.../KlantInstellingenServiceDaro.cls.xml)	(revision 53127)
@@ -3,17 +3,27 @@
 <Class name="APPS.EC.impl.KlantInstellingenServiceDaro">
 <Super>APPS.common.impl.KlantInstellingenService</Super>
 
+<Property name="LbxVerpakkingType">
+<Type>DOM.PM.enu.LBXVerpakkingType.AutoComplete</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="TaxVerpakkingType">
+<Type>DOM.PM.enu.TAORVerpakkingType.AutoComplete</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="MagKlantLBXVerpakkingTypeBestellen">
 <FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,VerpakkingType:DOM.PM.enu.LBXVerpakkingType</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit (VerpakkingType = ##class(DOM.PM.enu.LBXVerpakkingType).V1())
+<Implementation><![CDATA[	Quit ((VerpakkingType = ..LbxVerpakkingType.V1) || (VerpakkingType = ..LbxVerpakkingType.Probox))
 ]]></Implementation>
 </Method>
 
 <Method name="MagKlantTAORVerpakkingTypeBestellen">
 <FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,VerpakkingType:DOM.PM.enu.TAORVerpakkingType</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit (VerpakkingType = ##class(DOM.PM.enu.TAORVerpakkingType).V1())
+<Implementation><![CDATA[	Quit ((VerpakkingType = ..TaxVerpakkingType.V1) || (VerpakkingType = ..TaxVerpakkingType.Probox))
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/APPS/EC/impl/KlantInstellingenServiceDaro/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/EC/impl/KlantInstellingenServiceDaro/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/EC/impl/KlantInstellingenServiceDaro/Test.cls.xml	(revision 53127)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.EC.impl.KlantInstellingenServiceDaro.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Property name="KlantInstellingen">
+<Type>APPS.EC.impl.KlantInstellingenServiceDaro</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+	Do ##super()
+	
+	Set ..KlantInstellingen = ##class(APPS.EC.impl.KlantInstellingenServiceDaro).%New()
+]]></Implementation>
+</Method>
+
+<Method name="Test: LbxVerpakkingTypes die Daro mag bestellen">
+<Implementation><![CDATA[
+	Do ..AssertMagBestellen(##class(DOM.PM.enu.LBXVerpakkingType).V1(), $$$True)
+	Do ..AssertMagBestellen(##class(DOM.PM.enu.LBXVerpakkingType).Probox(), $$$True)
+	
+	Do ..AssertMagBestellen(##class(DOM.PM.enu.LBXVerpakkingType).VHoss(), $$$False)
+	Do ..AssertMagBestellen(##class(DOM.PM.enu.LBXVerpakkingType).Pallet(), $$$False)
+]]></Implementation>
+</Method>
+
+<Method name="Test: TaxVerpakkingTypes die Daro mag bestellen">
+<Implementation><![CDATA[
+	Do ..AssertMagBestellen(##class(DOM.PM.enu.TAORVerpakkingType).V1(), $$$True)
+	Do ..AssertMagBestellen(##class(DOM.PM.enu.TAORVerpakkingType).Probox(), $$$True)
+	
+	Do ..AssertMagBestellen(##class(DOM.PM.enu.TAORVerpakkingType).BulkPerOnderdeelGegroepeerd(), $$$False)
+	Do ..AssertMagBestellen(##class(DOM.PM.enu.TAORVerpakkingType).FlatpackV1(), $$$False)
+	Do ..AssertMagBestellen(##class(DOM.PM.enu.TAORVerpakkingType).LosseComponentenInBulk(), $$$False)
+]]></Implementation>
+</Method>
+
+<Method name="AssertMagBestellen">
+<FormalSpec>VerpakkingType:%String,MagBestellen:%Boolean</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[	Do $$$AssertEquals(..KlantInstellingen.MagKlantLBXVerpakkingTypeBestellen("RandomKlantId", VerpakkingType), MagBestellen)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>