Index: KF20.mac.rou
===================================================================
diff -u -r2132 -r2251
--- KF20.mac.rou	(.../KF20.mac.rou)	(revision 2132)
+++ KF20.mac.rou	(.../KF20.mac.rou)	(revision 2251)
@@ -48,7 +48,7 @@
  S K=$$ShowKennisAnker(KC,.UTF,1) If K="ANNULEER" S K="-",FP=UD*100+1 W @F,@F1 G 39:$N(^($N(^KUL(KC,"F",-1))))=-1 K:EENOPERF UTF D:EENOPERFOL  G 6:'$D(UTF),8 G 39
  .New BONNr
  .Set BONNr=$O(UTF(""))
- .If BONNr,$$ISORGAL^FLOWCHK("L",BONNr) Kill UTF
+ .;If BONNr,$$ISORGAL^FLOWCHK("L",BONNr) Kill UTF
 21 S UL=UD,Y=-1,FP=UL*100+1 W @F,@F1 G 6:'$D(UTF)
 23 G 25:UL>19 S Y=$N(UTF(Y))
 24 I Y'=-1 S UL=UL+1,FP=UL*100+1 W @F,$C(13),?(7-$L(Y)),Y,?10,$P(^KUL(KC,"F",Y,1),D,2),?21,$P(^(1),D,3) G 23
@@ -57,8 +57,12 @@
 26 G YZ:K="," I K="-" S FP=UD*100+1 W @F,@F1 G 39:$N(^($N(^KUL(KC,"F",-1))))=-1 K:EENOPERF UTF D:EENOPERFOL  G 6:'$D(UTF),8
  .New BONNr
  .Set BONNr=$O(UTF(""))
- .If BONNr,$$ISORGAL^FLOWCHK("L",BONNr) Kill UTF
+ .;If BONNr,$$ISORGAL^FLOWCHK("L",BONNr) Kill UTF
 260 S FP=UD*100+1 W @F,@F1 G 23:K=""
+ New BonNrs
+ Merge BonNrs=UTF
+ Kill UTF
+ Do ##Class(Flow.Facturatie.BulkFacturatie).Serie(.BonNrs) Goto YZ
  D VERPAK G 25:K="-",YZ:K=","
  S UR=$N(UTF(-1)),FP=UD*100+1 W @F,@F1 
  I $P(^KUL(KC,"F",UR,1),D,25)="M" D PARIT S NulFakt=1 D CHKREMB(KC,.UTF),^KF21P S @%Q1=1 D ChargeTraceProforma(FNR),PrintAndFileDoc("P",FNR),CHKEDIFAX(KC,"V",FNR),MoveBonToProforma^KLACHT4(FNR) G YZ
@@ -159,19 +163,6 @@
  . Do AUTO^DCPRINT(Document,DocNum,"Mail",ToMail,.DefData)
  Quit
  ;
