Index: PlanScan/Main.pas
===================================================================
diff -u -r456 -r481
--- PlanScan/Main.pas	(.../Main.pas)	(revision 456)
+++ PlanScan/Main.pas	(.../Main.pas)	(revision 481)
@@ -78,8 +78,12 @@
 end;
 
 procedure TfmMain.HuidigeGebruikerAfmelden;
+var
+  fAgent: TAgent;
 begin
-  TAgent.Create(UiContext).GebruikerAfmelden(UiContext.Initialen, UiContext.LoginCode);
+  fAgent := TAgent.Create(UiContext);
+  fAgent.GebruikerAfmelden(UiContext.Initialen, UiContext.LoginCode);
+  fAgent.Free;
   UiContext.Initialen := '';
   UiContext.LoginCode := '';
   lblInitialen.Caption := '';
@@ -110,12 +114,15 @@
   fLoginScherm: TfmLogin;
   fGebruikerAanmeldenResponse: GebruikerAanmeldenResponse;
   fInloggenGeslaagd: boolean;
+  fAgent: TAgent;
 begin
   fInloggenGeslaagd := true;
   fLoginScherm := TfmLogin.Create(self);
   fLoginScherm.ShowModal;
   if fLoginScherm.ModalResult = mrOk then begin
-    fGebruikerAanmeldenResponse := TAgent.Create(UiContext).GebruikerAanmelden(fLoginScherm.edtInitialen.Text, fLoginScherm.edtLoginCode.Text);
+    fAgent := TAgent.Create(UiContext);
+    fGebruikerAanmeldenResponse := fAgent.GebruikerAanmelden(fLoginScherm.edtInitialen.Text, fLoginScherm.edtLoginCode.Text);
+    fAgent.Free;
     try
       if fGebruikerAanmeldenResponse.Header.Status <> '200' then begin
         ShowMessage(fGebruikerAanmeldenResponse.Header.Omschrijving);
Index: PlanScan/UI/frameDnaCodes.dfm
===================================================================
diff -u -r462 -r481
--- PlanScan/UI/frameDnaCodes.dfm	(.../frameDnaCodes.dfm)	(revision 462)
+++ PlanScan/UI/frameDnaCodes.dfm	(.../frameDnaCodes.dfm)	(revision 481)
@@ -250,14 +250,14 @@
       ExplicitLeft = 6
       ExplicitWidth = 105
     end
-    object btnMaatwerketiket: TButton
+    object btnProductetiket: TButton
       Left = 6
       Top = 118
       Width = 115
       Height = 25
-      Caption = 'Maatwerketiket'
+      Caption = 'Productetiket'
       TabOrder = 0
-      OnClick = btnMaatwerketiketClick
+      OnClick = btnProductetiketClick
     end
     object btnKlantEtiket: TButton
       Left = 6
Index: PlanScan/UI/frameDnaCodes.pas
===================================================================
diff -u -r470 -r481
--- PlanScan/UI/frameDnaCodes.pas	(.../frameDnaCodes.pas)	(revision 470)
+++ PlanScan/UI/frameDnaCodes.pas	(.../frameDnaCodes.pas)	(revision 481)
@@ -12,7 +12,7 @@
   TfrmDnaCodes = class(TFrame)
     dbgDnaCodes: TDBGrid;
     pnlActies: TPanel;
-    btnMaatwerketiket: TButton;
+    btnProductetiket: TButton;
     btnKlantEtiket: TButton;
     btnProboxetiket: TButton;
     pnlZoekKnoppen: TPanel;
@@ -41,7 +41,7 @@
     procedure ZoekViaOrdernummer();
     procedure ZoekViaBatch();
     procedure btnZoekenClick(Sender: TObject);
-    procedure btnMaatwerketiketClick(Sender: TObject);
+    procedure btnProductetiketClick(Sender: TObject);
     procedure btnKlantEtiketClick(Sender: TObject);
     procedure btnProboxetiketClick(Sender: TObject);
     procedure edtToeleveringEnter(Sender: TObject);
@@ -87,7 +87,7 @@
   dsDnaCodes.DataSet := cdsDnaCodes;
 end;
 
-procedure TfrmDnaCodes.btnMaatwerketiketClick(Sender: TObject);
+procedure TfrmDnaCodes.btnProductetiketClick(Sender: TObject);
 var
   DnaCodesStringList: TStringList;
 begin
