Index: FLOW.mac.rou =================================================================== diff -u -r37608 -r37647 --- FLOW.mac.rou (.../FLOW.mac.rou) (revision 37608) +++ FLOW.mac.rou (.../FLOW.mac.rou) (revision 37647) @@ -37,7 +37,7 @@ .Set R=Document_"nummer of AB-nummer" .Set LEVNr=$G(DERDENr("L")) .If LEVNr Do - ..Set R=R_" van "_$P(^KLE(^KL1(LEVNr),0),D,2) + ..Set R=R_" van "_$P(^KLE(^KL1(LEVNr),0),"\",2) .Set R=R_$S('Exist:", "_Komm1,1:"") .Set Komm1=R Set Komm2="page up (SEL) voor lijst" @@ -85,26 +85,26 @@ Else Goto SQUIT:MultSel If R?.N,R'>99999 Set R=$$SHORTNUM(Global,IGlobal,R) Goto SASK:'R If R?.N,Global="KUL",ChkWMS=2,$D(^ORDW("D",R)) Do Goto SQUIT:R - .Set WMSStat=$P(^ORDW("D",R),D,20) + .Set WMSStat=$P(^ORDW("D",R),"\",20) .If WMSStat="K" Set R=0 Quit - .Quit:WMSStat'="B" Quit:'$P(^KU1(R,"F"),D,2) + .Quit:WMSStat'="B" Quit:'$P(^KU1(R,"F"),"\",2) .Set KLNr=$P(^ORDW("D",R),D) - .Set:'$$TXTPOP("BONGEFACTUREERD","",R,$P(^KKL(^KK1(KLNr),0),D,2)) R=0 + .Set:'$$TXTPOP("BONGEFACTUREERD","",R,$P(^KKL(^KK1(KLNr),0),"\",2)) R=0 If Global="KTO",R="B" Set R=$$ABNR(.DERDENr,Exist,MultSel,ChkWMS,Orgalux) Goto SASK:R="-" If R'="-",Exist,'$$DATA("I",R) Goto SASK If R="A"!(R="-") Goto SQUIT If Global="KOD","\AA\AC\AK\AM\AP\AT\"[(D_R_D) Goto SQUIT - If R'<$P(Limit,D),R'>$P(Limit,D,2) Goto SQUIT + If R'<$P(Limit,D),R'>$P(Limit,"\",2) Goto SQUIT If Global="KTO" Do Kill LEVNr .Set LEVNr="",R=$$UPTRIMAN^vhRtn1(R) - .For Set LEVNr=$O(^KTO4(LEVNr)) Quit:LEVNr="" If $P($O(^KTO4(LEVNr,R_D)),D)=R Set R=$P($O(^KTO4(LEVNr,R_D)),D,2) Quit - If R'<$P(Limit,D),R'>$P(Limit,D,2),$D(@($$GLOREF("I",R))) Goto SQUIT + .For Set LEVNr=$O(^KTO4(LEVNr)) Quit:LEVNr="" If $P($O(^KTO4(LEVNr,R_D)),D)=R Set R=$P($O(^KTO4(LEVNr,R_D)),"\",2) Quit + If R'<$P(Limit,D),R'>$P(Limit,"\",2),$D(@($$GLOREF("I",R))) Goto SQUIT Goto SASK SQUIT Kill ^HULP($J),^HULP(%J) Set FP=1901 Write @F,@F1 If R,$L(ChkWMS) Do Goto SASK:'R - .If Global="KTO" For I=1:1:$L(R,D) If +$$CHECKWMS($P(R,D,I),,,,,,,,1)'=ChkWMS Set R=0 Quit:'R - .If Global="KOD" For I=1:1:$L(R,D) If +$$CHECKWMS(,,$P(R,D,I))'=ChkWMS Set R=0 Quit:'R + .If Global="KTO" For I=1:1:$L(R,D) If +$$CHECKWMS($P(R,"\",I),,,,,,,,1)'=ChkWMS Set R=0 Quit:'R + .If Global="KOD" For I=1:1:$L(R,D) If +$$CHECKWMS(,,$P(R,"\",I))'=ChkWMS Set R=0 Quit:'R Quit R ; DERDENR @@ -118,12 +118,12 @@ New:'$G(DERDENr) DERDENr Set MultSel=$G(MultSel),ChkWMS=$G(ChkWMS),Orgalux=$G(Orgalux),MultNrs=D Kill ^HULP($J) - Do INIT^PROC("FLOWSEL"_$P("K",D,$D(DERDENr)>0)_$P("\M",D,MultSel+1),"LD") + Do INIT^PROC("FLOWSEL"_$P("K","\",$D(DERDENr)>0)_$P("\M","\",MultSel+1),"LD") Set LD(8)="Selecteer "_$C($A($E(Document))+32)_$E(Document,2,99) If MultSel Set LD(8)=LD(8)_$S("\KTO\KUL\"[(D_Global_D):"(en)",1:"(s)") If $D(DERDENr) Do .Set LD(8)=LD(8)_" van "_$S(Global="KTO":"leverancier",1:"klant")_" : " - .Set LD(8)=LD(8)_$P(@($$GLOREF("D","DERDENr")),D,2) + .Set LD(8)=LD(8)_$P(@($$GLOREF("D","DERDENr")),"\",2) Set:Orgalux LD(8)=LD(8)_" (Orgalux)" If 'Exist Set LD(8)=LD(8)_" - A=automatisch nummer" Set LD(8)=$E(LD(8),1,80) @@ -133,56 +133,56 @@ LSL Do SL^PROC If R="-" Quit R If 'Exist,R="A" Quit R - If MultSel Do Goto LSL:R'="ENTER",LSL:$TR(MultNrs,D,"")="" Quit $TR(MultNrs,"-","") + If MultSel Do Goto LSL:R'="ENTER",LSL:$TR(MultNrs,"\","")="" Quit $TR(MultNrs,"-","") .If R="ENTER",MultNrs'=D Set $E(MultNrs)="",$E(MultNrs,$L(MultNrs))="" .If R="ENTER",MultNrs=D Set MultNrs="-" .Quit:R'=" " Quit:'$D(^HULP($J,LD(6))) - .Set R=$P(^HULP($J,LD(6)),D,99) + .Set R=$P(^HULP($J,LD(6)),"\",99) .If MultNrs'[R Set MultNrs=MultNrs_R_D .Else Set MultNrs=$P(MultNrs,D_R_D)_D_$P(MultNrs,D_R_D,2) .Do EL^PROC - If R="ENTER",$D(^HULP($J,LD(6))) Quit $P(^HULP($J,LD(6)),D,99) + If R="ENTER",$D(^HULP($J,LD(6))) Quit $P(^HULP($J,LD(6)),"\",99) Goto LSL ; MORE(LSelect,LMax) New X,OrgaluxOk If Count,RefNr="" Quit Count If $D(LEVNr) Do Set LD(9)=Count Quit Count .For Set RefNr=$O(@($$GLOREF("A",RefNr))) Quit:RefNr="" Do - ..Quit:'$D(@($$GLOREF("H",$P(RefNr,D,2)))) - ..Set R=@($$GLOREF("H",$P(RefNr,D,2)))@(1),$P(R,D,99)=$P(RefNr,D,2) + ..Quit:'$D(@($$GLOREF("H",$P(RefNr,"\",2)))) + ..Set R=@($$GLOREF("H",$P(RefNr,"\",2)))@(1),$P(R,"\",99)=$P(RefNr,"\",2) ..If $L(ChkWMS),Global="KTO",+$$CHECKWMS(RefNr)'=ChkWMS Quit ..If $L(ChkWMS),Global="KOD",+$$CHECKWMS(,,RefNr)'=ChkWMS Quit ..If $L(Orgalux) Do Quit:'OrgaluxOk ...Set X="Set OrgaluxOk="_$S(Orgalux:"",1:"'")_"$$ISORGAL("_$S(Global="KOD":"""O""",1:"""L""")_",RefNr)" ...Xecute X - ..Set:Global="KOD" $P(R,D,100)=''$D(^ORDW("IO",RefNr)) - ..Set:Global="KTO" $P(R,D,100)=''$D(^RCP("IT",RefNr)) + ..Set:Global="KOD" $P(R,"\",100)=''$D(^ORDW("IO",RefNr)) + ..Set:Global="KTO" $P(R,"\",100)=''$D(^RCP("IT",RefNr)) ..Set Count=Count+1,^HULP($J,Count)=R If $D(DERDENr) Do Set LD(9)=Count Quit Count .For Set RefNr=$O(@($$GLOREF("H",RefNr)),-1) Quit:RefNr="" Do - ..Set R=@($$GLOREF("H",RefNr))@(1),$P(R,D,99)=RefNr + ..Set R=@($$GLOREF("H",RefNr))@(1),$P(R,"\",99)=RefNr ..If $L(ChkWMS),Global="KTO",+$$CHECKWMS(RefNr)'=ChkWMS Quit ..If $L(ChkWMS),Global="KOD",+$$CHECKWMS(,,RefNr)'=ChkWMS Quit ..If $L(Orgalux) Do Quit:'OrgaluxOk ...Set X="Set OrgaluxOk="_$S(Orgalux:"",1:"'")_"$$ISORGAL("_$S(Global="KOD":"""O""",1:"""L""")_",RefNr)" ...Xecute X - ..Set:Global="KOD" $P(R,D,100)=''$D(^ORDW("IO",RefNr)) - ..Set:Global="KTO" $P(R,D,100)=''$D(^RCP("IT",RefNr)) - ..If $L(ChkWMS),$P(R,D,100)'=ChkWMS Quit + ..Set:Global="KOD" $P(R,"\",100)=''$D(^ORDW("IO",RefNr)) + ..Set:Global="KTO" $P(R,"\",100)=''$D(^RCP("IT",RefNr)) + ..If $L(ChkWMS),$P(R,"\",100)'=ChkWMS Quit ..Quit:$D(NoSelNr(RefNr)) - ..If Global="KTO",$D(DERDENr("K")),$P(R,D,8)'=DERDENr("K") Quit + ..If Global="KTO",$D(DERDENr("K")),$P(R,"\",8)'=DERDENr("K") Quit ..Set Count=Count+1,^HULP($J,Count)=R New DERDENr For Set RefNr=$O(^HULP(%J,RefNr),-1) Quit:RefNr="" Do Quit:Count-LSelect>LMax .If $L(Orgalux) Do Quit:'OrgaluxOk ..Set X="Set OrgaluxOk="_$S(Orgalux:"",1:"'")_"$$ISORGAL("_$S(Global="KOD":"""O""",1:"""L""")_",RefNr)" ..Xecute X .Set R=^HULP(%J,RefNr) - .Set DERDENr=$P(R,D),R=@($$GLOREF("H",RefNr))@(1),$P(R,D,99)=RefNr - .Set:Global="KOD" $P(R,D,100)=''$D(^ORDW("IO",RefNr)) - .Set:Global="KTO" $P(R,D,100)=''$D(^RCP("IT",RefNr)) - .Set $P(R,D,6)=DERDENr,Count=Count+1,^HULP($J,Count)=R + .Set DERDENr=$P(R,D),R=@($$GLOREF("H",RefNr))@(1),$P(R,"\",99)=RefNr + .Set:Global="KOD" $P(R,"\",100)=''$D(^ORDW("IO",RefNr)) + .Set:Global="KTO" $P(R,"\",100)=''$D(^RCP("IT",RefNr)) + .Set $P(R,"\",6)=DERDENr,Count=Count+1,^HULP($J,Count)=R Set LD(9)=Count Quit Count ; @@ -194,7 +194,7 @@ If R="-" Quit R Set (LEVNr,LC)=R Set Prompt="AB-nummer : " - Set Komm1="van "_$P(^KLE(^KL1(LEVNr),0),D,2)_$S('Exist:" A=automatisch nummer",1:"") + Set Komm1="van "_$P(^KLE(^KL1(LEVNr),0),"\",2)_$S('Exist:" A=automatisch nummer",1:"") Set Komm2="page up (SEL) voor lijst" AASK Set FP=1901 Write @F,@F1 Set R=$$UPCASE^vhRtn1($$ASK^vhINP(Prompt,12,"",Komm1,Komm2)) @@ -203,8 +203,8 @@ If R="A",Exist Goto AASK If R="A"!(R="-") Quit R Set R=$$UPTRIMAN^vhRtn1(R) - If $P($O(^KTO4(LEVNr,R_D)),D)=R Set R=$P($O(^KTO4(LEVNr,R_D)),D,2) - If R'<$P(Limit,D),R'>$P(Limit,D,2),$D(@($$GLOREF("I",R))) Quit R + If $P($O(^KTO4(LEVNr,R_D)),D)=R Set R=$P($O(^KTO4(LEVNr,R_D)),"\",2) + If R'<$P(Limit,D),R'>$P(Limit,"\",2),$D(@($$GLOREF("I",R))) Quit R Goto AASK ; GLOREF(Type,Ref,Ref2) @@ -237,7 +237,7 @@ ..Set DERDENr="" ..For Set DERDENr=$O(^KTO4(DERDENr)) Quit:DERDENr="" Set Data=$$DATA(Type,Ref) Quit:Data .Quit:$P($O(^KTO4(DERDENr,Ref_D)),D)'=Ref - .Set Ref=$P($O(^KTO4(DERDENr,Ref_D)),D,2) + .Set Ref=$P($O(^KTO4(DERDENr,Ref_D)),"\",2) .Quit:Ref="" .Set Data=$D(@($$GLOREF(Type,Ref))) Quit Data @@ -273,7 +273,7 @@ ; HELP Set Help=1,I=24-$L(USC,U) - For I=$P(UD,D,2)+1:1:I Set FP=I*100+1 Write @F,@F2 + For I=$P(UD,"\",2)+1:1:I Set FP=I*100+1 Write @F,@F2 For I=1:1:$L(USC,U) Write !,$P(USC,U,I),$J("",80-$L($P(USC,U,I))) Quit ; @@ -317,9 +317,9 @@ . . Set R=$G(^KU1(Number,"F")),KLNr=$P(R,D) . . If KLNr Do Quit:$G(UseThisNumber) . . . If $D(^KUL(KLNr,"F",Number)) - . . . Else Set R=$G(^KUL(KLNr,"G",Number,1)) If $L(R),$$INTDATE^vhLib.DataTypes($P(R,D,2))>CompDate - . . . Else Set R=$G(^KUL(KLNr,"M",Number,1)) If $L(R),$$INTDATE^vhLib.DataTypes($P(R,D,2))>CompDate - . . . Else Set R=$G(^KUL(KLNr,"T",Number,1)) If $L(R),$$INTDATE^vhLib.DataTypes($P(R,D,2))>CompDate + . . . Else Set R=$G(^KUL(KLNr,"G",Number,1)) If $L(R),$$INTDATE^vhLib.DataTypes($P(R,"\",2))>CompDate + . . . Else Set R=$G(^KUL(KLNr,"M",Number,1)) If $L(R),$$INTDATE^vhLib.DataTypes($P(R,"\",2))>CompDate + . . . Else Set R=$G(^KUL(KLNr,"T",Number,1)) If $L(R),$$INTDATE^vhLib.DataTypes($P(R,"\",2))>CompDate . . . Else Do . . . . ; Deze bon is ouder dan 14 weken (3.5 maand) en reeds gefactureerd, hergebruik het nummer. . . . . Do VerwijderGefactureerdeBon^FLOWBON3(Number) @@ -331,12 +331,12 @@ Else If Global="KOD" Do . Set CompDate=$$CALCDATE^vhLib.DataTypes(,"M",-4,"FD") . For Quit:'$D(@IGloRef) Do - . . Set R=^KO1(Number,"F"),KLNr=$P(R,D),BONNr=$P(R,D,2) + . . Set R=^KO1(Number,"F"),KLNr=$P(R,"\"),BONNr=$P(R,"\",2) . . If $D(^KOD(KLNr,"F",Number)) . . Else If $D(^KUL(KLNr,"F",BONNr)) - . . Else Set R=$G(^KUL(KLNr,"G",BONNr,1)) If $L(R),$$INTDATE^vhLib.DataTypes($P(R,D,2))>CompDate - . . Else Set R=$G(^KUL(KLNr,"M",BONNr,1)) If $L(R),$$INTDATE^vhLib.DataTypes($P(R,D,2))>CompDate - . . Else Set R=$G(^KUL(KLNr,"T",BONNr,1)) If $L(R),$$INTDATE^vhLib.DataTypes($P(R,D,2))>CompDate + . . Else Set R=$G(^KUL(KLNr,"G",BONNr,1)) If $L(R),$$INTDATE^vhLib.DataTypes($P(R,"\",2))>CompDate + . . Else Set R=$G(^KUL(KLNr,"M",BONNr,1)) If $L(R),$$INTDATE^vhLib.DataTypes($P(R,"\",2))>CompDate + . . Else Set R=$G(^KUL(KLNr,"T",BONNr,1)) If $L(R),$$INTDATE^vhLib.DataTypes($P(R,"\",2))>CompDate . . Else Kill ^KO1(Number) Quit . . Set Number=Number+1,Number=$$CHKMAX(Global,Number) Else For Quit:'$D(@IGloRef) Set Number=Number+1,Number=$$CHKMAX(Global,Number) @@ -383,20 +383,20 @@ Do:Ok .If Aantal?.N,'$E(Aantal) Set Ok=0 Quit .Set IsHandel=$$IsHandel^KLANT5(KLNr) - .Set R=^KPR(PRNr,1),IsStock=$P(R,D,20) + .Set R=^KPR(PRNr,1),IsStock=$P(R,"\",20) .Set R=$O(^KPR(PRNr,"J")) Set:$E(R)="J" R=^KPR(PRNr,R) - .Set MinBestH=$P(R,D,6),PerStuk=$P(R,D,13),KleinVp=$P(R,D,14),NormVp=$P(R,D,15),GrootVp=$P(R,D,16) + .Set MinBestH=$P(R,"\",6),PerStuk=$P(R,"\",13),KleinVp=$P(R,"\",14),NormVp=$P(R,"\",15),GrootVp=$P(R,"\",16) .Set:'NormVp NormVp=GrootVp Set:'KleinVp KleinVp=NormVp .If 'IsStock Do ..Set ORDNr="",Contract=0 ..For Set ORDNr=$O(^KOD(KLNr,"F",ORDNr)) Quit:'ORDNr Do Quit:Contract - ...Quit:$P(^KOD(KLNr,"F",ORDNr,1),D,25)'="C" + ...Quit:$P(^KOD(KLNr,"F",ORDNr,1),"\",25)'="C" ...Set OLNr=100 ...For Set OLNr=$O(^KOD(KLNr,"F",ORDNr,OLNr)) Quit:'OLNr Do Quit:Contract ....Set R=^KOD(KLNr,"F",ORDNr,OLNr) - ....If $P(R,D,2)=PRNr,$P(R,D,3)'$$GETSTOCK^PRODUKT4(PRNr,"T"),GrootVp Do @@ -454,7 +454,7 @@ .If ORDNr Set $P(CheckWMS,";",3)=''$D(^ORDW("IO",ORDNr)) .If BONNr Do ..Set $P(CheckWMS,";",5)=''$D(^RCP("IU",BONNr)) - ..Set:$P(CheckWMS,";",5) $P(CheckWMS,";",5)=$P($G(^RCP("D",BONNr)),D,20)'="I" + ..Set:$P(CheckWMS,";",5) $P(CheckWMS,";",5)=$P($G(^RCP("D",BONNr)),"\",20)'="I" Else Do .Set (TLUNr,OLUNr)="" .If TOENr Do @@ -464,81 +464,81 @@ ...Quit:CheckKom ...Set TLNr=100 ...For Set TLNr=$O(^KTO(LEVNr,TOENr,TLNr)) Quit:TLNr="" Do Quit:CheckWMS - ....Set R=^KTO(LEVNr,TOENr,TLNr),ORDNr=$P(R,D,27) - ....If ORDNr,$TR(CheckWMS,";0","")="" Set R=$$CHECKWMS(,,ORDNr,,,,WarnMod,WarnDel,1) Set:R CheckWMS=$P(R,D,2) - ..Set R=^KTO(LEVNr,TOENr,TLNr),TLUNr=$P(R,D,15) - ..If 'ORDNr Set ORDNr=$P(R,D,27) Set:'OLNr OLNr=$P(R,D,28) + ....Set R=^KTO(LEVNr,TOENr,TLNr),ORDNr=$P(R,"\",27) + ....If ORDNr,$TR(CheckWMS,";0","")="" Set R=$$CHECKWMS(,,ORDNr,,,,WarnMod,WarnDel,1) Set:R CheckWMS=$P(R,"\",2) + ..Set R=^KTO(LEVNr,TOENr,TLNr),TLUNr=$P(R,"\",15) + ..If 'ORDNr Set ORDNr=$P(R,"\",27) Set:'OLNr OLNr=$P(R,"\",28) .If ORDNr Do ..Set KLNr=$P(^KO1(ORDNr,"F"),D) ..If 'OLNr Do Quit ...New TOENr,OLNr ...Quit:CheckKom ...Set OLNr=100 ...For Set OLNr=$O(^KOD(KLNr,"F",ORDNr,OLNr)) Quit:OLNr="" Do Quit:CheckWMS - ....Set R=^KOD(KLNr,"F",ORDNr,OLNr),TOENr=$P(R,D,27) - ....If TOENr,$TR(CheckWMS,";0","")="" Set R=$$CHECKWMS(TOENr,,,,,,WarnMod,WarnDel,1) Set:R CheckWMS=$P(R,D,2) - ..Set R=^KOD(KLNr,"F",ORDNr,OLNr),OLUNr=$P(R,D,15) - ..If 'TOENr Set TOENr=$P(R,D,27) Set:'TLNr TLNr=$P(R,D,28) + ....Set R=^KOD(KLNr,"F",ORDNr,OLNr),TOENr=$P(R,"\",27) + ....If TOENr,$TR(CheckWMS,";0","")="" Set R=$$CHECKWMS(TOENr,,,,,,WarnMod,WarnDel,1) Set:R CheckWMS=$P(R,"\",2) + ..Set R=^KOD(KLNr,"F",ORDNr,OLNr),OLUNr=$P(R,"\",15) + ..If 'TOENr Set TOENr=$P(R,"\",27) Set:'TLNr TLNr=$P(R,"\",28) .If TOENr,TLUNr Set $P(CheckWMS,";",2)=''$D(^RCP("IT",TOENr,TLUNr)) .Else If TOENr Set $P(CheckWMS,";")=''$D(^RCP("IT",TOENr)) .If ORDNr,OLUNr Set $P(CheckWMS,";",4)=''$D(^ORDW("IO",ORDNr,OLUNr)) .Else If ORDNr Set $P(CheckWMS,";",3)=''$D(^ORDW("IO",ORDNr)) .If BONNr Do ..Set $P(CheckWMS,";",5)=''$D(^RCP("IU",BONNr)) - ..Set:$P(CheckWMS,";",5) $P(CheckWMS,";",5)=$P($G(^RCP("D",BONNr)),D,20)'="I" + ..Set:$P(CheckWMS,";",5) $P(CheckWMS,";",5)=$P($G(^RCP("D",BONNr)),"\",20)'="I" If WarnMod,WarnDel Do .If TOENr,$P(CheckWMS,";")!$P(CheckWMS,";",2) Do - ..Set LEVNr=$P(^KTO1(TOENr),D),LevNaam=$P(^KLE(^KL1(LEVNr),0),D,2) + ..Set LEVNr=$P(^KTO1(TOENr),D),LevNaam=$P(^KLE(^KL1(LEVNr),0),"\",2) ..Set R=$$TXTPOP("WMSMODDELTOE","",""""_$$EXTNUM^vhLib.DataTypes(TOENr,0,".",0)_"""",""""_LevNaam_"""") .If ORDNr,$P(CheckWMS,";",3)!$P(CheckWMS,";",4) Do - ..Set KLNr=$P(^KO1(ORDNr,"F"),D),KlNaam=$P(^KKL(^KK1(KLNr),0),D,2) + ..Set KLNr=$P(^KO1(ORDNr,"F"),D),KlNaam=$P(^KKL(^KK1(KLNr),0),"\",2) ..Set R=$$TXTPOP("WMSMODDELORD","",""""_$$EXTNUM^vhLib.DataTypes(ORDNr,0,".",0)_"""",""""_KlNaam_"""") .If BONNr,$P(CheckWMS,";",5) Do - ..Set KLNr=$P(^KU1(BONNr,"F"),D),KlNaam=$P(^KKL(^KK1(KLNr),0),D,2) + ..Set KLNr=$P(^KU1(BONNr,"F"),D),KlNaam=$P(^KKL(^KK1(KLNr),0),"\",2) ..Set R=$$TXTPOP("WMSMODDELBON","",""""_$$EXTNUM^vhLib.DataTypes(BONNr,0,".",0)_"""",""""_KlNaam_"""") Else If WarnMod Do .If TOENr,$P(CheckWMS,";")!$P(CheckWMS,";",2) Do - ..Set LEVNr=$P(^KTO1(TOENr),D),LevNaam=$P(^KLE(^KL1(LEVNr),0),D,2) + ..Set LEVNr=$P(^KTO1(TOENr),D),LevNaam=$P(^KLE(^KL1(LEVNr),0),"\",2) ..If TLNr,$P(CheckWMS,";",2) Do Quit ...Set R=$$TXTPOP("WMSMODTOELINE","",""""_$$EXTNUM^vhLib.DataTypes(TOENr,0,".",0)_"""",""""_LevNaam_"""") ..Set R=$$TXTPOP("WMSMODTOE","",""""_$$EXTNUM^vhLib.DataTypes(TOENr,0,".",0)_"""",""""_LevNaam_"""") .If ORDNr,$P(CheckWMS,";",3)!$P(CheckWMS,";",4) Do - ..Set KLNr=$P(^KO1(ORDNr,"F"),D),KlNaam=$P(^KKL(^KK1(KLNr),0),D,2) + ..Set KLNr=$P(^KO1(ORDNr,"F"),D),KlNaam=$P(^KKL(^KK1(KLNr),0),"\",2) ..If OLNr,$P(CheckWMS,";",4) Do Quit ...Set R=$$TXTPOP("WMSMODORDLINE","",""""_$$EXTNUM^vhLib.DataTypes(ORDNr,0,".",0)_"""",""""_KlNaam_"""") ..Set R=$$TXTPOP("WMSMODORD","",""""_$$EXTNUM^vhLib.DataTypes(ORDNr,0,".",0)_"""",""""_KlNaam_"""") .If BONNr,$P(CheckWMS,";",5) Do - ..Set KLNr=$P(^KU1(BONNr,"F"),D),KlNaam=$P(^KKL(^KK1(KLNr),0),D,2) + ..Set KLNr=$P(^KU1(BONNr,"F"),D),KlNaam=$P(^KKL(^KK1(KLNr),0),"\",2) ..If BLNr Do Quit ...Set R=$$TXTPOP("WMSMODBONLINE","",""""_$$EXTNUM^vhLib.DataTypes(BONNr,0,".",0)_"""",""""_KlNaam_"""") ..Set R=$$TXTPOP("WMSMODBON","",""""_$$EXTNUM^vhLib.DataTypes(BONNr,0,".",0)_"""",""""_KlNaam_"""") Else If WarnDel Do .If TOENr,$P(CheckWMS,";")!$P(CheckWMS,";",2) Do - ..Set LEVNr=$P(^KTO1(TOENr),D),LevNaam=$P(^KLE(^KL1(LEVNr),0),D,2) + ..Set LEVNr=$P(^KTO1(TOENr),D),LevNaam=$P(^KLE(^KL1(LEVNr),0),"\",2) ..If TLNr,$P(CheckWMS,";",2) Do Quit ...Set R=$$TXTPOP("WMSDELTOELINE","",""""_$$EXTNUM^vhLib.DataTypes(TOENr,0,".",0)_"""",""""_LevNaam_"""") ..Set R=$$TXTPOP("WMSDELTOE","",""""_$$EXTNUM^vhLib.DataTypes(TOENr,0,".",0)_"""",""""_LevNaam_"""") .If ORDNr,$P(CheckWMS,";",3)!$P(CheckWMS,";",4) Do - ..Set KLNr=$P(^KO1(ORDNr,"F"),D),KlNaam=$P(^KKL(^KK1(KLNr),0),D,2) + ..Set KLNr=$P(^KO1(ORDNr,"F"),D),KlNaam=$P(^KKL(^KK1(KLNr),0),"\",2) ..If OLNr,$P(CheckWMS,";",4) Do Quit ...Set R=$$TXTPOP("WMSDELORDLINE","",""""_$$EXTNUM^vhLib.DataTypes(ORDNr,0,".",0)_"""",""""_KlNaam_"""") ..Set R=$$TXTPOP("WMSDELORD","",""""_$$EXTNUM^vhLib.DataTypes(ORDNr,0,".",0)_"""",""""_KlNaam_"""") .If BONNr,$P(CheckWMS,";",5) Do - ..Set KLNr=$P(^KU1(BONNr,"F"),D),KlNaam=$P(^KKL(^KK1(KLNr),0),D,2) + ..Set KLNr=$P(^KU1(BONNr,"F"),D),KlNaam=$P(^KKL(^KK1(KLNr),0),"\",2) ..If BLNr Do Quit ...Set R=$$TXTPOP("WMSDELBONLINE","",""""_$$EXTNUM^vhLib.DataTypes(BONNr,0,".",0)_"""",""""_KlNaam_"""") ..Set R=$$TXTPOP("WMSDELBON","",""""_$$EXTNUM^vhLib.DataTypes(BONNr,0,".",0)_"""",""""_KlNaam_"""") ..Quit:R'="V" ..If '$$ISTERUGN^FLOWBON5(BONNr,1) Quit:'$$ASK^vhWACHTW("MANAGER","","",0) ..Set RCPNr=$G(^RCP("IU",BONNr)) ..Quit:'RCPNr - ..Set R=^RCP("D",RCPNr),WMSStat=$P(R,D,20),Delete=WMSStat="" + ..Set R=^RCP("D",RCPNr),WMSStat=$P(R,"\",20),Delete=WMSStat="" ..If 'Delete,"AI"'[WMSStat Set Delete=$$CHKDEL^EWRCPST(RCPNr,BONNr) ..If 'Delete Do ...Set R="$$^vhTXTPOP(""EWRCPST"",""NODELTBNR"","""",""" ...Set R=R_"Terugname " ...Set R=R_$$EXTNUM^vhLib.DataTypes(BONNr,0,".",0)_""",""" - ...Set R=R_$P(^KKL(^KK1(KLNr),0),D,2)_""",""" + ...Set R=R_$P(^KKL(^KK1(KLNr),0),"\",2)_""",""" ...Set R=R_$$EXTNUM^vhLib.DataTypes(RCPNr,0,".",0) ...Set R=R_""")" ...Xecute "Set R="_R @@ -606,29 +606,29 @@ Set:FactCust="" FactCust=KLNr If Warn,FactCust'=KLNr Do . Set Space=$L(Document)+6 Set:Space<13 Space=13 Set Space=$J("",Space) - . Set Warn=Document_" van"_$J("",7-$L(Document))_": "_KLNr_" "_$P(^KKL(^KK1(KLNr),0),D,2)_"~"_Space_$P(^(0),D,5)_"~"_Space_$P(^(0),D,6)_" "_$P(^(0),D,7) - . Set Warn=Warn_"~~Factuur aan"_$J("",$L(Space)-13)_": "_FactCust_" "_$P(^KKL(^KK1(FactCust),0),D,2)_"~"_Space_$P(^(0),D,5)_"~"_Space_$P(^(0),D,6)_" "_$P(^(0),D,7) + . Set Warn=Document_" van"_$J("",7-$L(Document))_": "_KLNr_" "_$P(^KKL(^KK1(KLNr),0),"\",2)_"~"_Space_$P(^(0),"\",5)_"~"_Space_$P(^(0),"\",6)_" "_$P(^(0),"\",7) + . Set Warn=Warn_"~~Factuur aan"_$J("",$L(Space)-13)_": "_FactCust_" "_$P(^KKL(^KK1(FactCust),0),"\",2)_"~"_Space_$P(^(0),"\",5)_"~"_Space_$P(^(0),"\",6)_" "_$P(^(0),"\",7) . Do WARN^vhTXTPOP(Warn,"") Quit FactCust ; CALC(Document,DocNr,TxtPop) New R,Calc,KLNr,KlNaam,TeBet,Munt,Rembours,Afgehandeld,RembAfgeh Set TxtPop=$G(TxtPop) If Document="O" Do - .Set Calc=$$CALCORD^FLOWORD5(DocNr),TeBet=$P(Calc,D),Munt=$P(Calc,D,7) + .Set Calc=$$CALCORD^FLOWORD5(DocNr),TeBet=$P(Calc,D),Munt=$P(Calc,"\",7) .Do:TxtPop ..Set R=^KO1(DocNr,"F"),KLNr=$P(R,D),Document="Order",Rembours=$$ISREMB^REMBOURS(KLNr) - ..Set R=^KOD(KLNr,"F",DocNr,1),Afgehandeld=$P(R,D,37) + ..Set R=^KOD(KLNr,"F",DocNr,1),Afgehandeld=$P(R,"\",37) If Document="L" Do - .Set Calc=$$CALCBON^FLOWBON5(DocNr),TeBet=$P(Calc,D),Munt=$P(Calc,D,7) + .Set Calc=$$CALCBON^FLOWBON5(DocNr),TeBet=$P(Calc,D),Munt=$P(Calc,"\",7) .Set:TxtPop R=^KU1(DocNr,"F"),KLNr=$P(R,D),Document="Bon" If TxtPop Do .Set Rembours=$G(Rembours),Afgehandeld=$G(Afgehandeld),RembAfgeh="" - .Set R=^KKL(^KK1(KLNr),0),KlNaam=$P(R,D,2) + .Set R=^KKL(^KK1(KLNr),0),KlNaam=$P(R,"\",2) .If Rembours Set RembAfgeh="(Rembours" Set:Afgehandeld RembAfgeh=RembAfgeh_" - afgehandeld" Set RembAfgeh=RembAfgeh_")" .Set TeBet=$$EXTNUM^vhLib.DataTypes(TeBet,0,".",$$MUNT^vhRtn1(Munt,4)) .Set R=$$TXTPOP("TEBET",,KLNr,KlNaam,Document_$J("",10-$L(Document)),$$EXTNUM^vhLib.DataTypes(DocNr,0,".T",0),TeBet,Munt,RembAfgeh,''Afgehandeld) - .If Document="Order",R="R" Set R=^KOD(KLNr,"F",DocNr,1),Afgehandeld="",$P(R,D,37)=Afgehandeld,^KOD(KLNr,"F",DocNr,1)=R + .If Document="Order",R="R" Set R=^KOD(KLNr,"F",DocNr,1),Afgehandeld="",$P(R,"\",37)=Afgehandeld,^KOD(KLNr,"F",DocNr,1)=R Quit $G(Calc) ; CHKSOPR(KLNr,PRNr,Document,BackGrnd,IsToevoegingSpiegelProduct) @@ -639,15 +639,15 @@ .If $G(BackGrnd),'$G(OfferteNr),'IsToevoegingSpiegelProduct Quit .Set ChkSOPR = 1 Else Do - .Set SOPRPRNr="",R=^KPR(PRNr,2),IdentNr=$P(R,D,25),IdentNr=$E($TR(IdentNr,".",""),2,99) + .Set SOPRPRNr="",R=^KPR(PRNr,2),IdentNr=$P(R,"\",25),IdentNr=$E($TR(IdentNr,".",""),2,99) .For I=0:1:9 Do Quit:SOPRPRNr ..Set R=$G(^KPR2(I_IdentNr_" ")),PRNr=$P(R,D) ..Quit:'PRNr ..Set R=^KPR(PRNr,0),SKortTxt=$P(R,D) Set:SKortTxt[("*"_KLNr_"*") SOPRPRNr=PRNr .Quit:'SOPRPRNr .Set ChkSOPR="" .If $G(BackGrnd),'$G(OfferteNr),'IsToevoegingSpiegelProduct Quit - .Set R=^KKL(^KK1(KLNr),0),KlNaam=$P(R,D,2) + .Set R=^KKL(^KK1(KLNr),0),KlNaam=$P(R,"\",2) .Set ChkSOPR=$$TXTPOP("SOPR2","",KortTxt,KlNaam,SKortTxt) Set:ChkSOPR="S" ChkSOPR=SOPRPRNr Quit ChkSOPR ; @@ -668,11 +668,11 @@ Set Previus=$O(@(IGlobal_"("""")"),-1) Set:(Last-Previus-1)'Huidig,$P(R,"-",2)'