Index: AAPClient/ProScanMain.pas
===================================================================
diff -u -r68 -r69
--- AAPClient/ProScanMain.pas	(.../ProScanMain.pas)	(revision 68)
+++ AAPClient/ProScanMain.pas	(.../ProScanMain.pas)	(revision 69)
@@ -154,7 +154,6 @@
       (fHuidigScherm as TfmDrieKnoppenScherm).UiContext := fUiContext;
       fModalResult := fHuidigScherm.ShowModal;
       fUiContext := (fHuidigScherm as TfmDrieKnoppenScherm).UiContext;
-      fHuidigeToelevering := (fHuidigScherm as TfmDnaCodeScherm).GeefToelevering();
       if fHuidigScherm.ModalResult = mrYes then begin
         fHuidigScherm := fHomeScherm;
       end
@@ -173,7 +172,6 @@
     //InfoLogScherm tonen
     if fHuidigScherm.ClassType = TfmInfoLogScherm then begin
       (fHuidigScherm as TfmDrieKnoppenScherm).UiContext := fUiContext;
-      (fHuidigScherm as TfmInfoLogScherm).lblToelevering.Caption := fHuidigeToelevering;
       fModalResult := fHuidigScherm.ShowModal;
       if fHuidigScherm.ModalResult = mrYes then begin
         fHuidigScherm := fInfoLogScherm;
Index: AAPClient/Win32/Debug/ProScan.exe
===================================================================
diff -u -r68 -r69
Binary files differ
Index: AAPClient/Win32/Debug/DrieKnoppenScherm.dcu
===================================================================
diff -u -r68 -r69
Binary files differ
Index: AAPClient/UI/UiContext.pas
===================================================================
diff -u -r68 -r69
--- AAPClient/UI/UiContext.pas	(.../UiContext.pas)	(revision 68)
+++ AAPClient/UI/UiContext.pas	(.../UiContext.pas)	(revision 69)
@@ -8,10 +8,12 @@
     fInitialen: String;
     fLoginCode: String;
     fPallet: String;
+    fToelevering: String;
   public
     Property Initialen: String Read fInitialen Write fInitialen;
     Property LoginCode: String Read fLoginCode Write fLoginCode;
     Property Pallet: String Read fPallet Write fPallet;
+    Property Toelevering: String Read fToelevering Write fToelevering;
   end;
 
 implementation
Index: AAPClient/UI/DnaCodeScherm.pas
===================================================================
diff -u -r68 -r69
--- AAPClient/UI/DnaCodeScherm.pas	(.../DnaCodeScherm.pas)	(revision 68)
+++ AAPClient/UI/DnaCodeScherm.pas	(.../DnaCodeScherm.pas)	(revision 69)
@@ -69,7 +69,7 @@
     Request.Header := Header;
     Request.DnaCode := edtDnaCode.Text;
     Request.Aantal := 1;
-    Request.Toelevering := lblToelevering.Caption;
+    Request.Toelevering := UiContext.Toelevering;
     Request.PalletCode := UiContext.Pallet;
 
     Response := Service.DnaCodeAfmelden(Request);
@@ -78,7 +78,8 @@
         Self.ModalResult := mrRetry;
         ToonPopupScherm(Response.Header.Omschrijving, 'Probeer opnieuw')
       end else begin
-        lblToelevering.Caption := Response.DnaCodes[0].Toelevering;
+        UiContext.Toelevering := Response.DnaCodes[0].Toelevering;
+        lblToelevering.Caption := UiContext.Toelevering;
         lblAantalGescand.Caption := IntToStr(Response.AantalReedsGescand);
         lblTotaalAantal.Caption := IntToStr(Response.AantalInToelevering);
         if Response.DnaCodes[0].IsGlsDirect then begin
@@ -109,7 +110,7 @@
 
 function TfmDnaCodeScherm.GeefToelevering: String;
 begin
-  result := lblToelevering.Caption;
+  result := UiContext.Toelevering;
 end;
 
 end.
Index: AAPClient/Win32/Debug/ProScanMain.dcu
===================================================================
diff -u -r68 -r69
Binary files differ
Index: AAPClient/UI/InfoLogScherm.pas
===================================================================
diff -u -r65 -r69
--- AAPClient/UI/InfoLogScherm.pas	(.../InfoLogScherm.pas)	(revision 65)
+++ AAPClient/UI/InfoLogScherm.pas	(.../InfoLogScherm.pas)	(revision 69)
@@ -64,7 +64,7 @@
       Request.Header := Header;
       Request.DnaCode := sgToeleveringData.Rows[sgToeleveringData.Row][0];
       Request.Aantal := -1;
-      Request.Toelevering := lblToelevering.Caption;
+      Request.Toelevering := UiContext.Toelevering;
       Request.PalletCode := sgToeleveringData.Rows[sgToeleveringData.Row][1];
 
       Response := Service.DnaCodeAfmelden(Request);
@@ -109,6 +109,7 @@
   btnLinksOnder.Action := actHome;
   btnCentraalOnder.Action := actOngedaanMaken;
   btnRechtsOnder.Action := actVolgende;
+  lblToelevering.Caption := UiContext.Toelevering;
   Response := ToeleveringDataOphalen();
   VulGridMetToeleveringData(Response.DnaCodes);
 end;
@@ -125,10 +126,10 @@
   Request := ZoekViaToeleveringRequest.Create;
   Header := RequestHeader.Create;
   try
-    Header.Initialen := lblGebruiker.Caption;
+    Header.Initialen := UiContext.Initialen;
     Header.ComputerNaam := ComputerName();
     Request.Header := Header;
-    Request.Toelevering := lblToelevering.Caption;
+    Request.Toelevering := UiContext.Toelevering;
 
     Response := Service.ZoekViaToelevering(Request);
     try
Index: AAPClient/Win32/Debug/LoginScherm.dcu
===================================================================
diff -u -r68 -r69
Binary files differ