Index: csp/vhisie/TBX/Main/tmpDev.mac.rou =================================================================== diff -u -r356 -r362 --- csp/vhisie/TBX/Main/tmpDev.mac.rou (.../tmpDev.mac.rou) (revision 356) +++ csp/vhisie/TBX/Main/tmpDev.mac.rou (.../tmpDev.mac.rou) (revision 362) @@ -1020,18 +1020,12 @@ if 'WSOrd.IsGroepOrder() { Set SomAKPrijs=0 Set WSLn=WSOrd.Lijnen.GetNext("") - If WSLn Do - . Set dcID=##class(BL.PR.GA.TandemBox).DesignCodeFromDS(WSLn.ItemDS) - . Set:(dcID="") dcID="S" - . Set HeaderLogo = dcID - . Set:($L(WSLn.ItemDS)) DCSuffix=$$$Replace($$$pg.WebTextValue("DC_Suffix_"_dcID,Taal,"L"),"~","") - . Set:($L(DCSuffix)) DCSuffix=""_DCSuffix_"" - . Set arWSVTL("KLR_DS")=$S($L(WSLn.ItemDS):$$$pg.WebTextValue("DS_"_WSLn.ItemDS,Taal,"L")_DCSuffix, 1:"") - . Set arWSVTL("KLR_KL")=$S($L(WSLn.ItemDS):$$$pg.WebTextValue("DS_"_WSLn.ItemDS,Taal,"L"), 1:"") ; arWSVTL("KLR_DS") - . Set arWSVTL("KLR_KB")=$S($L(WSLn.ItemKB):$$$pg.WebTextValue("KL_"_WSLn.ItemKB_$S(WSLn.ItemKB?1(1"WI",1"BE"):"_KB", 1:""),Taal,"L"), 1:"") - . Set arWSVTL("KLR_RK")=$S($L(WSLn.ItemRK):$$$pg.WebTextValue("KL_"_WSLn.ItemRK,Taal,"L"), 1:"") - . Set arWSVTL("KLR_KX")=$S($L(WSLn.ItemKX):$$$pg.WebTextValue("KL_"_WSLn.ItemKX,Taal,"L"), 1:"") - . Set arWSVTL("KLR_KV")=$S($L(WSLn.ItemKV):$$$pg.WebTextValue("KLV_"_WSLn.ItemKV,Taal,"L"), 1:"") + If $IsObject(WSLn) { + Set dcID=##class(BL.PR.GA.TandemBox).DesignCodeFromDS(WSLn.ItemDS) + Set:(dcID="") dcID="S" + Set HeaderLogo = dcID + Do pwoZetTekstenWSLijnKleurkeuze(WSLn,.arWSVTL,dcID,Taal) + } Set blnContainsGlas=0 Set blnWSErrors=0 @@ -1057,6 +1051,20 @@ . Set:(blnShowAKPrijs) arWSVTL("AKPrijsTot")=$$PrijsConvert^cspBasis.Library(MuntCalc,SomAKPrijs) . Set arWSVTL("TotPrijs")=$$pwoTransTotPrijs($$PrijsConvert^cspBasis.Library(MuntCalc,$S(blnShowAKPrijs:SomAKPrijs, 1:WSOrd.TotPrijs))) Quit + +pwoZetTekstenWSLijnKleurkeuze(WSLn,arWSVTL,dcID,Taal) ; arWSVTL als .local doorgeven + New DCSuffix + Set DCSuffix="" + Set:($L(WSLn.ItemDS)) DCSuffix=$$$Replace($$$pg.WebTextValue("DC_Suffix_"_dcID,Taal,"L"),"~","") + Set:($L(DCSuffix)) DCSuffix=""_DCSuffix_"" + Set arWSVTL("KLR_DS")=$S($L(WSLn.ItemDS):$$$pg.WebTextValue("DS_"_WSLn.ItemDS,Taal,"L")_DCSuffix, 1:"") + Set arWSVTL("KLR_KL")=$S($L(WSLn.ItemDS):$$$pg.WebTextValue("DS_"_WSLn.ItemDS,Taal,"L"), 1:"") ; arWSVTL("KLR_DS") + Set arWSVTL("KLR_KB")=$S($L(WSLn.ItemKB):$$$pg.WebTextValue("KL_"_WSLn.ItemKB_$S(WSLn.ItemKB?1(1"WI",1"BE"):"_KB", 1:""),Taal,"L"), 1:"") + Set arWSVTL("KLR_RK")=$S($L(WSLn.ItemRK):$$$pg.WebTextValue("KL_"_WSLn.ItemRK,Taal,"L"), 1:"") + Set arWSVTL("KLR_KX")=$S($L(WSLn.ItemKX):$$$pg.WebTextValue("KL_"_WSLn.ItemKX,Taal,"L"), 1:"") + Set arWSVTL("KLR_KV")=$S($L(WSLn.ItemKV):$$$pg.WebTextValue("KLV_"_WSLn.ItemKV,Taal,"L"), 1:"") + Quit + pwoTransTotPrijs(Val) Quit:(Val>0) $J(Val,0,2)_" "_Munt Quit ""