Index: AXimpl/PM/SchaduwPrijs/CalculateAll.cls.xml
===================================================================
diff -u -r62525 -r65692
--- AXimpl/PM/SchaduwPrijs/CalculateAll.cls.xml	(.../CalculateAll.cls.xml)	(revision 62525)
+++ AXimpl/PM/SchaduwPrijs/CalculateAll.cls.xml	(.../CalculateAll.cls.xml)	(revision 65692)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="AXimpl.PM.SchaduwPrijs.CalculateAll">
+<IncludeCode>Prod.Product</IncludeCode>
 <Super>TECH.RegisteredObject</Super>
 
 <Property name="Translator">
@@ -27,9 +28,14 @@
 <InitialExpression>1</InitialExpression>
 </Property>
 
+<Property name="Debug">
+<Type>%Boolean</Type>
+<InitialExpression>0</InitialExpression>
+</Property>
+
 <Method name="VerwijderAlles">
 <Description>
-D ##class(AXimpl.PM.SchaduwPrijs.CalculateAll).%New().Verwerk()
+D ##class(AXimpl.PM.SchaduwPrijs.CalculateAll).%New().VerwerkEenMaand()
 D ##class(AXimpl.PM.SchaduwPrijs.CalculateAll).VerwijderAlles()</Description>
 <ClassMethod>1</ClassMethod>
 <Implementation><![CDATA[	Do ##class(SchaduwPrijs).%KillExtent()
@@ -44,9 +50,50 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkEenMaand">
+<Implementation><![CDATA[
+	Set ..Debug=1
+	lock +SchaduwPrijsCalculate:10 else  Quit
+	
+	Set StartTijd=$H
+	
+	Set ..itProduct=##class(AXProductIterator).%New(1)
+	Do ..VerwerkLijst()
+	
+	lock -SchaduwPrijsCalculate:0 
+	Write:..Debug !,"Verwerkingstijd (in min): ",$$DIFFTIME^vhLib.DataTypes(StartTijd,$H,"M"),! 
+	Read:..Debug "Druk op enter om verder te gaan" K
+]]></Implementation>
+</Method>
+
 <Method name="Verwerk">
 <Implementation><![CDATA[
+	lock +SchaduwPrijsCalculate:10 else  Quit
+	
+	Do ..VerwijderAlles()
+	Set StartTijd=$H
+
+	Write:..Debug !," ***** VOORRAAD (Zonder CachePerVariant of CachePerItem) *****"
+	Set ..itProduct=##class(AXProductIteratorZonderAdmin).%New()
+	Do ..VerwerkLijst()
+
+	Write:..Debug !," ***** SETS (CachePerItem) *****"
+	Set ..itProduct=##class(AXProductIteratorPerItem).%New()
+	Do ..VerwerkLijst()
+	
+	Write:..Debug !," ***** MAATWERK (CachePerVariant) *****"
 	Set ..itProduct=##class(AXProductIterator).%New()
+	Do ..VerwerkLijst()
+	
+	lock -SchaduwPrijsCalculate:0 
+	Write:..Debug !,"Verwerkingstijd (in min): ",$$DIFFTIME^vhLib.DataTypes(StartTijd,$H,"M"),! 
+	Read:..Debug "Druk op enter om verder te gaan" K
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkLijst">
+<Implementation><![CDATA[
+	Set StartTijd=$H
 	#dim lbProductIDs as %List
 	#dim ProductID as %String
 	#dim RecID as %String
@@ -57,12 +104,12 @@
 	{
 		Set rs=..itProduct.Next()
 		Set ProductID=rs.Data("ProductID")
-		Set PRNr=rs.Data("AdminProductNummer")
+		Set PRNr=$G(rs.Data("AdminProductNummer"))
 		Set ItemID=rs.Data("ItemID")
-		Set ConfigID=rs.Data("ConfigID")
+		Set ConfigID=$G(rs.Data("ConfigID"))
 		Do ..ConverteerOne(ProductID, PRNr, ItemID, ConfigID)
 		Set Count=Count+1
-		Write:Count#100=0 !,Count
+		Write:-..Debug&(Count#1000=0) !,"Aantal: ",Count," Tijd (in min): ",$$DIFFTIME^vhLib.DataTypes(StartTijd,$H,"M")
 	}
 ]]></Implementation>
 </Method>
@@ -86,7 +133,7 @@
 		Set PRNr=..Translator.GeefPRNrForAdmin(ProductID)
 	}
 	
-	If PRNr && $D(^KPR(PRNr,0)) && $D(^KPR(PRNr,1))
+	If PRNr && $D(^KPR(PRNr,0)) && $D(^KPR(PRNr,1)) && ($E($$$PRGet($$$KortTekst),1,3)'="GEN") && $D(^PRBS("BS",PRNr))
 	{
 		Set Q="K", D="\",U=";"
 		Set SchaduwPrijs=##class(SchaduwPrijs).%New()