Index: ProScan/Test/ProScanTests.dproj
===================================================================
diff -u -r398 -r399
--- ProScan/Test/ProScanTests.dproj	(.../ProScanTests.dproj)	(revision 398)
+++ ProScan/Test/ProScanTests.dproj	(.../ProScanTests.dproj)	(revision 399)
@@ -69,6 +69,7 @@
 			<DCC_RemoteDebug>true</DCC_RemoteDebug>
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
+			<Debugger_RunParams>displaymode=desktop server=tve-w10</Debugger_RunParams>
 			<DCC_RemoteDebug>false</DCC_RemoteDebug>
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Cfg_2)'!=''">
@@ -141,6 +142,7 @@
 					<TestFramework>DUnit / Delphi Win32</TestFramework>
 					<TestRunner>GUI</TestRunner>
 					<SourceProjectName>E:\svn\Delphi\ProScan\ProScan.dproj</SourceProjectName>
+					<TestProjectName/>
 				</UnitTesting>
 			</BorlandProject>
 			<ProjectFileVersion>12</ProjectFileVersion>
Index: ProScan/ProScan.dproj.local
===================================================================
diff -u -r396 -r399
--- ProScan/ProScan.dproj.local	(.../ProScan.dproj.local)	(revision 396)
+++ ProScan/ProScan.dproj.local	(.../ProScan.dproj.local)	(revision 399)
@@ -2,149 +2,153 @@
 <BorlandProject>
 	<Transactions>
     <Transaction>2019/03/01 14:25:16.000.954,=C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.pas</Transaction>
-    <Transaction>2019/03/01 14:25:57.000.930,C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.dfm=E:\svn\Delphi\AAPClient\ProScanMain.dfm</Transaction>
-    <Transaction>2019/03/01 14:25:57.000.930,C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.pas=E:\svn\Delphi\AAPClient\ProScanMain.pas</Transaction>
-    <Transaction>2019/03/01 14:26:05.000.981,C:\Users\TomV\Documents\RAD Studio\Projects\Project2.dproj=E:\svn\Delphi\AAPClient\ProScan.dproj</Transaction>
+    <Transaction>2019/03/01 14:25:57.000.930,E:\svn\Delphi\AAPClient\ProScanMain.dfm=C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.dfm</Transaction>
+    <Transaction>2019/03/01 14:25:57.000.930,E:\svn\Delphi\AAPClient\ProScanMain.pas=C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.pas</Transaction>
+    <Transaction>2019/03/01 14:26:05.000.981,E:\svn\Delphi\AAPClient\ProScan.dproj=C:\Users\TomV\Documents\RAD Studio\Projects\Project2.dproj</Transaction>
     <Transaction>2019/03/01 14:28:35.000.977,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/03/01 14:34:33.000.220,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\DrieKnoppenScherm.dfm</Transaction>
-    <Transaction>2019/03/01 14:34:33.000.220,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\DrieKnoppenScherm.pas</Transaction>
+    <Transaction>2019/03/01 14:34:33.000.220,E:\svn\Delphi\AAPClient\UI\DrieKnoppenScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm</Transaction>
+    <Transaction>2019/03/01 14:34:33.000.220,E:\svn\Delphi\AAPClient\UI\DrieKnoppenScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
     <Transaction>2019/03/01 15:26:22.000.761,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/03/01 15:27:42.000.618,E:\svn\Delphi\AAPClient\UI\LoginScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm</Transaction>
-    <Transaction>2019/03/01 15:27:42.000.618,E:\svn\Delphi\AAPClient\UI\LoginScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
+    <Transaction>2019/03/01 15:27:42.000.618,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\LoginScherm.pas</Transaction>
+    <Transaction>2019/03/01 15:27:42.000.618,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\LoginScherm.dfm</Transaction>
     <Transaction>2019/03/04 07:46:54.000.107,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
     <Transaction>2019/03/04 07:48:44.000.257,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
     <Transaction>2019/03/04 07:48:53.000.280,E:\svn\Delphi\AAPClient\UI\LoginScherm.pas=</Transaction>
