Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml
===================================================================
diff -u -r52195 -r52234
--- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 52195)
+++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 52234)
@@ -58,7 +58,9 @@
 	Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).VanRaemdonck())
 	Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).Noteborn())
 	Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).Daro())
-	Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).HaefeleNL()) 
+	Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).HaefeleNL())
+	Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BeslagDesign())
+	Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).Demo())
 
 	Do VerwachteBepalers.SetAt(..HeinVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).Hein())
 	Do VerwachteBepalers.SetAt(..HeinVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).Seefelder())
@@ -69,11 +71,9 @@
 	While PersonalityIterator.HasNext()
 	{
 		#dim PersonalityID As DOM.common.enu.Personality = PersonalityIterator.Next()
-		If (($$$Not(PersonalityID = ##class(DOM.common.enu.Personality).BeslagDesign())) && ($$$Not(PersonalityID = ##class(DOM.common.enu.Personality).Demo()))) {
-			#dim Sessie As APPS.EC.Transport.dto.KlantIdentificatie = ##class(APPS.EC.Transport.dto.KlantIdentificatie).%New(PersonalityID, "")
-			#dim VerkoopprijsBerekenaar = Factory.GeefVerkoopprijsBerekenaar(Sessie)
-			Do $$$AssertEquals(VerkoopprijsBerekenaar.%ClassName(1), VerwachteBepalers.GetAt(PersonalityID))
-		}
+		#dim Sessie As APPS.EC.Transport.dto.KlantIdentificatie = ##class(APPS.EC.Transport.dto.KlantIdentificatie).%New(PersonalityID, "")
+		#dim VerkoopprijsBerekenaar = Factory.GeefVerkoopprijsBerekenaar(Sessie)
+		Do $$$AssertEquals(VerkoopprijsBerekenaar.%ClassName(1), VerwachteBepalers.GetAt(PersonalityID))
 	}
 ]]></Implementation>
 </Method>
Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml
===================================================================
diff -u -r52195 -r52234
--- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 52195)
+++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 52234)
@@ -57,23 +57,22 @@
 	Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).VanRaemdonck())
 	Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Noteborn())
 	Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Daro())
-	Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).HaefeleNL()) 
+	Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).HaefeleNL())
+	Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).BeslagDesign())
+	Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Demo())
 	
 	Do VerwachteBepalers.SetAt(..HeinTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Hein())
 	Do VerwachteBepalers.SetAt(..HeinTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Seefelder())
-	
 
 	#dim TransportFirmaBepalerFactory As APPS.EC.Transport.impl.Factory
 	Set TransportFirmaBepalerFactory = ##class(APPS.EC.Transport.impl.Factory).%New()
 
 	#dim PersonalityIterator As TECH.ListIterator = ##class(DOM.common.enu.Personality).ValueListIterator()
 	While PersonalityIterator.HasNext()	{
 		#dim PersonalityID As DOM.common.enu.Personality = PersonalityIterator.Next()
-		If (($$$Not(PersonalityID = ##class(DOM.common.enu.Personality).BeslagDesign())) && ($$$Not(PersonalityID = ##class(DOM.common.enu.Personality).Demo()))) {
-			#dim Sessie As APPS.EC.Transport.dto.KlantIdentificatie = ##class(APPS.EC.Transport.dto.KlantIdentificatie).%New(PersonalityID, "")
-			#dim VerkoopprijsBerekenaar = TransportFirmaBepalerFactory.GeefTransportFirmaBepaler(Sessie)
-			Do $$$AssertEquals(VerkoopprijsBerekenaar.%ClassName(1), VerwachteBepalers.GetAt(PersonalityID))
-		}
+		#dim Sessie As APPS.EC.Transport.dto.KlantIdentificatie = ##class(APPS.EC.Transport.dto.KlantIdentificatie).%New(PersonalityID, "")
+		#dim VerkoopprijsBerekenaar = TransportFirmaBepalerFactory.GeefTransportFirmaBepaler(Sessie)
+		Do $$$AssertEquals(VerkoopprijsBerekenaar.%ClassName(1), VerwachteBepalers.GetAt(PersonalityID))
 	}
 ]]></Implementation>
 </Method>
