Index: DCPROD.mac.rou =================================================================== diff -u -r29059 -r64611 --- DCPROD.mac.rou (.../DCPROD.mac.rou) (revision 29059) +++ DCPROD.mac.rou (.../DCPROD.mac.rou) (revision 64611) @@ -182,8 +182,8 @@ ; Toelevering bouwstenen Halux PRODTOEBS(R) New PRNr,KortText,IdentNr,Omschr1,Omschr2,Omschr3,Omschr4,Omschr5,Omschr6,IsStock,Afmeting - New Aantal,BSKey,KPRNr,Sort,SortKey,BSAantal,WVStock - Set PRNr=$P(R,D,2),Aantal=$P(R,D,3) + New Aantal,BSKey,KPRNr,Sort,SortKey,BSAantal,WVStock,Korting + Set PRNr=$P(R,D,2),Aantal=$P(R,D,3),Korting=$P(R,D,7) Do FETCHPR(PRNr) Set R=IdentNr_"`3``B"_D_"*`15``B"_D_KortText_$S($L(KortText)<24:$J("",25-$L(KortText)),1:"")_"``41`B"_D_$$FN(Aantal,0)_"``78`B" Do BLOCK(R),PASTEB^DCTOE(L("D","B")) @@ -200,7 +200,7 @@ . Kill Omschr . Set Omschr(1)=##class(Prod.ProductTekst).GetOmschrijvingViaPRNr(KPRNr,,", ",1) . Do GETWRAP^vhBIGEDIT("Omschr",28,.Omschr,"G","~","") - . Set Omschr=$P($G(Omschr(1)),"`",5) + . Set Omschr=$P($G(Omschr(1)),"`",5) . Set R=$G(^PRSTOCK("D",KPRNr)),WVStock=$P(R,D,5),WVStock=$$CV2MAG^MRP(KPRNr,WVStock) . Set R=IdentNr_"`4``"_D_KortText_$J("",25-$L(KortText))_"`16``"_D_Omschr_$J("",27-$L(Omschr))_"`42``" . Set R=R_D_$$FN(Aantal*BSAantal,0)_"``78" @@ -212,6 +212,7 @@ . . Set R=R_Omschr_$J("",27-$L(Omschr))_"`42``" . . Do BLOCK(R) . . Set Afmeting="" + If (##class(DOM.PM.impl.ProductTypeAPIimpl).%New().IsAntislipmatProduct(PRNr)) Do ##class(BL.Legacy.DCALG).ZetOmschrijvingVanProductInB(PRNr,"BR",Korting) Quit ; ; Offerte type detail