Index: AAPClient/UI/DnaCodeReedsGescandScherm.pas
===================================================================
diff -u -r171 -r172
--- AAPClient/UI/DnaCodeReedsGescandScherm.pas	(.../DnaCodeReedsGescandScherm.pas)	(revision 171)
+++ AAPClient/UI/DnaCodeReedsGescandScherm.pas	(.../DnaCodeReedsGescandScherm.pas)	(revision 172)
@@ -18,13 +18,21 @@
     pnlAnnuleren: TPanel;
     imgAnnuleren: TImage;
     lblAnnuleren: TLabel;
+    edtPallet: TEdit;
+    lblScanPallet: TLabel;
     procedure FormShow(Sender: TObject);
     procedure imgAnnulerenClick(Sender: TObject);
     procedure pnlAnnulerenClick(Sender: TObject);
     procedure imgWegnemenClick(Sender: TObject);
     procedure pnlWegnemenClick(Sender: TObject);
+    procedure edtPalletKeyUp(Sender: TObject; var Key: Word;
+      Shift: TShiftState);
+    procedure pnlVerplaatsenClick(Sender: TObject);
+    procedure imgVerplaatsenClick(Sender: TObject);
   private
-    procedure Wegnemen();
+    procedure Wegnemen;
+    procedure Verplaatsen;
+    procedure SetPalletControlsVisibility(IsVisible: boolean);
   public
     { Public declarations }
   end;
@@ -39,6 +47,16 @@
 
 {$R *.dfm}
 
+procedure TfmDnaCodeReedsGescandScherm.edtPalletKeyUp(Sender: TObject;
+  var Key: Word; Shift: TShiftState);
+begin
+  inherited;
+  if Key = VK_RETURN then begin
+    Verplaatsen;
+    Key := 0;
+  end;
+end;
+
 procedure TfmDnaCodeReedsGescandScherm.FormShow(Sender: TObject);
 begin
   inherited;
@@ -53,11 +71,17 @@
   Self.ModalResult := mrDnaCode;
 end;
 
+procedure TfmDnaCodeReedsGescandScherm.imgVerplaatsenClick(Sender: TObject);
+begin
+  inherited;
+  SetPalletControlsVisibility(true);
+end;
+
 procedure TfmDnaCodeReedsGescandScherm.imgWegnemenClick(Sender: TObject);
 begin
   inherited;
+  SetPalletControlsVisibility(false);
   Wegnemen;
-  Self.ModalResult := mrDnaCode;
 end;
 
 procedure TfmDnaCodeReedsGescandScherm.pnlAnnulerenClick(Sender: TObject);
@@ -66,20 +90,69 @@
   Self.ModalResult := mrDnaCode;
 end;
 
+procedure TfmDnaCodeReedsGescandScherm.pnlVerplaatsenClick(Sender: TObject);
+begin
+  inherited;
+  SetPalletControlsVisibility(true);
+end;
+
 procedure TfmDnaCodeReedsGescandScherm.pnlWegnemenClick(Sender: TObject);
 begin
   inherited;
+  SetPalletControlsVisibility(false);
   Wegnemen;
-  Self.ModalResult := mrDnaCode;
 end;
 
-procedure TfmDnaCodeReedsGescandScherm.Wegnemen();
+procedure TfmDnaCodeReedsGescandScherm.SetPalletControlsVisibility(
+  IsVisible: boolean);
+begin
+  lblScanPallet.Visible := IsVisible;
+  edtPallet.Visible := IsVisible;
+end;
+
+procedure TfmDnaCodeReedsGescandScherm.Verplaatsen;var
+  Service: DnaCodeServiceSoap;
+  Request: HernoemPalletRequest;
+  Response: HernoemPalletResponse;
+  Header: RequestHeader;
+begin
+  Service := DnaCodeService.GetDnaCodeServiceSoap();
+  // request opbouwen
+  Request := HernoemPalletRequest.Create;
+  Header := RequestHeader.Create;
+  try
+    Header.Initialen := UiContext.Initialen;
+    Header.ComputerNaam := FullName();
+    Request.Header := Header;
+    Request.OudeCode := UiContext.Pallet;
+    Request.NieuweCode := edtPallet.Text;
+    Request.EnkelDezeDnaCode := UiContext.LaatsteDnaCode;
+    Response := Service.HernoemPallet(Request);
+    try
+      if Response.Header.Status <> '200' then begin
+        ToonPopupScherm(Response.Header.Omschrijving, 'Probeer opnieuw','')
+      end else begin
+        ToonPopupScherm(Response.Header.Omschrijving, 'OK','');
+        Self.ModalResult := mrDnaCode;
+      end;
+    finally
+      Response.Free;
+    end;
+  finally
+    Request.Free;
+  end;
+  if Self.ModalResult = mrDnaCode then
+    CloseModal;
+end;
+
+procedure TfmDnaCodeReedsGescandScherm.Wegnemen;
 var
   Service: DnaCodeServiceSoap;
   Request: DnaCodeAfmeldenRequest;
   Response: DnaCodeAfmeldenResponse;
   Header: RequestHeader;
 begin
+  Self.ModalResult := mrDnaCode;
   Service := DnaCodeService.GetDnaCodeServiceSoap();
   // request opbouwen
   Request := DnaCodeAfmeldenRequest.Create;