Index: AAPClient/ProScanMain.pas
===================================================================
diff -u -r37 -r38
--- AAPClient/ProScanMain.pas	(.../ProScanMain.pas)	(revision 37)
+++ AAPClient/ProScanMain.pas	(.../ProScanMain.pas)	(revision 38)
@@ -14,6 +14,7 @@
   private
     fInitialen: string;
     fLoginCode: string;
+    fHuidigePallet: string;
     fHuidigScherm: TForm;
     fLoginScherm: TForm;
     fHomeScherm: TForm;
@@ -105,6 +106,7 @@
         fHuidigScherm := fPalletScherm;
       end;
       if fHuidigScherm.ModalResult = mrNo then begin
+        fHuidigePallet := (fHuidigScherm as TfmPalletScherm).edtPallet.Text;
         fHuidigScherm := fBestaandePalletScherm;
       end;
       if fHuidigScherm.ModalResult = mrOk then begin
@@ -118,10 +120,20 @@
 
     //BestaandePalletScherm tonen
     if fHuidigScherm.ClassType = TfmBestaandePalletScherm then begin
+      (fHuidigScherm as TfmBestaandePalletScherm).lblPalletCode.Caption := fHuidigePallet;
       fModalResult := fHuidigScherm.ShowModal;
       if fHuidigScherm.ModalResult = mrYes then begin
         fHuidigScherm := fHomeScherm;
       end;
+      if fHuidigScherm.ModalResult = mrOk then begin
+        fHuidigScherm := fPalletScherm;
+      end;
+      if fHuidigScherm.ModalResult = mrOk then begin
+        ShowMessage('DnaCodeLeeg scherm');
+      end;
+      if fHuidigScherm.ModalResult = mrOk then begin
+        ShowMessage('DnaCodeGevuld scherm');
+      end;
       continue;
     end;
 
Index: AAPClient/UI/BestaandePalletScherm.pas
===================================================================
diff -u -r37 -r38
--- AAPClient/UI/BestaandePalletScherm.pas	(.../BestaandePalletScherm.pas)	(revision 37)
+++ AAPClient/UI/BestaandePalletScherm.pas	(.../BestaandePalletScherm.pas)	(revision 38)
@@ -11,6 +11,7 @@
   TfmBestaandePalletScherm = class(TfmDrieKnoppenScherm)
     btnExtraToelevering: TButton;
     btnRework: TButton;
+    lblPalletCode: TLabel;
     procedure FormShow(Sender: TObject);
     procedure actHomeExecute(Sender: TObject);
     procedure actPalletExecute(Sender: TObject);
Index: AAPClient/UI/PalletScherm.pas
===================================================================
diff -u -r37 -r38
--- AAPClient/UI/PalletScherm.pas	(.../PalletScherm.pas)	(revision 37)
+++ AAPClient/UI/PalletScherm.pas	(.../PalletScherm.pas)	(revision 38)
@@ -62,7 +62,8 @@
     try
       if fValideerPalletCodeResponse.Header.Status <> '200' then begin
         Self.ModalResult := mrRetry;
-        ToonPopupScherm(fValideerPalletCodeResponse.Header.Omschrijving, 'Scan opnieuw')
+        ToonPopupScherm(fValideerPalletCodeResponse.Header.Omschrijving, 'Scan opnieuw');
+        edtPallet.Text := '';
       end else begin
         Self.ModalResult := mrOk;
       end;
@@ -99,8 +100,6 @@
 
   end;
 
-
-  edtPallet.Text := '';
 end;
 
 procedure TfmPalletScherm.edtPalletKeyPress(Sender: TObject; var Key: Char);
@@ -114,6 +113,8 @@
   btnLinksOnder.Action := nil;
   btnCentraalOnder.Action := actHome;
   btnRechtsOnder.Action := actVolgende;
+  edtPallet.Text := '';
+  ActiveControl := edtPallet;
   inherited;
 
 end;
Index: AAPClient/UI/BestaandePalletScherm.dfm
===================================================================
diff -u -r37 -r38
--- AAPClient/UI/BestaandePalletScherm.dfm	(.../BestaandePalletScherm.dfm)	(revision 37)
+++ AAPClient/UI/BestaandePalletScherm.dfm	(.../BestaandePalletScherm.dfm)	(revision 38)
@@ -2,23 +2,30 @@
   Caption = 'fmBestaandePalletScherm'
   PixelsPerInch = 96
   TextHeight = 19
-  object btnExtraToelevering: TButton [4]
+  object lblPalletCode: TLabel [1]
+    Left = 144
+    Top = 8
+    Width = 73
+    Height = 19
+    AutoSize = False
+  end
+  object btnExtraToelevering: TButton [5]
     Left = 56
     Top = 112
     Width = 121
     Height = 66
     Caption = 'Extra toelevering'
-    ModalResult = 7
+    ModalResult = 2
     TabOrder = 3
     WordWrap = True
   end
-  object btnRework: TButton [5]
+  object btnRework: TButton [6]
     Left = 56
     Top = 40
     Width = 121
     Height = 66
     Caption = 'Rework'
-    ModalResult = 6
+    ModalResult = 4
     TabOrder = 4
     WordWrap = True
   end
Index: AAPClient/Win32/Debug/ProScan.exe
===================================================================
diff -u -r37 -r38
Binary files differ
Index: AAPClient/Win32/Debug/ProScanMain.dcu
===================================================================
diff -u -r37 -r38
Binary files differ