Index: csp/vhisie/TBX/Main/tmpDev.mac.rou
===================================================================
diff -u -r253 -r296
--- csp/vhisie/TBX/Main/tmpDev.mac.rou (.../tmpDev.mac.rou) (revision 253)
+++ csp/vhisie/TBX/Main/tmpDev.mac.rou (.../tmpDev.mac.rou) (revision 296)
@@ -665,7 +665,7 @@
Merge tmpAr=tmpRq
Kill tmpAr("HIST")
Kill tmpAr("REF")
- Set tmpAr("REF")=$$CreateHashedRef^cspBasis.TBX.DecodeURL.tmpDev($LB(KLNr,VERW,wsID,"START"))
+ Set tmpAr("REF")=$$CreateHashedRef^cspBasis.TBX.DecodeURL.tmpDev($LB(KLNr,VERW,"","START"))
If $L($G(Taal)) Do
. Kill tmpAr("Taal")
. Set tmpAr("Taal")=Taal
@@ -991,12 +991,13 @@
Set blnWSErrors=0
Set i=""
For Set WSLn=WSOrd.Lijnen.GetNext(.i) Quit:(i="") Do
- . For Key="LT","CB","WD","LD","DK","FB","BM","BX","SB","OPVL","STDL" Do
+ . For Key="LT","CB","WD","LD","DK","FB","BM","SB","OPVL","STDL" Do
. . Set arWSVTL("LN",i,Key)=$$pwoTransItemValue($zobjproperty(WSLn,"Item"_Key),Key)
+ . Set arWSVTL("LN",i,"BX")=$$pwoTransItemVerhoogdeZijwand(WSLn.ItemBX,WSLn.ItemKV)
. Set arWSVTL("LN",i,"DIV")=$$pwoTransItemValue(WSLn.ItemDIVToLB(),"DIV") ; ..ItemDIVToLB() ; Returns $LB()
. Set arWSVTL("LN",i,"AANT")=$$pwoTransItemValue(WSLn.Qty,"AANT") ; _$$pwoTransItemValue(WSLn.ItemVPK,"VPK")
. Set arWSVTL("LN",i,"PRIJS")=$$pwoTransItemValue($S(blnIsBeursUser:99.99, blnShowAKPrijs:WSLn.AKPrijs, 1:WSLn.KostPrijs),"PRIJS")
- . Set blnContainsGlas=(blnContainsGlas)||(WSLn.ItemBX?1(1"BG",1"COV"))||(WSLn.ItemBGRP?1(1"V"))
+ . Set blnContainsGlas=(blnContainsGlas)||(WSLn.ItemBX?1(1"BG",1"COV",1"INSCHF"))||(WSLn.ItemBGRP?1(1"V"))
. Set:(WSLn.KostPrijs["ERROR") blnWSErrors=1
. Set:(blnShowAKPrijs) SomAKPrijs=SomAKPrijs+(WSLn.AKPrijs*WSLn.Qty)
@@ -1024,7 +1025,7 @@
Quit:(Key="DK") Val_" kg"
Quit:(Key="FB") $S(Val="NM":"-", Val="Z":" ", (Val="S")&&(Taal="F"):"Vis", 1:Val)
; Quit:(Key="BM") $CASE(Val, "T":"T", "I":"v", "LR":"v", "Z":" ", :Val)
- Quit:(Key="BX") $CASE(Val, "DR":"==", "ER":"---", "ZR":" ", :Val)
+ ; Quit:(Key="BX") $$pwoTransItemVerhoogdeZijwand(Val,"")
Quit:(Key="SB") $S(Val:"v", 1:" ")
Quit:(Key="OPVL") $S(Val="LR":"L+R", 1:Val)
Quit:(Key="DIV") $$LCVTSimple^vhLib(Val,"
")
@@ -1034,6 +1035,12 @@
. If $$$UCase(Val)="ERROR" Set str="