-    <Transaction>2019/03/04 07:49:00.000.838,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\LoginScherm.pas</Transaction>
-    <Transaction>2019/03/04 07:49:00.000.838,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\LoginScherm.dfm</Transaction>
+    <Transaction>2019/03/04 07:49:00.000.838,E:\svn\Delphi\AAPClient\UI\LoginScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm</Transaction>
+    <Transaction>2019/03/04 07:49:00.000.838,E:\svn\Delphi\AAPClient\UI\LoginScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
     <Transaction>2019/03/05 10:51:12.000.820,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2019/03/05 10:53:16.000.806,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
-    <Transaction>2019/03/05 10:56:57.000.976,E:\svn\Delphi\AAPClient\WS\GebruikerService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
+    <Transaction>2019/03/05 10:56:57.000.976,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\GebruikerService.pas</Transaction>
     <Transaction>2019/03/05 11:54:27.000.053,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/03/05 11:57:08.000.016,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\PopupScherm.pas</Transaction>
-    <Transaction>2019/03/05 11:57:08.000.016,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\PopupScherm.dfm</Transaction>
+    <Transaction>2019/03/05 11:57:08.000.016,E:\svn\Delphi\AAPClient\UI\PopupScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
+    <Transaction>2019/03/05 11:57:08.000.016,E:\svn\Delphi\AAPClient\UI\PopupScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm</Transaction>
     <Transaction>2019/03/06 07:41:24.000.503,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/03/06 07:41:41.000.580,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\Images.dfm</Transaction>
-    <Transaction>2019/03/06 07:41:41.000.580,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\Images.pas</Transaction>
+    <Transaction>2019/03/06 07:41:41.000.580,E:\svn\Delphi\AAPClient\UI\Images.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
+    <Transaction>2019/03/06 07:41:41.000.580,E:\svn\Delphi\AAPClient\UI\Images.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm</Transaction>
     <Transaction>2019/03/07 08:39:12.000.150,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/03/07 08:39:29.000.118,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\HomeScherm.dfm</Transaction>
-    <Transaction>2019/03/07 08:39:29.000.118,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\HomeScherm.pas</Transaction>
+    <Transaction>2019/03/07 08:39:29.000.118,E:\svn\Delphi\AAPClient\UI\HomeScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm</Transaction>
+    <Transaction>2019/03/07 08:39:29.000.118,E:\svn\Delphi\AAPClient\UI\HomeScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
     <Transaction>2019/03/07 11:22:02.000.536,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/03/07 11:29:09.000.427,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\PalletScherm.pas</Transaction>
-    <Transaction>2019/03/07 11:29:09.000.427,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm</Transaction>
+    <Transaction>2019/03/07 11:29:09.000.427,E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm</Transaction>
+    <Transaction>2019/03/07 11:29:09.000.427,E:\svn\Delphi\AAPClient\UI\PalletScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
     <Transaction>2019/03/07 15:18:54.000.922,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
-    <Transaction>2019/03/07 15:19:13.000.507,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas</Transaction>
+    <Transaction>2019/03/07 15:19:13.000.507,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2019/03/08 10:21:18.000.208,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2019/03/08 10:26:55.000.996,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
-    <Transaction>2019/03/08 10:27:08.000.419,E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm=E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm</Transaction>
-    <Transaction>2019/03/08 10:27:08.000.419,E:\svn\Delphi\AAPClient\UI\PalletScherm.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas</Transaction>
-    <Transaction>2019/03/08 10:27:45.000.805,E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm=E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm</Transaction>
-    <Transaction>2019/03/08 10:27:45.000.805,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\UI\PalletScherm.pas</Transaction>
-    <Transaction>2019/03/08 10:28:02.000.451,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas</Transaction>
+    <Transaction>2019/03/08 10:27:08.000.419,E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm=E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm</Transaction>
+    <Transaction>2019/03/08 10:27:08.000.419,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\UI\PalletScherm.pas</Transaction>
+    <Transaction>2019/03/08 10:27:45.000.805,E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm=E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm</Transaction>
+    <Transaction>2019/03/08 10:27:45.000.805,E:\svn\Delphi\AAPClient\UI\PalletScherm.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas</Transaction>
+    <Transaction>2019/03/08 10:28:02.000.451,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2019/03/08 11:14:25.000.860,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/03/08 11:15:19.000.292,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\BestaandePalletScherm.dfm</Transaction>
-    <Transaction>2019/03/08 11:15:19.000.292,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\BestaandePalletScherm.pas</Transaction>
+    <Transaction>2019/03/08 11:15:19.000.292,E:\svn\Delphi\AAPClient\UI\BestaandePalletScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm</Transaction>
+    <Transaction>2019/03/08 11:15:19.000.292,E:\svn\Delphi\AAPClient\UI\BestaandePalletScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
     <Transaction>2019/03/08 13:41:42.000.692,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/03/08 13:43:18.000.167,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.pas</Transaction>
