Index: BL/Legacy/TRANSP/OrderOpBonBepaler.cls.xml
===================================================================
diff -u -r55304 -r55307
--- BL/Legacy/TRANSP/OrderOpBonBepaler.cls.xml	(.../OrderOpBonBepaler.cls.xml)	(revision 55304)
+++ BL/Legacy/TRANSP/OrderOpBonBepaler.cls.xml	(.../OrderOpBonBepaler.cls.xml)	(revision 55307)
@@ -3,13 +3,37 @@
 <Class name="BL.Legacy.TRANSP.OrderOpBonBepaler">
 <Super>TECH.Mockable</Super>
 
+<Property name="ORDW">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="KUL">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>ORDW:%String="^ORDW",KUL:%String="^KUL"</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..ORDW = ORDW
+	Set ..KUL = KUL
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="HeeftOrderlijnenOpTransport">
 <FormalSpec>OrderID:%String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	#dim HeeftOrderlijnenOpTransport As %Boolean = $$$False
 	
-	#dim OLUNr As %String = $Order(^ORDW("IO",OrderID,""))
+	#dim OLUNr As %String = $Order(@..ORDW@("IO",OrderID,""))
 	While $$$HasLength(OLUNr){
 
 		#dim ConsolidatieNr As %String = ..GeefConsolidatieNr(OrderID,OLUNr)
@@ -19,7 +43,7 @@
 			Set HeeftOrderlijnenOpTransport = $$$True
 		}
 		
-		Set OLUNr = $Order(^ORDW("IO",OrderID,OLUNr))
+		Set OLUNr = $Order(@..ORDW@("IO",OrderID,OLUNr))
 	}
 	
 	Quit HeeftOrderlijnenOpTransport
@@ -30,15 +54,15 @@
 <FormalSpec>OrderID:%String,OLUNr:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $G(^ORDW("IO",OrderID,OLUNr))
+<Implementation><![CDATA[	Quit $G(@..ORDW@("IO",OrderID,OLUNr))
 ]]></Implementation>
 </Method>
 
 <Method name="GeefKlantNr">
 <FormalSpec>ConsolidatieNr:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $Piece(^ORDW("D",ConsolidatieNr),"\",1)
+<Implementation><![CDATA[	Quit $Piece(@..ORDW@("D",ConsolidatieNr),"\",1)
 ]]></Implementation>
 </Method>
 
@@ -47,7 +71,7 @@
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
-	#dim VervRef As %String = $Piece(^KUL(KlantNr,ConsolidatieNr,1),"\",8)		
+	#dim VervRef As %String = $Piece(@..KUL@(KlantNr,ConsolidatieNr,1),"\",8)		
 	Quit $$$HasLength(VervRef)
 ]]></Implementation>
 </Method>
