Index: BL/PR/GA/TB/tmpDev2.mac.rou
===================================================================
diff -u -r818 -r819
--- BL/PR/GA/TB/tmpDev2.mac.rou	(.../tmpDev2.mac.rou)	(revision 818)
+++ BL/PR/GA/TB/tmpDev2.mac.rou	(.../tmpDev2.mac.rou)	(revision 819)
@@ -26,7 +26,7 @@
 	  ;d TTraceW("WS: Opties:"_$G(Opties)_"  condition No Prices calc:"_($G(Opties)'["PRS=1;"))
 	  new sDbg  Set sDbg=""
  
-	New dsID,Result,Templ,arKDtl,lbDomLU,sDomVERW,sDomKLNr
+	New OrderDesignID,Result,Templ,arKDtl,lbDomLU,sDomVERW,sDomKLNr
 	New arValidWS
 	Set lbDomLU=WS.DomainLookUp(WS.WebDomain,$LB("VERW","KLNR"))   ; Set TBXContext=##class(APPS.TBXWeb.TBXContext).InitFromHttpRequest()
 	Set sDomVERW=$LG(lbDomLU,1)
@@ -44,24 +44,24 @@
 	  ;d WL^vhDBG("Tijd einde BldFrWS : "_$$RestartTimer^vhLib)
 	Quit	
 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(WSLn.ItemKL,"")
 	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)	
@@ -104,7 +104,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