Index: BL/PR/GA/TB/tmpDev2.mac.rou =================================================================== diff -u -r40450 -r40451 --- BL/PR/GA/TB/tmpDev2.mac.rou (.../tmpDev2.mac.rou) (revision 40450) +++ BL/PR/GA/TB/tmpDev2.mac.rou (.../tmpDev2.mac.rou) (revision 40451) @@ -49,24 +49,24 @@ Quit $listbuild(GemaaktProductId) bfwTemplateViaLadeKL(BeperkDesignCode) ; (Templ) - New klID,lbTPs,TPCode,TemplateID,blnCheckDesign ; "dsID" is declared at a higher level + New klID,lbTPs,TPCode,TemplateID,blnCheckDesign,OrderDesignID Set klID=WS.Lijnen.GetNext("").ItemKL Set:(klID="BE") klID="BA" d DbgAdd("KL",klID) - Set dsID=WS.Lijnen.GetNext("").ItemDS ; Get design from first line - it shoud be the same for all other - If dsID="" Do + Set OrderDesignID=WS.Lijnen.GetNext("").ItemDS ; Get design from first line - it shoud be the same for all other + If OrderDesignID="" Do . Set blnCheckDesign=(BeperkDesignCode="") - . Set dsID=..DesignFromLadeKleur(klID,BeperkDesignCode) + . Set OrderDesignID=..DesignFromLadeKleur(klID,BeperkDesignCode) Else If $L(BeperkDesignCode) Do ; !!! TEMPORARY PATCH for F-Design !!! (added by WimV on 13/03/2009) . Set blnCheckDesign=0 - . Set dsID=..DesignFromLadeKleur(klID,BeperkDesignCode) + . Set OrderDesignID=..DesignFromLadeKleur(klID,BeperkDesignCode) Else Do . Set blnCheckDesign=0 - Quit:(dsID="") "Geen Design gevonden" - d DbgAdd("DS",dsID) + Quit:(OrderDesignID="") "Geen Design gevonden" + d DbgAdd("DS",OrderDesignID) ; Alleen "Standaard Design" toegelaten. - Quit:(blnCheckDesign)&&($LG(..BTDep("TBDesign","TBDesignCode",dsID),1)'?1(1"S",1"B")) "Geen Standaard Design" - Set lbTPs=..TPCodesFromDesign(dsID) + Quit:(blnCheckDesign)&&($LG(..BTDep("TBDesign","TBDesignCode",OrderDesignID),1)'?1(1"S",1"B")) "Geen Standaard Design" + Set lbTPs=..TPCodesFromDesign(OrderDesignID) Set TPCode=$LG(lbTPs,1) Quit:(TPCode="") "TemplateCode niet gevonden" d DbgAdd("TPCode",TPCode) @@ -109,7 +109,7 @@ If (WSLn.Exclude=1) Do Quit "" Else If WSLn.ItemSTDL=$$$tbxCodeStdLade Do Quit $$$tbxCodeStdLade Set ..Qty=WSLn.Qty - Set:(WSLn.ItemDS="") WSLn.ItemDS=dsID + Set:(WSLn.ItemDS="") WSLn.ItemDS=OrderDesignID Set WSLn.GAMeta="TBX" Do ..ResetTB() Do bfwBTItemsFromWSLijn @@ -590,3 +590,4 @@ +