Index: APPS/PM/Maatwerk/impl/TBX/WebOrderNaarGADataConverter.cls.xml
===================================================================
diff -u -r51492 -r51520
--- APPS/PM/Maatwerk/impl/TBX/WebOrderNaarGADataConverter.cls.xml	(.../WebOrderNaarGADataConverter.cls.xml)	(revision 51492)
+++ APPS/PM/Maatwerk/impl/TBX/WebOrderNaarGADataConverter.cls.xml	(.../WebOrderNaarGADataConverter.cls.xml)	(revision 51520)
@@ -10,6 +10,7 @@
 <Implementation><![CDATA[
 	Do ..ValideerWebOrder(WebOrder)
 	#dim GADataProduct As Prod.GAData.Product = ..GeefGADataProduct(WebOrder)
+	Do ..BerekenGADataProduct(GADataProduct)
 	Quit GADataProduct
 ]]></Implementation>
 </Method>
@@ -64,12 +65,27 @@
 	Do blTandemBox.BWValuesToProduct(GADataProduct)
 	Do blTandemBox.KMValuesToProduct(GADataProduct,"TBR")
 	
-	Set blTandemBox = ""   ; Close 
+	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)
+	
+	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>
+</Method>
+
 <Method name="GeefGADataTemplate">
 <FormalSpec>blTandemBox:BL.PR.GA.TandemBox,WebOrder:WS.TBX.Order</FormalSpec>
 <Private>1</Private>
@@ -127,6 +143,16 @@
 	Do bfwResetNMItemsBinnenlade^BL.PR.GA.TB.tmpDev2(blTandemBox)
 ]]></Implementation>
 </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.
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/APPS/PM/Maatwerk/impl/TBX/WebOrderNaarGADataConverter/Convert/Test.cls.xml
===================================================================
diff -u -r51490 -r51520
--- vhUnitTest/APPS/PM/Maatwerk/impl/TBX/WebOrderNaarGADataConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 51490)
+++ vhUnitTest/APPS/PM/Maatwerk/impl/TBX/WebOrderNaarGADataConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 51520)
@@ -63,7 +63,7 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 	If $$$AssertTrue($IsObject(GADataProduct)) {
-		; Controles
+		Do $$$AssertEquals($J(GADataProduct.Cumuls("KPrijs"),0,4), 31.3281)
 	}
 ]]></Implementation>
 </Method>