Index: STATWEEK.mac.rou
===================================================================
diff -u -r734 -r1623
--- STATWEEK.mac.rou	(.../STATWEEK.mac.rou)	(revision 734)
+++ STATWEEK.mac.rou	(.../STATWEEK.mac.rou)	(revision 1623)
@@ -23,6 +23,7 @@
  Set DispO=$P(GrpRec,"`",4) ; Pieces te tonen van de HULP global, overzicht 
  Set DispK=$P(GrpRec,"`",5) ; Pieces te tonen van de HULP global, klant
  Set LijstDef=$P(GrpRec,"`",6) ; Lijstdefinitie
+ Set LijstDtlDef=$P(GrpRec,"`",7) ; LijstDetaildefinitie
  Kill NodeCumul
  Set NodeSeq=""
  For I=1:1:$L(TransCumul,"/") Do
@@ -70,14 +71,14 @@
  ..Set I=$F(NodeSeq,NodeCumul(Node))-1 ; Volgorde van de nodes na cumulvertaling
  ..For J=1:1:5 Do 
  ...Set $P(Rec,D,I*5-4+J)=$P(Rec,D,I*5-4+J)+$P(RecH,D,J)
- ...Set $P(Rec,D,22+J)=$P(Rec,D,22+J)+$P(RecH,D,J)
+ ...Set $P(Rec,D,22+J)=$P(Rec,D,22+J)+$P(RecH,D,J) ; cumul
  .Set ^HULP(%J,"L",Cnt)=Rec
  .; Rec =  1:Week\
- .;        2:Order1\ 3:Lijn1\ 4:Qty1\ 5:Omzet1\ 6:Marge1\
- .;        7:Order2\ 8:Lijn2\ 9:Qty2\10:Omzet2\11:Marge2\
- .;       12:Order3\13:Lijn3\14:Qty3\15:Omzet3\16:Marge3\
- .;       17:Order4\18:Lijn4\19:Qty4\20:Omzet4\21:Marge4\\
- .;       23:Order5\24:Lijn5\25:Qty5\26:Omzet5\27:Marge5
+ .;        2:#Order1\ 3:#Lijn1\ 4:Qty1\ 5:Omzet1\ 6:Marge1\
+ .;        7:#Order2\ 8:#Lijn2\ 9:Qty2\10:Omzet2\11:Marge2\
+ .;       12:#Order3\13:#Lijn3\14:Qty3\15:Omzet3\16:Marge3\
+ .;       17:#Order4\18:#Lijn4\19:Qty4\20:Omzet4\21:Marge4\\
+ .;       23:#Order5\24:#Lijn5\25:Qty5\26:Omzet5\27:Marge5
  Set:$G(DefSelect) LD("SELECT")=DefSelect
  Quit
  
@@ -104,7 +105,7 @@
 SHOWDTL(LevWk) 
  New Rec,I,J,Soort,Node,RecH,SortNr,VolgNr
  Kill DLD
- Do INIT^vhLIST("STATWEEK","DTL",.DLD)
+ Do INIT^vhLIST("STATWEEK",$S($L($G(LijstDtlDef)):LijstDtlDef,1:"DTL"),.DLD)
  Set DispMode="D"
  Kill ^HULP(%J,"D"),^HULP(%J,"T1"),^HULP(%J,"T2")
  Set SortNr=""
@@ -225,6 +226,7 @@
 #define Z10A 342751
 STORE(Grp,Node,PRNr,KLNr,FAKNr,ULNr,ORDNr,NewOrd,LevWk,Qty,Omzet,Marge) 
  New Key
+ Set LevWk=$$CALCDATE^vhDTyp(LevWk,"W","MD")
  Set FAKNr=$G(FAKNr)
  Set ULNr=$G(ULNr)
  Set ORDNr=$G(ORDNr)
@@ -300,7 +302,7 @@
  Set Qty=$P(Rec,D,3)
  Set Tot=$P(Rec,D,16)
  Set Munt=$$MUNTPAR^vhRtn1($P(Rec,D,22))
- Set LevWk=$S($P(Rec,D,25)?5N:$P(Rec,D,25),1:$$INTDATE^vhDTyp($P(Rec,D,25),"DW"))
+ Set LevWk=$P(Rec,D,25)
  Set:$P(^KOD(KLNr,"F",ORDNr,1),D,25)="C" LevWk=$S($P(Rec,D,29)?5N:$P(Rec,D,29),1:$$INTDATE^vhDTyp($P(Rec,D,29),"DW")) ; Contract
  Do STORE(Grp,$S($P(Rec,D,27):"T",1:"O"),PRNr,KLNr,,,ORDNr,,LevWk,Qty,Tot/Munt)
  Quit
