Index: KF4.mac.rou
===================================================================
diff -u -r734 -r1420
--- KF4.mac.rou	(.../KF4.mac.rou)	(revision 734)
+++ KF4.mac.rou	(.../KF4.mac.rou)	(revision 1420)
@@ -25,27 +25,31 @@
 M14 S MSG="DIT ORDER WERD VERZONDEN NAAR HET WMS" G MY
 M15 S MSG="EEN ORGALUX-ORDER, KAN NIET GEMENGD WORDEN" G MY
 M16 S MSG="VERPAKKING """_XVP_""" EN """_VERP_""" MOGEN NIET GEMENGD WORDEN" G MY
+M17 S MSG="DEZE KLANT WENST AVENTOS ORDERS APPART" G MY
 MY S FP=2403+F60 W @F,@F4,MSG," [] = OK ",@F5,@F0 R K
 MZ K MSG Q
  ;
 1 L @("^"_Q_"OD(KC,US)"):2 E  D M1 G YZ
 6 K UTA,UTB,Beloofd S Beloofd="",Q15="^(""W    0.0""_UOR_UOD_$J(UR,6,0)_$J((UZ-100),3,0))" D S2
-7 S UL=UD,Y=-1,(KCO,UMNT,XLA,ULV,USBX,VWTX,XBF,XOL,XVP)="",(UVB,NBP)=0
- S EENOPERF=$P(@("^"_Q_"KL(I1,1)"),D,18)
+7 S UL=UD,Y=-1,(KCO,UMNT,XLA,ULV,USBX,VWTX,XBF,XOL,XVP,XAV)="",(UVB,NBP)=0
+ S EENOPERF=$P(@("^"_Q_"KL(I1,1)"),D,18),AventosAppart=($P(EENOPERF,";",2)="A"),EENOPERF=$P(EENOPERF,";")
  S:EENOPERF=3 EENOPERF=0 ; Meerdere orders per bon, een bon per factuur
 70 I $N(^($N(@("^"_Q_"OD(KC,US,Y)"))))=-1 D  D S3 G YZ:K="N" G 21:$D(@("^"_Q_"BA(11,UVM)")),YZ
  .S K=$N(^(Y)),X=^(K,1),KCN=$P(X,D,6),UEB=$P(X,D,14),UVM=$P(X,D,18),LVW=$P(X,D,21),USB=$P(X,D,25),UNBP=$P(X,D,27),VWT=$P(X,D,29) S:USB="" USB=" "
  .S X=^(3) S:'$L($P(X,D,1)) X="" S BFO=$$DEURORD(K),ORLU=$$ISORGAL^FLOW("O",K),VERP=$$ORDER^VERPAK(K) S:ORLU EENOPERF=1
+ .S ISAV=0 I AventosAppart S ISAV=$$BevatAventos^FLOW("O",K)
  I $D(KUR),KUR,EENOPERF S K=KUR K KUR I $D(@("^"_Q_"OD(KC,US,K)")) D  D S3 I K'="N" G 21:$D(@("^"_Q_"BA(11,UVM)"))
  .S X=^(K,1),KCN=$P(X,D,6),UEB=$P(X,D,14),UVM=$P(X,D,18),LVW=$P(X,D,21),USB=$P(X,D,25),UNBP=$P(X,D,27),VWT=$P(X,D,29) S:USB="" USB=" "
  .S X=^(3) S:'$L($P(X,D,1)) X="" S BFO=$$DEURORD(K),ORLU=$$ISORGAL^FLOW("O",K),VERP=$$ORDER^VERPAK(K) S:ORLU EENOPERF=1
+ .S ISAV=0 I AventosAppart S ISAV=$$BevatAventos^FLOW("O",K)
 8 I UL<12 S Y=$N(@("^"_Q_"OD(KC,US,Y)")) I Y'=-1 D S6 G 8
 80 I $D(KUR),$D(UTA(KUR)) S K=KUR K KUR G 11
 9 S R="K\22\3\GEEF OVER TE BOEKEN "_UOU_"NUMMER\""A[] = alle   [] = " S:Y=-1 R=R_"einde selektie" S:Y'=-1 R=R_"vervolg" S R=R_"""\6\\K=""""!(K=""-"")!(K="","")!(K=""A"")!(K?.N)\\" D R0
  I $L(K),K?.N,K'>99999 S K=$$SHORTNUM^FLOW("KOD","KO1",K) G 9:'K
 11 G YZ:K="-"!(K=","),18:K="A",21:K=""&(Y=-1) I K="" K UTA S UL=UD D S2 G 8
 12 G 9:'$D(@("^"_Q_"OD(KC,US,K)"))!$D(UTO(K)) S X=^(K,1) G 9:$P(X,D,25)="L"
  S KCN=$P(X,D,6),UEB=$P(X,D,14),UVM=$P(X,D,18),LVW=$P(X,D,21),USB=$P(X,D,25),UNBP=$P(X,D,27),VWT=$P(X,D,29),X=$P(^(3),D,1,8) S:USB="" USB=" " S BFO=$$DEURORD(K),ORLU=$$ISORGAL^FLOW("O",K),VERP=$$ORDER^VERPAK(K) S:ORLU EENOPERF=1
+ S ISAV=0 I AventosAppart S ISAV=$$BevatAventos^FLOW("O",K)
  I USB="M",VWT'[VWTX D M11 G 9
  I USB="P",VWT'[VWTX D M12 G 9
 13 I USB="M"!(USBX="M"),USB'[USBX D M9 G 9
@@ -59,16 +63,19 @@
  I '(NBP=0!(NBP=UNBP)) D M8 G 9
  I '(XBF=""!(XBF=BFO)) D M13 G 9
  I '(XOL=""!(XOL=ORLU)) D M15 G 9
+ I $L(XAV),XAV'=ISAV!XAV D M17 G 9
  I '$$CHKMIX^VERPAK(XVP,VERP) D M16 G 9
-130 D S3 G 9:'EENOPERF,9:'$D(UTO),21
+130 D S3 S:ISAV EENOPERF=2 G 9:'EENOPERF,9:'$D(UTO),21
 18 S Y=-1,KCO="",UL=UD-1 D S2 K UTO,UTA
 19 S (K,Y)=$N(@("^"_Q_"OD(KC,US,Y)")) G 21:Y=-1
  S X=@("^"_Q_"OD(KC,US,Y,1)") G 19:$P(X,D,25)="L"
  S KCN=$P(X,D,6),UEB=$P(X,D,14),UVM=$P(X,D,18),LVW=$P(X,D,21),USB=$P(X,D,25),UNBP=$P(X,D,27),VWT=$P(X,D,29),X=$P(^(3),D,1,8) S:USB="" USB=" " S BFO=$$DEURORD(Y),ORLU=$$ISORGAL^FLOW("O",Y),VERP=$$ORDER^VERPAK(Y) S:ORLU EENOPERF=1
+ S ISAV=0 I AventosAppart S ISAV=$$BevatAventos^FLOW("O",Y)
  I USB="M",VWT'[VWTX G 19
  I USB="P",VWT'[VWTX G 19
  I USB="M"!(USBX="M"),USB'[USBX G 19
  I USB="P"!(USBX="P"),USB'[USBX G 19
+ I $L(XAV),XAV'=ISAV!XAV G 19
 20 D:KCO=""!(KCN=KCO)&(UMNT=""!(UMNT=UVM))&(XLA=""!(XLA=X))&(ULV=""!(ULV=LVW))&$D(@("^"_Q_"BA(11,UVM)"))&(UVB=0!(UVB=UEB))&(NBP=0!(NBP=UNBP))&(XBF=""!(XBF=BFO))&(XOL=""!(XOL=ORLU))&$$CHKMIX^VERPAK(XVP,VERP) S3 G 19:'EENOPERF,19:'$D(UTO)
 21 K UTA S UL=UD,Y=-1 D S2 G 7:'$D(UTO)
 23 I UL<12 S Y=$N(UTO(Y)) I Y'=-1 S UL=UL+1,FP=UL*100+1 W @F,$C(13),?(7-$L(Y)),Y,@FMTK,$P("\*",D,$P(@("^"_Q_"OD(KC,US,Y,1)"),D,25)+1),@FMTk S FP=FP+10 W @F,$P(^(1),D,2) S FP=FP+11 W @F,$P(^(1),D,3) G 23
@@ -83,7 +90,7 @@
 32 D COPY
 39 S K=","
  ;
-YZ K Q15,UM,UTO,UUO,UTA,KCO,KCN,UMNT,FNR,I1,X,XLA,UVM,UEB,UVB,NBP,UNBP,VWTYP,USB,USBX,VWT,VWTX,Beloofd,XBF,BFO,XOL,ORLU,XVP,VERP Q
+YZ K Q15,UM,UTO,UUO,UTA,KCO,KCN,UMNT,FNR,I1,X,XLA,UVM,UEB,UVB,NBP,UNBP,VWTYP,USB,USBX,VWT,VWTX,Beloofd,XBF,BFO,XOL,ORLU,XVP,VERP,AventosAppart,XAV,ISAV Q
  ;
 R0 S R7="K'[D&(K'?.E1C.E)" S:$P(R,D,8)'="" R7=R7_","_$P(R,D,8) S:$P(R,D,7)'="" R7=R7_","_$P($T(@$P(R,D,7))," ",2,99)
 R0A S R2=$P(R,D,2),R3=$P(R,D,3),R4=$P(R,D,4),R5=$P(R,D,5),R6=$P(R,D,6)
@@ -94,7 +101,7 @@
 R0F S FP=$P(R,D,9)*100+($P(R,D,10)*1) I FP W @F,$E("                                        ",1,R6),@F,K
 R0Z K R,R0,R2,R3,R4,R5,R6,R7,RD,RM,RJ Q
  ;
-S1 S KCO=KCN,UMNT=UVM,UTO(K)="",UVB=UEB,XLA=X,ULV=LVW,NBP=UNBP,USBX=USB,VWTX=VWT,XBF=BFO,XOL=ORLU,XVP=$$ADDTYPE^VERPAK(XVP,VERP) D S4
+S1 S KCO=KCN,UMNT=UVM,UTO(K)="",UVB=UEB,XLA=X,ULV=LVW,NBP=UNBP,USBX=USB,VWTX=VWT,XBF=BFO,XOL=ORLU,XVP=$$ADDTYPE^VERPAK(XVP,VERP),XAV=ISAV D S4
 S1Z Q
  ;
 S2 S FP=UD*100+1 W @F,@F1
@@ -208,7 +215,7 @@
  .New Q15,UM,UUO,UTA,KCO,KCN,UMNT,FNR,I1,UEB,UVB,NBP,UNBP
  .New U2,VWTYP,USB,USBX,VWT,VWTX
  .New PC,PN,PR,PRE,PST,PV,U2,TU2,UA,UAA,UBE,UEP,UUZ,UM,UH,UN,TR,TZ,UZN
- .New UPL,UGW,UPT,UPB,PB,PL,PM,LC,LPT,LVW,ULV,UPAR,PPAR,UVM,UVW,X,VWTYP,XBF,BFO,XOL,ORLU,XVP,VERP
+ .New UPL,UGW,UPT,UPB,PB,PL,PM,LC,LPT,LVW,ULV,UPAR,PPAR,UVM,UVW,X,VWTYP,XBF,BFO,XOL,ORLU,XVP,VERP,XAV,ISAV
  .Set Q15="^(""W    0.0""_UOR_UOD_$J(UR,6,0)_$J((UZ-100),3,0))"
  .Set UGW=0,X=^KKL(^KK1(KLNr),0),KP=$P(X,D,6),KL=$P(X,D,8),KT=$P(X,D,9)
  .Set KL=$$LAND^vhRtn1(KL) Set:KT="" KT="N" Set:'$L(KP) KP="GEEN"