-    <Transaction>2019/03/08 13:43:18.000.168,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.dfm</Transaction>
+    <Transaction>2019/03/08 13:43:18.000.167,E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
+    <Transaction>2019/03/08 13:43:18.000.168,E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm</Transaction>
     <Transaction>2019/03/08 16:42:04.000.691,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2019/03/08 16:42:12.000.086,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
-    <Transaction>2019/03/08 16:42:32.000.114,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas</Transaction>
+    <Transaction>2019/03/08 16:42:32.000.114,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2019/03/12 11:42:34.000.194,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
     <Transaction>2019/03/12 11:42:41.000.845,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
-    <Transaction>2019/03/12 11:42:52.000.715,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
+    <Transaction>2019/03/12 11:42:52.000.715,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas</Transaction>
     <Transaction>2019/03/18 09:44:48.000.103,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/03/18 09:46:03.000.084,E:\svn\Delphi\AAPClient\UI\InfoLogScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/03/18 09:46:03.000.084,E:\svn\Delphi\AAPClient\UI\InfoLogScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm</Transaction>
+    <Transaction>2019/03/18 09:46:03.000.084,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\InfoLogScherm.pas</Transaction>
+    <Transaction>2019/03/18 09:46:03.000.084,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\InfoLogScherm.dfm</Transaction>
     <Transaction>2019/03/18 11:06:46.000.842,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2019/03/18 11:07:10.000.880,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
-    <Transaction>2019/03/18 11:07:23.000.750,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
+    <Transaction>2019/03/18 11:07:23.000.750,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas</Transaction>
     <Transaction>2019/03/19 14:36:29.000.587,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/03/19 14:42:58.000.764,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\UiContext.pas</Transaction>
+    <Transaction>2019/03/19 14:42:58.000.764,E:\svn\Delphi\AAPClient\UI\UiContext.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
     <Transaction>2019/03/20 14:52:28.000.434,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2019/03/20 14:52:34.000.233,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
-    <Transaction>2019/03/20 14:52:47.000.492,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas</Transaction>
+    <Transaction>2019/03/20 14:52:47.000.492,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2019/03/22 12:38:06.000.040,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/03/22 12:42:12.000.397,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\HernoemPalletScherm.dfm</Transaction>
-    <Transaction>2019/03/22 12:42:12.000.397,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\HernoemPalletScherm.pas</Transaction>
+    <Transaction>2019/03/22 12:42:12.000.397,E:\svn\Delphi\AAPClient\UI\HernoemPalletScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
+    <Transaction>2019/03/22 12:42:12.000.397,E:\svn\Delphi\AAPClient\UI\HernoemPalletScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm</Transaction>
     <Transaction>2019/04/10 07:45:17.000.841,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2019/04/10 07:45:55.000.611,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
-    <Transaction>2019/04/10 07:46:07.000.445,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
+    <Transaction>2019/04/10 07:46:07.000.445,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas</Transaction>
     <Transaction>2019/05/02 15:08:14.000.961,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2019/05/02 15:08:28.000.270,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
