Index: AXimpl/PM/SchaduwPrijs/AXProductIteratorPerItem.cls.xml
===================================================================
diff -u
--- AXimpl/PM/SchaduwPrijs/AXProductIteratorPerItem.cls.xml	(revision 0)
+++ AXimpl/PM/SchaduwPrijs/AXProductIteratorPerItem.cls.xml	(revision 65692)
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXimpl.PM.SchaduwPrijs.AXProductIteratorPerItem">
+<Super>TECH.RegisteredObject,TECH.Iterator</Super>
+
+<Property name="Converter">
+<Type>AXimpl.Controle.Order.Ax.AxOrderLijnConverter</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ResultSet">
+<Type>TECH.ResultSet</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="SqlQueryConnection">
+<Type>AXimpl.SqlQueryConnection</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>SqlQueryConnection:AXimpl.SqlQueryConnection</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..SqlQueryConnection = $$$Implementation(SqlQueryConnection,##class(AXimpl.SqlQueryConnection).%New())
+	Do ..VoerUitQuery()
+	Set ..Converter = ##class(AXimpl.Controle.Order.Ax.AxOrderLijnConverter).%New()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="VoerUitQuery">
+<Private>1</Private>
+<Implementation><![CDATA[
+	#Dim SqlStatement as %String
+	Set SqlStatement = "SELECT"
+ 	  _" ITEMID as ItemID,"
+ 	  _" ITEMID as ProductID"
+  	  _" FROM EcoResProduct prod"
+      _" left outer join ECORESPRODUCT ProductMaster "
+      _"      on ProductMaster.RECID = isnull(prod.PRODUCTMASTER, prod.RECID) and prod.partition=productmaster.PARTITION"
+      _" left outer join INVENTTABLE it "
+      _"     on it.PARTITION = prod.PARTITION and it.PRODUCT = isnull(prod.PRODUCTMASTER, prod.RECID) "
+      _" 	  where it.Dataareaid='vhbe' and it.Partition='5637144576'   "
+      _" 	  and ProductMaster.ADUCALCTECHNOLOGYBOMBOL =3 	"
+      _" group by itemid"
+	Set ..ResultSet = ..SqlQueryConnection.GetResultSet(SqlStatement)
+]]></Implementation>
+</Method>
+
+<Method name="HasNext">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (..ResultSet.Next() > 0)
+]]></Implementation>
+</Method>
+
+<Method name="Next">
+<ReturnType>%List</ReturnType>
+<Implementation><![CDATA[
+    /// Listbuild : QlikProductID, AdminPRNr, AXRecID
+ 	Quit ..ResultSet
+]]></Implementation>
+</Method>
+
+<Method name="%OnClose">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Do:$IsObject(..ResultSet) ..SqlQueryConnection.Disconnect()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/Halux/Planning/ResourcePitchingService.cls.xml
===================================================================
diff -u -r62525 -r65692
--- APPS/Halux/Planning/ResourcePitchingService.cls.xml	(.../ResourcePitchingService.cls.xml)	(revision 62525)
+++ APPS/Halux/Planning/ResourcePitchingService.cls.xml	(.../ResourcePitchingService.cls.xml)	(revision 65692)
@@ -20,10 +20,12 @@
 </Property>
 
 <Parameter name="RepeatTijdBatchTaak">
-<Default>540</Default>
+<Default>1800</Default>
 </Parameter>
 
 <Parameter name="ApplicatieNaam">
+<Description>
+om de 30min</Description>
 <Default>Halux_Planning_ResourcePitchingService</Default>
 </Parameter>
 
Index: AX/Inkomend/PM/Schaduwprijzen/impl/Verwerken.cls.xml
===================================================================
diff -u -r62525 -r65692
--- AX/Inkomend/PM/Schaduwprijzen/impl/Verwerken.cls.xml	(.../Verwerken.cls.xml)	(revision 62525)
+++ AX/Inkomend/PM/Schaduwprijzen/impl/Verwerken.cls.xml	(.../Verwerken.cls.xml)	(revision 65692)
@@ -35,9 +35,10 @@
 
 <Method name="Verwerk">
 <Description>
