Index: UI/MB/UGLYPicking/dlgReceptieSel.cls.xml
===================================================================
diff -u -r5108 -r5109
--- UI/MB/UGLYPicking/dlgReceptieSel.cls.xml	(.../dlgReceptieSel.cls.xml)	(revision 5108)
+++ UI/MB/UGLYPicking/dlgReceptieSel.cls.xml	(.../dlgReceptieSel.cls.xml)	(revision 5109)
@@ -845,8 +845,8 @@
  Else  If DefaultLocatie="ITS" Do
  . Set ..rbLocatieInTeScannen.Checked="True"
  . Set ..rdScanNadien.Checked="False"
- Else 
- . Set ..txtLocatieVast.Text=LocatieVast
+ Else  If DefaultLocatie="ScanNadien" Do
+ . Set ..txtLocatieVast.Text="04020101"
  . Set ..rdScanNadien.Checked="True"
  . Set ..rbLocatieInTeScannen.Checked="False"
 
Index: EWMS/Locations.cls.xml
===================================================================
diff -u -r5108 -r5109
--- EWMS/Locations.cls.xml	(.../Locations.cls.xml)	(revision 5108)
+++ EWMS/Locations.cls.xml	(.../Locations.cls.xml)	(revision 5109)
@@ -467,12 +467,12 @@
 <FormalSpec>LocM:%Library.String,LocG:%Library.String,LocX:%Library.String,LocY:%Library.String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
-	Set IsLocatieLeeg = 1
+	Set IsLocatieLeeg = 0
 	New RS
 	Set RS = ##class(%ResultSet).%New("EWMS.Locations:CheckIfLocationIsEmpty")
 	Do RS.Execute(LocM,LocG,LocX,LocY)
 	If RS.Next(){
-		Set IsLocatieLeeg = 0
+		Set IsLocatieLeeg = 1
 	}
 	Quit IsLocatieLeeg
 ]]></Implementation>
Index: UI/MB/UGLYPicking/dlgReceptie.cls.xml
===================================================================
diff -u -r5093 -r5109
--- UI/MB/UGLYPicking/dlgReceptie.cls.xml	(.../dlgReceptie.cls.xml)	(revision 5093)
+++ UI/MB/UGLYPicking/dlgReceptie.cls.xml	(.../dlgReceptie.cls.xml)	(revision 5109)
@@ -933,7 +933,13 @@
 
  ;Interface settings voor buffer (default)
  New DefaultLocatie,DefaultPallet,LocatieVast,PalletVast
- Set DefaultLocatie=$S(..LocatieVast:"V",1:"ITS")
+ If ..LocatieVast {
+ 	Set DefaultLocatie="V"
+ } ElseIf ..LocatieScanNadien {
+ 	Set DefaultLocatie="ScanNadien"
+ }Else{
+	Set DefaultLocatie="ITS"	
+ }
  Set DefaultPallet=$S(..PalletVast:"V",..PalletViaProduct:"VP",1:"ITS")
  Set LocatieVast=$S(..LocatieVast:..txtLocatie.Text,1:"")
  Set PalletVast=$S(..PalletVast:..txtPalletID.Text,1:"")
@@ -971,7 +977,13 @@
 
  ;Interface settings voor buffer (default)
  New DefaultLocatie,DefaultPallet,LocatieVast,PalletVast
- Set DefaultLocatie=$S(..LocatieVast:"V",1:"ITS")
+ If ..LocatieVast {
+ 	Set DefaultLocatie="V"
+ } ElseIf ..LocatieScanNadien {
+ 	Set DefaultLocatie="ScanNadien"
+ }Else{
+	Set DefaultLocatie="ITS"	
+ }
  Set DefaultPallet=$S(..PalletVast:"V",..PalletViaProduct:"VP",1:"ITS")
  Set LocatieVast=$S(..LocatieVast:..txtLocatie.Text,1:"")
  Set PalletVast=$S(..PalletVast:..txtPalletID.Text,1:"")