-    <Transaction>2019/05/02 15:08:38.000.127,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
+    <Transaction>2019/05/02 15:08:38.000.127,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas</Transaction>
     <Transaction>2019/09/03 15:55:43.000.155,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/09/03 15:56:30.000.060,E:\svn\Delphi\AAPClient\UI\LoginScherm2.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/09/03 15:56:30.000.060,E:\svn\Delphi\AAPClient\UI\LoginScherm2.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm</Transaction>
+    <Transaction>2019/09/03 15:56:30.000.060,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\LoginScherm2.pas</Transaction>
+    <Transaction>2019/09/03 15:56:30.000.060,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\LoginScherm2.dfm</Transaction>
     <Transaction>2019/09/04 13:14:25.000.076,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/09/04 13:17:21.000.462,E:\svn\Delphi\AAPClient\UI\DimmerForm.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/09/04 13:17:21.000.462,E:\svn\Delphi\AAPClient\UI\DimmerForm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm</Transaction>
+    <Transaction>2019/09/04 13:17:21.000.462,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\DimmerForm.pas</Transaction>
+    <Transaction>2019/09/04 13:17:21.000.462,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\DimmerForm.dfm</Transaction>
     <Transaction>2019/09/04 14:42:49.000.071,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
     <Transaction>2019/09/06 07:39:37.000.990,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2019/09/06 07:39:48.000.040,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
-    <Transaction>2019/09/06 07:40:00.000.929,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.pas</Transaction>
-    <Transaction>2019/09/06 07:40:00.000.929,E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm=E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.dfm</Transaction>
+    <Transaction>2019/09/06 07:40:00.000.929,E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas</Transaction>
+    <Transaction>2019/09/06 07:40:00.000.929,E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.dfm=E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm</Transaction>
     <Transaction>2019/09/06 07:44:11.000.442,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
     <Transaction>2019/09/06 07:45:06.000.602,=E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.pas</Transaction>
-    <Transaction>2019/09/06 07:46:50.000.159,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
+    <Transaction>2019/09/06 07:46:50.000.159,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas</Transaction>
     <Transaction>2019/09/09 10:12:07.000.120,E:\svn\Delphi\AAPClient\UI\LoginScherm.pas=</Transaction>
     <Transaction>2019/09/25 09:00:58.000.441,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/09/25 09:40:05.000.670,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\DnaCodeReedsGescandScherm.pas</Transaction>
-    <Transaction>2019/09/25 09:40:05.000.670,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\DnaCodeReedsGescandScherm.dfm</Transaction>
+    <Transaction>2019/09/25 09:40:05.000.670,E:\svn\Delphi\AAPClient\UI\DnaCodeReedsGescandScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm</Transaction>
+    <Transaction>2019/09/25 09:40:05.000.670,E:\svn\Delphi\AAPClient\UI\DnaCodeReedsGescandScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
     <Transaction>2019/10/01 13:49:36.000.449,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2019/10/01 13:49:56.000.314,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
-    <Transaction>2019/10/01 13:50:07.000.220,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
+    <Transaction>2019/10/01 13:50:07.000.220,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas</Transaction>
     <Transaction>2019/10/02 13:33:49.000.729,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2019/10/02 13:33:55.000.547,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
-    <Transaction>2019/10/02 13:34:08.000.237,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
+    <Transaction>2019/10/02 13:34:08.000.237,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas</Transaction>
     <Transaction>2019/10/02 15:42:02.000.588,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
     <Transaction>2019/10/02 15:42:14.000.814,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
-    <Transaction>2019/10/02 15:42:25.000.143,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
+    <Transaction>2019/10/02 15:42:25.000.143,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas</Transaction>
     <Transaction>2019/10/03 11:18:12.000.484,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2019/10/03 15:21:13.000.953,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/10/03 15:21:30.000.855,E:\svn\Delphi\AAPClient\WS\Agent.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
+    <Transaction>2019/10/03 15:21:30.000.855,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\WS\Agent.pas</Transaction>
     <Transaction>2019/10/07 09:39:36.000.456,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2019/10/07 09:39:44.000.760,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
