Index: APPS/PM/Maatwerk/impl/TBX/WebOrderNaarGADataConverter.cls.xml
===================================================================
diff -u -r51530 -r51531
--- APPS/PM/Maatwerk/impl/TBX/WebOrderNaarGADataConverter.cls.xml	(.../WebOrderNaarGADataConverter.cls.xml)	(revision 51530)
+++ APPS/PM/Maatwerk/impl/TBX/WebOrderNaarGADataConverter.cls.xml	(.../WebOrderNaarGADataConverter.cls.xml)	(revision 51531)
@@ -9,6 +9,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="GADataProduct">
+<Type>Prod.GAData.Product</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="blTandemBox">
 <Type>BL.PR.GA.TandemBox</Type>
 <Private>1</Private>
@@ -21,9 +26,9 @@
 	Set ..WebOrder = WebOrder
 	
 	Do ..ValideerWebOrder()
-	#dim GADataProduct As Prod.GAData.Product = ..GeefGADataProduct()
-	Do ..BerekenGADataProduct(GADataProduct)
-	Quit GADataProduct
+	Do ..MaakGADataProduct()
+	Do ..BerekenGADataProduct()
+	Quit ..GADataProduct
 ]]></Implementation>
 </Method>
 
@@ -48,7 +53,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefGADataProduct">
+<Method name="MaakGADataProduct">
 <Private>1</Private>
 <ReturnType>Prod.GAData.Product</ReturnType>
 <Implementation><![CDATA[
@@ -63,34 +68,31 @@
 	Do ..blTandemBox.ResetTB()
 	Do ..VulBTItemsFromWSLijn(WebOrderLijn)
 	
-	#dim GADataProduct As Prod.GAData.Product = ##class(Prod.GAData.Product).BuildFromTemplate(GADataTemplate.%Id())
-	Do GADataProduct.TemplateTmpInit()
-	Do GADataProduct.AutosFromTemplate(,"FILL")
-	Do GADataProduct.KlantSetObjectId(..WebOrder.KLNummer)
-	Do ..blTandemBox.BTValues.SetAt(GADataProduct.TemplateCode,"TemplateCode")
+	Set ..GADataProduct = ##class(Prod.GAData.Product).BuildFromTemplate(GADataTemplate.%Id())
+	Do ..GADataProduct.TemplateTmpInit()
+	Do ..GADataProduct.AutosFromTemplate(,"FILL")
+	Do ..GADataProduct.KlantSetObjectId(..WebOrder.KLNummer)
+	Do ..blTandemBox.BTValues.SetAt(..GADataProduct.TemplateCode,"TemplateCode")
 	
 	Do ..VulInBTItemsNietMeeleveren()
 	
-	Do ..blTandemBox.BTValuesToProduct(GADataProduct)
-	Do ..blTandemBox.BWValuesToProduct(GADataProduct)
-	Do ..blTandemBox.KMValuesToProduct(GADataProduct,"TBR")
+	Do ..blTandemBox.BTValuesToProduct(..GADataProduct)
+	Do ..blTandemBox.BWValuesToProduct(..GADataProduct)
+	Do ..blTandemBox.KMValuesToProduct(..GADataProduct,"TBR")
 	
 	Set ..blTandemBox = ""   ; Bewuste unswizzle van het blTandembox-object forceren. 
-
-	Quit GADataProduct
 ]]></Implementation>
 </Method>
 
 <Method name="BerekenGADataProduct">
-<FormalSpec>GADataProduct:Prod.GAData.Product</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	#dim mdValidPR As %String 
 	
-	Do ..GADataProductCalcAll(GADataProduct)
+	Do ..GADataProductCalcAll()
 	
-	If $$$Not(GADataProduct.ValidatePR(.mdValidPR)) {
-		#dim ErrorMessage As %String = "Fout bij berekening van het TBX-product: "_GADataProduct.ValidPRArrayToText(.mdValidPR, $$$True)
+	If $$$Not(..GADataProduct.ValidatePR(.mdValidPR)) {
+		#dim ErrorMessage As %String = "Fout bij berekening van het TBX-product: "_..GADataProduct.ValidPRArrayToText(.mdValidPR, $$$True)
 		Do ##class(TECH.Exceptions.GeneralErrorException).Throw(ErrorMessage)
 	}
 ]]></Implementation>
@@ -153,12 +155,11 @@
 </Method>
 
 <Method name="GADataProductCalcAll">
-<FormalSpec>GADataProduct:Prod.GAData.Product</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>0</ProcedureBlock>
 <Implementation><![CDATA[
 	New arKDtl
-	Do GADataProduct.CalcAll()   ; deze method is Not ProcedureBlock, daarom ook afgeschermd in deze klasse.
+	Do ..GADataProduct.CalcAll()   ; deze method is Not ProcedureBlock, daarom ook afgeschermd in deze klasse.
 ]]></Implementation>
 </Method>
 </Class>