-D ##class(AX.Inkomend.PM.Schaduwprijzen.impl.Verwerken).%New(0).Verwerk()</Description>
+D ##class(AX.Inkomend.PM.Schaduwprijzen.impl.Verwerken).%New(1).Verwerk()</Description>
 <Implementation><![CDATA[
 	Set Body=""
+	Set Count=1
 	Do ..itPrijzen.Init()
 	While ..itPrijzen.HasNext()
 	{
@@ -47,51 +48,55 @@
 		Set GrootteOrde=rsPrijs.Data("PRICEUNIT")
 		Set GeldigVanaf=rsPrijs.Data("FROMDATE")
 		Set ProductCount=rsPrijs.Data("VOLGORDE")
-		Set PRNr=..VertaalProduct(ItemID,rsPrijs.Data("BLUMKUNDE"))
+		//Set PRNr=..VertaalProduct(ItemID,rsPrijs.Data("BLUMKUNDE"))
+		Set PRNr=..VertaalProduct(ItemID)
 
-		If ..IsGeldig(PRNr,GeldigVanaf)
+
+		If (PRNr'="") && ..IsGeldig(PRNr,GeldigVanaf)
 		{
 			If ProductCount'=1
 			{
-				Set Body=Body_$$$CRLF_ItemID_", "_rsPrijs.Data("BLUMKUNDE")_","_KostPrijs_$$$CRLF
+				Set Body=Body_$$$CRLF_ItemID_", "_KostPrijs_$$$CRLF
 			}
 			Else
 			{
+				Set Count=Count+1
 				Do ..OpslaanPrijs(PRNr,KostPrijs,GrootteOrde)
 			}
 		}
 	}
 	Read:'..Muet " Druk op [enter] om verder te gaan",k
+	Write "Aantal producten",Count,!
 	Do:$L(Body) ..MailFouten(Body)
 ]]></Implementation>
 </Method>
 
 <Method name="MailFouten">
 <FormalSpec>Body</FormalSpec>
-<Implementation><![CDATA[	Do SendMiniMail^vhLib.Mail("systeem@vanhoecke.be",$LB("pv@vanhoecke.be","mcl@vanhoecke.be"),"Schaduw prijzen - fouten",Body)
+<Implementation><![CDATA[	Do SendMiniMail^vhLib.Mail("Cache01@vanhoecke.be",$LB("pv@vanhoecke.be"),"Schaduw prijzen - fouten",Body)  ;,"mcl@vanhoecke.be"
 ]]></Implementation>
 </Method>
 
 <Method name="VertaalProduct">
-<FormalSpec>AXItemID:%String,AXBlumKunde:%String</FormalSpec>
+<FormalSpec>AXItemID:%String,AXBlumKunde:%String=""</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	
 	Set PRNr=$P($G(^KPR2($TR(AXItemID,".")_" ")),"\")
 	If PRNr="" {
-		Do ##class(TECH.Exceptions.GeneralErrorException).Throw("VertaalProduct kon geen ProductNummer vinden voor AxItemId '"_AXItemID_"'.")
+		Write AXItemID,!
+		;Do ##class(TECH.Exceptions.GeneralErrorException).Throw("VertaalProduct kon geen ProductNummer vinden voor AxItemId '"_AXItemID_"'.")
 	}
-	If ..SoprConvertor.IsSOPRInCache(PRNr)
+	/*If ..SoprConvertor.IsSOPRInCache(PRNr)
 	{
 		Set it=..SoprConvertor.GeefSOPRIterator(PRNr)
 		While it.HasNext()
 		{
 			Set SoprPRNr=it.Next()
 			If ..SoprConvertor.GeefBlumKunde(SoprPRNr)=AXBlumKunde Set PRNr=SoprPRNr
 		}
-	}
-	Write:'..Muet AXItemID," ",PRNr," ",$$$PRGet($$$KortTekst)," ",$G(AXBlumKunde),!
+	}*/
 	Quit PRNr
 ]]></Implementation>
 </Method>
@@ -102,6 +107,9 @@
 <Implementation><![CDATA[
 	Quit:'PRNr 0
 	Quit:(..PrijzenTot && (GeldigVanaf>..PrijzenTot)) 0
+	Quit:($$GENTYP^HAD(PRNr,0,1)'="") 0 ; geen generisch, noch afgeleid product
+	Quit:($E($$$PRGet($$$KortTekst),1,3)="GEN") 0 ; Geen generisch moederproduct
+	Quit:$D(^PRBS("BS",PRNr)) 0 ; geen product met bouwstenen
 	Quit 1
 ]]></Implementation>
 </Method>
@@ -112,6 +120,7 @@
 <ProcedureBlock>1</ProcedureBlock>
 <Implementation><![CDATA[
 	; Schaduwprijs steeds per 100 omdat de product sync interface ook per honderd werkt
+	Write:'..Muet PRNr," ",$$$PRGet($$$KortTekst),!
 	
 	If +GrootteOrdeSchaduw=1 
 	{
@@ -124,6 +133,7 @@
 	Set GrootteOrdeHuidig=$$$PRGet($$$GrootteOrdeAankoop)
 	Set GrootteOrdeHuidig=$S("E"[GrootteOrdeHuidig:1,GrootteOrdeHuidig="H":100,GrootteOrdeHuidig="M":1000,1:0)
 	Do FETCHPR^UTILI(PRNr) ; ophalen B local ; noodzakelijk voor de logging
+	
 	If GrootteOrdeHuidig'=+GrootteOrdeSchaduw
 	{
 		Do $$$PRSet($$$PPLMTL,($$$PRGet($$$PPLMTL)*GrootteOrdeSchaduw/GrootteOrdeHuidig))
@@ -135,6 +145,72 @@
 	Do $$$PRSet($$$SchaduwMunt,"EUR") ; steeds in EUR !
 ]]></Implementation>
 </Method>
+
+<UDLText name="T">
+<Content><![CDATA[
+/*
+
+//D ##class(AX.Inkomend.PM.Schaduwprijzen.impl.Verwerken).%New(1).Read()
+Method Read()
+{
+	Set PRNr=123
+	While PRNr'=""
+	{
+		Read !,PRNr
+		
+		If PRNr && $D(^KPR(PRNr)) && ($$$PRGet($$$GrootteOrdeAankoop)="H")
+		{
+			Do $$$PRSet($$$GrootteOrdeAankoop,"E")
+		}
+
+	}
+}
+
+Method IsGeldigOL(PRNr As %String, GeldigVanaf As %Date) [ Private ]
+{
+	Quit:'PRNr 0
+	Quit:(..PrijzenTot && (GeldigVanaf>..PrijzenTot)) 0
+	;Quit:'$D(^PRBS("BS",PRNr)) 0 ; geen product met bouwstenen
+	;Quit:$$$PRGet($$$GrootteOrdeAankoop)'="H" 0
+	Quit:$E($$$PRGet($$$KortTekst),1,3)'="GEN" 0
+	;Quit:'..CheckLog(PRNr) 0
+	
+	
+	Write PRNr," ",$$$PRGet($$$KortTekst),!
+	Quit 1
+}
+
+Method CheckLog(PRNr As %String)
+{
+	Set Found=0
+	Set Datum=$O(^DLOG("K","PR",PRNr,20210415.0000))	
+	While Datum'=""
+	{
+		If $P(^DLOG("K","PR",PRNr,Datum),"\",1,4)="W\J128\E\H"
+		{
+			Set Found=1
+			}
+		Set Datum=$O(^DLOG("K","PR",PRNr,Datum))	
+		}
+	Quit Found
+}
+
+Method OpslaanPrijsOL(PRNr As %String, KostPrijsSchaduw As %Decimal, GrootteOrdeSchaduw As %Integer) [ Private, ProcedureBlock = 1 ]
+{
+	Do FETCHPR^UTILI(PRNr) ; ophalen B local ; noodzakelijk voor de logging
+	
+	;Do $$$PRSet($$$PPLMTL,($$$PRGet($$$PPLMTL)/100))
+	;Do $$$PRSet($$$GrootteOrdeAankoop,"E")
+	Do $$$PRSet($$$SchaduwPPL,"")
+	Do $$$PRSet($$$SchaduwCifPerc,"") ;AX geeft de kostprijs dus incl. Cif%
+	Do $$$PRSet($$$SchaduwKortingPerc,"") ;AX geeft de kostprijs dus incl. korting
+	Do $$$PRSet($$$SchaduwMunt,"") ; steeds in EUR !
+
+	r K
+}
+*/
+]]></Content>
+</UDLText>
 </Class>
 
 
Index: APPS/Halux/Opvolging/ProductieStap/TAOR/impl/ArdisSelcoParser.cls.xml
===================================================================
diff -u -r62598 -r65692
--- APPS/Halux/Opvolging/ProductieStap/TAOR/impl/ArdisSelcoParser.cls.xml	(.../ArdisSelcoParser.cls.xml)	(revision 62598)
+++ APPS/Halux/Opvolging/ProductieStap/TAOR/impl/ArdisSelcoParser.cls.xml	(.../ArdisSelcoParser.cls.xml)	(revision 65692)
@@ -57,9 +57,6 @@
 
 	#include %occStatus
 	
-	Do ##class(DS.Prod.OptiBox.sub.btBoxSelect).%DeleteExtent()
-
-
 	Set reader = ##class(%XML.Reader).%New()
 	// Begin processing of the XML input
 	Set sc=reader.OpenFile(..Directory_$G(FileNaam))
Index: AXimpl/PM/SchaduwPrijs/AXProductIterator.cls.xml
===================================================================
diff -u -r62525 -r65692
--- AXimpl/PM/SchaduwPrijs/AXProductIterator.cls.xml	(.../AXProductIterator.cls.xml)	(revision 62525)
+++ AXimpl/PM/SchaduwPrijs/AXProductIterator.cls.xml	(.../AXProductIterator.cls.xml)	(revision 65692)
@@ -13,18 +13,23 @@
 <Private>1</Private>
 </Property>
 
+<Property name="AantalMaanden">
+<Type>%Integer</Type>
+</Property>
+
 <Property name="SqlQueryConnection">
 <Type>AXimpl.SqlQueryConnection</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>SqlQueryConnection:AXimpl.SqlQueryConnection</FormalSpec>
+<FormalSpec>AantalMaanden:%Integer=13,SqlQueryConnection:AXimpl.SqlQueryConnection</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
+	Set ..AantalMaanden=AantalMaanden
 	Set ..SqlQueryConnection = $$$Implementation(SqlQueryConnection,##class(AXimpl.SqlQueryConnection).%New())
 	Do ..VoerUitQuery()
 	Set ..Converter = ##class(AXimpl.Controle.Order.Ax.AxOrderLijnConverter).%New()
@@ -36,33 +41,29 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 	#Dim SqlStatement as %String
-	Set VanafDatum=$$CALCDATE^vhLib.DataTypes($H,"M",-12,"FD")
+	Set VanafDatum=$$CALCDATE^vhLib.DataTypes($H,"M",-..AantalMaanden,"FD")
 	
-	Set SqlStatement = "SELECT DISTINCT"
- 	_"  case isnull(ResProductMaster.ADUCALCTECHNOLOGYBOMBOL,0) WHEN 3 THEN sl.ITEMID WHEN 0 THEN sl.ITEMID ELSE ResProduct.DISPLAYPRODUCTNUMBER END as ProductID,"
- 	_"  sl.ItemID,"
- 	_"	case isnull(ResProductMaster.ADUCALCTECHNOLOGYBOMBOL,0) WHEN 3 THEN '' WHEN 0 THEN '' ELSE dim.ConfigID END as ConfigID,"
-  	_"  isnull(AdminProductNummer,'') as AdminProductNummer"
- 	_" FROM SalesLine sl"
- 	_" join InventTable "
- 	_"        on InventTable.ITEMID = sl.ITEMID and InventTable.DataAreaId = sl.DataAreaId and inventtable.PARTITION = sl.PARTITION "
- 	_" join INVENTDIM dim "
- 	_"        on dim.DATAAREAID = sl.DATAAREAID and dim.INVENTDIMID = sl.INVENTDIMID and dim.Partition=sl.PARTITION "
- 	_" join INVENTDIM dimbase "
- 	_"        on dimbase.DATAAREAID = dim.DATAAREAID and dimbase.Partition=dim.PARTITION "
- 	_"        and dim.ConfigID =dimbase.configid and dimbase.WMSLOCATIONID='' and dimbase.inventlocationid ='' and dimbase.inventsiteid='' "
- 	_"        and dimbase.inventbatchid=''"
- 	_" join INVENTDIMCOMBINATION as Idc "
- 	_"        on  Idc.DATAAREAID= sl.DATAAREAID and Idc.ITEMID=sl.ITEMID and Idc.INVENTDIMID=DimBase.INVENTDIMID and idc.PARTITION = sl.PARTITION "
- 	_" join ECORESPRODUCT ResProduct "
- 	_"        on idc.DISTINCTPRODUCTVARIANT= ResProduct.RecID and ResProduct.PARTITION = sl.PARTITION "
- 	_" join ECORESPRODUCT ResProductMaster "
-  	_"       on ResProductMaster.RecID= ResProduct.ProductMaster and ResProduct.PARTITION = sl.PARTITION "
- 	_" left outer join ADUEcoResAttributeCombination as Kenmerk     "
- 	_"        on dim.ConfigId=Kenmerk.ConfigId and sl.ITEMID=Kenmerk.ITEMID and dim.ConfigId<>'' and kenmerk.Partition=sl.Partition "
- 	_" where sl.Dataareaid='vhbe' and sl.Partition='5637144576' " 
- 	_" and ResProductMaster.ADUCALCTECHNOLOGYBOMBOL in (2,3)"	
- 	_" and sl.CREATEDDATETIME >= '"_$zd(VanafDatum,3)_"'"
+	Set SqlStatement = 	"select DISTINCT "
+   	_"	case isnull(ResProductMaster.ADUCALCTECHNOLOGYBOMBOL,0) WHEN 3 THEN sl.ITEMID WHEN 0 THEN sl.ITEMID ELSE ResProduct.DISPLAYPRODUCTNUMBER END as ProductID, "
+    _"      sl.ItemID, "
+    _"      case isnull(ResProductMaster.ADUCALCTECHNOLOGYBOMBOL,0) WHEN 3 THEN '' WHEN 0 THEN '' ELSE dim.ConfigID END as ConfigID, "
+    _"      isnull(AdminProductNummer,'') as AdminProductNummer "
+	_" from ecoresproduct resProductMaster"
+	_" join inventtable i"
+	_"	 on i.PARTITION = resproductmasteR.PARTITION and i.product = resProductMaster.recid"
+	_" join salesline sl"
+	_"   on sl.itemid = i.itemid and sl.PARTITION = i.PARTITION and sl.DATAAREAID = i.DATAAREAID"
+	_" join inventdim dim"
+	_"	 on dim.inventdimid = sl.inventdimid and dim.PARTITION = sl.PARTITION and dim.DATAAREAID = sl.DATAAREAID"
+	_" join INVENTDIMCOMBINATION idc"
+	_"	 on idc.PARTITION = sl.PARTITION and idc.DATAAREAID = sl.DATAAREAID and idc.itemid = sl.itemid and idc.RETAILVARIANTID = sl.RETAILVARIANTID"
+	_" join ecoresproduct resProduct"
+	_"   on idc.DISTINCTPRODUCTVARIANT = resproduct.RECID"
+    _" left outer join ADUEcoResAttributeCombination as Kenmerk      "
+    _"   on dim.ConfigId=Kenmerk.ConfigId and sl.ITEMID=Kenmerk.ITEMID and dim.ConfigId<>'' and kenmerk.Partition=sl.Partition"
+	_" where resProductMaster.INSTANCERELATIONTYPE = 3267 and resproductmaster.ADUCALCTECHNOLOGYBOMBOL = 2 and resproductmaster.PARTITION = 5637144576"
+	_" and i.DATAAREAID = 'vhbe' "
+ 	_" and (sl.CREATEDDATETIME >= '"_$zd(VanafDatum,3)_"' or sl.MODIFIEDDATETIME >= '"_$zd(VanafDatum,3)_"')"
 	Set ..ResultSet = ..SqlQueryConnection.GetResultSet(SqlStatement)
 ]]></Implementation>
 </Method>
Index: APPS/Halux/Opvolging/ProductieStap/dto/ProductieStapLogItem.cls.xml
===================================================================
diff -u -r61757 -r65692
--- APPS/Halux/Opvolging/ProductieStap/dto/ProductieStapLogItem.cls.xml	(.../ProductieStapLogItem.cls.xml)	(revision 61757)
+++ APPS/Halux/Opvolging/ProductieStap/dto/ProductieStapLogItem.cls.xml	(.../ProductieStapLogItem.cls.xml)	(revision 65692)
@@ -115,6 +115,10 @@
 <Type>%String</Type>
 </Property>
 
+<Property name="OorsprongID">
+<Type>%String</Type>
+</Property>
+
 <Property name="IsRework">
 <Description>
 Geeft aan of dit rework vertegenwoordigt of niet.</Description>
@@ -192,6 +196,9 @@
 <Value name="20">
 <Value>TijdstipDueOut</Value>
 </Value>
+<Value name="21">
+<Value>OorsprongID</Value>
+</Value>
 </Data>
 </Storage>
 </Class>
Index: AX/Inkomend/PM/Schaduwprijzen/impl/AXIterator.cls.xml
===================================================================
diff -u -r62525 -r65692
--- AX/Inkomend/PM/Schaduwprijzen/impl/AXIterator.cls.xml	(.../AXIterator.cls.xml)	(revision 62525)
+++ AX/Inkomend/PM/Schaduwprijzen/impl/AXIterator.cls.xml	(.../AXIterator.cls.xml)	(revision 65692)
@@ -36,10 +36,38 @@
 </Method>
 
 <Method name="GeefSQL">
+<Description>
+Zonder SOPR verwerking</Description>
 <Private>1</Private>
 <Implementation><![CDATA[
 	#Dim SqlStatement as %String
 	Set SqlStatement = ""
+	_"select * from	 "
+	_" (select "
+	_"    ps.ITEMID,  ps.VERSIONID"
+	_"    , ps.PRICE ,Case ps.PRICEUNIT when 0 then 1 else ps.priceunit end as PRICEUNIT "
+    _"    , row_number() over (partition by ps.itemid order by case versionid when 'Basis' then 2 when 'std' then 1 else 0 end desc, ps.fromdate asc) as VOLGORDE "
+    _"    ,ps.FROMDATE "
+    _"    from INVENTITEMPRICESIM ps "
+	_"	left join Inventtable it on ps.itemid=it.itemid and ps.dataareaid=it.DATAAREAID and ps.partition=it.partition"
+    _"    where ps.DATAAREAID = 'vhbe' and ps.PARTITION ='5637144576' "
+	_"	and ps.fromdate > getdate()"
+    _"    and ps.PRICETYPE = 0 "
+	_"	and ps.Versionid in ('std', 'basis')"
+	_"	and isnull(it.itemid,'')<>''"
+	_"	) as sim"
+	_"	where sim.Volgorde=1"
+	Quit SqlStatement
+]]></Implementation>
+</Method>
+
+<Method name="GeefSQLOLD">
+<Description>
+Met SOPR verwerking</Description>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#Dim SqlStatement as %String
+	Set SqlStatement = ""
 	_"select "
 	_"   p.ITEMID, case when p.VERSIONID in ('std','basis') then '' else p.versionid end as SOPRCONTRACT"
 	_"   , isnull(vendor.ACCOUNTNUM,'') as SUPPLIERID,isnull(vendor.YOURACCOUNTNUM,'') as BLUMKUNDE"
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()
Index: APPS/Halux/Planning/Resource/impl/ConvertAll.cls.xml
===================================================================
diff -u -r58984 -r65692
--- APPS/Halux/Planning/Resource/impl/ConvertAll.cls.xml	(.../ConvertAll.cls.xml)	(revision 58984)
+++ APPS/Halux/Planning/Resource/impl/ConvertAll.cls.xml	(.../ConvertAll.cls.xml)	(revision 65692)
@@ -36,6 +36,7 @@
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Set ..UpdateOnly=UpdateOnly
+	Kill ^||ExistToelev
 	quit $$$OK
 ]]></Implementation>
 </Method>
@@ -62,6 +63,7 @@
 		}
 		;Quit:..Cnt>10000
 	}
+	Do ..DeleteWezen()
 	Lock -ProductieResource
 ]]></Implementation>
 </Method>