-    <Transaction>2019/10/07 09:40:00.000.589,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas</Transaction>
+    <Transaction>2019/10/07 09:40:00.000.589,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2019/10/07 09:43:00.000.939,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2019/10/07 09:43:11.000.201,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
-    <Transaction>2019/10/07 09:43:28.000.012,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas</Transaction>
+    <Transaction>2019/10/07 09:43:28.000.012,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2019/10/07 10:02:08.000.507,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/10/07 10:02:34.000.480,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\CommonFunctions.pas</Transaction>
+    <Transaction>2019/10/07 10:02:34.000.480,E:\svn\Delphi\AAPClient\UI\CommonFunctions.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
     <Transaction>2019/10/15 10:29:07.000.266,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2019/10/15 10:29:23.000.010,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
-    <Transaction>2019/10/15 10:29:44.000.142,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
+    <Transaction>2019/10/15 10:29:44.000.142,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas</Transaction>
     <Transaction>2019/10/21 13:21:40.000.148,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
     <Transaction>2019/10/21 13:21:55.000.323,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
-    <Transaction>2019/10/21 13:22:13.000.787,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
+    <Transaction>2019/10/21 13:22:13.000.787,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas</Transaction>
     <Transaction>2020/02/13 14:45:20.000.233,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2020/02/13 14:45:36.000.322,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
-    <Transaction>2020/02/13 14:45:56.000.560,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas</Transaction>
+    <Transaction>2020/02/13 14:45:56.000.560,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2020/03/16 11:37:39.000.897,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2020/03/16 11:37:49.000.784,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
-    <Transaction>2020/03/16 11:38:05.000.598,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas</Transaction>
+    <Transaction>2020/03/16 11:38:05.000.598,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2020/03/20 17:13:18.000.846,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2020/03/20 17:13:25.000.428,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
-    <Transaction>2020/03/20 17:13:40.000.466,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas</Transaction>
+    <Transaction>2020/03/20 17:13:40.000.466,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2020/03/23 12:12:38.000.123,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2020/03/23 12:12:48.000.665,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
-    <Transaction>2020/03/23 12:13:04.000.234,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas</Transaction>
+    <Transaction>2020/03/23 12:13:04.000.234,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2020/04/03 10:30:15.000.465,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2020/04/03 10:30:37.000.131,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
-    <Transaction>2020/04/03 10:31:50.000.819,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
+    <Transaction>2020/04/03 10:31:50.000.819,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas</Transaction>
     <Transaction>2020/04/21 13:48:23.000.846,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2020/04/21 13:48:39.000.235,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
-    <Transaction>2020/04/21 13:48:57.000.462,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas</Transaction>
+    <Transaction>2020/04/21 13:48:57.000.462,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2020/05/29 11:41:39.000.278,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2020/05/29 11:42:20.000.248,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
-    <Transaction>2020/05/29 11:42:47.000.154,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
+    <Transaction>2020/05/29 11:42:47.000.154,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas</Transaction>
     <Transaction>2020/06/02 10:32:11.000.124,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2020/06/02 10:34:06.000.051,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
-    <Transaction>2020/06/02 10:34:24.000.522,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
+    <Transaction>2020/06/02 10:34:24.000.522,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas</Transaction>
     <Transaction>2020/06/03 17:24:09.000.708,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2020/06/03 17:24:20.000.352,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
-    <Transaction>2020/06/03 17:25:05.000.147,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
+    <Transaction>2020/06/03 17:25:05.000.147,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas</Transaction>
+    <Transaction>2020/06/11 13:42:02.458,=E:\svn\Delphi\ProScan\Unit1.pas</Transaction>
+    <Transaction>2020/06/11 13:42:37.605,E:\svn\Delphi\ProScan\BL\BlPallet.pas=E:\svn\Delphi\ProScan\Unit1.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
+    <File Path="BL"/>
+    <File Path="BL\BlPallet.pas"/>
     <File Path="UI"/>
     <File Path="UI\BestaandePalletScherm.pas"/>
     <File Path="UI\BestaandePalletScherm.dfm"/>
