Index: BL/PR/GA/TandemBox.cls.xml =================================================================== diff -u -r507 -r508 --- BL/PR/GA/TandemBox.cls.xml (.../TandemBox.cls.xml) (revision 507) +++ BL/PR/GA/TandemBox.cls.xml (.../TandemBox.cls.xml) (revision 508) @@ -1218,7 +1218,7 @@ Set:(WSLn.ItemSB>0 ) tmpLB=tmpLB_$LB("SB",##class(cspBasis.GAProdTBox).WebTextValue("Stabilisator",actTaal,"L")) Set:($$$FScond ) tmpLB=tmpLB_$LB("FS", $$$FCase(##class(Prod.GAMeta.BT.TBFrontSteun).TaalAfhOmsClass("",WSLn.ItemFS,actTaal,,,DC)) ) ; ##class(cspBasis.GAProdTBox).WebTextValue("Frontsteun",actTaal,"L")_": "_WSLn.ItemFS) Set:($$$DWVcond ) tmpLB=tmpLB_$LB("DWV", $$$FCase(##class(Prod.GAMeta.BT.TBDwarsVerdeling).TaalAfhOmsClass("",WSLn.ItemDWV,actTaal,,,DC)) ) ; ##class(cspBasis.GAProdTBox).WebTextValue("Dwarsverdeling",actTaal,"L")_": "_WSLn.ItemDWV) - Set:($L(WSLn.ItemOPVL)) tmpLB=tmpLB_$LB("OPVL",##class(cspBasis.GAProdTBox).WebTextValue("Opvullijst",actTaal,"L")_": "_WSLn.ItemOPVL) ; _ ##class(Prod.GAMeta.BT.TBOpvullijstKleur).TaalAfhOmsClass("",WSLn.ItemKLROPVL,actTaal,,,DC) + Set:($L(WSLn.ItemOPVL)) tmpLB=tmpLB_$LB("OPVL",##class(cspBasis.GAProdTBox).WebTextValue("Opvullijst",actTaal,"L")_": "_WSLn.ItemOPVL_" ("_##class(Prod.GAMeta.BT.TBOpvullijstKleur).TaalAfhOmsClass("",WSLn.ItemKLROPVL,actTaal,,,DC)_")") Set:($$$isBulkVPK ) tmpLB=tmpLB_$LB("VPK",##class(cspBasis.GAProdTBox).WebTextValue("VerpakBulk",actTaal,"L")_" - "_##class(cspBasis.GAProdTBox).WebTextValue("VPK_"_WSLn.ItemVPK_"_kort",actTaal,"L")) Set:($IsObject(ActieTeksten)) tmpLB=tmpLB_$LB("ACTIE",ActieTeksten.GetNext("")) ; Moet uitgebreid worden naar alle acties, te overlopen met een iterator (added by WimV on 21/12/2010) Index: cspBasis/GAProdTBox.cls.xml =================================================================== diff -u -r480 -r508 --- cspBasis/GAProdTBox.cls.xml (.../GAProdTBox.cls.xml) (revision 480) +++ cspBasis/GAProdTBox.cls.xml (.../GAProdTBox.cls.xml) (revision 508) @@ -1284,6 +1284,7 @@ Set arMDRow("KLANTREF")=$P(pdlMDRow,D2,23) Set arMDRow("FS")= $P(pdlMDRow,D2,24) Set arMDRow("DWV")= $P(pdlMDRow,D2,25) + Set arMDRow("KLROPVL")=$P(pdlMDRow,D2,26) Quit ]]> @@ -1324,6 +1325,7 @@ Set $P(pdlMDRow,D2,23)=$G(arMDRow("KLANTREF")) Set $P(pdlMDRow,D2,24)=$G(arMDRow("FS")) Set $P(pdlMDRow,D2,25)=$G(arMDRow("DWV")) + Set $P(pdlMDRow,D2,26)=$G(arMDRow("KLROPVL")) Quit pdlMDRow ]]> Index: WS/TBX/EM/OrderLijn.cls.xml =================================================================== diff -u -r390 -r508 --- WS/TBX/EM/OrderLijn.cls.xml (.../OrderLijn.cls.xml) (revision 390) +++ WS/TBX/EM/OrderLijn.cls.xml (.../OrderLijn.cls.xml) (revision 508) @@ -165,6 +165,11 @@ + +%String + + + Standaard Lade. Waarde: $$$tbxCodeStdLade = "Std" is gedefinieerd in vhLib.Macro.INC @@ -405,7 +410,7 @@ Set arDataRow("GAMETA")=..GAMeta Set arDataRow("EXCLUDE")=..Exclude Set arDataRow("PRIJS")=..KostPrijs - For Key="DS","LT","CB","WD","LD","DK","BM","BX","ASM","BGRP","SPZK","SB","OPVL","STDL","VPK","OLP","FB","FS","DWV" Do + For Key="DS","LT","CB","WD","LD","DK","BM","BX","ASM","BGRP","SPZK","SB","OPVL","STDL","VPK","OLP","FB","FS","DWV","KLROPVL" Do . Set arDataRow(Key)=$zobjproperty(%this,"Item"_Key) . ;Set arDataRow(Key)=..Item For Key="KL","KB","RK","KX","KV","DS" Do @@ -433,7 +438,7 @@ Set WSLn.GAMeta=$G(arDataRow("GAMETA")) Set WSLn.Exclude=$G(arDataRow("EXCLUDE")) Set WSLn.KostPrijs=$G(arDataRow("PRIJS")) - For Key="DS","LT","CB","WD","LD","DK","BM","BX","ASM","BGRP","SPZK","SB","OPVL","STDL","VPK","OLP","FB","FS","DWV" Do + For Key="DS","LT","CB","WD","LD","DK","BM","BX","ASM","BGRP","SPZK","SB","OPVL","STDL","VPK","OLP","FB","FS","DWV","KLROPVL" Do . Set $zobjproperty(WSLn,"Item"_Key)=$G(arDataRow(Key)) . ;Set WSLn.Item=$G(arData("LN",i,Key)) For Key="KL","KB","RK","KX","KV","DS" Do @@ -574,6 +579,9 @@ ActieItems + +ItemKLROPVL + Index: BL/PR/GA/TB/tmpDev2.mac.rou =================================================================== diff -u -r320 -r508 --- BL/PR/GA/TB/tmpDev2.mac.rou (.../tmpDev2.mac.rou) (revision 320) +++ BL/PR/GA/TB/tmpDev2.mac.rou (.../tmpDev2.mac.rou) (revision 508) @@ -157,6 +157,7 @@ Do ..BTValues.SetAt(WSLn.ItemBX ,"TBBoxSide") Do ..BTValues.SetAt(KBxs ,"TBBoxsideKleur") ; WSLn.ItemKX Do ..BTValues.SetAt(WSLn.ItemKV ,"TBVulstukKleur") + Do ..BTValues.SetAt(WSLn.ItemKLROPVL ,"TBOpvullijstKleur") Do ..BTValues.SetAt(WSLn.ItemSB ,"TBStabilisator") Do ..BTValues.SetAt("Z" ,"TBStalenRug") @@ -545,3 +546,4 @@ d TTrace(.msg) ;w msg,! Quit + \ No newline at end of file