Index: KPRIJSAX.mac.rou =================================================================== diff -u -r48131 -r48137 --- KPRIJSAX.mac.rou (.../KPRIJSAX.mac.rou) (revision 48131) +++ KPRIJSAX.mac.rou (.../KPRIJSAX.mac.rou) (revision 48137) @@ -139,9 +139,10 @@ Set R = $$PROD(.PRNr,.Korting1,.Korting2,.KlMunt,.NetBrutP,.KlTyp,.NoSa,.SimPPL,.KlantGrOrde,.CheckKAT,.BusinessType) Set $P(R,"\") = $P(R,"\")*$$GETBTWFACTOR(.Land) Quit R + ProdViaCodex(PRNr,Codex) New KLNr - Set KLNr=$Case(Codex,"L":6819,"R":6820,"S":6821,"B":6822,"G":29391,"P":13854,"C":15876) + Set KLNr=$Case(Codex,"L":$$$KlantLVanHoecke,"R":$$$KlantRVanHoecke,"S":$$$KlantSVanHoecke,"B":$$$KlantBVanHoecke,"G":$$$KlantGVanHoecke,"P":$$$KlantPVanHoecke,"C":$$$KlantCVanHoecke) Quit:'$D(^KK1(KLNr)) "" Quit $$KLANTPR(KLNr,PRNr) @@ -153,7 +154,7 @@ New R,KatPr,CorFakt,KatProd,IsKatPr,FaMunt,Munt,MuntPar,IsKsCust,PrijsKl,VkpPr,KortNiv,AkpEUR,VkpEUR,LijstEUR,LEVNr,KatPrHan,KatPrInd,KatPrKs,GrOrde,GrOrdNum,PrMunt,CifPPL,LijstPr,Vork,%Vork New BTWfactor,LijstPr1,VkpEURIncl,VkpPr1,VkpPrIncl - If ($G(Korting1)'="")&&("CPLRSBG"[Korting1) Quit $$ProdViaCodex(PRNr,Korting1) + If $$$CheckAXFase&&($G(Korting1)'="")&&("CPLRSBG"[Korting1) Quit $$ProdViaCodex(PRNr,Korting1) ; Opgezet via GETPROD : LEVNr,KatPrHan,KatPrInd,KatPrKs,GrOrde,GrOrdNum,PrMunt,CifPPL,LijstPr,Vork,%Vork