Index: BL/PR/GA/TandemBox.cls.xml
===================================================================
diff -u -r253 -r296
--- BL/PR/GA/TandemBox.cls.xml (.../TandemBox.cls.xml) (revision 253)
+++ BL/PR/GA/TandemBox.cls.xml (.../TandemBox.cls.xml) (revision 296)
@@ -540,10 +540,10 @@
Set:(OneDS?1(1"*",1"GF")) arKlrDfl("GF")=$LB("MG","LG","MG","MG","FG","F")
Set:(OneDS?1(1"*",1"AF")) arKlrDfl("AF")=$LB("AL","LG","AL","AL","FG","F")
Set:(OneDS?1(1"*",1"GMA")) arKlrDfl("GMA")=$LB("MG","LG","MG","MG","FG","MA")
- Set:(OneDS?1(1"*",1"WA")) arKlrDfl("WA")=$LB("SW","WI","SW","SW","-","A")
- Set:(OneDS?1(1"*",1"GA")) arKlrDfl("GA")=$LB("MG","LG","MG","MG","-","A")
- Set:(OneDS?1(1"*",1"ZA")) arKlrDfl("ZA")=$LB("BZ","BZ","BZ","BZ","-","A")
- Set:(OneDS?1(1"*",1"IA")) arKlrDfl("IA")=$LB("IN","DG","IN","IN","GRI8","A")
+ Set:(OneDS?1(1"*",1"WA")) arKlrDfl("WA")=$LB("SW","WI","SW","SW","FG8","A")
+ Set:(OneDS?1(1"*",1"GA")) arKlrDfl("GA")=$LB("MG","LG","MG","MG","FG8","A")
+ Set:(OneDS?1(1"*",1"ZA")) arKlrDfl("ZA")=$LB("BZ","BZ","BZ","BZ","FG8","A")
+ Set:(OneDS?1(1"*",1"IA")) arKlrDfl("IA")=$LB("IN","DG","IN","IN","FG8","A")
Quit $S(OneDS="*":"", 1:$G(arKlrDfl(OneDS)))
]]>
Index: csp/tbx/printpage.cls.xml
===================================================================
diff -u -r222 -r296
--- csp/tbx/printpage.cls.xml (.../printpage.cls.xml) (revision 222)
+++ csp/tbx/printpage.cls.xml (.../printpage.cls.xml) (revision 296)
@@ -154,7 +154,7 @@
. Set:($L(WSLn.ItemKX)) WSLn.ItemKXOms=$$$GetVertaling("KL_"_WSLn.ItemKX,Taal,"L")
. Set:($L(WSLn.ItemKV)) WSLn.ItemKVOms=$$$GetVertaling("KLV_"_WSLn.ItemKV,Taal,"L")
. Set:(WSLn.ItemFB="NM") WSLn.ItemFB="-"
- . 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"))
If 'blnContainsGlas Do
. ; Kan ook op voorhand bepaald worden, en dan 'niet invullen' i.p.v. achteraf te wissen
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="# "_$$$pg.WebTextValue("jsFout",Taal,"L",$LB("U"))_" #"
. Else Set str=$J($$PrijsConvert^cspBasis.Library(MuntCalc,Val),0,2)_" "_Munt
Quit Val
+pwoTransItemVerhoogdeZijwand(ItemBX,VulstukKleur)
+ Quit $S(ItemBX="DR":"==", ItemBX="ER":"---", ItemBX="ZR":" ", ItemBX?1(1"BG",1"xCOV",1"INSCHF"):$$pwoGeefVerhoogdeZijwandInfoVoorVulstukKleur(ItemBX,$G(VulstukKleur)), 1:ItemBX )
+pwoGeefVerhoogdeZijwandInfoVoorVulstukKleur(ItemBX,VulstukKleur)
+ Quit ItemBX
+ ;Quit $S(VulstukKleur="ZV":" ", VulstukKleur="": ItemBX_"..", 1:VulstukKleur)
+
pwoTransNietMee(NMKeys)
#define LowerCaseExceptBS $S(NietMeeKey="NM_BS":"",1:$LB("L"))
Index: BL/Prod/GAData/TBXLadeXML.cls.xml
===================================================================
diff -u -r117 -r296
--- BL/Prod/GAData/TBXLadeXML.cls.xml (.../TBXLadeXML.cls.xml) (revision 117)
+++ BL/Prod/GAData/TBXLadeXML.cls.xml (.../TBXLadeXML.cls.xml) (revision 296)
@@ -192,7 +192,7 @@
Set blnContainsGlas=0
Set i=""
- For Set WSLn=pxOrder.Lijnen.GetNext(.i) Quit:(i="") Set blnContainsGlas=(blnContainsGlas)||(WSLn.ItemBX?1(1"BG",1"COV"))||(WSLn.ItemBGRP?1(1"V"))
+ For Set WSLn=pxOrder.Lijnen.GetNext(.i) Quit:(i="") Set blnContainsGlas=(blnContainsGlas)||(WSLn.ItemBX?1(1"BG",1"COV",1"INSCHF"))||(WSLn.ItemBGRP?1(1"V"))
// Fill Order Lijnen
Set i=""
@@ -348,7 +348,7 @@
Set blnContainsGlas=0
Set i=""
- For Set WSLn=pxOrder.Lijnen.GetNext(.i) Quit:(i="") Set blnContainsGlas=(blnContainsGlas)||(WSLn.ItemBX?1(1"BG",1"COV"))||(WSLn.ItemBGRP?1(1"V"))
+ For Set WSLn=pxOrder.Lijnen.GetNext(.i) Quit:(i="") Set blnContainsGlas=(blnContainsGlas)||(WSLn.ItemBX?1(1"BG",1"COV",1"INSCHF"))||(WSLn.ItemBGRP?1(1"V"))
// Fill Order Lijnen
Set i=""