Index: FLOW.mac.rou
===================================================================
diff -u -r48784 -r48859
--- FLOW.mac.rou	(.../FLOW.mac.rou)	(revision 48784)
+++ FLOW.mac.rou	(.../FLOW.mac.rou)	(revision 48859)
@@ -307,15 +307,22 @@
  Quit
  ;
 GETNUM(Global,IGlobal,OrdTyp) 
- New %TC,R,Number,GloRef,IGloRef,KLNr,BONNr,CompDate,CompDate3,CompDate4,UseThisNumber,Pre2AEnTransferOrder
- Set OrdTyp=$G(OrdTyp)
- Set Pre2AEnTransferOrder=(Global="KOD") && (OrdTyp="T" ) && (##class(TECH.Config.ConfigMgr).Instance().GetBoolean("AparteNummerRangeTijdelijkeEnTransferOrders") = $$$False)
- Set GloRef="^"_Global_"(0,"_$S(Global="KTO":"""TR"")",Pre2AEnTransferOrder:"""F"",""TR"")",1:"""F"",""UR"")")
- Set IGloRef="^"_IGlobal_"(Number)"
+ New %TC,R,Number,GloRef,IGloRef,KLNr,BONNr,CompDate,CompDate3,CompDate4,UseThisNumber, GetNum, IsPre2AEnTransferOrder, HeeftAparteNummerRangeTijdelijkeEnTransferOrders
+ 
+ Set OrdTyp = $Get(OrdTyp)
+ Set HeeftAparteNummerRangeTijdelijkeEnTransferOrders = ##class(TECH.Config.ConfigMgr).Instance().GetBoolean("AparteNummerRangeTijdelijkeEnTransferOrders")
+ Set IsPre2AEnTransferOrder = ((Global = "KOD") && (OrdTyp = "T") && $$$Not(HeeftAparteNummerRangeTijdelijkeEnTransferOrders))
+ Set GetNum = ##class(BL.Legacy.FLOW.GetNum).%New()
+ Set GloRef = GetNum.MaakGlobalReferentie(Global, IsPre2AEnTransferOrder)
+ Set IGloRef = "^" _ IGlobal _ "(Number)"
+ 
  For  Do ADD^vhLock(GloRef) Quit:%TC  Hang 1
- Set Number=@GloRef,Number=$$CHKMAX(Global,Number,OrdTyp)
+
+ Set Number = @GloRef 
+ Set Number = $$CHKMAX(Global, Number, OrdTyp) 
+ 
  If Global="KUL" Do
- . Set CompDate=$$CALCDATE^vhLib.DataTypes(,"W",-14,"FD")
+ . Set CompDate=$$CALCDATE^vhLib.DataTypes(,"W",-14,"FD") // 14 weken geleden, eerste dag van de week
  . For  Quit:'$D(@IGloRef)&'$D(^ORDW("D",Number))  Do
  . . Set R=$G(^KU1(Number,"F")),KLNr=$P(R,D)
  . . If KLNr Do  Quit:$G(UseThisNumber)
@@ -354,9 +361,9 @@
  Set BeperkteOrdernummerRange = ##class(TECH.Config.ConfigMgr).Instance().GetBoolean("AparteNummerRangeTijdelijkeEnTransferOrders")
  If Global="KTO",Number>299999 Set Number=200000
  If Global="KOD"{
- 	If ( (BeperkteOrdernummerRange || ($Get(OrdTyp)="T")) && (Number>100999)) {
+ 	If ((BeperkteOrdernummerRange || ($Get(OrdTyp)="T")) && (Number>100999)) {
 	 	;2A of (Pre 2a + Transferorder)
-	 	Set Number=100000
+	 	Set Number = 100000
  	} Else {
 	 	;Pre 2A en geen Transferorder
  		If Number>199999 Set Number=101000
@@ -733,4 +740,3 @@
  Set PerDag=1 ; Steeds per dag ; +$G(^KOD(0,"F","PERDAG"))
  ;If PerDag,$ZU(5)'="DEV-ADMIN1",'$G(NoWachtW) Set PerDag=$$ASK^vhWACHTW("PROGMODE",,,0,,"Ingave levering per dag.")
  Quit PerDag
-