Index: PlanScan/PlanScan.dproj.local
===================================================================
diff -u -r468 -r481
--- PlanScan/PlanScan.dproj.local	(.../PlanScan.dproj.local)	(revision 468)
+++ PlanScan/PlanScan.dproj.local	(.../PlanScan.dproj.local)	(revision 481)
@@ -2,76 +2,76 @@
 <BorlandProject>
 	<Transactions>
     <Transaction>2020/02/17 10:05:16.000.600,=C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.pas</Transaction>
-    <Transaction>2020/02/17 10:06:02.000.921,E:\svn\Delphi\PlanScan\Main.pas=C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.pas</Transaction>
-    <Transaction>2020/02/17 10:06:02.000.921,E:\svn\Delphi\PlanScan\Main.dfm=C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.dfm</Transaction>
-    <Transaction>2020/02/17 10:06:12.000.996,E:\svn\Delphi\PlanScan\PlanScan.dproj=C:\Users\TomV\Documents\RAD Studio\Projects\Project2.dproj</Transaction>
+    <Transaction>2020/02/17 10:06:02.000.921,C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.dfm=E:\svn\Delphi\PlanScan\Main.dfm</Transaction>
+    <Transaction>2020/02/17 10:06:02.000.921,C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.pas=E:\svn\Delphi\PlanScan\Main.pas</Transaction>
+    <Transaction>2020/02/17 10:06:12.000.996,C:\Users\TomV\Documents\RAD Studio\Projects\Project2.dproj=E:\svn\Delphi\PlanScan\PlanScan.dproj</Transaction>
+    <Transaction>2020/02/17 11:09:31.000.815,=E:\svn\Delphi\PlanScan\WS\__history</Transaction>
     <Transaction>2020/02/17 11:09:31.000.812,=E:\svn\Delphi\PlanScan\WS\GebruikerService.pas</Transaction>
-    <Transaction>2020/02/17 11:09:31.000.808,=E:\svn\Delphi\PlanScan\WS\Agent.pas</Transaction>
     <Transaction>2020/02/17 11:09:31.000.810,=E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas</Transaction>
-    <Transaction>2020/02/17 11:09:31.000.815,=E:\svn\Delphi\PlanScan\WS\__history</Transaction>
+    <Transaction>2020/02/17 11:09:31.000.808,=E:\svn\Delphi\PlanScan\WS\Agent.pas</Transaction>
     <Transaction>2020/02/17 11:12:28.000.857,=E:\svn\Delphi\AAPClient\UI\UiContext.pas</Transaction>
     <Transaction>2020/02/17 11:13:01.000.260,E:\svn\Delphi\AAPClient\UI\UiContext.pas=</Transaction>
     <Transaction>2020/02/17 11:14:30.000.384,=E:\svn\Delphi\PlanScan\UI\UiContext.pas</Transaction>
     <Transaction>2020/02/17 11:16:33.000.742,=E:\svn\Delphi\PlanScan\UI\Images.pas</Transaction>
     <Transaction>2020/02/18 08:16:12.000.093,=E:\svn\Delphi\PlanScan\WS.pas</Transaction>
     <Transaction>2020/02/18 08:21:57.000.780,E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas=</Transaction>
-    <Transaction>2020/02/18 08:22:15.000.174,E:\svn\Delphi\PlanScan\WS.pas=E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas</Transaction>
+    <Transaction>2020/02/18 08:22:15.000.174,E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas=E:\svn\Delphi\PlanScan\WS.pas</Transaction>
     <Transaction>2020/02/18 08:32:28.000.107,E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas=</Transaction>
     <Transaction>2020/02/18 08:32:46.000.480,=E:\svn\Delphi\PlanScan\WS.pas</Transaction>
-    <Transaction>2020/02/18 08:33:00.000.884,E:\svn\Delphi\PlanScan\WS.pas=E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas</Transaction>
+    <Transaction>2020/02/18 08:33:00.000.884,E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas=E:\svn\Delphi\PlanScan\WS.pas</Transaction>
     <Transaction>2020/02/18 11:21:59.000.209,=E:\svn\Delphi\PlanScan\WS.pas</Transaction>
     <Transaction>2020/02/18 11:22:27.000.481,E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas=</Transaction>
