Index: KLPOP.mac.rou
===================================================================
diff -u -r734 -r1418
--- KLPOP.mac.rou	(.../KLPOP.mac.rou)	(revision 734)
+++ KLPOP.mac.rou	(.../KLPOP.mac.rou)	(revision 1418)
@@ -16,13 +16,23 @@
  Quit
  ;
 ORDERCUMUL ; Cumuleren van orders bij levering en facturatie
- ;
- New zb,PopPos
- Set K=$P($G(B(2)),D,18),K=$S(K="O":K,1:+K),PopPos=U2(2)+K+1+(K="O"*4)_";"_(U2(6)+2)
- Set K=$$PI^vhPOPUP(PopPos,"-O1","Ordercumul","KLANT","ORDERCUMUL",K)
- Set K=$S(zb="CANC":"-",K="O":K,'K:"",1:K)
+ New zb
+ Set K=$P($G(B(2)),D,18),$P(K,";")=$S($P(K,";")="O":$P(K,";"),1:+K)
+ Set K=$$PI^vhPOPUP("C;C","-O1M","Ordercumul","KLANT","ORDERCUMUL",K)
+ Set:K="A" K=";A"
+ If zb="CANC" Set K="-"
+ Else  Set $P(K,";")=$S(zb="CANC":"-",$P(K,";")="O":$P(K,";"),'$P(K,";"):"",1:$P(K,";"))
+ Set Locals("K")=K
  Quit
  ;
+CBOrderCumul(sSelect,sOld,sNew,sRec)
+ New I
+ If $P(sRec,"`")="A" ; Aventos
+ Else  Do
+ . For I=1:1 Set R=$G(sY(I)) Quit:R=""  If $P(R,"`")'="A" Kill sX(I)
+ . Set:'sOld sX(sSelect)=1
+ Quit 1
+ ;
 SENDWMS ; Orders doorsturen naar het WMS
  New zb,SendWMS
  Set SendWMS=$P($G(B(3)),D,8)