Index: AAPClient/UI/DnaCodeScherm.pas
===================================================================
diff -u -r78 -r79
--- AAPClient/UI/DnaCodeScherm.pas	(.../DnaCodeScherm.pas)	(revision 78)
+++ AAPClient/UI/DnaCodeScherm.pas	(.../DnaCodeScherm.pas)	(revision 79)
@@ -23,10 +23,12 @@
     procedure FormShow(Sender: TObject);
     procedure actPalletExecute(Sender: TObject);
     procedure actHomeExecute(Sender: TObject);
-    procedure actVolgendeExecute(Sender: TObject);
     procedure btnInfoClick(Sender: TObject);
+    procedure edtDnaCodeKeyDown(Sender: TObject; var Key: Word;
+      Shift: TShiftState);
+    procedure actVolgendeExecute(Sender: TObject);
   private
-    { Private declarations }
+    procedure MeldDnaCodeAf();
   public
     function GeefToelevering: String;
   end;
@@ -54,6 +56,52 @@
 end;
 
 procedure TfmDnaCodeScherm.actVolgendeExecute(Sender: TObject);
+begin
+  inherited;
+  if lblAantalGescand.Caption = lblTotaalAantal.Caption then begin
+    ShowMessage('toelev compl');
+  end else begin
+    ShowMessage('toelev niet compl');
+  end;
+end;
+
+procedure TfmDnaCodeScherm.btnInfoClick(Sender: TObject);
+begin
+  inherited;
+  if UiContext.Toelevering = '' then
+    Self.ModalResult := mrDnaCode
+  else
+    Self.ModalResult := mrInfoLog;
+end;
+
+procedure TfmDnaCodeScherm.edtDnaCodeKeyDown(Sender: TObject; var Key: Word;
+  Shift: TShiftState);
+begin
+  inherited;
+  if ord(Key) = VK_RETURN then
+  begin
+    Key := Word(#0);
+    MeldDnaCodeAf;
+  end;
+end;
+
+procedure TfmDnaCodeScherm.FormShow(Sender: TObject);
+begin
+  btnLinksOnder.Action := actPallet;
+  btnCentraalOnder.Action := actHome;
+  btnRechtsOnder.Action := actVolgende;
+  edtDnaCode.Text := '';
+  ActiveControl := edtDnaCode;
+  lblPalletCode.Caption := UiContext.Pallet;
+  inherited;
+end;
+
+function TfmDnaCodeScherm.GeefToelevering: String;
+begin
+  result := UiContext.Toelevering;
+end;
+
+procedure TfmDnaCodeScherm.MeldDnaCodeAf;
 var
   Service: DnaCodeServiceSoap;
   Request: DnaCodeAfmeldenRequest;
@@ -98,29 +146,4 @@
   end;
 end;
 
-procedure TfmDnaCodeScherm.btnInfoClick(Sender: TObject);
-begin
-  inherited;
-  if UiContext.Toelevering = '' then
-    Self.ModalResult := mrDnaCode
-  else
-    Self.ModalResult := mrInfoLog;
-end;
-
-procedure TfmDnaCodeScherm.FormShow(Sender: TObject);
-begin
-  btnLinksOnder.Action := actPallet;
-  btnCentraalOnder.Action := actHome;
-  btnRechtsOnder.Action := actVolgende;
-  edtDnaCode.Text := '';
-  ActiveControl := edtDnaCode;
-  lblPalletCode.Caption := UiContext.Pallet;
-  inherited;
-end;
-
-function TfmDnaCodeScherm.GeefToelevering: String;
-begin
-  result := UiContext.Toelevering;
-end;
-
 end.
Index: AAPClient/UI/DnaCodeScherm.dfm
===================================================================
diff -u -r77 -r79
--- AAPClient/UI/DnaCodeScherm.dfm	(.../DnaCodeScherm.dfm)	(revision 77)
+++ AAPClient/UI/DnaCodeScherm.dfm	(.../DnaCodeScherm.dfm)	(revision 79)
@@ -75,9 +75,9 @@
     Height = 27
     CharCase = ecUpperCase
     TabOrder = 2
+    OnKeyDown = edtDnaCodeKeyDown
   end
   inherited btnRechtsOnder: TButton
-    Default = True
     TabOrder = 3
   end
   object btnInfo: TButton [14]