-    <Transaction>2020/02/18 11:22:42.000.597,E:\svn\Delphi\PlanScan\WS.pas=E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas</Transaction>
+    <Transaction>2020/02/18 11:22:42.000.597,E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas=E:\svn\Delphi\PlanScan\WS.pas</Transaction>
     <Transaction>2020/03/02 09:30:33.000.825,=E:\svn\Delphi\PlanScan\WS.pas</Transaction>
     <Transaction>2020/03/02 09:30:46.000.906,E:\svn\Delphi\PlanScan\WS\GebruikerService.pas=</Transaction>
-    <Transaction>2020/03/02 09:31:23.000.040,E:\svn\Delphi\PlanScan\WS\GebruikerService.pas=E:\svn\Delphi\PlanScan\WS.pas</Transaction>
+    <Transaction>2020/03/02 09:31:23.000.040,E:\svn\Delphi\PlanScan\WS.pas=E:\svn\Delphi\PlanScan\WS\GebruikerService.pas</Transaction>
     <Transaction>2020/03/04 11:43:31.000.229,=E:\svn\Delphi\PlanScan\Unit1.pas</Transaction>
-    <Transaction>2020/03/04 11:49:17.000.078,E:\svn\Delphi\PlanScan\UI\LoginScherm.dfm=E:\svn\Delphi\PlanScan\Unit1.dfm</Transaction>
-    <Transaction>2020/03/04 11:49:17.000.078,E:\svn\Delphi\PlanScan\UI\LoginScherm.pas=E:\svn\Delphi\PlanScan\Unit1.pas</Transaction>
+    <Transaction>2020/03/04 11:49:17.000.078,E:\svn\Delphi\PlanScan\Unit1.dfm=E:\svn\Delphi\PlanScan\UI\LoginScherm.dfm</Transaction>
+    <Transaction>2020/03/04 11:49:17.000.078,E:\svn\Delphi\PlanScan\Unit1.pas=E:\svn\Delphi\PlanScan\UI\LoginScherm.pas</Transaction>
     <Transaction>2020/04/20 08:48:05.000.552,=E:\svn\Delphi\PlanScan\Unit1.pas</Transaction>
-    <Transaction>2020/04/20 08:48:21.000.787,E:\svn\Delphi\PlanScan\UI\frmDnaCodes.dfm=E:\svn\Delphi\PlanScan\Unit1.dfm</Transaction>
-    <Transaction>2020/04/20 08:48:21.000.787,E:\svn\Delphi\PlanScan\UI\frmDnaCodes.pas=E:\svn\Delphi\PlanScan\Unit1.pas</Transaction>
-    <Transaction>2020/04/20 09:19:59.000.705,E:\svn\Delphi\PlanScan\UI\frameDnaCodes.dfm=E:\svn\Delphi\PlanScan\UI\frmDnaCodes.dfm</Transaction>
-    <Transaction>2020/04/20 09:19:59.000.705,E:\svn\Delphi\PlanScan\UI\frameDnaCodes.pas=E:\svn\Delphi\PlanScan\UI\frmDnaCodes.pas</Transaction>
+    <Transaction>2020/04/20 08:48:21.000.787,E:\svn\Delphi\PlanScan\Unit1.pas=E:\svn\Delphi\PlanScan\UI\frmDnaCodes.pas</Transaction>
+    <Transaction>2020/04/20 08:48:21.000.787,E:\svn\Delphi\PlanScan\Unit1.dfm=E:\svn\Delphi\PlanScan\UI\frmDnaCodes.dfm</Transaction>
+    <Transaction>2020/04/20 09:19:59.000.705,E:\svn\Delphi\PlanScan\UI\frmDnaCodes.pas=E:\svn\Delphi\PlanScan\UI\frameDnaCodes.pas</Transaction>
+    <Transaction>2020/04/20 09:19:59.000.705,E:\svn\Delphi\PlanScan\UI\frmDnaCodes.dfm=E:\svn\Delphi\PlanScan\UI\frameDnaCodes.dfm</Transaction>
     <Transaction>2020/04/20 09:21:17.000.241,=E:\svn\Delphi\PlanScan\Unit1.pas</Transaction>
     <Transaction>2020/04/20 10:46:18.000.858,=E:\svn\Delphi\PlanScan\Unit1.pas</Transaction>
