Index: AXimpl/PM/SchaduwPrijs/CalculateAll.cls.xml
===================================================================
diff -u -r55345 -r58234
--- AXimpl/PM/SchaduwPrijs/CalculateAll.cls.xml	(.../CalculateAll.cls.xml)	(revision 55345)
+++ AXimpl/PM/SchaduwPrijs/CalculateAll.cls.xml	(.../CalculateAll.cls.xml)	(revision 58234)
@@ -55,44 +55,49 @@
 	Set Count=1
 	While ..itProduct.HasNext() 
 	{
-		Set lbProductIDs=..itProduct.Next()
-		Set ProductID=$LI(lbProductIDs,1)
-		Set PRNr=$LI(lbProductIDs,2)
-		Set RecID=$LI(lbProductIDs,3)
-		Do ..ConverteerOne(ProductID,PRNr)
+		Set rs=..itProduct.Next()
+		Set ProductID=rs.Data("ProductID")
+		Set PRNr=rs.Data("AdminProductNummer")
+		Set ItemID=rs.Data("ItemID")
+		Set ConfigID=rs.Data("ConfigID")
+		Do ..ConverteerOne(ProductID, PRNr, ItemID, ConfigID)
 		Set Count=Count+1
 		Write:Count#100=0 !,Count
 	}
 ]]></Implementation>
 </Method>
 
 <Method name="ConverteerOne">
-<FormalSpec>ProductID:%String,PRNr:%String,RecID:%String</FormalSpec>
+<FormalSpec>ProductID:%String,PRNr:%String,ItemID:%String,ConfigID:%String</FormalSpec>
 <Implementation><![CDATA[
 	If ..AddOnly&&('##class(SchaduwPrijs).%ExistsId(ProductID))
 	{
 		Do ##class(SchaduwPrijs).%DeleteId(ProductID)
-		Do ..Add(ProductID,PRNr)				
+		Do ..Add(ProductID, PRNr, ItemID, ConfigID)				
 	}
 ]]></Implementation>
 </Method>
 
 <Method name="Add">
-<FormalSpec>ProductID:%String,PRNr:%String</FormalSpec>
+<FormalSpec>ProductID:%String,PRNr:%String,ItemID:%String,ConfigID:%String</FormalSpec>
 <Implementation><![CDATA[
 	If 'PRNr,ProductID'[":" ; Alleen Identnr zonder configuratie
 	{ 
 		Set PRNr=..Translator.GeefPRNrForAdmin(ProductID)
 	}
 	
-	If PRNr
+	If PRNr && $D(^KPR(PRNr,0)) && $D(^KPR(PRNr,1))
 	{
 		Set Q="K", D="\",U=";"
 		Set SchaduwPrijs=##class(SchaduwPrijs).%New()
 		Set SchaduwPrijs.ProductID=ProductID
+		Set SchaduwPrijs.ItemID=ItemID
+		Set SchaduwPrijs.ConfigID=ConfigID
 		Do SchaduwPrijs.AdminProductSetObjectId(PRNr)
-		Set SchaduwPrijs.CostPrice=$$CifPPL^KPRIJS(PRNr,"S")*100
-		Set SchaduwPrijs.UnitPrice=100
+		Set SchaduwPrijs.FutureCostPrice=+$J($$CifPPL^KPRIJS(PRNr,"S")*100,0,2)
+		Set SchaduwPrijs.FutureUnitPrice=100
+		Set SchaduwPrijs.CurrentCostPrice=+$J($$CifPPL^KPRIJS(PRNr,"N")*100,0,2)
+		Set SchaduwPrijs.CurrentUnitPrice=100
 		Do SchaduwPrijs.Save()
 	}
 ]]></Implementation>