Index: BL/MB/UGLYPicking/Receptie.cls.xml
===================================================================
diff -u -r4639 -r5114
--- BL/MB/UGLYPicking/Receptie.cls.xml	(.../Receptie.cls.xml)	(revision 4639)
+++ BL/MB/UGLYPicking/Receptie.cls.xml	(.../Receptie.cls.xml)	(revision 5114)
@@ -2077,5 +2077,18 @@
  Quit $LB(1,Msg)
 ]]></Implementation>
 </Method>
+
+<Method name="VerplaatsBufferNaarLocatie">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>RGID:%String,VolgNr:%Integer,LocatieID:%String</FormalSpec>
+<Implementation><![CDATA[
+	Set LijnNr = $O(^UPRCP("B","TB",VolgNr,""))
+	While (LijnNr '= ""){
+		Set PalletID = $Piece(^UPRCP("B","TB",VolgNr,LijnNr),"\",3)
+		Do ..ChangeBufferLocAndPal(RGID,VolgNr,LijnNr,LocatieID,PalletID)
+		Set LijnNr = $O(^UPRCP("B","TB",VolgNr,LijnNr))
+	}
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: EWMS/Locations.cls.xml
===================================================================
diff -u -r5109 -r5114
--- EWMS/Locations.cls.xml	(.../Locations.cls.xml)	(revision 5109)
+++ EWMS/Locations.cls.xml	(.../Locations.cls.xml)	(revision 5114)
@@ -585,6 +585,31 @@
 <Parameter name="ROWSPEC" value="locg:%Integer,locm:%Integer,locx:%Integer,locy:%Integer,locz:%Integer"/>
 </Query>
 
+<Method name="GeefFeedbackLocatie">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>LocatieID:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Set Msg = ""
+	If (LocatieID '= "04020101"){
+		If '##class(EWMS.TransLoc).CheckLocTrans(LocatieID){
+			Set Msg = "De locatie '"_LocatieID_"' heeft geen correct formaat."	
+		}Else{
+			Set (LocM,LocG,LocX,LocY) = ""
+			Do ##class(EWMS.TransLoc).GetWMSLocation(LocatieID,.LocM,.LocG,.LocX,.LocY)	
+			If '##class(EWMS.Locations).BestaatLocatie(LocM,LocG,LocX,LocY){
+				Set Msg = "De locatie '"_LocatieID_"' bestaat niet."	
+			}Else{
+				If '##class(EWMS.Locations).IsLocatieLeeg(LocM,LocG,LocX,LocY){
+					Set Msg = "De locatie '"_LocatieID_"' is bezet."	
+				}	
+			}
+		}
+	}
+	Quit Msg
+]]></Implementation>
+</Method>
+
 <Storage name="GSQLStorage">
 <Type>%Library.CacheSQLStorage</Type>
 <StreamLocation>^EWMS.LocationsS</StreamLocation>
Index: UI/MB/UGLYPicking/dlgReceptieScanNadien.cls.xml
===================================================================
diff -u -r5108 -r5114
--- UI/MB/UGLYPicking/dlgReceptieScanNadien.cls.xml	(.../dlgReceptieScanNadien.cls.xml)	(revision 5108)
+++ UI/MB/UGLYPicking/dlgReceptieScanNadien.cls.xml	(.../dlgReceptieScanNadien.cls.xml)	(revision 5114)
@@ -343,45 +343,16 @@
 <FormalSpec>LocatieID:%String</FormalSpec>
 <ProcedureBlock>0</ProcedureBlock>
 <Implementation><![CDATA[
-	Set Msg = ..ControleerLocatie(LocatieID)
+	Set Msg = ##class(EWMS.Locations).GeefFeedbackLocatie(LocatieID)
 	If (Msg = ""){
-		Set LijnNr = $O(^UPRCP("B","TB",..VolgNr,""))
-		While (LijnNr '= ""){
-			Set PalletID = $Piece(^UPRCP("B","TB",..VolgNr,LijnNr),"\",3)
-			Do ##class(BL.MB.UGLYPicking.Receptie).ChangeBufferLocAndPal(..RGID,..VolgNr,LijnNr,LocatieID,PalletID)
-			Set LijnNr = $O(^UPRCP("B","TB",..VolgNr,LijnNr))
-		}
+		Do ##class(BL.MB.UGLYPicking.Receptie).VerplaatsBufferNaarLocatie(..RGID,..VolgNr,LocatieID)
 		Do ..Form.Close()	
 	}Else{
    		Do pdaMsgBox^vhVisual(..Form.Caption,Msg,$$$MBICONEXCLAMATION,0)
 	}
 ]]></Implementation>
 </Method>
 
-<Method name="ControleerLocatie">
-<FormalSpec>LocatieID:%String</FormalSpec>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	Set Msg = ""
-	If (LocatieID '= "04020101"){
-		If '##class(EWMS.TransLoc).CheckLocTrans(LocatieID){
-			Set Msg = "De locatie '"_LocatieID_"' heeft geen correct formaat."	
-		}Else{
-			Set (LocM,LocG,LocX,LocY) = ""
-			Do ##class(EWMS.TransLoc).GetWMSLocation(LocatieID,.LocM,.LocG,.LocX,.LocY)	
-			If '##class(EWMS.Locations).BestaatLocatie(LocM,LocG,LocX,LocY){
-				Set Msg = "De locatie '"_LocatieID_"' bestaat niet."	
-			}Else{
-				If '##class(EWMS.Locations).IsLocatieLeeg(LocM,LocG,LocX,LocY){
-					Set Msg = "De locatie '"_LocatieID_"' is bezet."	
-				}	
-			}
-		}
-	}
-	Quit Msg
-]]></Implementation>
-</Method>
-
 <Storage name="Default">
 <Type>%Library.CacheSerialState</Type>
 <Data name="TMFormClassState">