-    <Transaction>2020/04/20 10:49:21.000.229,E:\svn\Delphi\PlanScan\UI\frameGebruikers.dfm=E:\svn\Delphi\PlanScan\Unit1.dfm</Transaction>
-    <Transaction>2020/04/20 10:49:21.000.229,E:\svn\Delphi\PlanScan\UI\frameGebruikers.pas=E:\svn\Delphi\PlanScan\Unit1.pas</Transaction>
+    <Transaction>2020/04/20 10:49:21.000.229,E:\svn\Delphi\PlanScan\Unit1.pas=E:\svn\Delphi\PlanScan\UI\frameGebruikers.pas</Transaction>
+    <Transaction>2020/04/20 10:49:21.000.229,E:\svn\Delphi\PlanScan\Unit1.dfm=E:\svn\Delphi\PlanScan\UI\frameGebruikers.dfm</Transaction>
     <Transaction>2020/04/21 13:47:35.000.169,=E:\svn\Delphi\PlanScan\WS.pas</Transaction>
     <Transaction>2020/04/21 13:47:43.000.211,E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas=</Transaction>
-    <Transaction>2020/04/21 13:47:54.000.335,E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas=E:\svn\Delphi\PlanScan\WS.pas</Transaction>
+    <Transaction>2020/04/21 13:47:54.000.335,E:\svn\Delphi\PlanScan\WS.pas=E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas</Transaction>
     <Transaction>2020/04/28 16:29:21.000.325,=E:\svn\Delphi\PlanScan\WS.pas</Transaction>
     <Transaction>2020/04/28 16:29:32.000.030,E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas=</Transaction>
-    <Transaction>2020/04/28 16:29:49.000.701,E:\svn\Delphi\PlanScan\WS.pas=E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas</Transaction>
+    <Transaction>2020/04/28 16:29:49.000.701,E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas=E:\svn\Delphi\PlanScan\WS.pas</Transaction>
     <Transaction>2020/05/06 15:48:04.000.623,=E:\svn\Delphi\PlanScan\Unit1.pas</Transaction>
-    <Transaction>2020/05/06 15:48:51.000.604,E:\svn\Delphi\PlanScan\Unit1.dfm=E:\svn\Delphi\PlanScan\UI\frameKlantinstellingen.dfm</Transaction>
-    <Transaction>2020/05/06 15:48:51.000.604,E:\svn\Delphi\PlanScan\Unit1.pas=E:\svn\Delphi\PlanScan\UI\frameKlantinstellingen.pas</Transaction>
+    <Transaction>2020/05/06 15:48:51.000.604,E:\svn\Delphi\PlanScan\UI\frameKlantinstellingen.dfm=E:\svn\Delphi\PlanScan\Unit1.dfm</Transaction>
+    <Transaction>2020/05/06 15:48:51.000.604,E:\svn\Delphi\PlanScan\UI\frameKlantinstellingen.pas=E:\svn\Delphi\PlanScan\Unit1.pas</Transaction>
     <Transaction>2020/05/07 08:09:33.000.580,=E:\svn\Delphi\PlanScan\WS.pas</Transaction>
     <Transaction>2020/05/07 08:09:44.000.951,E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas=</Transaction>
-    <Transaction>2020/05/07 08:10:20.000.303,E:\svn\Delphi\PlanScan\WS.pas=E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas</Transaction>
+    <Transaction>2020/05/07 08:10:20.000.303,E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas=E:\svn\Delphi\PlanScan\WS.pas</Transaction>
     <Transaction>2020/05/07 08:37:58.000.610,=E:\svn\Delphi\PlanScan\WS.pas</Transaction>
     <Transaction>2020/05/07 08:38:23.000.569,=E:\svn\Delphi\PlanScan\WS.pas</Transaction>
     <Transaction>2020/05/07 08:38:31.000.739,E:\svn\Delphi\PlanScan\WS\GebruikerService.pas=</Transaction>
-    <Transaction>2020/05/07 08:38:57.000.386,E:\svn\Delphi\PlanScan\WS.pas=E:\svn\Delphi\PlanScan\WS\GebruikerService.pas</Transaction>
+    <Transaction>2020/05/07 08:38:57.000.386,E:\svn\Delphi\PlanScan\WS\GebruikerService.pas=E:\svn\Delphi\PlanScan\WS.pas</Transaction>
     <Transaction>2020/05/07 11:27:31.000.777,=E:\svn\Delphi\PlanScan\Unit1.pas</Transaction>
