Index: AXimpl/PM/SchaduwPrijs/SchaduwPrijs.cls.xml
===================================================================
diff -u -r55345 -r58234
--- AXimpl/PM/SchaduwPrijs/SchaduwPrijs.cls.xml	(.../SchaduwPrijs.cls.xml)	(revision 55345)
+++ AXimpl/PM/SchaduwPrijs/SchaduwPrijs.cls.xml	(.../SchaduwPrijs.cls.xml)	(revision 58234)
@@ -8,18 +8,34 @@
 <Type>%String</Type>
 </Property>
 
+<Property name="ItemID">
+<Type>%String</Type>
+</Property>
+
+<Property name="ConfigID">
+<Type>%String</Type>
+</Property>
+
 <Property name="AdminProduct">
 <Type>Prod.Product</Type>
 </Property>
 
-<Property name="CostPrice">
+<Property name="FutureCostPrice">
 <Type>%Decimal</Type>
 </Property>
 
-<Property name="UnitPrice">
+<Property name="FutureUnitPrice">
 <Type>%Decimal</Type>
 </Property>
 
+<Property name="CurrentCostPrice">
+<Type>%Decimal</Type>
+</Property>
+
+<Property name="CurrentUnitPrice">
+<Type>%Decimal</Type>
+</Property>
+
 <Index name="PrimaryKey">
 <IdKey>1</IdKey>
 <PrimaryKey>1</PrimaryKey>
@@ -35,8 +51,6 @@
 <IndexLocation>^AXimpl.PM.Sch64E5.SchaduwPrijsI</IndexLocation>
 <StreamLocation>^AXimpl.PM.Sch64E5.SchaduwPrijsS</StreamLocation>
 <Data name="SchaduwPrijsDefaultData">
-<Structure>listnode</Structure>
-<Subscript/>
 <Value name="1">
 <Value>%%CLASSNAME</Value>
 </Value>
@@ -49,6 +63,24 @@
 <Value name="4">
 <Value>UnitPrice</Value>
 </Value>
+<Value name="5">
+<Value>ItemID</Value>
+</Value>
+<Value name="6">
+<Value>ConfigID</Value>
+</Value>
+<Value name="7">
+<Value>FutureCostPrice</Value>
+</Value>
+<Value name="8">
+<Value>FutureUnitPrice</Value>
+</Value>
+<Value name="9">
+<Value>CurrentCostPrice</Value>
+</Value>
+<Value name="10">
+<Value>CurrentUnitPrice</Value>
+</Value>
 </Data>
 </Storage>
 </Class>
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>
Index: EWORDS6.mac.rou
===================================================================
diff -u -r57925 -r58234
--- EWORDS6.mac.rou	(.../EWORDS6.mac.rou)	(revision 57925)
+++ EWORDS6.mac.rou	(.../EWORDS6.mac.rou)	(revision 58234)
@@ -14,8 +14,9 @@
 
 SendWMSIndienAfhaling(ORDNr)
 	Set VerzW = $P($P($$DEFAULT^KLVERZW(, , ORDNr),"`"),";")
-	If VerzW["AF"  ; AFH en AFC
+	If (VerzW["AF")&&$$CheckAutoSend(ORDNr) ; AFH en AFC
 	{
+		Do ##class(vhLib.Logger).%New().Info("Klaarzetten voor picking", "Afhaling order '" _ ORDNr _ "' wordt doorgestuurd, werd getriggerd door interface AXOrder2Admin" )
 		Do SendWMS(ORDNr)
 	}
 	Quit
Index: AXimpl/PM/SchaduwPrijs/AXProductIterator.cls.xml
===================================================================
diff -u -r55345 -r58234
--- AXimpl/PM/SchaduwPrijs/AXProductIterator.cls.xml	(.../AXProductIterator.cls.xml)	(revision 55345)
+++ AXimpl/PM/SchaduwPrijs/AXProductIterator.cls.xml	(.../AXProductIterator.cls.xml)	(revision 58234)
@@ -37,12 +37,11 @@
 <Implementation><![CDATA[
 	#Dim SqlStatement as %String
 	
-	Set SqlStatement = "SELECT " ;top 10000"
+	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,"
- 	_"  Kenmerk.RecID,"
-  	_"  case isnull(ResProductMaster.ADUCALCTECHNOLOGYBOMBOL,0) WHEN 3 THEN 'KIND' WHEN 0 THEN 'BESLAG' ELSE 'MW' END as ProductType, "
-  	_"  Inventtable.VHProductGroup as Familie,"
-  	_"  AdminProductNummer"
+ 	_"  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"
@@ -75,7 +74,7 @@
 <ReturnType>%List</ReturnType>
 <Implementation><![CDATA[
     /// Listbuild : QlikProductID, AdminPRNr, AXRecID
- 	Quit $LB(..ResultSet.Data("ProductID"),..ResultSet.Data("AdminProductNummer"),..ResultSet.Data("RecID"))
+ 	Quit ..ResultSet
 ]]></Implementation>
 </Method>
 
Index: AXimpl/Dynamics/InventoryOut/Converter/PickingCompleetConverter.cls.xml
===================================================================
diff -u -r55297 -r58234
--- AXimpl/Dynamics/InventoryOut/Converter/PickingCompleetConverter.cls.xml	(.../PickingCompleetConverter.cls.xml)	(revision 55297)
+++ AXimpl/Dynamics/InventoryOut/Converter/PickingCompleetConverter.cls.xml	(.../PickingCompleetConverter.cls.xml)	(revision 58234)
@@ -96,8 +96,14 @@
 				Set Pick.PickId = Bon.GeefID()
 				Set Pick.InventTransId = Lijn.GeefAxInventTransId()
 				Set Pick.Qty = Lijn.GeefAantal()
-				Set Pick.ShippingDate = ##class(TECH.DateTime).HorologToDate(..OrderWMSHoofdingRepository.GeefViaID(Bon.GeefID()).DueOutTime)
 				
+				#dim ShippingDate as %Date = +..OrderWMSHoofdingRepository.GeefViaID(Bon.GeefID()).DueOutTime
+				; Je kan niet in het verleden goederen verzenden die vandaag geraapt zijn.
+				If ShippingDate<+$H {
+					Set ShippingDate=+$H
+				}
+				Set Pick.ShippingDate = ##class(TECH.DateTime).HorologToDate(ShippingDate)
+				
 				If $$$Not(Pick.Qty = 0) {
 					Do ..AxdEntityHeader.Pick.Insert(Pick)
 				}