Index: AAPClient/UI/PalletScherm.pas
===================================================================
diff -u -r59 -r68
--- AAPClient/UI/PalletScherm.pas	(.../PalletScherm.pas)	(revision 59)
+++ AAPClient/UI/PalletScherm.pas	(.../PalletScherm.pas)	(revision 68)
@@ -15,8 +15,10 @@
     procedure FormShow(Sender: TObject);
     procedure actHomeExecute(Sender: TObject);
     procedure actVolgendeExecute(Sender: TObject);
+    procedure edtPalletKeyUp(Sender: TObject; var Key: Word;
+      Shift: TShiftState);
   private
-    { Private declarations }
+    procedure SetContext;
   public
     { Public declarations }
   end;
@@ -52,7 +54,7 @@
   fValideerPalletCodeRequest := ValideerPalletCodeRequest.Create;
   Header := RequestHeader.Create;
   try
-    Header.Initialen := lblGebruiker.Caption;
+    Header.Initialen := UiContext.Initialen;
     Header.ComputerNaam := ComputerName();
     fValideerPalletCodeRequest.Header := Header;
     fValideerPalletCodeRequest.PalletCode := edtPallet.Text;
@@ -63,6 +65,7 @@
         Self.ModalResult := mrRetry;
         ToonPopupScherm(fValideerPalletCodeResponse.Header.Omschrijving, 'Scan opnieuw');
         edtPallet.Text := '';
+        SetContext;
       end else begin
         Self.ModalResult := mrOk;
       end;
@@ -78,10 +81,10 @@
     fZoekViaPalletCodeRequest := ZoekViaPalletCodeRequest.Create;
     Header := RequestHeader.Create;
     try
-      Header.Initialen := lblGebruiker.Caption;
+      Header.Initialen := UiContext.Initialen;
       Header.ComputerNaam := ComputerName();
       fZoekViaPalletCodeRequest.Header := Header;
-      fZoekViaPalletCodeRequest.PalletCode := edtPallet.Text;
+      fZoekViaPalletCodeRequest.PalletCode := UiContext.Pallet;
 
       fZoekViaPalletCodeResponse := Service.ZoekViaPalletCode(fZoekViaPalletCodeRequest);
       try
@@ -100,15 +103,28 @@
 
 end;
 
+procedure TfmPalletScherm.edtPalletKeyUp(Sender: TObject; var Key: Word;
+  Shift: TShiftState);
+begin
+  inherited;
+  SetContext;
+end;
+
 procedure TfmPalletScherm.FormShow(Sender: TObject);
 begin
   btnLinksOnder.Action := nil;
   btnCentraalOnder.Action := actHome;
   btnRechtsOnder.Action := actVolgende;
   edtPallet.Text := '';
+  SetContext;
   ActiveControl := edtPallet;
   inherited;
 
 end;
 
+procedure TfmPalletScherm.SetContext;
+begin
+  UiContext.Pallet := edtPallet.Text;
+end;
+
 end.