Index: AAPClient/UI/BestaandePalletScherm.pas
===================================================================
diff -u -r38 -r68
--- AAPClient/UI/BestaandePalletScherm.pas	(.../BestaandePalletScherm.pas)	(revision 38)
+++ AAPClient/UI/BestaandePalletScherm.pas	(.../BestaandePalletScherm.pas)	(revision 68)
@@ -45,6 +45,7 @@
   btnLinksOnder.Action := actPallet;
   btnCentraalOnder.Action := actHome;
   btnRechtsOnder.Action := nil;
+  lblPalletCode.Caption := UiContext.Pallet;
   inherited;
 end;
 
Index: AAPClient/UI/UiContext.pas
===================================================================
diff -u -r66 -r68
--- AAPClient/UI/UiContext.pas	(.../UiContext.pas)	(revision 66)
+++ AAPClient/UI/UiContext.pas	(.../UiContext.pas)	(revision 68)
@@ -7,9 +7,11 @@
   private
     fInitialen: String;
     fLoginCode: String;
+    fPallet: String;
   public
     Property Initialen: String Read fInitialen Write fInitialen;
     Property LoginCode: String Read fLoginCode Write fLoginCode;
+    Property Pallet: String Read fPallet Write fPallet;
   end;
 
 implementation
Index: AAPClient/Win32/Debug/DrieKnoppenScherm.dcu
===================================================================
diff -u -r66 -r68
Binary files differ
Index: AAPClient/UI/DnaCodeScherm.pas
===================================================================
diff -u -r53 -r68
--- AAPClient/UI/DnaCodeScherm.pas	(.../DnaCodeScherm.pas)	(revision 53)
+++ AAPClient/UI/DnaCodeScherm.pas	(.../DnaCodeScherm.pas)	(revision 68)
@@ -64,13 +64,13 @@
   Request := DnaCodeAfmeldenRequest.Create;
   Header := RequestHeader.Create;
   try
-    Header.Initialen := lblGebruiker.Caption;
+    Header.Initialen := UiContext.Initialen;
     Header.ComputerNaam := ComputerName();
     Request.Header := Header;
     Request.DnaCode := edtDnaCode.Text;
     Request.Aantal := 1;
     Request.Toelevering := lblToelevering.Caption;
-    Request.PalletCode := lblPalletCode.Caption;
+    Request.PalletCode := UiContext.Pallet;
 
     Response := Service.DnaCodeAfmelden(Request);
     try
@@ -103,7 +103,7 @@
   btnRechtsOnder.Action := actVolgende;
   edtDnaCode.Text := '';
   ActiveControl := edtDnaCode;
-
+  lblPalletCode.Caption := UiContext.Pallet;
   inherited;
 end;
 
Index: AAPClient/Win32/Debug/ProScan.exe
===================================================================
diff -u -r67 -r68
Binary files differ
Index: AAPClient/UI/DnaCodeScherm.dfm
===================================================================
diff -u -r59 -r68
--- AAPClient/UI/DnaCodeScherm.dfm	(.../DnaCodeScherm.dfm)	(revision 59)
+++ AAPClient/UI/DnaCodeScherm.dfm	(.../DnaCodeScherm.dfm)	(revision 68)
@@ -1,8 +1,6 @@
 inherited fmDnaCodeScherm: TfmDnaCodeScherm
   ActiveControl = edtDnaCode
   Caption = 'fmDnaCodeScherm'
-  ExplicitWidth = 232
-  ExplicitHeight = 246
   PixelsPerInch = 96
   TextHeight = 19
   object lblToelevering: TLabel [1]
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.
Index: AAPClient/ProScanMain.pas
===================================================================
diff -u -r67 -r68
--- AAPClient/ProScanMain.pas	(.../ProScanMain.pas)	(revision 67)
+++ AAPClient/ProScanMain.pas	(.../ProScanMain.pas)	(revision 68)
@@ -92,6 +92,7 @@
     if fHuidigScherm.ClassType = TfmHomeScherm then begin
       (fHuidigScherm as TfmDrieKnoppenScherm).UiContext := fUiContext;
       fModalResult := fHuidigScherm.ShowModal;
