Index: RPLKL1.mac.rou =================================================================== diff -u -r29059 -r50381 --- RPLKL1.mac.rou (.../RPLKL1.mac.rou) (revision 29059) +++ RPLKL1.mac.rou (.../RPLKL1.mac.rou) (revision 50381) @@ -215,10 +215,10 @@ Q ; ;Leveringen -BON S DL(1)="BON",BON(1)="^HULP("_$J_",""K"_KC_""",""L""," G BON1:VTB=U4&(KC=KCX) D KIF,SA - I $D(^HULP($J,"K"_KC,"L")) D WL G BON1 - D SA1,BON^RPLKL2,SA -BON1 D SL^PROC S VTB=U4,SW2=0 +BON S DL(1)="BON",BON(1)="^HULP("_$J_",""K"_KC_""",""L""," G BON2:VTB=U4&(KC=KCX) D KIF,SA + I $D(^HULP($J,"K"_KC,"L")) D WL G BON2 +BON1 D SA1,BON^RPLKL2,SA +BON2 D SL^PROC S VTB=U4,SW2=0 Q ; ; Productreferentie @@ -472,6 +472,7 @@ ; ;Vervolg VRV S R=$S($L(VTB):VTB,1:SW2) + I VTB="L" Set MaxLevering='$G(MaxLevering) S (VNR,FLD(6),FLD(7))=$P(U2,D,1),VRV=1,U4=VTB w "jfgdlsjflsjf" r k G BON1 I VTB'="F",VTB'="Z" G VRV1 I VTB="F" G VRV1:'$D(^HULP($J,"K"_KC,"F",FLD(6))),VRV1:$P(^($O(^HULP($J,"K"_KC,"F",""),-1)),D,1,4)'="\\\ *** VERVOLG ***" I VTB="Z" G VRV1:'$D(^HULP($J,"K"_KC,"P",PLD(6))),VRV1:$P(^($O(^HULP($J,"K"_KC,"P",""),-1)),D,1,4)'="\\\ *** VERVOLG ***" Index: RPLKL2.mac.rou =================================================================== diff -u -r50372 -r50381 --- RPLKL2.mac.rou (.../RPLKL2.mac.rou) (revision 50372) +++ RPLKL2.mac.rou (.../RPLKL2.mac.rou) (revision 50381) @@ -353,10 +353,13 @@ ; ;Leveringen BON - N STUPD,Format,Bold,IsOrgal,IsComm,PRNr + N STUPD,Format,Bold,IsOrgal,IsComm,PRNr,LevDatum,MaxDatum S (BON(9),VNR)=0,UR=-1,(URX,PRNr)="" + Set MaxDatum=$$CALCDATE^vhLib.DataTypes($H,"A",-3) For Set UR=$O(^KUL(KC,"F",UR)) Quit:UR="" Do .S U2=^(UR,1),UVM=$P(U2,D,18) + .S LevDatum=$$INTDATE^vhLib.DataTypes($P(U2,"\",2),"DK") + .Quit:('$G(MaxLevering))&&(LevDatum