Index: EWTOE.mac.rou
===================================================================
diff -u -r1134 -r1266
--- EWTOE.mac.rou	(.../EWTOE.mac.rou)	(revision 1134)
+++ EWTOE.mac.rou	(.../EWTOE.mac.rou)	(revision 1266)
@@ -137,7 +137,7 @@
  Quit
  ;
 TOELINE(RCPNr,TOENr,TLUNr,RCPODate,AantWMS,AantBo,HistRef,NoAsk,WMS,OverKind)
- New R,Rec,LEVNr,TLNr,PRNr,ABLNr,Besteld,KLNr,ORDNr,OLNr,OLUNr,CifPPL,LevTA,LevTB,LevTW,RCPDate,Decimals,RCPPRNr,ZRRCP,ZRKTO,ASAP,LevRef,BLKLNr,BLFactuurNr,BLFactuurDatum
+ New R,Rec,LEVNr,TLNr,PRNr,ABLNr,Besteld,KLNr,ORDNr,OLNr,OLUNr,CifPPL,LevTA,LevTB,LevTW,RCPDate,Decimals,RCPPRNr,ZRRCP,ZRKTO,ASAP,LevRef,BLKLNr,BLFactuurNr,BLFactuurDatum,TOEPRNr,ORDPRNr
  Set RCPODate=$G(RCPODate,$H),OverKind=$G(OverKind)
  Do COPY(TOENr)
  Set LEVNr=$P($G(^KTO1(TOENr)),D) Quit:'LEVNr
@@ -150,7 +150,7 @@
  For  Do ADD^vhLock("^KTO(LEVNr,TOENr)") Quit:%TC  Do
  .If NoAsk Hang 5
  .Else  Do LDISP^vhLock("^KTO(LEVNr,TOENr)","Toelevering "_TOENr)
- Set Rec=^KTO(LEVNr,TOENr,TLNr),ZRKTO=$ZR,PRNr=$P(Rec,D,2) Quit:'PRNr
+ Set Rec=^KTO(LEVNr,TOENr,TLNr),ZRKTO=$ZR,(PRNr,TOEPRNr)=$P(Rec,D,2) Quit:'PRNr
  If RCPPRNr,PRNr'=RCPPRNr Do  Quit  ; Product receptie en toelevering niet gelijk
  .Quit:NoAsk
  .Set R=$$^vhTXTPOP("EWTOE","VERSCHILLENDPRODUCT","",ZRRCP,$P(^KPR(RCPPRNr,0),D)_" ("_RCPPRNr_")",ZRKTO,$P(^KPR(PRNr,0),D)_" ("_PRNr_")")
@@ -177,6 +177,9 @@
  .Set $P(Rec,D,10)=$J(($P(Rec,D,10)/$P(Rec,D,3)*AantBo),0,2)
  .Set $P(Rec,D,16)=$J(($P(Rec,D,16)/$P(Rec,D,3)*AantBo),0,2)
  .Set $P(Rec,D,3)=AantBo,$P(Rec,D,15)=$P(Rec,D,15)+1
+ .If ORDNr,$D(^KO1(ORDNr,"F")) Do
+ ..Set KLNr=$P(^KO1(ORDNr,"F"),D),ORDPRNr=$P(^KOD(KLNr,"F",ORDNr,OLNr),D,2)
+ ..Set:ORDPRNr'=TOEPRNr $P(Rec,D,27,28)=D
  .Set ^KTO(LEVNr,TOENr,TLNr)=Rec
  .Do SWNODE^FLOWTOE(LEVNr,TOENr,TLNr)
  .If ORDNr Do
@@ -185,8 +188,8 @@
  ..For  Do ADD^vhLock("^KOD(KLNr,""F"",ORDNr)") Quit:%TC  Do
  ...If NoAsk Hang 5
  ...Else  Do LDISP^vhLock("^KOD(KLNr,""F"",ORDNr)","Order "_ORDNr)
- ..Set Rec=^KOD(KLNr,"F",ORDNr,OLNr)
- ..Do:$P(Rec,D,3)
+ ..Set Rec=^KOD(KLNr,"F",ORDNr,OLNr),ORDPRNr=$P(Rec,D,2)
+ ..If $P(Rec,D,3),ORDPRNr=TOEPRNr Do
  ...New OLNr
  ...Set OLNr=^KOD(KLNr,"F",ORDNr,0),^KOD(KLNr,"F",ORDNr,0)=OLNr+1
  ...Set $P(Rec,D,9)=$J(($P(Rec,D,9)/$P(Rec,D,3)*AantBo),0,2)
@@ -207,15 +210,15 @@
  ..If NoAsk Hang 5
  ..Else  Do LDISP^vhLock("^KOD(KLNr,""F"",ORDNr)","Order "_ORDNr)
  .Do KWNODE^FLOWORD(KLNr,ORDNr,OLNr)
- .Set Rec=^KOD(KLNr,"F",ORDNr,OLNr)
+ .Set Rec=^KOD(KLNr,"F",ORDNr,OLNr),ORDPRNr=$P(Rec,D,2)
  .Do:$P(Rec,D,3)
  ..Set ASAP=$P(^KOD(KLNr,"F",ORDNr,1),D,28)
- ..Set PRNrUitOrder=$P(Rec,D,2)
- ..Set AantWMS=$$WijzigAantalIndienKind(AantWMS,PRNr,PRNrUitOrder)
- ..Set $P(Rec,D,9)=$J(($P(Rec,D,9)/$P(Rec,D,3)*AantWMS),0,2)
- ..Set $P(Rec,D,10)=$J(($P(Rec,D,10)/$P(Rec,D,3)*AantWMS),0,2)
- ..Set $P(Rec,D,16)=$J(($P(Rec,D,16)/$P(Rec,D,3)*AantWMS),0,2)
-  ..Set $P(Rec,D,3)=AantWMS
+ ..Do:ORDPRNr=TOEPRNr
+ ...Set AantWMS=$$WijzigAantalIndienKind(AantWMS,PRNr,ORDPRNr)
+ ...Set $P(Rec,D,9)=$J(($P(Rec,D,9)/$P(Rec,D,3)*AantWMS),0,2)
+ ...Set $P(Rec,D,10)=$J(($P(Rec,D,10)/$P(Rec,D,3)*AantWMS),0,2)
+ ...Set $P(Rec,D,16)=$J(($P(Rec,D,16)/$P(Rec,D,3)*AantWMS),0,2)
+ ...Set $P(Rec,D,3)=AantWMS
  ..Set $P(Rec,D,27,28)="\KOM"
  ..Set ^KOD(KLNr,"F",ORDNr,OLNr)=Rec
  ..Do SWNODE^FLOWORD(KLNr,ORDNr,OLNr)