@@ -313,7 +315,7 @@
  Set Qty=$P(Rec,D,3)
  Set Tot=$P(Rec,D,16)
  Set Munt=$$MUNTPAR^vhRtn1($P(Rec,D,22))
- Set LevWk=$S($P(Rec,D,25)?5N:$P(Rec,D,25),1:$$INTDATE^vhDTyp($P(Rec,D,25),"DW"))
+ Set LevWk=$P(Rec,D,25)
  Do STORE(Grp,"B",PRNr,KLNr,,,ORDNr,,LevWk,Qty,Tot/Munt)
  Quit
  
@@ -330,6 +332,7 @@
  
 CHKGROEP(PRNr) ;Nagaan tot welke groep het product behoort
  New GR,KKey
+ Quit:$$ISORGAL^PRODUKT2(PRNr) "OL"
  If (($P($G(^KPR(PRNr,0)),D,1)?1(1"Z10",1"993.0830",1" 21FA")1.E)||($P($G(^KPRO(PRNr,0)),D,1)?1(1"Z10",1"993.0830",1" 21FA")1.E))&&($D(^KPR(PRNr,"J5005"))||$D(^KPRO(PRNr,"J5005"))) Quit "BLUM;SERVODRIVE"
  If (($P($G(^KPR(PRNr,0)),D,1)?1(1" 21FA")1.E)||($P($G(^KPRO(PRNr,0)),D,1)?1(1" 21FA")1.E))&&($D(^KPR(PRNr,"J6051"))||$D(^KPRO(PRNr,"J6051"))) Quit "BLUM;SERVODRIVE"
  If (($P($G(^KPR(PRNr,0)),D,1)?1(1"SD1")1.E)||($P($G(^KPRO(PRNr,0)),D,1)?1(1"SD1")1.E))&&($D(^KPR(PRNr,"J6332"))||$D(^KPRO(PRNr,"J6332"))) Quit "BLUM;SERVODRIVE"
@@ -338,6 +341,7 @@
  Quit:'$D(^KPR(PRNr,"J6332"))&&'$D(^KPRO(PRNr,"J6332")) "" ; NIET Halux
  Set GenRec=$$GENTYP^HAD(PRNr,1)
  Set KKey="HAL;"_$TR($P(GenRec,D,1,2),D,";")
+ ;IF '$D(^RES("STATWEEK","PI","PRODGRP","D",KKey)) Write "Statweek",PRNr," ",$P($G(^KPR(PRNr,0)),"\",1)," ",KKey,!
  Quit:'$D(^RES("STATWEEK","PI","PRODGRP","D",KKey)) ""
  ;Quit:$P(GenRec,D)'="TBX"&&($P(GenRec,D,1,2)'="DIV\GRP")&&($P(GenRec,D,1,2)'="DIV\POM")&&($P(GenRec,D,1,2)'="DIV\TLM") ""
  Quit KKey
@@ -346,7 +350,8 @@
  Set FNode="A"
  For  Set FNode=$O(@Glob@(FNode)) Quit:FNode=""  Do
  . Set FAKNr=$S(Node="F":0,1:0)
- . For  Set FAKNr=$O(@Glob@(FNode,FAKNr)) Quit:FAKNr=""  Do  ;Quit:FAKNr>899999 
+ . ;Set FAKNr=154000
+ . For  Set FAKNr=$O(@Glob@(FNode,FAKNr)) Quit:FAKNr=""  Do  ;Quit:FAKNr>156000
  ..  Set BONNr="U"
  ..  Set KLNr=$P(@Glob@(FNode,FAKNr,0,0),D)
  ..  Set NewOrd=1
@@ -365,6 +370,7 @@
  ....    Set Omzet=$P(Rec,D,34)
  ....    Set Marge=Omzet-$P(Rec,D,33)
  ....    Set LevWk=$S($P(Rec,D,25)?5N:$P(Rec,D,25),1:$$INTDATE^vhDTyp($P(Rec,D,25),"DW"))
+ ....    ;Write Grp," ",PRNr," ",$P($G(^KPR(PRNr,0)),"\",1)," ",LevWk,!
  ....    If $G(VanWeek) Quit:VanWeek>LevWk
  ....    Do STORE(Grp,Node,PRNr,KLNr,FAKNr,$E(BONNr,2,99),ORDNr,NewOrd,LevWk,Qty,Omzet,Marge)
  ....    Set NewOrd=0