Index: vhUnitTest/BL/Legacy/TRANSP/OrderOpBonBepaler/Test.cls.xml
===================================================================
diff -u -r55307 -r55587
--- vhUnitTest/BL/Legacy/TRANSP/OrderOpBonBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 55307)
+++ vhUnitTest/BL/Legacy/TRANSP/OrderOpBonBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 55587)
@@ -5,18 +5,14 @@
 
 <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")
+	Set $P(@KULTemp@("KlantNr","F","ConsolidatieNr1",1),"\",8) = "VervRef"
+	Set $P(@KULTemp@("KlantNr","F","ConsolidatieNr1",1),"\",58) = "SalesIdAX"
+	
+	Set OrderOpBonBepaler = ##class(BL.Legacy.TRANSP.OrderOpBonBepaler).%New(KULTemp)
+	#dim HeeftOrderlijnenOpTransport As %Boolean = OrderOpBonBepaler.HeeftOrderlijnenOpTransport("SalesIdAX","KlantNr")
 
-	kill @ORDWTemp
 	kill @KULTemp
 	
 	Do $$$AssertTrue(HeeftOrderlijnenOpTransport)
@@ -25,18 +21,14 @@
 
 <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")
+	Set $P(@KULTemp@("KlantNr","F","ConsolidatieNr1",1),"\",8) = ""
+	Set $P(@KULTemp@("KlantNr","F","ConsolidatieNr1",1),"\",58) = "SalesIdAX"
+	
+	Set OrderOpBonBepaler = ##class(BL.Legacy.TRANSP.OrderOpBonBepaler).%New(KULTemp)
+	#dim HeeftOrderlijnenOpTransport As %Boolean = OrderOpBonBepaler.HeeftOrderlijnenOpTransport("SalesIdAX","KlantNr")
 
-	kill @ORDWTemp
 	kill @KULTemp
 	
 	Do $$$AssertFalse(HeeftOrderlijnenOpTransport)
@@ -45,21 +37,17 @@
 
 <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")
+	Set $P(@KULTemp@("KlantNr","F","ConsolidatieNr1",1),"\",8) = ""
+	Set $P(@KULTemp@("KlantNr","F","ConsolidatieNr1",1),"\",58) = "SalesIdAX"
 
-	kill @ORDWTemp
+	Set $P(@KULTemp@("KlantNr","F","ConsolidatieNr2",1),"\",8) = "VervRef"
+	Set $P(@KULTemp@("KlantNr","F","ConsolidatieNr2",1),"\",58) = "SalesIdAX"
+	
+	Set OrderOpBonBepaler = ##class(BL.Legacy.TRANSP.OrderOpBonBepaler).%New(KULTemp)
+	#dim HeeftOrderlijnenOpTransport As %Boolean = OrderOpBonBepaler.HeeftOrderlijnenOpTransport("SalesIdAX","KlantNr")
+
 	kill @KULTemp
 	
 	Do $$$AssertTrue(HeeftOrderlijnenOpTransport)
@@ -68,21 +56,36 @@
 
 <Method name="Test: Gesplitst order heeft geen orderlijnen op transport">
 <Implementation><![CDATA[
-	#dim ORDWTemp As %String = "ORDWTemp"
+	#dim KULTemp As %String = "KULTemp"
+	
+	Set $P(@KULTemp@("KlantNr","F","ConsolidatieNr1",1),"\",8) = ""
+	Set $P(@KULTemp@("KlantNr","F","ConsolidatieNr1",1),"\",58) = "SalesIdAX"
 
-	Set @ORDWTemp@("IO","OrderID","1") = "ConsolidatieNr1"
-	Set @ORDWTemp@("IO","OrderID","2") = "ConsolidatieNr2"
-	Set @ORDWTemp@("D","ConsolidatieNr1") = "KlantNr\"
-	Set @ORDWTemp@("D","ConsolidatieNr2") = "KlantNr\"
+	Set $P(@KULTemp@("KlantNr","F","ConsolidatieNr2",1),"\",8) = ""
+	Set $P(@KULTemp@("KlantNr","F","ConsolidatieNr2",1),"\",58) = "SalesIdAX"
+	
+	Set OrderOpBonBepaler = ##class(BL.Legacy.TRANSP.OrderOpBonBepaler).%New(KULTemp)
+	#dim HeeftOrderlijnenOpTransport As %Boolean = OrderOpBonBepaler.HeeftOrderlijnenOpTransport("SalesIdAX","KlantNr")
 
+	kill @KULTemp
+	
+	Do $$$AssertFalse(HeeftOrderlijnenOpTransport)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Gesplitst order heeft geen orderlijnen op transport van dezelfde SalesIdAX">
+<Implementation><![CDATA[
 	#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")
+	Set $P(@KULTemp@("KlantNr","F","ConsolidatieNr1",1),"\",8) = ""
+	Set $P(@KULTemp@("KlantNr","F","ConsolidatieNr1",1),"\",58) = "SalesIdAX"
 
-	kill @ORDWTemp
+	Set $P(@KULTemp@("KlantNr","F","ConsolidatieNr2",1),"\",8) = "VervRef"
+	Set $P(@KULTemp@("KlantNr","F","ConsolidatieNr2",1),"\",58) = "Andere SalesIdAX"
+	
+	Set OrderOpBonBepaler = ##class(BL.Legacy.TRANSP.OrderOpBonBepaler).%New(KULTemp)
+	#dim HeeftOrderlijnenOpTransport As %Boolean = OrderOpBonBepaler.HeeftOrderlijnenOpTransport("SalesIdAX","KlantNr")
+
 	kill @KULTemp
 	
 	Do $$$AssertFalse(HeeftOrderlijnenOpTransport)