Index: APPS/Verpakking/DoosAanvuller.cls.xml
===================================================================
diff -u -r72242 -r72545
--- APPS/Verpakking/DoosAanvuller.cls.xml	(.../DoosAanvuller.cls.xml)	(revision 72242)
+++ APPS/Verpakking/DoosAanvuller.cls.xml	(.../DoosAanvuller.cls.xml)	(revision 72545)
@@ -156,9 +156,9 @@
 			}
 		}
 		
-		Set BasisDoos.Depth = BoxData.Diepte
-		Set BasisDoos.Height = BoxData.Hoogte
-		Set BasisDoos.Width = BoxData.Breedte
+		Set BasisDoos.Depth = ..CalcMetDefault(1, BoxData.DiepteExec)
+		Set BasisDoos.Height = ..CalcMetDefault(1, BoxData.HoogteExec)
+		Set BasisDoos.Width = ..CalcMetDefault(1, BoxData.BreedteExec)
 		
 		#dim ParamKey As %String
 		For ParamKey = "K1","K2" {
@@ -307,9 +307,9 @@
 			}
 		}
 		
-		Set BasisDoos.Depth = BoxData.Diepte
-		Set BasisDoos.Height = BoxData.Hoogte
-		Set BasisDoos.Width = BoxData.Breedte
+		Set BasisDoos.Depth = ..CalcMetDefault(1, BoxData.DiepteExec)
+		Set BasisDoos.Height = ..CalcMetDefault(1, BoxData.HoogteExec)
+		Set BasisDoos.Width = ..CalcMetDefault(1, BoxData.BreedteExec)
 		
 		#dim Param As %String
 		For Param = "Fold3","Fold4","Fold5","NBR" {
@@ -351,9 +351,9 @@
 		}
 	}
 	
-	Set BasisDoos.Depth = BoxData.Diepte
-	Set BasisDoos.Height = BoxData.Hoogte
-	Set BasisDoos.Width = BoxData.Breedte
+	Set BasisDoos.Depth = ..CalcMetDefault(1, BoxData.DiepteExec)
+	Set BasisDoos.Height = ..CalcMetDefault(1, BoxData.HoogteExec)
+	Set BasisDoos.Width = ..CalcMetDefault(1, BoxData.BreedteExec)
 	
 	If (BoxData.Params.IsDefined("QO")) {
 		If $$$Not(BoxData.Params.GetAt("QO").Waarde = "") {
@@ -381,9 +381,9 @@
 		}
 	}
 	
-	Set BasisDoos.Depth = BoxData.Diepte
-	Set BasisDoos.Height = BoxData.Hoogte
-	Set BasisDoos.Width = BoxData.Breedte
+	Set BasisDoos.Depth = ..CalcMetDefault(1, BoxData.DiepteExec)
+	Set BasisDoos.Height = ..CalcMetDefault(1, BoxData.HoogteExec)
+	Set BasisDoos.Width = ..CalcMetDefault(1, BoxData.BreedteExec)
 ]]></Implementation>
 </Method>
 
@@ -403,9 +403,9 @@
 		}
 	}
 	
-	Set BasisDoos.Depth = BoxData.Diepte
-	Set BasisDoos.Height = BoxData.Hoogte
-	Set BasisDoos.Width = BoxData.Breedte
+	Set BasisDoos.Depth = ..CalcMetDefault(1, BoxData.DiepteExec)
+	Set BasisDoos.Height = ..CalcMetDefault(1, BoxData.HoogteExec)
+	Set BasisDoos.Width = ..CalcMetDefault(1, BoxData.BreedteExec)
 	
 	#dim Param As %String
 	For Param = "FS","LS","LT","RS","RT" {
@@ -440,9 +440,9 @@
 		}
 	}
 	
-	Set BasisDoos.Depth = BoxData.Diepte
-	Set BasisDoos.Height = BoxData.Hoogte
-	Set BasisDoos.Width = BoxData.Breedte
+	Set BasisDoos.Depth = ..CalcMetDefault(1, BoxData.DiepteExec)
+	Set BasisDoos.Height = ..CalcMetDefault(1, BoxData.HoogteExec)
+	Set BasisDoos.Width = ..CalcMetDefault(1, BoxData.BreedteExec)
 	
 	If (BoxData.Params.IsDefined("Flap")) {
 		If $$$Not(BoxData.Params.GetAt("Flap").Waarde = "") {
@@ -471,9 +471,9 @@
 	
 	//in boxdata zit niets ivm overdoos, dat zit in de snijdata.. Snijdata op te halen adhv ObjRef = bonnr?
 	Do BasisDoos.PackageDesignItems.Insert("Item2")
-	Set BasisDoos.Depth = BoxData.Diepte
-	Set BasisDoos.Height = BoxData.Hoogte
-	Set BasisDoos.Width = BoxData.Breedte
+	Set BasisDoos.Depth = ..CalcMetDefault(1, BoxData.DiepteExec)
+	Set BasisDoos.Height = ..CalcMetDefault(1, BoxData.HoogteExec)
+	Set BasisDoos.Width = ..CalcMetDefault(1, BoxData.BreedteExec)
 	
 	If (BasisDoos.Height > 330) {
 		Set BasisDoos.AG = 1
@@ -506,6 +506,46 @@
 	Quit Param
 ]]></Implementation>
 </Method>
+
+<Method name="CalcMetDefault">
+<FormalSpec>DefaultWaarde:%String,Expression:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set Params("PRODAANTAL") = 1
+	Set Params("AANTAL") = 1
+	#dim Resultaat As %String = ..Calc(Expression, .Params, .varErrStr)
+	If ("" = Resultaat) {
+		Set Resultaat = DefaultWaarde
+	}
+	Quit Resultaat
+]]></Implementation>
+</Method>
+
+<Method name="Calc">
+<Description>
+Berekenen van een expressie door gebruik te maken van de waarden in Params</Description>
+<FormalSpec><![CDATA[Expression:%String,&Params:%CacheString,&varErrStr:%String]]></FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>0</ProcedureBlock>
+<Implementation><![CDATA[
+	Set:('$D(varErrStr)) varErrStr=""
+	Quit:'$D(Params) ""
+	Quit:Expression="" ""
+	New Result,$ETRAP
+	Set $ETRAP="Do CalcTrap^"_$ZN_"()"
+	Set:Expression?.N1","1.N Expression=$TR(Expression,",",".")
+	X "Set Result="_Expression
+	Quit Result
+CalcTrap()
+ 	Set varErrStr=$S(varErrStr="":"",1:varErrStr_$C(13,10))_"- "_$P($ZE,">",1)_"> "_Expression
+ 	New msg
+ 	Set $ECODE=""
+ 	Set msg="EXECUTE FOUT: "_Expression_$$ArrayToText^vhLib("Params",.Params)
+ 	Do WLFMT^vhDBG(msg,"B-Red")
+ 	Set Result="ERR"
+	Quit Result
+]]></Implementation>
+</Method>
 </Class>