Index: ProScan/UI/PalletScherm.dfm
===================================================================
diff -u -r396 -r399
--- ProScan/UI/PalletScherm.dfm	(.../PalletScherm.dfm)	(revision 396)
+++ ProScan/UI/PalletScherm.dfm	(.../PalletScherm.dfm)	(revision 399)
@@ -2,8 +2,7 @@
   ActiveControl = edtPallet
   Caption = 'fmPalletScherm'
   OnActivate = FormActivate
-  ExplicitWidth = 480
-  ExplicitHeight = 640
+  OnHide = FormHide
   PixelsPerInch = 96
   TextHeight = 19
   object imgPallet: TImage [0]
@@ -421,7 +420,6 @@
     ImageIndex = 0
     ParentFont = False
     TabOrder = 3
-    Visible = False
     OnClick = btnGenereerTbpClick
   end
   inherited alAlgemeen: TActionList
Index: ProScan/ProScan.dpr
===================================================================
diff -u -r396 -r399
--- ProScan/ProScan.dpr	(.../ProScan.dpr)	(revision 396)
+++ ProScan/ProScan.dpr	(.../ProScan.dpr)	(revision 399)
@@ -20,7 +20,8 @@
   Agent in 'WS\Agent.pas',
   CommonFunctions in 'UI\CommonFunctions.pas',
   MidasLib,
-  DnaCodeService in 'WS\DnaCodeService.pas';
+  DnaCodeService in 'WS\DnaCodeService.pas',
+  BlPallet in 'BL\BlPallet.pas';
 
 {$R *.res}
 
Index: ProScan/Test/ProScanTests.dproj.local
===================================================================
diff -u -r398 -r399
--- ProScan/Test/ProScanTests.dproj.local	(.../ProScanTests.dproj.local)	(revision 398)
+++ ProScan/Test/ProScanTests.dproj.local	(.../ProScanTests.dproj.local)	(revision 399)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
-  <Transactions>
-    <Transaction>2020/06/11 10:59:02.352,=E:\svn\Delphi\ProScan\Test\TestCommonFunctions.pas</Transaction>
-    <Transaction>2020/06/11 10:59:02.460,=E:\svn\Delphi\ProScan\UI\CommonFunctions.pas</Transaction>
+	<Transactions>
+    <Transaction>2020/06/11 10:59:02.000.460,=E:\svn\Delphi\ProScan\UI\CommonFunctions.pas</Transaction>
+    <Transaction>2020/06/11 10:59:02.000.352,=E:\svn\Delphi\ProScan\Test\TestCommonFunctions.pas</Transaction>
   </Transactions>
 </BorlandProject>