Index: DOM/common/BeslagDesignPersonality.cls.xml
===================================================================
diff -u -r52195 -r52234
--- DOM/common/BeslagDesignPersonality.cls.xml	(.../BeslagDesignPersonality.cls.xml)	(revision 52195)
+++ DOM/common/BeslagDesignPersonality.cls.xml	(.../BeslagDesignPersonality.cls.xml)	(revision 52234)
@@ -18,6 +18,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefLeverancierData">
+<ReturnType>DOM.common.LeverancierPersonalityData</ReturnType>
+<Implementation><![CDATA[	quit ##class(DOM.common.LeverancierPersonalityData).%New(##class(DOM.common.enu.Personality).VanHoecke(),##class(DOM.VKP.enu.Klant).BeslagDesign())
+]]></Implementation>
+</Method>
+
 <Method name="IsHandel">
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[	quit 1
Index: DOM/common/DemoPersonality.cls.xml
===================================================================
diff -u -r52195 -r52234
--- DOM/common/DemoPersonality.cls.xml	(.../DemoPersonality.cls.xml)	(revision 52195)
+++ DOM/common/DemoPersonality.cls.xml	(.../DemoPersonality.cls.xml)	(revision 52234)
@@ -18,6 +18,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefLeverancierData">
+<ReturnType>DOM.common.LeverancierPersonalityData</ReturnType>
+<Implementation><![CDATA[	quit ##class(DOM.common.LeverancierPersonalityData).%New(##class(DOM.common.enu.Personality).VanHoecke(),##class(DOM.VKP.enu.Klant).DemoMultiPersonality())
+]]></Implementation>
+</Method>
+
 <Method name="IsHandel">
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[	quit 1
Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml
===================================================================
diff -u -r52195 -r52234
--- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 52195)
+++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 52234)
@@ -55,7 +55,9 @@
 	Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).VanRaemdonck())
 	Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).Noteborn())
 	Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).Daro())
-	Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).HaefeleNL()) 
+	Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).HaefeleNL())
+	Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).BeslagDesign())
+	Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).Demo())
 	
 	Do VerwachteBepalers.SetAt(..HeinLandenBepalerClassName,##class(DOM.common.enu.Personality).Hein())
 	Do VerwachteBepalers.SetAt(..HeinLandenBepalerClassName,##class(DOM.common.enu.Personality).Seefelder())
@@ -65,10 +67,8 @@
 	#dim PersonalityIterator As TECH.ListIterator = ##class(DOM.common.enu.Personality).ValueListIterator()
 	While PersonalityIterator.HasNext()	{
 		#dim PersonalityID As DOM.common.enu.Personality = PersonalityIterator.Next()
-		If (($$$Not(PersonalityID = ##class(DOM.common.enu.Personality).BeslagDesign())) && ($$$Not(PersonalityID = ##class(DOM.common.enu.Personality).Demo()))) {
-			#dim Sessie As APPS.EC.Transport.dto.KlantIdentificatie = ##class(APPS.EC.Transport.dto.KlantIdentificatie).%New(PersonalityID, "")
-			Do $$$AssertEquals($classname(LandenBepalerFactory.GeefLandenBepaler(Sessie)), VerwachteBepalers.GetAt(PersonalityID),PersonalityID)
-		}
+		#dim Sessie As APPS.EC.Transport.dto.KlantIdentificatie = ##class(APPS.EC.Transport.dto.KlantIdentificatie).%New(PersonalityID, "")
+		Do $$$AssertEquals($classname(LandenBepalerFactory.GeefLandenBepaler(Sessie)), VerwachteBepalers.GetAt(PersonalityID),PersonalityID)
 	}
 ]]></Implementation>
 </Method>