Index: OBJTimpl/WMSOrder/OphalenPickLijnenConsolidatie.cls.xml
===================================================================
diff -u -r69094 -r70781
--- OBJTimpl/WMSOrder/OphalenPickLijnenConsolidatie.cls.xml	(.../OphalenPickLijnenConsolidatie.cls.xml)	(revision 69094)
+++ OBJTimpl/WMSOrder/OphalenPickLijnenConsolidatie.cls.xml	(.../OphalenPickLijnenConsolidatie.cls.xml)	(revision 70781)
@@ -100,17 +100,17 @@
 	Set SqlStatement = "select distinct orders.ID CONSNR,olines.name LIJNNR,olines.QTYTARGET,pa.QTY AANTAL,item.id IDENTNR "
 	_" ,isnull((select top 1 fl.FULLNAME from DCEREPORT_PICK_ACTUALS p1 "
 	_"         left join DCEREPORT_LOCATIONS         fl on fl.OID= p1.FROM_LOCATION_OID "
-	_"         where p1.PICKORDER_OID = pa.PICKORDER_OID and p1.PICKLINE_OID = pa.PICKLINE_OID and p1.FROM_CONTAINER_OID = pa.FROM_CONTAINER_OID order by p1.DTSSTART asc),'KardexOPSLAG') FROMLOC "
+	_"         where p1.PICKORDER_OID = pa.PICKORDER_OID and p1.PICKLINE_OID = pa.PICKLINE_OID and p1.FROM_LOCATION_OID = pa.FROM_LOCATION_OID order by p1.DTSSTART asc),'KardexOPSLAG') FROMLOC "
 	_" ,isnull(fromcont.LPN,fromloc.FULLNAME) BRONPALLET "
 	_" ,isnull((select top 1 toloc.FULLNAME from DCEREPORT_PICK_ACTUALS p2 "
 	_"         left join DCEREPORT_LOCATIONS         toloc on toloc.OID= p2.to_LOCATION_OID "
-	_"         where p2.PICKORDER_OID = pa.PICKORDER_OID and p2.PICKLINE_OID = pa.PICKLINE_OID and p2.FROM_CONTAINER_OID = pa.FROM_CONTAINER_OID order by p2.DTSSTART desc),'KardexOUT') AFZETLOC "
+	_"         where p2.PICKORDER_OID = pa.PICKORDER_OID and p2.PICKLINE_OID = pa.PICKLINE_OID and p2.FROM_LOCATION_OID = pa.FROM_LOCATION_OID order by p2.DTSSTART desc),'KardexOUT') AFZETLOC "
 	_" ,tocont.LPN DOELPALLET "
 	_" ,isnull((select top 1 emp.ID from DCEREPORT_PICK_ACTUALS p3 "
 	_"         left join DCEREPORT_EMPLOYEES         emp on emp.OID= p3.EMPLOYEE_OID "
-	_"         where p3.PICKORDER_OID = pa.PICKORDER_OID and p3.PICKLINE_OID = pa.PICKLINE_OID and p3.FROM_CONTAINER_OID = pa.FROM_CONTAINER_OID order by p3.DTSSTART asc),'KardexOperator') USERID "
+	_"         where p3.PICKORDER_OID = pa.PICKORDER_OID and p3.PICKLINE_OID = pa.PICKLINE_OID and p3.FROM_LOCATION_OID = pa.FROM_LOCATION_OID order by p3.DTSSTART asc),'KardexOperator') USERID "
 	_" ,isnull((select top 1 p4.DTSSTART from DCEREPORT_PICK_ACTUALS p4 "
-	_"         where p4.PICKORDER_OID = pa.PICKORDER_OID and p4.PICKLINE_OID = pa.PICKLINE_OID and p4.FROM_CONTAINER_OID = pa.FROM_CONTAINER_OID order by p4.DTSSTART asc) ,pa.DTSSTART) PICKINGTIJDSTIP "
+	_"         where p4.PICKORDER_OID = pa.PICKORDER_OID and p4.PICKLINE_OID = pa.PICKLINE_OID and p4.FROM_LOCATION_OID = pa.FROM_LOCATION_OID order by p4.DTSSTART asc) ,pa.DTSSTART) PICKINGTIJDSTIP "
 	_" ,ml.fullname TOLOC"
 	_" from DCEREPORT_OUTBOUNDORDERS orders "
 	_" inner join DCEREPORT_OUTBOUNDLINES    olines on olines.OUTBOUNDORDER_OID = orders.oid "