Index: ProScan/ProScan.identcache
===================================================================
diff -u -r397 -r399
Binary files differ
Index: ProScan/BL/BlPallet.pas
===================================================================
diff -u
--- ProScan/BL/BlPallet.pas	(revision 0)
+++ ProScan/BL/BlPallet.pas	(revision 399)
@@ -0,0 +1,62 @@
+unit BlPallet;
+
+interface
+
+uses
+  UiContext;
+
+type
+  TBlPallet = Class
+    private
+      fUiContext: TUiContext;
+    public
+      constructor Create(aUiContext: TUiContext);
+      function GenereerTbp: string;
+      procedure SetContext(GescandeWaarde: string);
+  End;
+
+
+implementation
+
+uses
+  DnaCodeService, Agent, CommonFunctions, SysUtils;
+
+{ TBlPallet }
+
+constructor TBlPallet.Create(aUiContext: TUiContext);
+begin
+  fUiContext := aUiContext;
+end;
+
+function TBlPallet.GenereerTbp: string;
+var
+  fGeefVolgendeTbpCodeResponse: GeefVolgendeTbpCodeResponse;
+begin
+  inherited;
+  fGeefVolgendeTbpCodeResponse := TAgent.Create(fUiContext).GeefVolgendeTbpCode();
+  try
+    if fGeefVolgendeTbpCodeResponse.Header.Status <> '200' then begin
+      //Self.ModalResult := mrPallet;
+      raise EExternalException.Create(fGeefVolgendeTbpCodeResponse.Header.Omschrijving);
+      //ToonPopupScherm(fGeefVolgendeTbpCodeResponse.Header.Omschrijving, 'Probeer opnieuw');
+      result := '';
+    end else begin
+      result := fGeefVolgendeTbpCodeResponse.VolgendeTbpCode;
+      fUiContext.Pallet := result;
+      fUiContext.Toelevering := '';
+    end;
+  SetContext(result);
+  finally
+    fGeefVolgendeTbpCodeResponse.Free;
+  end;;
+end;
+
+procedure TBlPallet.SetContext(GescandeWaarde: string);
+begin
+  if TCommonFunctions.IsKaderdeurLocatie(GescandeWaarde) then
+    fUiContext.Pallet := GescandeWaarde
+  else
+    fUiContext.Pallet := UpperCase(GescandeWaarde);
+end;
+
+end.
Index: ProScan/Test/TestCommonFunctions.dcu
===================================================================
diff -u -r398 -r399
Binary files differ
Index: ProScan/UI/DrieKnoppenScherm.pas
===================================================================
diff -u -r396 -r399
--- ProScan/UI/DrieKnoppenScherm.pas	(.../DrieKnoppenScherm.pas)	(revision 396)
+++ ProScan/UI/DrieKnoppenScherm.pas	(.../DrieKnoppenScherm.pas)	(revision 399)
@@ -6,7 +6,7 @@
   Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
   Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, Vcl.ActnList, Images,
   Vcl.ImgList, UiContext, Vcl.ExtCtrls, Soap.InvokeRegistry, Soap.Rio,
-  Soap.SOAPHTTPClient, Data.DB, Datasnap.DBClient, Soap.SOAPConn, Agent;
+  Soap.SOAPHTTPClient, Data.DB, Datasnap.DBClient, Soap.SOAPConn;
 
 type
   TfmDrieKnoppenScherm = class(TForm)
Index: ProScan/ProScan.dproj
===================================================================
diff -u -r398 -r399
--- ProScan/ProScan.dproj	(.../ProScan.dproj)	(revision 398)
+++ ProScan/ProScan.dproj	(.../ProScan.dproj)	(revision 399)
@@ -132,6 +132,7 @@
 			<DCCReference Include="WS\Agent.pas"/>
 			<DCCReference Include="UI\CommonFunctions.pas"/>
 			<DCCReference Include="WS\DnaCodeService.pas"/>
+			<DCCReference Include="BL\BlPallet.pas"/>
 			<BuildConfiguration Include="Release">
 				<Key>Cfg_2</Key>
 				<CfgParent>Base</CfgParent>
Index: ProScan/UI/PalletScherm.pas
===================================================================
diff -u -r396 -r399
--- ProScan/UI/PalletScherm.pas	(.../PalletScherm.pas)	(revision 396)
+++ ProScan/UI/PalletScherm.pas	(.../PalletScherm.pas)	(revision 399)
@@ -5,7 +5,7 @@
 uses
   Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
   Vcl.Controls, Vcl.Forms, Vcl.Dialogs, DrieKnoppenScherm, Vcl.ActnList,
-  Vcl.StdCtrls, Vcl.ExtCtrls, Vcl.Imaging.pngimage;
+  Vcl.StdCtrls, Vcl.ExtCtrls, Vcl.Imaging.pngimage, Agent, BlPallet;
 
 type
   TfmPalletScherm = class(TfmDrieKnoppenScherm)
@@ -20,12 +20,14 @@
       Shift: TShiftState);
     procedure btnGenereerTbpClick(Sender: TObject);
     procedure FormActivate(Sender: TObject);
+    procedure FormHide(Sender: TObject);
   private