@@ -72,6 +74,7 @@
 	#Dim PRNr, AxProductID as %String
 	Set TOENr=..ProductieOrderLijn.ToeleveringNr
 	Set TLUNr=..ProductieOrderLijn.UniekLijnNr\100*100
+	Set ^||ExistToelev(TOENr,TLUNr)=""
 	Set PRNr=..ProductieOrderLijn.ProductGetObjectId()
 	Set ResPRNr=""
 	&SQL(select top 1 Product into :ResPRNr from APPS_Halux_Planning_Resource_dto.ResourceLijn where ToeleveringNr=:TOENr and UniekLijnNr=:TLUNr)
@@ -89,20 +92,37 @@
 		select ID into :ResourceID from APPS_Halux_Planning_Resource_dto.ResourceLijn where ToeleveringNr=:TOENr and UniekLijnNr=:TLUNr)
    	&sql(OPEN DELRES)
    	   	
- 	For  &sql(FETCH DELRES) Quit:SQLCODE  Do  
+ 	For  &sql(FETCH DELRES) Quit:SQLCODE  Do
 	. Do ##class(APPS.Halux.Planning.Resource.dto.ResourceLijn).%DeleteId(ResourceID)
  	&sql(CLOSE DELRES)
 ]]></Implementation>
 </Method>
 
