Index: AAPClient/UI/HernoemPalletScherm.pas
===================================================================
diff -u -r251 -r335
--- AAPClient/UI/HernoemPalletScherm.pas	(.../HernoemPalletScherm.pas)	(revision 251)
+++ AAPClient/UI/HernoemPalletScherm.pas	(.../HernoemPalletScherm.pas)	(revision 335)
@@ -71,7 +71,9 @@
   inherited;
   if pcHernoemPallet.ActivePageIndex = 0 then begin
     fEnkelDezeDnaCode := '';
-    if ((length(edtOudeCode.Text)=7) and CheckBestaandeDnaCode(edtOudeCode.Text)) then begin
+    if TCommonFunctions.IsKaderdeurLocatie(edtOudeCode.Text) then begin
+      ToonPopupScherm('Kaderdeurlocaties kunnen niet ingescand worden.','Probeer opnieuw','')
+    end else if ((length(edtOudeCode.Text)=7) and CheckBestaandeDnaCode(edtOudeCode.Text)) then begin
       if ToonPopupScherm('Enkel code ''' + TCommonFunctions.VerkorteDnaCode(edtOudeCode.Text) + ''' verwerken?','Ja','Nee',14,6,7) = mrYes then begin
          fEnkelDezeDnaCode := edtOudeCode.Text
       end;
@@ -84,6 +86,7 @@
   end else if pcHernoemPallet.ActivePageIndex = 1 then begin
     pcHernoemPallet.ActivePageIndex := 2;
   end else if pcHernoemPallet.ActivePageIndex = 2 then begin
+
     HernoemPallet(edtOudeCode.Text, edtNieuweCode.Text);
   end;
 end;
@@ -161,7 +164,8 @@
   Response := TAgent.Create(UiContext).HernoemPallet(OudeCode, NieuweCode, fEnkelDezeDnaCode);
   try
     if Response.Header.Status <> '200' then begin
-      ToonPopupScherm(Response.Header.Omschrijving, 'Probeer opnieuw','')
+      ToonPopupScherm(Response.Header.Omschrijving, 'Probeer opnieuw','') ;
+      pcHernoemPallet.ActivePageIndex := 0;
     end else begin
       if NieuweCode = '' then begin
         VulGridMetToeleveringData(Response.DnaCodes);
Index: AAPClient/UI/HernoemPalletScherm.dfm
===================================================================
diff -u -r252 -r335
--- AAPClient/UI/HernoemPalletScherm.dfm	(.../HernoemPalletScherm.dfm)	(revision 252)
+++ AAPClient/UI/HernoemPalletScherm.dfm	(.../HernoemPalletScherm.dfm)	(revision 335)
@@ -673,6 +673,10 @@
       Caption = 'tsNieuweCode'
       ImageIndex = 2
       TabVisible = False
+      ExplicitLeft = 0
+      ExplicitTop = 0
+      ExplicitWidth = 0
+      ExplicitHeight = 0
       object lblNieuweCode: TLabel
         Left = 13
         Top = 207