+    fAgent: TAgent;
+    fBlPallet: TBlPallet;
     procedure SetContext;
     procedure SetModus(GescandeInput: string);
     function ValideerPalletCode(GescandeInput: string): boolean;
   public
-    { Public declarations }
   end;
 
 var
@@ -34,7 +36,7 @@
 implementation
 
 uses
-  DnaCodeService, UiContext, Agent, ProScanMain, StrUtils, CommonFunctions;
+  DnaCodeService, UiContext, ProScanMain, StrUtils, CommonFunctions;
 
 {$R *.dfm}
 
@@ -51,15 +53,15 @@
   fZoekViaToeleveringResponse: ZoekViaToeleveringResponse;
   fPalletGevalideerd: boolean;
 begin
-  SetModus(edtPallet.Text);
+  SetModus(UiContext.Pallet);
 
   fPalletGevalideerd := false;
   if not (UiContext.Modus = modusKAD) then
-    fPalletGevalideerd := ValideerPalletCode(edtPallet.Text);
+    fPalletGevalideerd := ValideerPalletCode(UiContext.Pallet);
 
   //checken of pallet in gebruik is indien het vorige geslaagd is
   if fPalletGevalideerd and not(UiContext.Modus = modusKAD )then begin
-    fZoekViaPalletCodeResponse := TAgent.Create(UiContext).ZoekViaPalletCode(edtPallet.Text);
+    fZoekViaPalletCodeResponse := TAgent.Create(UiContext).ZoekViaPalletCode(UiContext.Pallet);
     try
       if fZoekViaPalletCodeResponse.Header.Status = '200' then begin
         UiContext.Toelevering := fZoekViaPalletCodeResponse.DnaCodes[0].Toelevering;
@@ -93,12 +95,13 @@
 begin
   // pallet code valideren
   result := false;
-  fValideerPalletCodeResponse := TAgent.Create(UiContext).ValideerPalletCode(edtPallet.Text);
+  fValideerPalletCodeResponse := TAgent.Create(UiContext).ValideerPalletCode(GescandeInput);
   try
     if fValideerPalletCodeResponse.Header.Status <> '200' then begin
       Self.ModalResult := mrPallet;
       ToonPopupScherm(fValideerPalletCodeResponse.Header.Omschrijving, 'Probeer opnieuw');
       edtPallet.Text := '';
+      UiContext.Pallet := '';
       SetContext;
     end else begin
       result := true;
@@ -111,22 +114,11 @@
 procedure TfmPalletScherm.btnGenereerTbpClick(Sender: TObject);
 var
   fGeefVolgendeTbpCodeResponse: GeefVolgendeTbpCodeResponse;
+  fGegenereerdeTbp: string;
 begin
   inherited;
-  fGeefVolgendeTbpCodeResponse := TAgent.Create(UiContext).GeefVolgendeTbpCode();
-  try
-    if fGeefVolgendeTbpCodeResponse.Header.Status <> '200' then begin
-      Self.ModalResult := mrPallet;
-      ToonPopupScherm(fGeefVolgendeTbpCodeResponse.Header.Omschrijving, 'Probeer opnieuw');
-      edtPallet.Text := '';
-    end else begin
-      edtPallet.Text := fGeefVolgendeTbpCodeResponse.VolgendeTbpCode;
-      UiContext.Toelevering := '';
-    end;
-  SetContext;
-  finally
-    fGeefVolgendeTbpCodeResponse.Free;
-  end;
+  fGegenereerdeTbp := fBlPallet.GenereerTbp;
+
   actVolgendeExecute(Self);
 end;
 
@@ -147,8 +139,15 @@
   ActiveControl := edtPallet;
 end;
 
+procedure TfmPalletScherm.FormHide(Sender: TObject);
+begin
+  inherited;
+  fBlPallet.Free;
+end;
+
 procedure TfmPalletScherm.FormShow(Sender: TObject);
 begin
+  fBlPallet := TBlPallet.Create(UiContext);
   btnLinksOnder.Action := nil;
   btnCentraalOnder.Action := actHome;
   btnRechtsOnder.Action := actVolgende;