Index: AAPClient/UI/InfoLogScherm.pas
===================================================================
diff -u -r84 -r86
--- AAPClient/UI/InfoLogScherm.pas	(.../InfoLogScherm.pas)	(revision 84)
+++ AAPClient/UI/InfoLogScherm.pas	(.../InfoLogScherm.pas)	(revision 86)
@@ -51,6 +51,7 @@
   Header: RequestHeader;
   fWaarschuwingModalResult: TModalResult;
 begin
+  Self.ModalResult := mrInfoLog;
   fWaarschuwingModalResult := ToonPopupScherm('Scan ongedaan maken?'+sgToeleveringData.Rows[sgToeleveringData.Row][0],'Ja','Nee');
 
   if fWaarschuwingModalResult = mrOk then begin
@@ -88,6 +89,7 @@
   Response: ZoekViaToeleveringResponse;
 begin
   inherited;
+  Self.ModalResult := mrInfoLog;
   ToonGescand := not(ToonGescand);
   Response := ToeleveringDataOphalen();
   VulGridMetToeleveringData(Response.DnaCodes);
Index: AAPClient/UI/BestaandePalletScherm.pas
===================================================================
diff -u -r77 -r86
--- AAPClient/UI/BestaandePalletScherm.pas	(.../BestaandePalletScherm.pas)	(revision 77)
+++ AAPClient/UI/BestaandePalletScherm.pas	(.../BestaandePalletScherm.pas)	(revision 86)
@@ -54,7 +54,7 @@
 procedure TfmBestaandePalletScherm.btnReworkClick(Sender: TObject);
 begin
   inherited;
-  //
+  Self.ModalResult := mrDnaCode;
 end;
 
 procedure TfmBestaandePalletScherm.FormShow(Sender: TObject);
Index: AAPClient/ProScanMain.pas
===================================================================
diff -u -r84 -r86
--- AAPClient/ProScanMain.pas	(.../ProScanMain.pas)	(revision 84)
+++ AAPClient/ProScanMain.pas	(.../ProScanMain.pas)	(revision 86)
@@ -96,7 +96,7 @@
         mrBestaandePallet : fHuidigScherm := fBestaandePalletScherm;
         mrPallet          : fHuidigScherm := fPalletScherm;
         mrDnaCode         : fHuidigScherm := fDnaCodeScherm;
-        mrAbort           : ShowMessage('DnaCodeGevuld scherm');
+        mrAbort           : fHuidigScherm := fDnaCodeScherm;
       end;
       continue;
     end;
@@ -128,10 +128,7 @@
     if fHuidigScherm.ClassType = TfmInfoLogScherm then begin
       case fHuidigScherm.ModalResult of
         mrHome           : fHuidigScherm := fHomeScherm;
-        mrYes            : fHuidigScherm := fInfoLogScherm;
-        mrNone           : fHuidigScherm := fInfoLogScherm;
         mrDnaCode        : fHuidigScherm := fDnaCodeScherm;
-        mrIgnore         : fHuidigScherm := fInfoLogScherm;
       end;
       continue;
     end;