-    <Transaction>2020/05/07 11:28:03.000.538,E:\svn\Delphi\PlanScan\Unit1.dfm=E:\svn\Delphi\PlanScan\UI\KlantinstellingenDetailScherm.dfm</Transaction>
-    <Transaction>2020/05/07 11:28:03.000.538,E:\svn\Delphi\PlanScan\Unit1.pas=E:\svn\Delphi\PlanScan\UI\KlantinstellingenDetailScherm.pas</Transaction>
+    <Transaction>2020/05/07 11:28:03.000.538,E:\svn\Delphi\PlanScan\UI\KlantinstellingenDetailScherm.dfm=E:\svn\Delphi\PlanScan\Unit1.dfm</Transaction>
+    <Transaction>2020/05/07 11:28:03.000.538,E:\svn\Delphi\PlanScan\UI\KlantinstellingenDetailScherm.pas=E:\svn\Delphi\PlanScan\Unit1.pas</Transaction>
     <Transaction>2020/06/22 09:45:59.000.420,=E:\svn\Delphi\PlanScan\WS.pas</Transaction>
     <Transaction>2020/06/22 09:46:07.000.509,E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas=</Transaction>
-    <Transaction>2020/06/22 09:46:23.000.552,E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas=E:\svn\Delphi\PlanScan\WS.pas</Transaction>
+    <Transaction>2020/06/22 09:46:23.000.552,E:\svn\Delphi\PlanScan\WS.pas=E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas</Transaction>
     <Transaction>2020/06/22 10:13:59.000.200,=E:\svn\Delphi\PlanScan\WS.pas</Transaction>
     <Transaction>2020/06/22 10:14:25.000.473,E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas=</Transaction>
-    <Transaction>2020/06/22 10:14:54.000.776,E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas=E:\svn\Delphi\PlanScan\WS.pas</Transaction>
+    <Transaction>2020/06/22 10:14:54.000.776,E:\svn\Delphi\PlanScan\WS.pas=E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas</Transaction>
     <Transaction>2020/06/30 12:02:40.000.659,=E:\svn\Delphi\PlanScan\WS.pas</Transaction>
     <Transaction>2020/06/30 12:03:20.000.988,E:\svn\Delphi\PlanScan\WS\GebruikerService.pas=</Transaction>
     <Transaction>2020/06/30 12:04:00.000.987,E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas=</Transaction>
-    <Transaction>2020/06/30 12:04:28.000.864,E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas=E:\svn\Delphi\PlanScan\WS.pas</Transaction>
+    <Transaction>2020/06/30 12:04:28.000.864,E:\svn\Delphi\PlanScan\WS.pas=E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas</Transaction>
     <Transaction>2020/06/30 12:04:53.000.617,=E:\svn\Delphi\PlanScan\WS\GebruikerService.pas</Transaction>
     <Transaction>2020/07/14 14:42:35.000.095,=E:\svn\Delphi\PlanScan\WS.pas</Transaction>
-    <Transaction>2020/07/14 14:43:07.000.741,E:\svn\Delphi\PlanScan\WS.pas=E:\svn\Delphi\PlanScan\WS\AfdrukService.pas</Transaction>
-    <Transaction>2020/07/30 14:51:51.877,=E:\svn\Delphi\PlanScan\WS.pas</Transaction>
-    <Transaction>2020/07/30 14:52:02.905,E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas=</Transaction>
-    <Transaction>2020/07/30 14:52:16.466,E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas=E:\svn\Delphi\PlanScan\WS.pas</Transaction>
+    <Transaction>2020/07/14 14:43:07.000.741,E:\svn\Delphi\PlanScan\WS\AfdrukService.pas=E:\svn\Delphi\PlanScan\WS.pas</Transaction>
+    <Transaction>2020/07/30 14:51:51.000.877,=E:\svn\Delphi\PlanScan\WS.pas</Transaction>
+    <Transaction>2020/07/30 14:52:02.000.905,E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas=</Transaction>
+    <Transaction>2020/07/30 14:52:16.000.466,E:\svn\Delphi\PlanScan\WS.pas=E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="UI"/>
Index: PlanScan/PlanScan.identcache
===================================================================
diff -u -r404 -r481
Binary files differ