Index: vhDeploy/D20171228xSluitenOrderMenuOrderIngave.cls.xml =================================================================== diff -u --- vhDeploy/D20171228xSluitenOrderMenuOrderIngave.cls.xml (revision 0) +++ vhDeploy/D20171228xSluitenOrderMenuOrderIngave.cls.xml (revision 48784) @@ -0,0 +1,33 @@ + + + + +vhLib.Macro +1 +vhDeploy.Deploy + + +%String +Order Menu, sluiten order aangepast + + + +1 + + + + + + Index: FLOW.mac.rou =================================================================== diff -u -r44636 -r48784 --- FLOW.mac.rou (.../FLOW.mac.rou) (revision 44636) +++ FLOW.mac.rou (.../FLOW.mac.rou) (revision 48784) @@ -734,4 +734,3 @@ ;If PerDag,$ZU(5)'="DEV-ADMIN1",'$G(NoWachtW) Set PerDag=$$ASK^vhWACHTW("PROGMODE",,,0,,"Ingave levering per dag.") Quit PerDag - Index: FLOWORD.mac.rou =================================================================== diff -u -r47577 -r48784 --- FLOWORD.mac.rou (.../FLOWORD.mac.rou) (revision 47577) +++ FLOWORD.mac.rou (.../FLOWORD.mac.rou) (revision 48784) @@ -121,7 +121,8 @@ .If Input="I" Do LINSERT("","B") .If Input="K" Do QKORT .If Input="R" Do SORT(KLNr,ORDNr),FETCHDET,WL^PROC - .If Input="S" Do CREATOR If $$CHKKRED^FLOW2(ORDNr,1) If $$CANCLOSE Do CLOSE If '$G(CashECar) Set Input="-" Quit + .If Input="TijdelijkOrder" Do SLUITTIJDELIJKORDER If '$G(CashECar) Set Input="-" Quit + .If Input="ManueelOrder" Do SLUITMANUEELORDER If '$G(CashECar) Set Input="-" Quit .If Input="V" Do LDELETE .If Input="X" Do DELETE Set Input=$S($G(K)="-":"",1:"-") Quit .If Input="E" Do NEWPROD^FLOWORD2 @@ -136,6 +137,20 @@ Do PutViaFLOWORD^EWORDS6(ORDNr) Quit ; + ; Sluit tijdelijk Order +SLUITTIJDELIJKORDER + Do CREATOR + Set $P(^KOD(KLNr,"F",ORDNr,1),"\",60)="0" + If $$CHKKRED^FLOW2(ORDNr,1) If $$CANCLOSE Do CLOSE + Quit + ; + ; Sluit manueel Order +SLUITMANUEELORDER + Do CREATOR + Set $P(^KOD(KLNr,"F",ORDNr,1),"\",60) = "1" + If $$CHKKRED^FLOW2(ORDNr,1) If $$CANCLOSE Do CLOSE + Quit + ; ; Insert van een lijn INSERT(Rec,Insert,OLNr,Show) Do INSERT^FLOWORD2(Rec,Insert,$G(OLNr),$G(Show)) @@ -1047,4 +1062,3 @@ -