-CHKEDIFAXold(KLNr,Document,DocNum) 
- New Optie,ToFax,ToMail
- If Document="F",$P(^KKL(^KK1(KLNr),1),D,2)["E" Set ^KFBEDI(Document,KLNr,DocNum)=""
- Do:$P(^KKL(^KK1(KLNr),1),D,2)["F"
- .Set Optie("NOPOP")=1,Optie("VWBEPERK")="BK2",Optie("FILTER")=1,Optie("PIECE")="5,6",Optie("CONNECT")="F"
- .Set ToFax=$P($$SELECT^PERSS("K",KLNr,.Optie),";")
- .Do AUTO^DCPRINT(Document,DocNum,"Fax",ToFax)
- Do:$P(^KKL(^KK1(KLNr),1),D,2)["M"
- .Set Optie("NOPOP")=1,Optie("VWBEPERK")="BK2",Optie("FILTER")=1,Optie("PIECE")="5,6",Optie("CONNECT")="E"
- .Set ToMail=$P($$SELECT^PERSS("K",KLNr,.Optie),";")
- .Do AUTO^DCPRINT(Document,DocNum,"Mail",ToMail)
- Quit
- ;
 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)
 R0B S R0=$L(R4)+R3+3 S FP=R2*100+R3+F60 W @F W:R3<4 @F1 W @F2,R4," : " I R5'="" W:R5["""" !,?2,@R5 D:R5'["""" @R5
@@ -197,6 +188,7 @@
  .Do RecalcCommKort^FLOWMANL("KUL",KLNr,BonNr)
  .Set Count=Count+1,BonNr(Count)=BonNr
  .Set:BonNr=$G(AutoSel) LD("SELECT")=Count,SelFakt=$P(^KUL(KLNr,"F",BonNr,1),D,12)
+ If $L(BulkGroep) Do SortBon(.BonNr,BulkGroep,.AutoSel)
  Do WRITE^vhLIST(.LD)
  For  Set Input=$S(EENOPERF&$D(Fakt):"F",$G(SelFakt):"ENTER",1:$$SCROLL^vhLIST(.LD)) Do  Quit:Quit
  .Kill SelFakt
@@ -209,9 +201,27 @@
  .Set Quit="\-\,\F\"[(D_Input_D) Quit:Quit
  .Set:"\COM\SPEC\"[(D_Input_D) Input=""
  .Do EXEC^vhMenu("FLOWFAKT",.Input)
- .If EENOPERFOL,$D(Fakt),$D(UTF(BonNr)),$$ISORGAL^FLOWCHK("L",BonNr) Set Input="F",Quit=1
+ .;If EENOPERFOL,$D(Fakt),$D(UTF(BonNr)),$$ISORGAL^FLOWCHK("L",BonNr) Set Input="F",Quit=1
  Quit Input
  ;
+SortBon(BonNr,BulkGroep,AutoSel)
+ New Sort,SortKey,Count,RefDate,BonDate
+ If $G(AutoSel) Set RefDate=$$INTDATE^vhDTyp($P(^KUL(KLNr,"F",AutoSel,1),D,2))
+ For Count=1:1 Quit:'$D(BonNr(Count))  Do
+ . Set BonNr=BonNr(Count)
+ . If $L($P(^KUL(KLNr,"F",BonNr,1),D,38)) Set SortKey=$S($P(^KUL(KLNr,"F",BonNr,1),D,38)=BulkGroep:10,1:30)
+ . Else  Set BonDate=$$INTDATE^vhDTyp($P(^KUL(KLNr,"F",BonNr,1),D,2)),SortKey=$S(BonDate<RefDate:20,1:40)
+ . Set Sort(SortKey,BonNr)=""
+ Kill BonNr
+ Set SortKey="",Count=0
+ For  Set SortKey=$O(Sort(SortKey)) Quit:SortKey=""  Do
+ . If Count Set Count=Count+1,BonNr(Count)="&S"
+ . Set BonNr=""
+ . For  Set BonNr=$O(Sort(SortKey,BonNr)) Quit:BonNr=""  Do
+ . . Set Count=Count+1,BonNr(Count)=BonNr
+ . . Set:BonNr=$G(AutoSel) LD("SELECT")=Count,SelFakt=$P(^KUL(KLNr,"F",BonNr,1),D,12)
+ Quit
+ ;
 FDATA(BONNr,Piece) 
  New R,KLNr
  If $G(Piece) Do
@@ -231,32 +241,18 @@
  Quit Bedrag
  ;
 SELECT(KC,UR) 
- New R,X,Ok,Next
- Set Ok=1
+ New R,X,Ok
  If $D(Fakt(UR)) Do
  .Do S5(KC,UR,"-")
  .Kill Fakt(UR)
  .Do LINE^vhLIST(.LD,LD("SELECT"))
  Else  Do
- .If $D(Fakt) Set Ok=$$CHECK(UR) Quit:'Ok
- .Set X=^KUL(KC,"F",UR,1),KCN=$P(X,D,6),UEB=$P(X,D,14),UVM=$P(X,D,18)
- .Set USB=$P(X,D,25),UNBP=$P(X,D,27),VWT=$P(X,D,29),UREMB=+$P(X,D,39),(KFA,KLA)=0
- .Set:$D(^KUL(KC,"F",UR,2)) KFA=$P(^KUL(KC,"F",UR,2),D,1,8)
- .Set:$D(^KUL(KC,"F",UR,3)) KLA=$P(^KUL(KC,"F",UR,3),D,1,8)
- .Set:USB="" USB=" " Set BFO=$$DEURBON(UR),ORLU=$$ISORGAL^FLOWCHK("L",UR)
  .Set R=$$PORT(KC,UR),Ok=R'="-"
  .Quit:'Ok
- .Do S4,S5(KC,UR)
- .Set $P(^KUL(KC,"F",UR,1),D,12)=""
- .Do:Ok LINE^vhLIST(.LD,LD("SELECT"))
- .If 'EENOPERF Do
- ..Set Next=$$NEXT(KC,UR)
- ..Quit:'Next
- ..Set SelFakt=$P(^KUL(KC,"F",Next,1),D,12)
- ..For  Set UR=$O(^KUL(KC,"F",UR)) Do  Quit:UR=Next
- ...If 'UR Do MOVE^vhLIST(.LD,"HO","") Set UR=$O(^KUL(KC,"F",UR)) Quit
- ...Quit:$$CHECKWMS^FLOW(,,,,UR)
- ...Do MOVE^vhLIST(.LD,"DO","")
+ .Do S5(KC,UR)
+ .Set $P(^KUL(KC,"F",UR,1),D,12)="",UTF(UR)=""
+ .Do LINE^vhLIST(.LD,LD("SELECT"))
+ .Do MOVE^vhLIST(.LD,"DO","")
  Quit
  ;
 PORT(KC,UR,Refresh) 
@@ -320,28 +316,22 @@
  Quit
  ;
 SELALL(KC) 
- New R,X,UR
- Set UR=0,(KCF,UFA)=""
+ New R,X,UR,Ok,Exit
  Do MOVE^vhLIST(.LD,"HO","")
- For  Set UR=$O(^KUL(KC,"F",UR)) Quit:'UR  Do  Quit:EENOPERF
- .Do:'$D(Fakt(UR))
- ..Set X=^KUL(KC,"F",UR,1),KCN=$P(X,D,6),UEB=$P(X,D,14),UVM=$P(X,D,18)
- ..Set USB=$P(X,D,25),UNBP=$P(X,D,27),VWT=$P(X,D,29),UREMB=+$P(X,D,39),KFA=0
- ..Set:$D(^KUL(KC,"F",UR,2)) KFA=$P(^KUL(KC,"F",UR,2),D,1,8)
- ..Set:$D(^KUL(KC,"F",UR,3)) KLA=$P(^KUL(KC,"F",UR,3),D,1,8)
- ..Set:USB="" USB=" " Set BFO=$$DEURBON(UR),ORLU=$$ISORGAL^FLOWCHK("L",UR)
- ..If USB="M",VWT'[VWTX Quit
- ..If USB="P",VWT'[VWTX Quit
- ..If USB="M"!(USBX="M"),USB'[USBX Quit
- ..If USB="P"!(USBX="P"),USB'[USBX Quit
- ..If EENOPERFOL,$D(UTF),$$ISORGAL^FLOWCHK("L",UR) Quit
- ..If KCF=""!(KCN=KCF)&(UFA=""!(UFA=KFA))&(VM=0!(VM=UVM))&(UVB=0!(UVB=UEB))&(XLA=""!(XLA=KLA))&(NBP=0!(NBP=UNBP))&(XBF=""!(XBF=BFO))&(XOL=""!(XOL=ORLU))&(REMB=""!(REMB=UREMB)) Do
- ...Set R=$$PORT(KC,UR)
- ...Quit:R="-"
- ...Do S4,S5(KC,UR)
- ...Set $P(^KUL(KC,"F",UR,1),D,12)=""
- ...Do LINE^vhLIST(.LD,LD("SELECT"))
- .Do:'EENOPERF MOVE^vhLIST(.LD,"DO","")
+ Set BonNr=BonNr(LD("SELECT")),Ok=1
+ For  Do  Quit:Exit
+ .Do:'$D(Fakt(BonNr))
+ ..Set UR=BonNr
+ ..Set R=$$PORT(KC,UR),Ok=R'="-"
+ ..Quit:'Ok
+ ..Do S5(KC,UR)
+ ..Set $P(^KUL(KC,"F",UR,1),D,12)="",UTF(UR)=""
+ ..Do LINE^vhLIST(.LD,LD("SELECT"))
+ .Set Exit='Ok
+ .Set:'Exit Exit=LD("SELECT")=LD("MAX")
+ .Do:Ok
+ ..Do MOVE^vhLIST(.LD,"DO","")
+ ..Set BonNr=BonNr(LD("SELECT"))
  Quit
  ;
 NEXT(KC,UR)