Index: BL/Legacy/EWORDS6.cls.xml
===================================================================
diff -u -r47790 -r49859
--- BL/Legacy/EWORDS6.cls.xml	(.../EWORDS6.cls.xml)	(revision 47790)
+++ BL/Legacy/EWORDS6.cls.xml	(.../EWORDS6.cls.xml)	(revision 49859)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="BL.Legacy.EWORDS6">
-<Super>%RegisteredObject</Super>
+<Super>TECH.RegisteredObject</Super>
 
 <Method name="PickingVoorVandaagVolgendeArbeidsdagOfAndereDag">
 <Description><![CDATA[
@@ -127,6 +127,25 @@
 <Implementation><![CDATA[  	Quit $Piece(^KO1(OrderNummer, "F"), Delimiter)
 ]]></Implementation>
 </Method>
+
+<Method name="BevatOrderOrgalux">
+<FormalSpec>OrderNummer:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim BevatOrderOrgalux As %Boolean = $$$False
+	#dim KlantNummer As %String = ..GeefKlantNummer(OrderNummer, "\")
+	#dim OrderLijnNummer As %String = $Order(^KOD(KlantNummer, "F", OrderNummer, 100))
+
+	While $$$Not(OrderLijnNummer = "") && $$$Not(BevatOrderOrgalux) {
+		#dim ProductNummer As %String = $Piece(^KOD(KlantNummer, "F", OrderNummer, OrderLijnNummer), "\", 2)
+		
+		Set BevatOrderOrgalux = $$ISORGAL^PRODUKT2(ProductNummer)
+		Set OrderLijnNummer = $Order(^KOD(KlantNummer, "F", OrderNummer, OrderLijnNummer))
+	}
+
+	Quit BevatOrderOrgalux
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: EWORDS6.mac.rou
===================================================================
diff -u -r48810 -r49859
--- EWORDS6.mac.rou	(.../EWORDS6.mac.rou)	(revision 48810)
+++ EWORDS6.mac.rou	(.../EWORDS6.mac.rou)	(revision 49859)
@@ -705,10 +705,7 @@
  
  ; Orgaluxcode orders steeds afzonderlijk?
 Orgalux(ORDNr,CumulORDNr)
- New CumulOrgalux
- Set CumulOrgalux='$$ISORGAL^FLOW("O",ORDNr)
- Set:CumulOrgalux CumulOrgalux='$$ISORGAL^FLOW("O",CumulORDNr)
- Quit CumulOrgalux
+ Quit $$$Not(##class(BL.Legacy.EWORDS6).%New().BevatOrderOrgalux(ORDNr))
 
 TaorIndeling(ORDNr,CumulORDNr)
  New CumulTaorIndeling