Index: vhUnitTest/BL/Legacy/TRANSP/OrderOpBonBepaler/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/BL/Legacy/TRANSP/OrderOpBonBepaler/Test.cls.xml	(revision 0)
+++ vhUnitTest/BL/Legacy/TRANSP/OrderOpBonBepaler/Test.cls.xml	(revision 55307)
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.BL.Legacy.TRANSP.OrderOpBonBepaler.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: Order heeft orderlijnen op transport">
+<Implementation><![CDATA[
+	#dim ORDWTemp As %String = "ORDWTemp"
+
+	Set @ORDWTemp@("IO","OrderID","1") = "ConsolidatieNr1"
+	Set @ORDWTemp@("D","ConsolidatieNr1") = "KlantNr\"
+
+	#dim KULTemp As %String = "KULTemp"
+	Set @KULTemp@("KlantNr","ConsolidatieNr1",1) = "\\\\\\\VervRef"
+	
+	Set OrderOpBonBepaler = ##class(BL.Legacy.TRANSP.OrderOpBonBepaler).%New(ORDWTemp,KULTemp)
+	#dim HeeftOrderlijnenOpTransport As %Boolean = OrderOpBonBepaler.HeeftOrderlijnenOpTransport("OrderID")
+
+	kill @ORDWTemp
+	kill @KULTemp
+	
+	Do $$$AssertTrue(HeeftOrderlijnenOpTransport)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Order heeft geen orderlijnen op transport">
+<Implementation><![CDATA[
+	#dim ORDWTemp As %String = "ORDWTemp"
+
+	Set @ORDWTemp@("IO","OrderID","1") = "ConsolidatieNr1"
+	Set @ORDWTemp@("D","ConsolidatieNr1") = "KlantNr\"
+
+	#dim KULTemp As %String = "KULTemp"
+	Set @KULTemp@("KlantNr","ConsolidatieNr1",1) = "\\\\\\\"
+	
+	Set OrderOpBonBepaler = ##class(BL.Legacy.TRANSP.OrderOpBonBepaler).%New(ORDWTemp,KULTemp)
+	#dim HeeftOrderlijnenOpTransport As %Boolean = OrderOpBonBepaler.HeeftOrderlijnenOpTransport("OrderID")
+
+	kill @ORDWTemp
+	kill @KULTemp
+	
+	Do $$$AssertFalse(HeeftOrderlijnenOpTransport)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Gesplitst order heeft orderlijnen op transport">
+<Implementation><![CDATA[
+	#dim ORDWTemp As %String = "ORDWTemp"
+
+	Set @ORDWTemp@("IO","OrderID","1") = "ConsolidatieNr1"
+	Set @ORDWTemp@("IO","OrderID","2") = "ConsolidatieNr2"
+	Set @ORDWTemp@("D","ConsolidatieNr1") = "KlantNr\"
+	Set @ORDWTemp@("D","ConsolidatieNr2") = "KlantNr\"
+
+	#dim KULTemp As %String = "KULTemp"
+	Set @KULTemp@("KlantNr","ConsolidatieNr1",1) = "\\\\\\\"
+	Set @KULTemp@("KlantNr","ConsolidatieNr2",1) = "\\\\\\\VervRef"
+	
+	Set OrderOpBonBepaler = ##class(BL.Legacy.TRANSP.OrderOpBonBepaler).%New(ORDWTemp,KULTemp)
+	#dim HeeftOrderlijnenOpTransport As %Boolean = OrderOpBonBepaler.HeeftOrderlijnenOpTransport("OrderID")
+
+	kill @ORDWTemp
+	kill @KULTemp
+	
+	Do $$$AssertTrue(HeeftOrderlijnenOpTransport)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Gesplitst order heeft geen orderlijnen op transport">
+<Implementation><![CDATA[
+	#dim ORDWTemp As %String = "ORDWTemp"
+
+	Set @ORDWTemp@("IO","OrderID","1") = "ConsolidatieNr1"
+	Set @ORDWTemp@("IO","OrderID","2") = "ConsolidatieNr2"
+	Set @ORDWTemp@("D","ConsolidatieNr1") = "KlantNr\"
+	Set @ORDWTemp@("D","ConsolidatieNr2") = "KlantNr\"
+
+	#dim KULTemp As %String = "KULTemp"
+	Set @KULTemp@("KlantNr","ConsolidatieNr1",1) = "\\\\\\\"
+	Set @KULTemp@("KlantNr","ConsolidatieNr2",1) = "\\\\\\\"
+	
+	Set OrderOpBonBepaler = ##class(BL.Legacy.TRANSP.OrderOpBonBepaler).%New(ORDWTemp,KULTemp)
+	#dim HeeftOrderlijnenOpTransport As %Boolean = OrderOpBonBepaler.HeeftOrderlijnenOpTransport("OrderID")
+
+	kill @ORDWTemp
+	kill @KULTemp
+	
+	Do $$$AssertFalse(HeeftOrderlijnenOpTransport)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Mock/BL/Legacy/TRANSP/OrderOpBonBepaler.cls.xml
===================================================================
diff -u -r55304 -r55307
--- vhTest/Mock/BL/Legacy/TRANSP/OrderOpBonBepaler.cls.xml	(.../OrderOpBonBepaler.cls.xml)	(revision 55304)
+++ vhTest/Mock/BL/Legacy/TRANSP/OrderOpBonBepaler.cls.xml	(.../OrderOpBonBepaler.cls.xml)	(revision 55307)
@@ -8,6 +8,13 @@
 <Super>BL.Legacy.TRANSP.OrderOpBonBepaler,Tools.Mock.MockClassBase</Super>
 <Inheritance>right</Inheritance>
 
+<Method name="%OnNew">
+<FormalSpec>ORDW:%String="^ORDW",KUL:%String="^KUL"</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="HeeftOrderlijnenOpTransport">
 <FormalSpec>OrderID:%String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>