Index: FLOWHALUX.mac.rou
===================================================================
diff -u -r68994 -r69022
--- FLOWHALUX.mac.rou	(.../FLOWHALUX.mac.rou)	(revision 68994)
+++ FLOWHALUX.mac.rou	(.../FLOWHALUX.mac.rou)	(revision 69022)
@@ -26,8 +26,7 @@
 SetDueOutProductieTOELEV(TOENr,Forced)
  New LevNr,VroegsteDueOut
  Set LevNr=$P(^KTO1(TOENr),D)
- Set ToeleveringsService = ##class(DOM.AKP.impl.ToeleveringService).%New()
- Quit:((LevNr'=$$$LevHalux) && '(LevNr=$$$LevVanHoecke && ToeleveringsService.BevatToeleveringRevegoProducten(TOENr)))
+ Quit:('##class(BL.Legacy.FLOWHALUX).IsLeverancieHaluxOfVanHoeckeMetRevego(LevNr, TOENr))
  Quit:'$G(Forced)&&($P(^KTO(LevNr,TOENr,1),D,19)) ; reeds ingevuld
  Set VroegsteDueOut=$$GetDueOutProductieTOELEV(LevNr,TOENr)
  Do PutDueOutProductieTOELEV(LevNr,TOENr,VroegsteDueOut)
@@ -54,8 +53,7 @@
  Set DateComparator = ##class(TECH.Comparator.DateComparator).%New()
  Set CurrentDate = ##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentDate()
  
- Set ToeleveringsService = ##class(DOM.AKP.impl.ToeleveringService).%New()
- Quit:((LevNr'=$$$LevHalux) && '(LevNr=$$$LevVanHoecke && ToeleveringsService.BevatToeleveringRevegoProducten(TOENr))) ""
+ Quit:('##class(BL.Legacy.FLOWHALUX).IsLeverancieHaluxOfVanHoeckeMetRevego(LevNr, TOENr)) ""
  Set VroegsteDueOut=""
  Set TLNr=100
  For  Set TLNr=$O(^KTO(LevNr,TOENr,TLNr)) Quit:TLNr=""  Do
Index: BL/Legacy/FLOWORD7.cls.xml
===================================================================
diff -u -r69006 -r69022
--- BL/Legacy/FLOWORD7.cls.xml	(.../FLOWORD7.cls.xml)	(revision 69006)
+++ BL/Legacy/FLOWORD7.cls.xml	(.../FLOWORD7.cls.xml)	(revision 69022)
@@ -3,6 +3,22 @@
 <Class name="BL.Legacy.FLOWORD7">
 <Super>TECH.RegisteredObject</Super>
 
+<Method name="IsLeverancierHaluxOfVanHoeckeMetRevego">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>LeverancierNummer:%String,OrderID:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Set LegacyPartyAPI = ##class(DOM.PARTIJ.impl.LegacyPartijAPI).%New()
+	#dim LeverancierIdHalux As %String = LegacyPartyAPI.GeefLeverancierNummerVoorPartijID(##class(DOM.AKP.enu.Leverancier).Halux())
+	#dim LeverancierIdVanHoecke As %String = LegacyPartyAPI.GeefLeverancierNummerVoorPartijID(##class(DOM.AKP.enu.Leverancier).VanHoecke())
+	
+	#dim IsLeverancierHalux As %Boolean = (LeverancierNummer=LeverancierIdHalux)
+	#dim IsLeverancierVanHoeckeMetRevego As %Boolean = ((LeverancierNummer=LeverancierIdVanHoecke) && ..BevatOrderRevegoProducten(OrderID))
+	
+	Quit (IsLeverancierHalux || IsLeverancierVanHoeckeMetRevego)
+]]></Implementation>
+</Method>
+
 <Method name="BevatOrderRevegoProducten">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>OrderID:%String</FormalSpec>
@@ -11,7 +27,6 @@
 	#dim IsOrderMetRevegoProducten As %Boolean = $$$False 
 	Set OrderApi = ##class(DOM.VKP.impl.DataM.DataMOrderAPI).%New()
 	Set ProductTypeAPI = ##class(DOM.PM.impl.ProductTypeAPIimpl).%New()
-	
 	If (($$$HasLength(OrderID)) && (OrderApi.BestaatOrder(OrderID))) {
 		#dim Order As DOM.VKP.Order = OrderApi.GeefOrder(OrderID)
 		#dim OrderLijnIterator As TECH.Iterator = Order.GeefProductOrderLijnIterator()
Index: FLOWORD7.mac.rou
===================================================================
diff -u -r68952 -r69022
--- FLOWORD7.mac.rou	(.../FLOWORD7.mac.rou)	(revision 68952)
+++ FLOWORD7.mac.rou	(.../FLOWORD7.mac.rou)	(revision 69022)
@@ -148,7 +148,7 @@
  ..Set R=^KPR(PRNr,1),IsStock=$P(R,D,20),R=^KPR(PRNr,2),InOrder=$P(R,D,9)
  ..Set R=^KPR(PRNr,$O(^KPR(PRNr,"J"))),LEVNr=$P(R,D),MinBestH=$P(R,D,6),PrMunt=$P(R,D,17)
  ..Quit:((InventTransId'="")&&($$OrderLijnIsGeblokkeerd(InventTransId)))
- ..Quit:(((LEVNr'=$$$LevHalux) && '(##class(BL.Legacy.FLOWORD7).BevatOrderRevegoProducten(ORDNr) && (LEVNr=$$$LevVanHoecke)))||IsStock)
+ ..Quit:('(##class(BL.Legacy.FLOWORD7).IsLeverancierHaluxOfVanHoeckeMetRevego(LEVNr, ORDNr)) || IsStock)
  ..Set LevTerm=$P(R,D,7),GrootVp=$P(R,D,16) Set:'GrootVp GrootVp=1
  ..If IsStock Quit:$$CALCDATE^vhLib.DataTypes(,"W")+(LevTerm+1*7)>OLevWk
  ..Set OrdToe("P",LEVNr)=PrMunt,OrdToe("P",LEVNr,OLNr)=""
@@ -460,7 +460,7 @@
 ToeLevBSControl(ORDNr,Control)
  New R,KLNr,LEVNr,TOENr,PRNr,FBLocal,Data
  Set KLNr=$P(^KO1(ORDNr,"F"),D),LEVNr=""
- For  Set LEVNr=$O(Control("T",LEVNr)) Quit:(LEVNr="")||((LEVNr'=$$$LevHalux) || (LEVNr'=$$$LevVanHoecke))  Do
+ For  Set LEVNr=$O(Control("T",LEVNr)) Quit:(LEVNr="")||'(##class(BL.Legacy.FLOWORD7).IsLeverancierHaluxOfVanHoeckeMetRevego(LEVNr, ORDNr))  Do
  . Do ##class(Tools.Wlip).%New(26).String("Test maken toelevering")
  . Kill PRNr
  . Merge PRNr=Control("T",LEVNr)
Index: BL/Legacy/FLOWHALUX.cls.xml
===================================================================
diff -u -r63842 -r69022
--- BL/Legacy/FLOWHALUX.cls.xml	(.../FLOWHALUX.cls.xml)	(revision 63842)
+++ BL/Legacy/FLOWHALUX.cls.xml	(.../FLOWHALUX.cls.xml)	(revision 69022)
@@ -3,6 +3,24 @@
 <Class name="BL.Legacy.FLOWHALUX">
 <Super>TECH.RegisteredObject</Super>
 
+<Method name="IsLeverancieHaluxOfVanHoeckeMetRevego">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>LeverancierNummer:%String,ToeleveringNr:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Set LegacyPartyAPI = ##class(DOM.PARTIJ.impl.LegacyPartijAPI).%New()
+	Set ToeleveringsService = ##class(DOM.AKP.impl.ToeleveringService).%New()
+	
+	#dim LeverancierIdHalux As %String = LegacyPartyAPI.GeefLeverancierNummerVoorPartijID(##class(DOM.AKP.enu.Leverancier).Halux())
+	#dim LeverancierIdVanHoecke As %String = LegacyPartyAPI.GeefLeverancierNummerVoorPartijID(##class(DOM.AKP.enu.Leverancier).VanHoecke())
+		
+	#dim IsLeverancierHalux As %Boolean = (LeverancierNummer = LeverancierIdHalux)
+	#dim IsLeverancierVanHoeckeMetRevego As %Boolean = ((LeverancierNummer=LeverancierIdVanHoecke) && ToeleveringsService.BevatToeleveringRevegoProducten(ToeleveringNr))
+	
+	Quit (IsLeverancierHalux || IsLeverancierVanHoeckeMetRevego)
+]]></Implementation>
+</Method>
+
 <Method name="VerstuurSpaceStepInToeleveringMail">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>ToeleveringNr:%String</FormalSpec>