Index: ProScan/UI/PalletScherm.pas
===================================================================
diff -u -r686 -r687
--- ProScan/UI/PalletScherm.pas	(.../PalletScherm.pas)	(revision 686)
+++ ProScan/UI/PalletScherm.pas	(.../PalletScherm.pas)	(revision 687)
@@ -68,6 +68,7 @@
     try
       if fZoekViaPalletCodeResponse.Header.Status = '200' then begin
         UiContext.Toelevering := fZoekViaPalletCodeResponse.DnaCodes[0].Toelevering;
+        SetContext;
         if fZoekViaPalletCodeResponse.MeerdereToeleveringenToegestaan then
           Self.ModalResult := mrBestaandePallet
         else
@@ -106,7 +107,7 @@
   result := false;
 
   if (UiContext.MoetTbpCodeGenereren) then begin
-	result := true;
+	  result := true;
   end else begin
     fAgent := TAgent.Create(UiContext);
     fValideerPalletCodeResponse := fAgent.ValideerPalletCode(edtPallet.Text);
@@ -142,6 +143,7 @@
   inherited;
   edtPallet.Text := '';
   UiContext.Toelevering := '';
+  UiContext.Pallet := '';
   UiContext.MoetTbpCodeGenereren := true;
   actVolgendeExecute(Self);
 end;
@@ -152,7 +154,6 @@
   inherited;
   SetContext;
   if Key = VK_RETURN then begin
-    UiContext.MoetTbpCodeGenereren := false;
     actVolgende.Execute;
     Key := 0;
   end;
@@ -171,6 +172,7 @@
   btnRechtsOnder.Action := actVolgende;
   edtPallet.Text := '';
   edtPallet.SetFocus;
+  UiContext.MoetTbpCodeGenereren := false;
   SetContext;
   inherited;
 end;