+<Method name="DeleteWezen">
+<Implementation><![CDATA[
+	#Dim PRNr, AxProductID as %String
+	&sql(DECLARE DELWEZEN CURSOR FOR
+		select ID,ToeleveringNr,UniekLijnNr into :ResourceID,:TOENr,:TLUNr from APPS_Halux_Planning_Resource_dto.ResourceLijn)
+   	&sql(OPEN DELWEZEN)
+   	
+   	;TLUNr is per 100 geen backorderlijnen   	
+ 	For  &sql(FETCH DELWEZEN) Quit:SQLCODE  Do  
+	. If '$D(^||ExistToelev(TOENr,TLUNr)) Do
+	. . Do ##class(APPS.Halux.Planning.Resource.dto.ResourceLijn).%DeleteId(ResourceID)
+	. . ;Write "NOT Exist Toelev ",TOENr,":",TLUNr,!
+ 	&sql(CLOSE DELWEZEN)
+ 	Kill ^||ExistToelev
+]]></Implementation>
+</Method>
+
 <Method name="ConverteerOne">
 <Implementation><![CDATA[
 		#Dim PRNr,GenTyp,GenTyp2 as %String
 		#dim Convertor as ConvertProductAbstract
 		Set PRNr=..ProductieOrderLijn.ProductGetObjectId()
 		Quit:'PRNr
-		Set GenTyp=$P($$GENTYP^HAD(PRNr),"\")
 		Set GenTyp2=$P($$GENTYP^HAD(PRNr),"\",1,2)
+		Set GenTyp=$P(GenTyp2,"\")
 			;quit:'("DIV"[GenTyp&&(GenTyp2=""))
 		Set ..Cnt=..Cnt+1
 		;w GenTyp," ",PRNr,!
Index: AXimpl/PM/SchaduwPrijs/AXProductIteratorZonderAdmin.cls.xml
===================================================================
diff -u
--- AXimpl/PM/SchaduwPrijs/AXProductIteratorZonderAdmin.cls.xml	(revision 0)
+++ AXimpl/PM/SchaduwPrijs/AXProductIteratorZonderAdmin.cls.xml	(revision 65692)
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXimpl.PM.SchaduwPrijs.AXProductIteratorZonderAdmin">
+<Super>TECH.RegisteredObject,TECH.Iterator</Super>
+
+<Property name="Converter">
+<Type>AXimpl.Controle.Order.Ax.AxOrderLijnConverter</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ResultSet">
+<Type>TECH.ResultSet</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="SqlQueryConnection">
+<Type>AXimpl.SqlQueryConnection</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>SqlQueryConnection:AXimpl.SqlQueryConnection</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..SqlQueryConnection = $$$Implementation(SqlQueryConnection,##class(AXimpl.SqlQueryConnection).%New())
+	Do ..VoerUitQuery()
+	Set ..Converter = ##class(AXimpl.Controle.Order.Ax.AxOrderLijnConverter).%New()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="VoerUitQuery">
+<Private>1</Private>
+<Implementation><![CDATA[
+	#Dim SqlStatement as %String
+	Set SqlStatement = "SELECT DISTINCT"
+ 	  _" i.ITEMID as ItemID,"
+ 	  _" i.ITEMID as ProductID"
+ 	  _" from inventtable i"
+	  _" join ecoresproduct p on p.recid  = i.PRODUCT"
+	  _" where PMFPRODUCTTYPE = 4 and p.ADUCALCTECHNOLOGYBOMBOL is null and i.PHANTOM = 0"
+	  
+	Set ..ResultSet = ..SqlQueryConnection.GetResultSet(SqlStatement)
+]]></Implementation>
+</Method>
+
+<Method name="HasNext">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (..ResultSet.Next() > 0)
+]]></Implementation>
+</Method>
+
+<Method name="Next">
+<ReturnType>%List</ReturnType>
+<Implementation><![CDATA[
+    /// Listbuild : QlikProductID, AdminPRNr, AXRecID
+ 	Quit ..ResultSet
+]]></Implementation>
+</Method>
+
+<Method name="%OnClose">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Do:$IsObject(..ResultSet) ..SqlQueryConnection.Disconnect()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>