Index: DCTOE.mac.rou =================================================================== diff -u -r734 -r921 --- DCTOE.mac.rou (.../DCTOE.mac.rou) (revision 734) +++ DCTOE.mac.rou (.../DCTOE.mac.rou) (revision 921) @@ -1,5 +1,6 @@ DCTOE ;AFDRUKKEN TOELEVERINGEN [ 01/17/2002 4:18 PM ] #Include BL.Derde.Kennis + #include BL.Derde.LevSpecifiek ; ; Het afdrukken van een toelevering kan met volgende oproep ; --> Do PRINT^DCTOE(TOENr,,,,SelPrint) @@ -19,7 +20,7 @@ ; PASTEB(R,AddBlank) New NewPage - Set NewPage="Do FOOTER^"_$ZN_","_$S(LEVNr=6332:"HTITEL",1:"TITEL")_"^"_$ZN_",HEADER^"_$ZN + Set NewPage="Do FOOTER^"_$ZN_","_$S(LEVNr=$$$LevHalux:"HTITEL",1:"TITEL")_"^"_$ZN_",HEADER^"_$ZN Do PASTEB^DCALG(R,NewPage,$G(AddBlank)) Quit ; @@ -63,8 +64,12 @@ Do PASTE(PCount,LCount,T,3,"","") Set T=$$TXT("Aant") Do PASTE(PCount,LCount,T,"",56,"") - Set T=$S(LEVNr=6332:"",1:$$TXT("Prijs")_" "_ToeMunt) - Do PASTE(PCount,LCount,T,"",69,"") + If LEVNr=$$$LevHalux Do + . Set T=$$TXT("BarCode") + . Do PASTE(PCount,LCount,T,60,"","") + Else Do + . Set T=$$TXT("Prijs")_" "_ToeMunt + . Do PASTE(PCount,LCount,T,"",69,"") Set T=$$TXT("LevWk") Do PASTE(PCount,LCount,T,"",77,"") If $D(L("B","S")) Do CACHE(L("B","S")) @@ -142,7 +147,7 @@ If LEVNr=6092!(LEVNr=6428) Do .Set T=T_"/"_KLNr Set:LevAdr T=T_"."_$C(64+LevAdr) .Set:$L(OrdRef) T=T_"/"_OrdRef - ;If LEVNr=6332,$E(ToeRef,1,6)="KOMM. " Set T=T_"/"_$E(ToeRef,7,99) + ;If LEVNr=$$$LevHalux,$E(ToeRef,1,6)="KOMM. " Set T=T_"/"_$E(ToeRef,7,99) Set T=$E(T,1,35) Do PASTE(PCount,Blank-3,T,2,"","B") Do VHPD^DCALG(PCount,.Blank,.VH) @@ -211,7 +216,7 @@ ; ; Afdruk afsluiting (laatste blad) LFOOTER - Do CACHE($S($LL(lbKenAnk):L("A","L"),LEVNr=6332:L("A","H"),1:L("A","L"))) + Do CACHE($S($LL(lbKenAnk):L("A","L"),LEVNr=$$$LevHalux:L("A","H"),1:L("A","L"))) Quit ; ; Afdruk van de voorwaarden @@ -271,8 +276,8 @@ ; ; Afdruk van de kennisankers - via proxy objects KENANKPROXY(LEVNr,TOENr,Cache) ; Cache als .local doorgeven --> wordt opgevuld met teksten - New i,R,KLNr,lbKenAnk,KenAnk,KennisObject,Msg,Wrap,Lijn - Do:LEVNr=6332 ; Enkel Halux + New i,R,KLNr,lbKenAnk,KenAnk,KennisObject,Msg,Wrap,Lijn,varErrStr + Do:LEVNr=$$$LevHalux ; Enkel Halux . Set R=^KTO(LEVNr,TOENr,1),KLNr=$P(R,"\",8) . Set lbKenAnk=##Class(BL.Derde.Kennis.Kennis).GetIDsToPopup(KLNr,.varErrStr,$LB($$$adWerkbon,$$$adpGetAll($$$adProductie)),,"PRINT",,,1) . Quit:'$LL(lbKenAnk) ; Geen kennisankers @@ -293,7 +298,7 @@ ; Afdruk van de kennisankers KENANK(lbKenAnk) New I,R,KenAnk,Msg,Wrap,Lijn - Do CACHE($S(LEVNr=6332:L("V","F"),1:L("V","B"))) + Do CACHE($S(LEVNr=$$$LevHalux:L("V","F"),1:L("V","B"))) Set BCount=0 For I=$LL(lbKenAnk):-1:1 Do . Set KenAnk=($LI(lbKenAnk,I)) @@ -323,7 +328,7 @@ ; Opbouwen local C en afdrukken van de toelevering PRINT(TOENr,Sessie,Init,MetFax,SelPrint) New LEVNr,LevInd,Taal,ToelTyp - New C,PCount,LCount,lbKenAnk,KLNr + New C,PCount,LCount,lbKenAnk,KLNr,varErrStr If $$IsTBX1239EDI(TOENr) Do PRINT^DCTBX(TOENr,$G(Init),$G(SelPrint)) Quit Set SelPrint=$G(SelPrint) If 0'[SelPrint Do SELPRINT^DCPRINT(SelPrint) Quit:'$D(Print) @@ -332,13 +337,13 @@ Set R=^KTO1(TOENr),LEVNr=$P(R,D) If LEVNr=5005,$D(^BLBeri("Z",TOENr)) Set BLBeri=1 Set R=^KTO(LEVNr,TOENr,1),ToeMunt=$$MUNT^vhRtn1($P(R,D,18),1) - Do:LEVNr=6332 + Do:LEVNr=$$$LevHalux .Set KLNr=$P(R,D,8) .Set lbKenAnk=##Class(BL.Derde.Kennis.Kennis).GetIDsToPopup(KLNr,.varErrStr,$LB($$$adWerkbon,$$$adpGetAll($$$adProductie)),,"PRINT",,,1) Set LevInd=^KL1(LEVNr),R=^KLE(LevInd,0),Taal=$P(R,D,9) If Taal="" Set Taal="N" Do PRINT^LOG("TO",TOENr,$S($G(MetFax):"F",1:"P")) - Do @$S(LEVNr=6332:"HTITEL",1:"FTITEL"),HEADER,BODY,VOORW:LEVNr'=6332,KENANK(lbKenAnk):$LL(lbKenAnk),LFOOTER,PPRINT - Do:LEVNr=6332 PrintToelevering^HADTBXPrep(TOENr,Print("DEV")) + Do @$S(LEVNr=$$$LevHalux:"HTITEL",1:"FTITEL"),HEADER,BODY,VOORW:LEVNr'=$$$LevHalux,KENANK(lbKenAnk):$LL(lbKenAnk),LFOOTER,PPRINT + Do:LEVNr=$$$LevHalux PrintToelevering^HADTBXPrep(TOENr,Print("DEV")) Set:$G(MetFax) Data("Pages")=$G(Data("Pages"))+PCount If 0'[SelPrint Do CLOSE^vhPRINTER Kill ^KTOB(TOENr) Quit @@ -347,7 +352,7 @@ IsTBX1239EDI(TOENr) New R,Ok,LEVNr,KLNr,ORDNr,TLNr,PRNr Set Ok=0,R=^KTO1(TOENr),LEVNr=$P(R,D) - Do:LEVNr=6332 + Do:LEVNr=$$$LevHalux . Set R=^KTO(LEVNr,TOENr,1),ORDNr=$P(R,D,7),KLNr=$P(R,D,8) . Quit:KLNr'=1239 Quit:'ORDNr . Set R=$G(^KOD(KLNr,"F",ORDNr,1)) @@ -382,6 +387,7 @@ TArt ;Artikel\Article\Artikel\Article TAant ;Aantal\Quant.\Menge\Quant. TPrijs ;Prijs\Prix\Preis\Price +TBarCode ;Barcode\Barcode\Barcode\Barcode TLevWk ;Week\Sem.\Woche\Week TLevVw ;Leveringsvoorwaarde\Conditions de livraison\Lieferbedingung\Betalingsvoorwaarde TBetVw ;Betalingsvoorwaarde\Conditions de paiement\Zahlungsbedingung\Betalingsvoorwaarde