+      fUiContext := (fHuidigScherm as TfmDrieKnoppenScherm).UiContext;
       if fHuidigScherm.ModalResult = mrYes then begin
         fHuidigScherm := fPalletScherm;
       end
@@ -109,18 +110,17 @@
     if fHuidigScherm.ClassType = TfmPalletScherm then begin
       (fHuidigScherm as TfmDrieKnoppenScherm).UiContext := fUiContext;
       fModalResult := fHuidigScherm.ShowModal;
+      fUiContext := (fHuidigScherm as TfmDrieKnoppenScherm).UiContext;
       if fHuidigScherm.ModalResult = mrYes then begin
         fHuidigScherm := fHomeScherm;
       end
       else if fHuidigScherm.ModalResult = mrRetry then begin
         fHuidigScherm := fPalletScherm;
       end
       else if fHuidigScherm.ModalResult = mrNo then begin
-        fHuidigePallet := (fHuidigScherm as TfmPalletScherm).edtPallet.Text;
         fHuidigScherm := fBestaandePalletScherm;
       end
       else if fHuidigScherm.ModalResult = mrOk then begin
-        fHuidigePallet := (fHuidigScherm as TfmPalletScherm).edtPallet.Text;
         fHuidigScherm := fDnaCodeScherm;
       end
       else if fHuidigScherm.ModalResult = mrAbort then begin
@@ -132,8 +132,8 @@
     //BestaandePalletScherm tonen
     if fHuidigScherm.ClassType = TfmBestaandePalletScherm then begin
       (fHuidigScherm as TfmDrieKnoppenScherm).UiContext := fUiContext;
-      (fHuidigScherm as TfmBestaandePalletScherm).lblPalletCode.Caption := fHuidigePallet;
       fModalResult := fHuidigScherm.ShowModal;
+      fUiContext := (fHuidigScherm as TfmDrieKnoppenScherm).UiContext;
       if fHuidigScherm.ModalResult = mrYes then begin
         fHuidigScherm := fHomeScherm;
       end
@@ -152,8 +152,8 @@
     //DnaCodeScherm tonen
     if fHuidigScherm.ClassType = TfmDnaCodeScherm then begin
       (fHuidigScherm as TfmDrieKnoppenScherm).UiContext := fUiContext;
-      (fHuidigScherm as TfmDnaCodeScherm).lblPalletCode.Caption := fHuidigePallet;
       fModalResult := fHuidigScherm.ShowModal;
+      fUiContext := (fHuidigScherm as TfmDrieKnoppenScherm).UiContext;
       fHuidigeToelevering := (fHuidigScherm as TfmDnaCodeScherm).GeefToelevering();
       if fHuidigScherm.ModalResult = mrYes then begin
         fHuidigScherm := fHomeScherm;
Index: AAPClient/UI/PalletScherm.dfm
===================================================================
diff -u -r44 -r68
--- AAPClient/UI/PalletScherm.dfm	(.../PalletScherm.dfm)	(revision 44)
+++ AAPClient/UI/PalletScherm.dfm	(.../PalletScherm.dfm)	(revision 68)
@@ -25,6 +25,7 @@
     Height = 27
     CharCase = ecUpperCase
     TabOrder = 3
+    OnKeyUp = edtPalletKeyUp
   end
   inherited alAlgemeen: TActionList
     inherited actVolgende: TAction
Index: AAPClient/Win32/Debug/LoginScherm.dcu
===================================================================
diff -u -r67 -r68
Binary files differ
Index: AAPClient/Win32/Debug/ProScanMain.dcu
===================================================================
diff -u -r67 -r68
Binary files differ