From c843b688f464c93a452153b341625e4ad83329b6 Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Tue, 11 Mar 2008 19:13:35 +0000
Subject: [PATCH] =?UTF-8?q?Carga=20de=20ficheros=20EDI:=20-=20mejoras=20en?=
 =?UTF-8?q?=20los=20tiempos=20de=20carga=20al=20no=20intentar=20meter=20to?=
 =?UTF-8?q?dos=20los=20registros=20del=20fichero=20(se=20evita=20la=20exce?=
 =?UTF-8?q?pci=C3=B3n=20de=20violaci=C3=B3n=20de=20clave)=20-=20Timeout=20?=
 =?UTF-8?q?del=20cliente=20ampliado=20a=2045=20minutos=20para=20las=20carg?=
 =?UTF-8?q?as=20que=20sean=20m=C3=A1s=20pesadas.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://192.168.0.254/svn/Proyectos.Varela_PuntosVenta/trunk@102 1c943782-d109-9647-9548-93b3ac332352
---
 Source/Base/BaseD10.drc                       |    4 +-
 Source/CargaEDI/CargaEDI.dproj                |   14 +-
 Source/CargaEDI/CargaEDI.drc                  |    2 +-
 Source/CargaEDI/CargaEDI.rc                   |    6 +-
 Source/CargaEDI/CargaEDI.res                  |  Bin 15548 -> 15548 bytes
 Source/CargaEDI/uCargaEDI.pas                 |    7 +-
 Source/Cliente/AdminPV.dproj                  |    4 +-
 Source/Cliente/AdminPV.drc                    |    2 +-
 Source/Cliente/AdminPV.rc                     |    8 +-
 Source/Cliente/AdminPV.res                    |  Bin 18468 -> 18468 bytes
 Source/Configuracion/Configuracion.drc        |    2 +-
 Source/ControlesBase/ControlesBaseD10.drc     |    4 +-
 .../Devoluciones/Cliente/Devoluciones.drc     |    4 +-
 .../FicherosEDI/Cliente/FicherosEDI.drc       |    4 +-
 .../FicherosEDI/Cliente/uCargarFicheros.pas   |    5 +-
 .../Modulos/Parametros/Cliente/Parametros.drc |    4 +-
 .../Modulos/Parametros/Cliente/Parametros.res |  Bin 4748 -> 384 bytes
 .../Recepciones/Cliente/Recepciones.drc       |    4 +-
 .../Cliente/ReferenciaGenerica.drc            |    4 +-
 Source/Modulos/Stock/Cliente/Stock.drc        |    4 +-
 .../Modulos/Traspasos/Cliente/Traspasos.drc   |    2 +-
 .../VentasProceso/Cliente/VentasProceso.drc   |    2 +-
 .../Cliente/VentasTerminadas.drc              |    2 +-
 Source/Servidor/AdminPV_Server.dproj          |  331 +++--
 Source/Servidor/AdminPV_Server.drc            | 1206 ++++++++---------
 Source/Servidor/AdminPV_Server.rc             |   10 +-
 Source/Servidor/AdminPV_Server.res            |  Bin 23336 -> 23336 bytes
 Source/Servidor/EDI_Log_Impl.dfm              |   47 -
 Source/Servidor/EDI_Log_Impl.pas              |    3 +-
 .../uDataModuleEDI_Inventary.dfm              |  343 +----
 .../uDataModuleEDI_Inventary.pas              |  174 ++-
 .../EDI_Sales/uDataModuleEDI_Sales.dfm        |  950 +------------
 .../EDI_Sales/uDataModuleEDI_Sales.pas        |  159 ++-
 Source/Servidor/uDataModuleServer.dfm         |   10 +-
 Source/Usuarios/Usuarios.drc                  |    2 +-
 35 files changed, 1074 insertions(+), 2249 deletions(-)

diff --git a/Source/Base/BaseD10.drc b/Source/Base/BaseD10.drc
index 6c03fcc..ad83b8e 100644
--- a/Source/Base/BaseD10.drc
+++ b/Source/Base/BaseD10.drc
@@ -13,7 +13,7 @@ BEGIN
 END
 
 /* C:\Varela_D2007\Source\Base\uConfigurarConexion.dfm */
-/* C:\Varela_D2007\Source\Base\uDataModuleBase.DFM */
+/* C:\Varela_D2007\Source\Base\uDataModuleBase.dfm */
 /* C:\Varela_D2007\Source\Base\uViewBase.dfm */
 /* C:\Varela_D2007\Source\Base\uEditorBase.dfm */
 /* C:\Varela_D2007\Source\Base\uViewGridBase.dfm */
@@ -26,4 +26,4 @@ END
 /* C:\Varela_D2007\Source\Base\uViewBarraSeleccion.dfm */
 /* C:\Varela_D2007\Source\Base\uViewGrid.dfm */
 /* C:\Varela_D2007\Source\Base\BaseD10.res */
-/* C:\Varela_D2007\Source\Base\BaseD10.drf */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf6.tmp */
diff --git a/Source/CargaEDI/CargaEDI.dproj b/Source/CargaEDI/CargaEDI.dproj
index 6c2765e..2cbf25b 100644
--- a/Source/CargaEDI/CargaEDI.dproj
+++ b/Source/CargaEDI/CargaEDI.dproj
@@ -43,19 +43,7 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>VCLApplication</Borland.ProjectType>
     <BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.1.1.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
       
       
       
diff --git a/Source/CargaEDI/CargaEDI.drc b/Source/CargaEDI/CargaEDI.drc
index 2868863..3588f69 100644
--- a/Source/CargaEDI/CargaEDI.drc
+++ b/Source/CargaEDI/CargaEDI.drc
@@ -15,4 +15,4 @@ END
 /* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\WindowsXP.res */
 /* C:\Varela_D2007\Source\CargaEDI\uCargaEDI.dfm */
 /* C:\Varela_D2007\Source\CargaEDI\CargaEDI.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf26.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf98.tmp */
diff --git a/Source/CargaEDI/CargaEDI.rc b/Source/CargaEDI/CargaEDI.rc
index 44990e7..45d4ab2 100644
--- a/Source/CargaEDI/CargaEDI.rc
+++ b/Source/CargaEDI/CargaEDI.rc
@@ -1,7 +1,7 @@
 MAINICON ICON "C:\Varela_D2007\Resources\Iconos\CargaEDI.ico"
 1 VERSIONINFO
-FILEVERSION 2,0,0,0
-PRODUCTVERSION 2,0,0,0
+FILEVERSION 2,1,1,0
+PRODUCTVERSION 2,1,1,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@@ -12,7 +12,7 @@ BEGIN
     BEGIN
          BLOCK "0C0A04E4"
          BEGIN
-              VALUE "FileVersion", "2.0.0.0\0"
+              VALUE "FileVersion", "2.1.1.0\0"
               VALUE "ProductVersion", "1.0.0.0\0"
          END
     END
diff --git a/Source/CargaEDI/CargaEDI.res b/Source/CargaEDI/CargaEDI.res
index 5c6d4bd5049f3e4d0f72eec13a7aa979b5041874..350f2a0f8e99539dde1a63069e9b303f3faf4322 100644
GIT binary patch
delta 37
ocmdl}xu<f&8f$(=1||ju21XzR)01~w*RmQi=rI^hwza7T0IjYFKL7v#

delta 37
lcmdl}xu<f&8f$(A1||jw0MnCqTi3E0Fz7KDOt!VD2LP=|2sr=%

diff --git a/Source/CargaEDI/uCargaEDI.pas b/Source/CargaEDI/uCargaEDI.pas
index 748bddb..3dcebcb 100644
--- a/Source/CargaEDI/uCargaEDI.pas
+++ b/Source/CargaEDI/uCargaEDI.pas
@@ -130,13 +130,14 @@ begin
   end
   else begin
     JvAnimate1.Active := True;
-    AnadirMensaje('Cargando ficheros de ventas');
-    TCargarVentasThread.Create('CABVEN.TXT', 'LUGVEN.TXT',
-      'ARTVEN.TXT', OnLoadSuccess, OnLoadError);
 
     AnadirMensaje('Cargando ficheros de inventario');
     TCargarInventarioThread.Create('CABINV.TXT', 'LININV.TXT',
       'CANTINV.TXT', OnLoadSuccess, OnLoadError);
+
+    AnadirMensaje('Cargando ficheros de ventas');
+    TCargarVentasThread.Create('CABVEN.TXT', 'LUGVEN.TXT',
+      'ARTVEN.TXT', OnLoadSuccess, OnLoadError);
   end;
 end;
 
diff --git a/Source/Cliente/AdminPV.dproj b/Source/Cliente/AdminPV.dproj
index b070396..ba9a539 100644
--- a/Source/Cliente/AdminPV.dproj
+++ b/Source/Cliente/AdminPV.dproj
@@ -42,9 +42,7 @@
 		<Borland.Personality>Delphi.Personality</Borland.Personality>
 		<Borland.ProjectType>VCLApplication</Borland.ProjectType>
 		<BorlandProject>
-			<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.1.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">Administración de puntos de venta</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">Administración de puntos de venta</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys>
-						<VersionInfoKeys Name="CompileDate">viernes, 05 de octubre de 2007 17:13</VersionInfoKeys>
-					</VersionInfoKeys><Excluded_Packages>
+			<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.1.1.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">Administración de puntos de venta</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">Administración de puntos de venta</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">martes, 11 de marzo de 2008 18:44</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
 						<Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>
 						<Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages>
 						<Excluded_Packages Name="$(BDS)\bin\dclofficexp100.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
diff --git a/Source/Cliente/AdminPV.drc b/Source/Cliente/AdminPV.drc
index 68efa45..f852ed3 100644
--- a/Source/Cliente/AdminPV.drc
+++ b/Source/Cliente/AdminPV.drc
@@ -19,4 +19,4 @@ END
 /* C:\Varela_D2007\Source\Cliente\uAcercaDe.dfm */
 /* C:\Varela_D2007\Source\Cliente\uPantallaPrincipal.dfm */
 /* C:\Varela_D2007\Source\Cliente\AdminPV.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf24.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf96.tmp */
diff --git a/Source/Cliente/AdminPV.rc b/Source/Cliente/AdminPV.rc
index 0d42ed9..7158581 100644
--- a/Source/Cliente/AdminPV.rc
+++ b/Source/Cliente/AdminPV.rc
@@ -1,7 +1,7 @@
 MAINICON ICON "C:\Varela_D2007\Resources\Iconos\Cliente.ico"
 1 VERSIONINFO
-FILEVERSION 2,1,0,0
-PRODUCTVERSION 2,1,0,0
+FILEVERSION 2,1,1,0
+PRODUCTVERSION 2,1,1,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@@ -13,11 +13,11 @@ BEGIN
          BLOCK "0C0A04E4"
          BEGIN
               VALUE "CompanyName", "Rodax Software S.L.\0"
-              VALUE "FileVersion", "2.1.0.0\0"
+              VALUE "FileVersion", "2.1.1.0\0"
               VALUE "InternalName", "Administración de puntos de venta\0"
               VALUE "ProductName", "Administración de puntos de venta\0"
               VALUE "ProductVersion", "1.0.0.0\0"
-              VALUE "CompileDate", "jueves, 24 de enero de 2008 19:08\0"
+              VALUE "CompileDate", "martes, 11 de marzo de 2008 20:09\0"
          END
     END
     BLOCK "VarFileInfo"
diff --git a/Source/Cliente/AdminPV.res b/Source/Cliente/AdminPV.res
index b50bec2f9f3d45dcf9925391c12fd0c416604acc..12e70be35e50c8193dcf4354a5de062b75d1882d 100644
GIT binary patch
delta 84
zcmZ27fpN(M#tq9{IT;xk8JHLt7#Jt7cRk5yxVh3znNc~HA(5eop@boop_oC3L4m;#
g2o)GofP4i8h+Ng={qCZiMhpfFRzPey`L4S=08JVb1^@s6

delta 84
zcmZ27fpN(M#tq9{IT;uj8JHM=VDfs`lZ*zNE8UbCm9rR18B!U_fVh}Jhe3hCh`|I%
grU3a0K%57}MU(fti*gz=STa~K7%*5&zU%G|08J?q1ONa4

diff --git a/Source/Configuracion/Configuracion.drc b/Source/Configuracion/Configuracion.drc
index aecef17..80e4b17 100644
--- a/Source/Configuracion/Configuracion.drc
+++ b/Source/Configuracion/Configuracion.drc
@@ -14,4 +14,4 @@ END
 
 /* C:\Varela_D2007\Source\Configuracion\uPanelControl.dfm */
 /* C:\Varela_D2007\Source\Configuracion\Configuracion.res */
-/* C:\Varela_D2007\Source\Configuracion\Configuracion.drf */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfE.tmp */
diff --git a/Source/ControlesBase/ControlesBaseD10.drc b/Source/ControlesBase/ControlesBaseD10.drc
index ac1854f..d1f1368 100644
--- a/Source/ControlesBase/ControlesBaseD10.drc
+++ b/Source/ControlesBase/ControlesBaseD10.drc
@@ -15,7 +15,7 @@ END
 /* C:\Varela_D2007\Source\ControlesBase\Cliente\uFormPropiedadesControl.dfm */
 /* C:\Varela_D2007\Source\ControlesBase\Cliente\uViewControlesBase.dfm */
 /* C:\Varela_D2007\Source\ControlesBase\Cliente\uEditorControlesBase.dfm */
-/* C:\Varela_D2007\Source\ControlesBase\Cliente\uDataModuleControles.DFM */
+/* C:\Varela_D2007\Source\ControlesBase\Cliente\uDataModuleControles.dfm */
 /* C:\Varela_D2007\Source\ControlesBase\Cliente\uViewControlGrid.dfm */
 /* C:\Varela_D2007\Source\ControlesBase\Cliente\uViewParametrosControlGrid.dfm */
 /* C:\Varela_D2007\Source\ControlesBase\Cliente\uViewAgrupaciones.dfm */
@@ -26,4 +26,4 @@ END
 /* C:\Varela_D2007\Source\ControlesBase\Cliente\uEditorControlBase.dfm */
 /* C:\Varela_D2007\Source\ControlesBase\Cliente\uViewPeriodoFechas.dfm */
 /* C:\Varela_D2007\Source\ControlesBase\ControlesBaseD10.res */
-/* C:\Varela_D2007\Source\ControlesBase\ControlesBaseD10.drf */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf8.tmp */
diff --git a/Source/Modulos/Devoluciones/Cliente/Devoluciones.drc b/Source/Modulos/Devoluciones/Cliente/Devoluciones.drc
index 3099efa..aec5e05 100644
--- a/Source/Modulos/Devoluciones/Cliente/Devoluciones.drc
+++ b/Source/Modulos/Devoluciones/Cliente/Devoluciones.drc
@@ -12,10 +12,10 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Varela_D2007\Source\Modulos\Devoluciones\Cliente\uDataModuleDevoluciones.DFM */
+/* C:\Varela_D2007\Source\Modulos\Devoluciones\Cliente\uDataModuleDevoluciones.dfm */
 /* C:\Varela_D2007\Source\Modulos\Devoluciones\Cliente\uViewListaDevoluciones.dfm */
 /* C:\Varela_D2007\Source\Modulos\Devoluciones\Cliente\uEditorListaDevoluciones.dfm */
 /* C:\Varela_D2007\Source\Modulos\Devoluciones\Cliente\uPluginControllerDevoluciones.dfm */
 /* C:\Varela_D2007\Source\Modulos\Devoluciones\Cliente\uEditorAjustarDevoluciones.dfm */
 /* C:\Varela_D2007\Source\Modulos\Devoluciones\Cliente\Devoluciones.res */
-/* C:\Varela_D2007\Source\Modulos\Devoluciones\Cliente\Devoluciones.drf */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1A.tmp */
diff --git a/Source/Modulos/FicherosEDI/Cliente/FicherosEDI.drc b/Source/Modulos/FicherosEDI/Cliente/FicherosEDI.drc
index ad1b50f..a133ba7 100644
--- a/Source/Modulos/FicherosEDI/Cliente/FicherosEDI.drc
+++ b/Source/Modulos/FicherosEDI/Cliente/FicherosEDI.drc
@@ -13,9 +13,9 @@ BEGIN
 END
 
 /* C:\Varela_D2007\Source\Modulos\FicherosEDI\Cliente\uAsistenteCargaFicheros.dfm */
-/* C:\Varela_D2007\Source\Modulos\FicherosEDI\Cliente\uDataModuleFicherosEDI.DFM */
+/* C:\Varela_D2007\Source\Modulos\FicherosEDI\Cliente\uDataModuleFicherosEDI.dfm */
 /* C:\Varela_D2007\Source\Modulos\FicherosEDI\Cliente\uViewHistorialCargasEDI.dfm */
 /* C:\Varela_D2007\Source\Modulos\FicherosEDI\Cliente\uEditorHistorialCargasEDI.dfm */
 /* C:\Varela_D2007\Source\Modulos\FicherosEDI\Cliente\uPluginControllerFicherosEDI.dfm */
 /* C:\Varela_D2007\Source\Modulos\FicherosEDI\Cliente\FicherosEDI.res */
-/* C:\Varela_D2007\Source\Modulos\FicherosEDI\Cliente\FicherosEDI.drf */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf10.tmp */
diff --git a/Source/Modulos/FicherosEDI/Cliente/uCargarFicheros.pas b/Source/Modulos/FicherosEDI/Cliente/uCargarFicheros.pas
index 5fd37ac..d1e3862 100644
--- a/Source/Modulos/FicherosEDI/Cliente/uCargarFicheros.pas
+++ b/Source/Modulos/FicherosEDI/Cliente/uCargarFicheros.pas
@@ -87,8 +87,10 @@ implementation
 uses
   uDataModuleBase, cxControls;
 
-{ TROThread }
+const
+  TIME_OUT = 1000 * 60 * 45; // 45 MINUTOS
 
+{ TROThread }
 
 destructor TCargarFicherosThread.Destroy;
 begin
@@ -159,6 +161,7 @@ begin
   fROChannel := TROWinInetHTTPChannel.Create(NIL);
   fROChannel.OnFailure := OnChannelFailure;
   fROChannel.TargetURL := dmBase.Channel.TargetURL;
+  fROChannel.Timeout := TIME_OUT;
 end;
 
 { TCargarVentasThread }
diff --git a/Source/Modulos/Parametros/Cliente/Parametros.drc b/Source/Modulos/Parametros/Cliente/Parametros.drc
index 97071bf..07be104 100644
--- a/Source/Modulos/Parametros/Cliente/Parametros.drc
+++ b/Source/Modulos/Parametros/Cliente/Parametros.drc
@@ -12,9 +12,9 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Varela_D2007\Source\Modulos\Parametros\Cliente\uDataModuleParametros.DFM */
+/* C:\Varela_D2007\Source\Modulos\Parametros\Cliente\uDataModuleParametros.dfm */
 /* C:\Varela_D2007\Source\Modulos\Parametros\Cliente\uViewParametrosCentro.dfm */
 /* C:\Varela_D2007\Source\Modulos\Parametros\Cliente\uViewParametrosColeccion.dfm */
 /* C:\Varela_D2007\Source\Modulos\Parametros\Cliente\uViewParametrosFecha.dfm */
 /* C:\Varela_D2007\Source\Modulos\Parametros\Cliente\Parametros.res */
-/* C:\Varela_D2007\Source\Modulos\Parametros\Cliente\Parametros.drf */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfA.tmp */
diff --git a/Source/Modulos/Parametros/Cliente/Parametros.res b/Source/Modulos/Parametros/Cliente/Parametros.res
index 1641339fcc482e7e3492d1b45813a86619622c33..8b251f312bcccec5485024f6fe8d80e1cdf25746 100644
GIT binary patch
delta 11
ScmeBCZD5|Duvteife`=|>;pCc

literal 4748
zcmbW5&ub)A5XUPdpe&2#;C*uNAUVhgd+&(4um@dnom`vXF9g}ZuHJ;se=<3UNdFJg
zbCw+UD9j$byGIXV`~6hC>h4S?F|k9X-j90q{Z_qtZ<;nUJCO8!h?<w4U-ol;S2jC7
zx4(byej2@_#)0HWvg0i^wC4Xli+W*aXJ^(njceK|Kb@c3qFNX>p${kR>3GhM`oH*q
zk=UsjOCIgA_4!`B+Gb&`I84R)bT4dy-BQV<-SyFz?R8ILEQ(+JB$u{sEXE@j@B*7W
zT;iZH#|OJ<&DO$RCkM6VbK3(B(k{nbdv1lpc;E$xz9as|v3uE1V{hw2w~g3eD0an7
z{BT%G%irdMe*|oDJmgvJ<ltI;x5J<Oc>aA2`9B<Z5Toyra?r{a4$fnJHGXo6Pmcq8
z{JGCD500t1h4|yI?-f&xoj9;YT&Ch&JLO*X#NC3sCI0Xmc<f_vh`jn-1E!?th$%QM
znzGM|)$vl3f7;nE+9qR}|A?C$H3K&BFdq9?uxrIqHIne#5?8G@da2ybWLGKA686M2
z*LJMMMk4<U`dzFC9}HrSxLfOGll{P#??xir)$c2}C;ql+y-&Wa(LP{PgPk1E1@{uR
zIMCNz;u9;r(axhQvEx%?i#p<Vn=Z!SK%f10?4_`0@RY8lXRM3(t(nFSzJ$4kJr6&x
ze)~B%biu*TY$HDstHD=|UGxJceYiUQQa0Gu(p3og@%ZJ><6Xi*?M~Q;)@Sbfwf3uf
zVaWkbU<NjR3%=~AdoZbkXp`f@b0%GBT^$^V5e(n|#O(?P)hBbF)4n%2cw6U#adPM!
zz(!`V|Bfl{aH0)Y&w;SK7R4<z{p;Gwz1D%l86L3ZFZQ&=pB$<&esXT|OZ?=AGaWoe
z{>jU=;sL{BlYemIZXv%qZ{SZw{-TCU+;!nH6KDDIJumU+9{E0zXW4>7T)y|>$DQlv
zRJe?TjSp{c!DqeayAnSMTtZZT;>LN7J0Rls+5m@q)MbyB*eL%Eu@(+$Cw}Pd@q7N|
z%Q0*AHpCP^b9v`@jx-l_FD>khpW2W8(OU2&V5TrnoAY-m_hlcV?zq3;7{2gF{J#Hc
z6R+o~mVenX?>@W0@_DVzyOFs(5464CY{!q9ChoF#_*eXi@4gFuV8?vhl=_w5$iKL0
zEV0nMBcN08xtRmsgJrqjh@s#|{?*ssnsG)mH*wa6{efF0JFWHok@kA5%b661{B38=
zCcgJ|*ZFTpV$8<-&+AWpa)Q8*`wL&hMeNQ^v6I7$HSdLZhZ^&+6<@Uw_Zsml9^v3W
zVvPDBKHh;i=RU4J_ta3E;)M<P+=2X7;VbzliQZ=IHV#+fr#{!(ukt%UJMS8=332qg
z7jD)rSbpCW+^j*cd6LUEe8#9n&v!NEJM(@?SHvB$=h@|)fjw|&qD?NQ5A&R>n>Y+L
zKLZ0UQ+*km9FO-b?U4gmn-62iwzH6&*duKGo~aUV)bYDla8wWZ9+^7p-F<8lP@i!m
z@vhbD_${F}h>^T;C(?(b*OJDk?{dEXB?nuehoON3HAb!7Mr7-ls!84-5V-jJu<OVP
zzHjp+hnwo*3NQE$JTA(agu~silV5T`du+GJgWGi_7mAy`Nk8fLt~%GF$;XXcE-ri?
zyIglyyzA`K-);4Eem2MZm07RBza@W3UP)d`Rz=RFk-I);`s{$L%yyBNX0OTjo5Gk0
zs}g44uXg*l%xo^{`#0=kd*2?}Cz22Bv2;Gu?;3o~(D#gk1OKYQSCAb$(&vu@_pvWO
z>gbu<_$}mU=Yd9!?TOX;|B-#B)+0x#9q*yqJiqS!`49d=7ztk$O+9=1i;?K_|J<8T
z?0b7=-`Z3A#vV$4XJ5(lQ~TOZHUFdA%oWvK5zg&_IKXIbughQBA8XAsd#=@|TFLXC
zy(^m((;DnQmDQ<zX+PK(Lfu@ox#mOnbZjSDl}IBqv$qwK+2@))5$ba>Katmw!@c`|
G?EMQ&4NnpP

diff --git a/Source/Modulos/Recepciones/Cliente/Recepciones.drc b/Source/Modulos/Recepciones/Cliente/Recepciones.drc
index 2c1e586..239fd85 100644
--- a/Source/Modulos/Recepciones/Cliente/Recepciones.drc
+++ b/Source/Modulos/Recepciones/Cliente/Recepciones.drc
@@ -12,7 +12,7 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Varela_D2007\Source\Modulos\Recepciones\Cliente\uDataModuleRecepciones.DFM */
+/* C:\Varela_D2007\Source\Modulos\Recepciones\Cliente\uDataModuleRecepciones.dfm */
 /* C:\Varela_D2007\Source\Modulos\Recepciones\Cliente\uViewListaRecepciones.dfm */
 /* C:\Varela_D2007\Source\Modulos\Recepciones\Cliente\uEditorListaRecepciones.dfm */
 /* C:\Varela_D2007\Source\Modulos\Recepciones\Cliente\uViewListaRecepcionesAlbaran.dfm */
@@ -20,4 +20,4 @@ END
 /* C:\Varela_D2007\Source\Modulos\Recepciones\Cliente\uPluginControllerRecepciones.dfm */
 /* C:\Varela_D2007\Source\Modulos\Recepciones\Cliente\uEditorAjustarRecepciones.dfm */
 /* C:\Varela_D2007\Source\Modulos\Recepciones\Cliente\Recepciones.res */
-/* C:\Varela_D2007\Source\Modulos\Recepciones\Cliente\Recepciones.drf */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf18.tmp */
diff --git a/Source/Modulos/ReferenciaGenerica/Cliente/ReferenciaGenerica.drc b/Source/Modulos/ReferenciaGenerica/Cliente/ReferenciaGenerica.drc
index 855053a..6087eef 100644
--- a/Source/Modulos/ReferenciaGenerica/Cliente/ReferenciaGenerica.drc
+++ b/Source/Modulos/ReferenciaGenerica/Cliente/ReferenciaGenerica.drc
@@ -12,10 +12,10 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Varela_D2007\Source\Modulos\ReferenciaGenerica\Cliente\uDataModuleReferenciaGenerica.DFM */
+/* C:\Varela_D2007\Source\Modulos\ReferenciaGenerica\Cliente\uDataModuleReferenciaGenerica.dfm */
 /* C:\Varela_D2007\Source\Modulos\ReferenciaGenerica\Cliente\uViewListaReferenciaGenerica.dfm */
 /* C:\Varela_D2007\Source\Modulos\ReferenciaGenerica\Cliente\uEditorListaReferenciaGenerica.dfm */
 /* C:\Varela_D2007\Source\Modulos\ReferenciaGenerica\Cliente\uPluginControllerReferenciaGenerica.dfm */
 /* C:\Varela_D2007\Source\Modulos\ReferenciaGenerica\Cliente\uEditorCambioReferenciaGenerica.dfm */
 /* C:\Varela_D2007\Source\Modulos\ReferenciaGenerica\Cliente\ReferenciaGenerica.res */
-/* C:\Varela_D2007\Source\Modulos\ReferenciaGenerica\Cliente\ReferenciaGenerica.drf */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf16.tmp */
diff --git a/Source/Modulos/Stock/Cliente/Stock.drc b/Source/Modulos/Stock/Cliente/Stock.drc
index 609d96f..6ec588a 100644
--- a/Source/Modulos/Stock/Cliente/Stock.drc
+++ b/Source/Modulos/Stock/Cliente/Stock.drc
@@ -12,7 +12,7 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Varela_D2007\Source\Modulos\Stock\Cliente\uDataModuleStock.DFM */
+/* C:\Varela_D2007\Source\Modulos\Stock\Cliente\uDataModuleStock.dfm */
 /* C:\Varela_D2007\Source\Modulos\Stock\Cliente\uViewControGridStockEDI.dfm */
 /* C:\Varela_D2007\Source\Modulos\Stock\Cliente\uViewControGridStockPrendasCentros.dfm */
 /* C:\Varela_D2007\Source\Modulos\Stock\Cliente\uViewControGridStockEDIInventario.dfm */
@@ -21,4 +21,4 @@ END
 /* C:\Varela_D2007\Source\Modulos\Stock\Cliente\uEditorControlStockVARELA.dfm */
 /* C:\Varela_D2007\Source\Modulos\Stock\Cliente\uPluginControllerStock.dfm */
 /* C:\Varela_D2007\Source\Modulos\Stock\Cliente\Stock.res */
-/* C:\Varela_D2007\Source\Modulos\Stock\Cliente\Stock.drf */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1E.tmp */
diff --git a/Source/Modulos/Traspasos/Cliente/Traspasos.drc b/Source/Modulos/Traspasos/Cliente/Traspasos.drc
index 8b12acd..2b63fc7 100644
--- a/Source/Modulos/Traspasos/Cliente/Traspasos.drc
+++ b/Source/Modulos/Traspasos/Cliente/Traspasos.drc
@@ -18,4 +18,4 @@ END
 /* C:\Varela_D2007\Source\Modulos\Traspasos\Cliente\uPluginControllerTraspasos.dfm */
 /* C:\Varela_D2007\Source\Modulos\Traspasos\Cliente\uEditorAjustarTraspasos.dfm */
 /* C:\Varela_D2007\Source\Modulos\Traspasos\Cliente\Traspasos.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf20.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf92.tmp */
diff --git a/Source/Modulos/VentasProceso/Cliente/VentasProceso.drc b/Source/Modulos/VentasProceso/Cliente/VentasProceso.drc
index 2df04e5..b16ef3c 100644
--- a/Source/Modulos/VentasProceso/Cliente/VentasProceso.drc
+++ b/Source/Modulos/VentasProceso/Cliente/VentasProceso.drc
@@ -20,4 +20,4 @@ END
 /* C:\Varela_D2007\Source\Modulos\VentasProceso\Cliente\uViewControlVentaProceso.dfm */
 /* C:\Varela_D2007\Source\Modulos\VentasProceso\Cliente\uEditorControlVentaProceso.dfm */
 /* C:\Varela_D2007\Source\Modulos\VentasProceso\Cliente\VentasProceso.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf18.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf8A.tmp */
diff --git a/Source/Modulos/VentasTerminadas/Cliente/VentasTerminadas.drc b/Source/Modulos/VentasTerminadas/Cliente/VentasTerminadas.drc
index 0969032..f626433 100644
--- a/Source/Modulos/VentasTerminadas/Cliente/VentasTerminadas.drc
+++ b/Source/Modulos/VentasTerminadas/Cliente/VentasTerminadas.drc
@@ -22,4 +22,4 @@ END
 /* C:\Varela_D2007\Source\Modulos\VentasTerminadas\Cliente\uPluginControllerVentasTerminadas.dfm */
 /* C:\Varela_D2007\Source\Modulos\VentasTerminadas\Cliente\uEditorControlVentasTerminadas.dfm */
 /* C:\Varela_D2007\Source\Modulos\VentasTerminadas\Cliente\VentasTerminadas.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf16.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf88.tmp */
diff --git a/Source/Servidor/AdminPV_Server.dproj b/Source/Servidor/AdminPV_Server.dproj
index 4547883..ba91412 100644
--- a/Source/Servidor/AdminPV_Server.dproj
+++ b/Source/Servidor/AdminPV_Server.dproj
@@ -1,173 +1,166 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{86364157-b301-43dd-bfad-250a58064559}</ProjectGuid>
-    <MainSource>AdminPV_Server.dpr</MainSource>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
-    <DCC_DependencyCheckOutputName>..\..\Output\Debug\Servidor\AdminPV_Server.exe</DCC_DependencyCheckOutputName>
-    <DCC_UsePackage>vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dbxcds;DbxCommonDriver;dbexpress;dsnapcon;vclib;ibxpress;adortl;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;xmlrtl;RemObjects_Core_D10;RemObjects_WebBroker_D10;RemObjects_RODX_D10;RemObjects_BPDX_D10;RemObjects_Synapse_D10;RemObjects_Indy_D10;DataAbstract_Core_D10;DataAbstract_IDE_D10;DataAbstract_DBXDriver_D10B;DataAbstract_SQLiteDriver_D10;DataAbstract_Scripting_D10;PascalScript_RO_D10;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;fqb100;frx10;frxADO10;frxBDE10;frxDB10;frxe10;frxIBX10;fs10;fsADO10;fsBDE10;fsDB10;fsIBX10;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;ccpack10dsg;ccpack10;EasyListviewD10;GUISDK_D10;JvAppFrmD10R;JvCoreD10R;JclVcl;Jcl;JvSystemD10R;JvStdCtrlsD10R;JvBandsD10R;JvDBD10R;JvDlgsD10R;JvBDED10R;JvCmpD10R;JvCryptD10R;JvCtrlsD10R;JvCustomD10R;JvDockingD10R;JvDotNetCtrlsD10R;JvEDID10R;JvGlobusD10R;JvHMID10R;JvInterpreterD10R;JvJansD10R;JvManagedThreadsD10R;JvMMD10R;JvPageCompsD10R;JvPrintPreviewD10R;JvRuntimeDesignD10R;JvTimeFrameworkD10R;JvUIBD10R;JvValidatorsD10R;JvWizardD10R;JvXPCtrlsD10R;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;RemObjects_DataSnap_D10</DCC_UsePackage>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <Version>7.0</Version>
-    <DCC_DebugInformation>False</DCC_DebugInformation>
-    <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
-    <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
-    <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
-    <DCC_MapFile>3</DCC_MapFile>
-    <DCC_ExeOutput>..\..\Output\Release\Servidor</DCC_ExeOutput>
-    <DCC_DcuOutput>.\</DCC_DcuOutput>
-    <DCC_ObjOutput>.\</DCC_ObjOutput>
-    <DCC_HppOutput>.\</DCC_HppOutput>
-    <DCC_UnitSearchPath>..\Lib;..\Base</DCC_UnitSearchPath>
-    <DCC_ResourcePath>..\Lib;..\Base</DCC_ResourcePath>
-    <DCC_ObjPath>..\Lib;..\Base</DCC_ObjPath>
-    <DCC_IncludePath>..\Lib;..\Base</DCC_IncludePath>
-    <DCC_Define>RELEASE</DCC_Define>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <Version>7.0</Version>
-    <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
-    <DCC_MapFile>3</DCC_MapFile>
-    <DCC_ExeOutput>..\..\Output\Debug\Servidor</DCC_ExeOutput>
-    <DCC_DcuOutput>.\</DCC_DcuOutput>
-    <DCC_ObjOutput>.\</DCC_ObjOutput>
-    <DCC_HppOutput>.\</DCC_HppOutput>
-    <DCC_UnitSearchPath>..\Lib;..\Base</DCC_UnitSearchPath>
-    <DCC_ResourcePath>..\Lib;..\Base</DCC_ResourcePath>
-    <DCC_ObjPath>..\Lib;..\Base</DCC_ObjPath>
-    <DCC_IncludePath>..\Lib;..\Base</DCC_IncludePath>
-    <DCC_Define>DEBUG;</DCC_Define>
-  </PropertyGroup>
-  <ProjectExtensions>
-    <Borland.Personality>Delphi.Personality</Borland.Personality>
-    <Borland.ProjectType>VCLApplication</Borland.ProjectType>
-    <BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.1.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">AdminPV_Server</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">viernes, 05 de octubre de 2007 17:13</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">AdminPV_Server.dpr</Source></Source><Excluded_Packages>
-      
-      
-      
-      
-      
-      
-      
-      <Excluded_Packages Name="C:\Varela_D2007\Lib\DevExpressVCL\dxPSCoreD10.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages>
-      <Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>
-      <Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages>
-      <Excluded_Packages Name="$(BDS)\bin\dclofficexp100.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
-      <Excluded_Packages Name="$(BDS)\bin\dcloffice2k100.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
-      <Excluded_Packages Name="$(BDS)\bin\bcboffice2k100.bpl">CodeGear C++Builder Office 2000 Servers Package</Excluded_Packages>
-      <Excluded_Packages Name="$(BDS)\bin\bcbofficexp100.bpl">CodeGear C++Builder Office XP Servers Package</Excluded_Packages>
-    </Excluded_Packages></Delphi.Personality></BorlandProject></BorlandProject>
-  </ProjectExtensions>
-  <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
-  <ItemGroup>
-    <DelphiCompile Include="AdminPV_Server.dpr">
-      <MainSource>MainSource</MainSource>
-    </DelphiCompile>
-    <DCCReference Include="..\Base\uDataTableUtils.pas" />
-    <DCCReference Include="..\Base\uDBSelectionList.pas" />
-    <DCCReference Include="..\Base\uIntegerList.pas" />
-    <DCCReference Include="..\ControlesBase\Reglas\schControlesClient_Intf.pas" />
-    <DCCReference Include="..\ControlesBase\Reglas\schControlesServer_Intf.pas" />
-    <DCCReference Include="..\ControlesBase\Servidor\srvControles_Impl.pas">
-      <Form>srvControles</Form>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Devoluciones\Servidor\srvDevoluciones_Impl.pas">
-      <Form>srvDevoluciones</Form>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\FicherosEDI\Reglas\schEDILogClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\FicherosEDI\Reglas\schEDILogServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Parametros\Reglas\schParametrosClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Parametros\Reglas\schParametrosServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Parametros\Servidor\srvParametros_Impl.pas">
-      <Form>srvParametros</Form>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Recepciones\Servidor\srvRecepciones_Impl.pas">
-      <Form>srvRecepciones</Form>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\ReferenciaGenerica\Reglas\schReferenciaGenericaClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\ReferenciaGenerica\Reglas\schReferenciaGenericaServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\ReferenciaGenerica\Reglas\uBizReferenciaGenericaServer.pas" />
-    <DCCReference Include="..\Modulos\ReferenciaGenerica\Servidor\srvReferenciaGenerica_Impl.pas">
-      <Form>srvReferenciaGenerica</Form>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Stock\Reglas\schStockClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Stock\Reglas\schStockServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Stock\Servidor\srvStock_Impl.pas">
-      <Form>srvStock</Form>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Traspasos\Servidor\srvTraspasos_Impl.pas">
-      <Form>srvTraspasos</Form>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\VentasProceso\Reglas\schVentasEnProcesoClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\VentasProceso\Reglas\schVentasEnProcesoServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\VentasProceso\Servidor\srvVentasEnProceso_Impl.pas">
-      <Form>srvVentasEnProceso</Form>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\VentasTerminadas\Reglas\schVentasTerminadasClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\VentasTerminadas\Reglas\schVentasTerminadasServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\VentasTerminadas\Servidor\srvVentasTerminadas_Impl.pas">
-      <Form>srvVentasTerminadas</Form>
-    </DCCReference>
-    <DCCReference Include="Configuracion\uConexionBD.pas">
-      <Form>frConexionBD</Form>
-    </DCCReference>
-    <DCCReference Include="Configuracion\uConfFicherosEDI.pas">
-      <Form>frConfFicherosEDI</Form>
-    </DCCReference>
-    <DCCReference Include="Configuracion\uConfGeneral.pas">
-      <Form>frConfGeneral</Form>
-    </DCCReference>
-    <DCCReference Include="Configuracion\uConfiguracion.pas">
-      <Form>fConfiguracion</Form>
-    </DCCReference>
-    <DCCReference Include="Configuracion\uFrameConfiguracion.pas">
-      <Form>FrameConfiguracion</Form>
-    </DCCReference>
-    <DCCReference Include="EDI\EDI_INVRPT.pas" />
-    <DCCReference Include="EDI\EDI_Reader.pas" />
-    <DCCReference Include="EDI\EDI_SLSRPT.pas" />
-    <DCCReference Include="EDI_Inventary_Impl.pas" />
-    <DCCReference Include="EDI_Log_Impl.pas" />
-    <DCCReference Include="EDI_Sales_Impl.pas" />
-    <DCCReference Include="EDI_Utils.pas" />
-    <DCCReference Include="fServerForm.pas">
-      <Form>ServerForm</Form>
-    </DCCReference>
-    <DCCReference Include="RegExpr.pas" />
-    <DCCReference Include="Services\EDI_Inventary\schEDIInventaryClient_Intf.pas" />
-    <DCCReference Include="Services\EDI_Inventary\schEDIInventaryServer_Intf.pas" />
-    <DCCReference Include="Services\EDI_Inventary\uBizEDIInventary.pas" />
-    <DCCReference Include="Services\EDI_Inventary\uDataModuleEDI_Inventary.pas">
-      <Form>dmEDIInventary</Form>
-    </DCCReference>
-    <DCCReference Include="Services\EDI_Sales\schEDISalesClient_Intf.pas" />
-    <DCCReference Include="Services\EDI_Sales\schEDISalesServer_Intf.pas" />
-    <DCCReference Include="Services\EDI_Sales\uBizEDISales.pas" />
-    <DCCReference Include="Services\EDI_Sales\uDataModuleEDI_Sales.pas">
-      <Form>dmEDISales</Form>
-    </DCCReference>
-    <DCCReference Include="Services\Login\srvLogin_Impl.pas">
-      <Form>srvLogin</Form>
-    </DCCReference>
-    <DCCReference Include="Services\TransferenciaFicheros\srvTransfereciaFicheros_Impl.pas">
-      <Form>srvTransfereciaFicheros</Form>
-    </DCCReference>
-    <DCCReference Include="srvInformes_Impl.pas">
-      <Form>srvInformes</Form>
-    </DCCReference>
-    <DCCReference Include="uAcercaDe.pas">
-      <Form>fAcercaDe</Form>
-    </DCCReference>
-    <DCCReference Include="uDataModuleServer.pas">
-      <Form>dmServer</Form>
-    </DCCReference>
-    <DCCReference Include="uSchemaUtilsServer.pas" />
-    <DCCReference Include="VARELA_Intf.pas" />
-    <DCCReference Include="VARELA_Invk.pas" />
-  </ItemGroup>
+	<PropertyGroup>
+		<ProjectGuid>{86364157-b301-43dd-bfad-250a58064559}</ProjectGuid>
+		<MainSource>AdminPV_Server.dpr</MainSource>
+		<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+		<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+		<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+		<DCC_DependencyCheckOutputName>..\..\Output\Debug\Servidor\AdminPV_Server.exe</DCC_DependencyCheckOutputName>
+		<DCC_UsePackage>vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dbxcds;DbxCommonDriver;dbexpress;dsnapcon;vclib;ibxpress;adortl;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;xmlrtl;RemObjects_Core_D10;RemObjects_WebBroker_D10;RemObjects_RODX_D10;RemObjects_BPDX_D10;RemObjects_Synapse_D10;RemObjects_Indy_D10;DataAbstract_Core_D10;DataAbstract_IDE_D10;DataAbstract_DBXDriver_D10B;DataAbstract_SQLiteDriver_D10;DataAbstract_Scripting_D10;PascalScript_RO_D10;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;fqb100;frx10;frxADO10;frxBDE10;frxDB10;frxe10;frxIBX10;fs10;fsADO10;fsBDE10;fsDB10;fsIBX10;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;ccpack10dsg;ccpack10;EasyListviewD10;GUISDK_D10;JvAppFrmD10R;JvCoreD10R;JclVcl;Jcl;JvSystemD10R;JvStdCtrlsD10R;JvBandsD10R;JvDBD10R;JvDlgsD10R;JvBDED10R;JvCmpD10R;JvCryptD10R;JvCtrlsD10R;JvCustomD10R;JvDockingD10R;JvDotNetCtrlsD10R;JvEDID10R;JvGlobusD10R;JvHMID10R;JvInterpreterD10R;JvJansD10R;JvManagedThreadsD10R;JvMMD10R;JvPageCompsD10R;JvPrintPreviewD10R;JvRuntimeDesignD10R;JvTimeFrameworkD10R;JvUIBD10R;JvValidatorsD10R;JvWizardD10R;JvXPCtrlsD10R;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;RemObjects_DataSnap_D10</DCC_UsePackage>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+		<Version>7.0</Version>
+		<DCC_DebugInformation>False</DCC_DebugInformation>
+		<DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
+		<DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
+		<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+		<DCC_MapFile>3</DCC_MapFile>
+		<DCC_ExeOutput>..\..\Output\Release\Servidor</DCC_ExeOutput>
+		<DCC_DcuOutput>.\</DCC_DcuOutput>
+		<DCC_ObjOutput>.\</DCC_ObjOutput>
+		<DCC_HppOutput>.\</DCC_HppOutput>
+		<DCC_UnitSearchPath>..\Lib;..\Base</DCC_UnitSearchPath>
+		<DCC_ResourcePath>..\Lib;..\Base</DCC_ResourcePath>
+		<DCC_ObjPath>..\Lib;..\Base</DCC_ObjPath>
+		<DCC_IncludePath>..\Lib;..\Base</DCC_IncludePath>
+		<DCC_Define>RELEASE</DCC_Define>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+		<Version>7.0</Version>
+		<DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
+		<DCC_MapFile>3</DCC_MapFile>
+		<DCC_ExeOutput>..\..\Output\Debug\Servidor</DCC_ExeOutput>
+		<DCC_DcuOutput>.\</DCC_DcuOutput>
+		<DCC_ObjOutput>.\</DCC_ObjOutput>
+		<DCC_HppOutput>.\</DCC_HppOutput>
+		<DCC_UnitSearchPath>..\Lib;..\Base</DCC_UnitSearchPath>
+		<DCC_ResourcePath>..\Lib;..\Base</DCC_ResourcePath>
+		<DCC_ObjPath>..\Lib;..\Base</DCC_ObjPath>
+		<DCC_IncludePath>..\Lib;..\Base</DCC_IncludePath>
+		<DCC_Define>DEBUG;</DCC_Define>
+	</PropertyGroup>
+	<ProjectExtensions>
+		<Borland.Personality>Delphi.Personality</Borland.Personality>
+		<Borland.ProjectType>VCLApplication</Borland.ProjectType>
+		<BorlandProject>
+			<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.1.1.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">AdminPV_Server</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">lunes, 10 de marzo de 2008 13:15</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">AdminPV_Server.dpr</Source></Source><Excluded_Packages>
+						<Excluded_Packages Name="C:\Varela_D2007\Lib\DevExpressVCL\dxPSCoreD10.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages>
+						<Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>
+						<Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages>
+						<Excluded_Packages Name="$(BDS)\bin\dclofficexp100.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+						<Excluded_Packages Name="$(BDS)\bin\dcloffice2k100.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+						<Excluded_Packages Name="$(BDS)\bin\bcboffice2k100.bpl">CodeGear C++Builder Office 2000 Servers Package</Excluded_Packages>
+						<Excluded_Packages Name="$(BDS)\bin\bcbofficexp100.bpl">CodeGear C++Builder Office XP Servers Package</Excluded_Packages>
+					</Excluded_Packages></Delphi.Personality></BorlandProject></BorlandProject>
+	</ProjectExtensions>
+	<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets"/>
+	<ItemGroup>
+		<DelphiCompile Include="AdminPV_Server.dpr">
+			<MainSource>MainSource</MainSource>
+		</DelphiCompile>
+		<DCCReference Include="..\Base\uDataTableUtils.pas"/>
+		<DCCReference Include="..\Base\uDBSelectionList.pas"/>
+		<DCCReference Include="..\Base\uIntegerList.pas"/>
+		<DCCReference Include="..\ControlesBase\Reglas\schControlesClient_Intf.pas"/>
+		<DCCReference Include="..\ControlesBase\Reglas\schControlesServer_Intf.pas"/>
+		<DCCReference Include="..\ControlesBase\Servidor\srvControles_Impl.pas">
+			<Form>srvControles</Form>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Devoluciones\Servidor\srvDevoluciones_Impl.pas">
+			<Form>srvDevoluciones</Form>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\FicherosEDI\Reglas\schEDILogClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\FicherosEDI\Reglas\schEDILogServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Parametros\Reglas\schParametrosClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Parametros\Reglas\schParametrosServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Parametros\Servidor\srvParametros_Impl.pas">
+			<Form>srvParametros</Form>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Recepciones\Servidor\srvRecepciones_Impl.pas">
+			<Form>srvRecepciones</Form>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\ReferenciaGenerica\Reglas\schReferenciaGenericaClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\ReferenciaGenerica\Reglas\schReferenciaGenericaServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\ReferenciaGenerica\Reglas\uBizReferenciaGenericaServer.pas"/>
+		<DCCReference Include="..\Modulos\ReferenciaGenerica\Servidor\srvReferenciaGenerica_Impl.pas">
+			<Form>srvReferenciaGenerica</Form>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Stock\Reglas\schStockClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Stock\Reglas\schStockServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Stock\Servidor\srvStock_Impl.pas">
+			<Form>srvStock</Form>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Traspasos\Servidor\srvTraspasos_Impl.pas">
+			<Form>srvTraspasos</Form>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\VentasProceso\Reglas\schVentasEnProcesoClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\VentasProceso\Reglas\schVentasEnProcesoServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\VentasProceso\Servidor\srvVentasEnProceso_Impl.pas">
+			<Form>srvVentasEnProceso</Form>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\VentasTerminadas\Reglas\schVentasTerminadasClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\VentasTerminadas\Reglas\schVentasTerminadasServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\VentasTerminadas\Servidor\srvVentasTerminadas_Impl.pas">
+			<Form>srvVentasTerminadas</Form>
+		</DCCReference>
+		<DCCReference Include="Configuracion\uConexionBD.pas">
+			<Form>frConexionBD</Form>
+		</DCCReference>
+		<DCCReference Include="Configuracion\uConfFicherosEDI.pas">
+			<Form>frConfFicherosEDI</Form>
+		</DCCReference>
+		<DCCReference Include="Configuracion\uConfGeneral.pas">
+			<Form>frConfGeneral</Form>
+		</DCCReference>
+		<DCCReference Include="Configuracion\uConfiguracion.pas">
+			<Form>fConfiguracion</Form>
+		</DCCReference>
+		<DCCReference Include="Configuracion\uFrameConfiguracion.pas">
+			<Form>FrameConfiguracion</Form>
+		</DCCReference>
+		<DCCReference Include="EDI\EDI_INVRPT.pas"/>
+		<DCCReference Include="EDI\EDI_Reader.pas"/>
+		<DCCReference Include="EDI\EDI_SLSRPT.pas"/>
+		<DCCReference Include="EDI_Inventary_Impl.pas"/>
+		<DCCReference Include="EDI_Log_Impl.pas"/>
+		<DCCReference Include="EDI_Sales_Impl.pas"/>
+		<DCCReference Include="EDI_Utils.pas"/>
+		<DCCReference Include="fServerForm.pas">
+			<Form>ServerForm</Form>
+		</DCCReference>
+		<DCCReference Include="RegExpr.pas"/>
+		<DCCReference Include="Services\EDI_Inventary\schEDIInventaryClient_Intf.pas"/>
+		<DCCReference Include="Services\EDI_Inventary\schEDIInventaryServer_Intf.pas"/>
+		<DCCReference Include="Services\EDI_Inventary\uBizEDIInventary.pas"/>
+		<DCCReference Include="Services\EDI_Inventary\uDataModuleEDI_Inventary.pas">
+			<Form>dmEDIInventary</Form>
+		</DCCReference>
+		<DCCReference Include="Services\EDI_Sales\schEDISalesClient_Intf.pas"/>
+		<DCCReference Include="Services\EDI_Sales\schEDISalesServer_Intf.pas"/>
+		<DCCReference Include="Services\EDI_Sales\uBizEDISales.pas"/>
+		<DCCReference Include="Services\EDI_Sales\uDataModuleEDI_Sales.pas">
+			<Form>dmEDISales</Form>
+		</DCCReference>
+		<DCCReference Include="Services\Login\srvLogin_Impl.pas">
+			<Form>srvLogin</Form>
+		</DCCReference>
+		<DCCReference Include="Services\TransferenciaFicheros\srvTransfereciaFicheros_Impl.pas">
+			<Form>srvTransfereciaFicheros</Form>
+		</DCCReference>
+		<DCCReference Include="srvInformes_Impl.pas">
+			<Form>srvInformes</Form>
+		</DCCReference>
+		<DCCReference Include="uAcercaDe.pas">
+			<Form>fAcercaDe</Form>
+		</DCCReference>
+		<DCCReference Include="uDataModuleServer.pas">
+			<Form>dmServer</Form>
+		</DCCReference>
+		<DCCReference Include="uSchemaUtilsServer.pas"/>
+		<DCCReference Include="VARELA_Intf.pas"/>
+		<DCCReference Include="VARELA_Invk.pas"/>
+	</ItemGroup>
 </Project>
 <!-- EurekaLog First Line
 [Exception Log]
diff --git a/Source/Servidor/AdminPV_Server.drc b/Source/Servidor/AdminPV_Server.drc
index d149905..2990877 100644
--- a/Source/Servidor/AdminPV_Server.drc
+++ b/Source/Servidor/AdminPV_Server.drc
@@ -355,9 +355,9 @@
 #define DAConsts_SRefreshFailed 64397
 #define DAConsts_SInvalidFetchRows 64398
 #define DAConsts_SNoCorrespondParam 64399
-#define SqlConst_SDriverNotInConfigFile 64400
-#define SqlConst_SObjectTypenameRequired 64401
-#define SqlConst_SCannotCreateFile 64402
+#define DBXPool_SConnectTimeout 64400
+#define DBXPool_SInvalidCommand 64401
+#define DBXTrace_SINVALID_TRACE_FLAG 64402
 #define ZLibConst_sTargetBufferTooSmall 64403
 #define ZLibConst_sError 64404
 #define DAConsts_SUnknownDataType 64405
@@ -371,54 +371,54 @@
 #define DAConsts_SKeyFieldsReq 64413
 #define DAConsts_SNoKeyFields 64414
 #define DAConsts_SBadTableInfoName 64415
-#define SqlConst_SINVALIDPRECISION 64416
-#define SqlConst_SINVALIDLEN 64417
-#define SqlConst_SINVALIDXISOLEVEL 64418
-#define SqlConst_SINVALIDTXNID 64419
-#define SqlConst_SDUPLICATETXNID 64420
-#define SqlConst_SDRIVERRESTRICTED 64421
-#define SqlConst_SLOCALTRANSACTIVE 64422
-#define SqlConst_SMULTIPLETRANSNOTENABLED 64423
-#define SqlConst_SCONNECTIONFAILED 64424
-#define SqlConst_SDRIVERINITFAILED 64425
-#define SqlConst_SOPTLOCKFAILED 64426
-#define SqlConst_SINVALIDREF 64427
-#define SqlConst_SNOTABLE 64428
-#define SqlConst_SMISSINGPARAMINSQL 64429
-#define SqlConst_SNOTIMPLEMENTED 64430
-#define SqlConst_SDRIVERINCOMPATIBLE 64431
-#define SqlConst_SErrorMappingError 64432
-#define SqlConst_SStoredProcsNotSupported 64433
-#define SqlConst_SPackagesNotSupported 64434
-#define SqlConst_SNOERROR 64435
-#define SqlConst_SWARNING 64436
-#define SqlConst_SNOMEMORY 64437
-#define SqlConst_SINVALIDFLDTYPE 64438
-#define SqlConst_SINVALIDHNDL 64439
-#define SqlConst_SNOTSUPPORTED 64440
-#define SqlConst_SINVALIDTIME 64441
-#define SqlConst_SINVALIDXLATION 64442
-#define SqlConst_SOUTOFRANGE 64443
-#define SqlConst_SINVALIDPARAM 64444
-#define SqlConst_SEOF 64445
-#define SqlConst_SSQLPARAMNOTSET 64446
-#define SqlConst_SINVALIDUSRPASS 64447
-#define SqlConst_SDatabaseClosed 64448
-#define SqlConst_SMissingSQLConnection 64449
-#define SqlConst_SConnectionNameMissing 64450
-#define SqlConst_SEmptySQLStatement 64451
-#define SqlConst_SNoParameterValue 64452
-#define SqlConst_SNoSqlStatement 64453
-#define SqlConst_SMissingDataBaseName 64454
-#define SqlConst_SMissingDriverName 64455
-#define SqlConst_SPrepareError 64456
-#define SqlConst_SObjectNameError 64457
-#define SqlConst_SSQLDataSetOpen 64458
-#define SqlConst_SNoActiveTrans 64459
-#define SqlConst_SActiveTrans 64460
-#define SqlConst_SMissingDLLName 64461
-#define SqlConst_SMissingDriverRegFile 64462
-#define SqlConst_SNoCursor 64463
+#define SqlConst_SINVALIDTXNID 64416
+#define SqlConst_SDUPLICATETXNID 64417
+#define SqlConst_SDRIVERRESTRICTED 64418
+#define SqlConst_SLOCALTRANSACTIVE 64419
+#define SqlConst_SMULTIPLETRANSNOTENABLED 64420
+#define SqlConst_SCONNECTIONFAILED 64421
+#define SqlConst_SDRIVERINITFAILED 64422
+#define SqlConst_SOPTLOCKFAILED 64423
+#define SqlConst_SINVALIDREF 64424
+#define SqlConst_SNOTABLE 64425
+#define SqlConst_SMISSINGPARAMINSQL 64426
+#define SqlConst_SNOTIMPLEMENTED 64427
+#define SqlConst_SDRIVERINCOMPATIBLE 64428
+#define SqlConst_SDriverNotInConfigFile 64429
+#define SqlConst_SObjectTypenameRequired 64430
+#define SqlConst_SCannotCreateFile 64431
+#define SqlConst_SNOERROR 64432
+#define SqlConst_SWARNING 64433
+#define SqlConst_SNOMEMORY 64434
+#define SqlConst_SINVALIDFLDTYPE 64435
+#define SqlConst_SINVALIDHNDL 64436
+#define SqlConst_SNOTSUPPORTED 64437
+#define SqlConst_SINVALIDTIME 64438
+#define SqlConst_SINVALIDXLATION 64439
+#define SqlConst_SOUTOFRANGE 64440
+#define SqlConst_SINVALIDPARAM 64441
+#define SqlConst_SEOF 64442
+#define SqlConst_SSQLPARAMNOTSET 64443
+#define SqlConst_SINVALIDUSRPASS 64444
+#define SqlConst_SINVALIDPRECISION 64445
+#define SqlConst_SINVALIDLEN 64446
+#define SqlConst_SINVALIDXISOLEVEL 64447
+#define SqlConst_SEmptySQLStatement 64448
+#define SqlConst_SNoParameterValue 64449
+#define SqlConst_SNoSqlStatement 64450
+#define SqlConst_SMissingDataBaseName 64451
+#define SqlConst_SMissingDriverName 64452
+#define SqlConst_SPrepareError 64453
+#define SqlConst_SObjectNameError 64454
+#define SqlConst_SSQLDataSetOpen 64455
+#define SqlConst_SNoActiveTrans 64456
+#define SqlConst_SActiveTrans 64457
+#define SqlConst_SMissingDLLName 64458
+#define SqlConst_SMissingDriverRegFile 64459
+#define SqlConst_SNoCursor 64460
+#define SqlConst_SErrorMappingError 64461
+#define SqlConst_SStoredProcsNotSupported 64462
+#define SqlConst_SPackagesNotSupported 64463
 #define DBXCommon_SDriverLoadError 64464
 #define DBXCommon_SReaderNew 64465
 #define DBXCommon_SReaderClosed 64466
@@ -429,12 +429,12 @@
 #define DBXCommon_SInvalidOrdinal 64471
 #define DBXCommon_SDefaultErrorMessage 64472
 #define DBXCommon_SAlreadyPrepared 64473
-#define DBXPool_SConnectTimeout 64474
-#define DBXPool_SInvalidCommand 64475
-#define DBXTrace_SINVALID_TRACE_FLAG 64476
-#define SqlConst_SLoginError 64477
-#define SqlConst_SMonitorActive 64478
-#define SqlConst_SDatabaseOpen 64479
+#define SqlConst_SLoginError 64474
+#define SqlConst_SMonitorActive 64475
+#define SqlConst_SDatabaseOpen 64476
+#define SqlConst_SDatabaseClosed 64477
+#define SqlConst_SMissingSQLConnection 64478
+#define SqlConst_SConnectionNameMissing 64479
 #define bdeconst_SNoCachedUpdates 64480
 #define bdeconst_SInvalidAliasName 64481
 #define bdeconst_SNoFieldAccess 64482
@@ -483,150 +483,150 @@
 #define bdeconst_SInvalidSessionName 64525
 #define bdeconst_SDatabaseNameMissing 64526
 #define bdeconst_SSessionNameMissing 64527
-#define IBSQLMonitor_StrFetch 64528
-#define IBSQLMonitor_StrPrepare 64529
-#define IBSQLMonitor_StrPlan 64530
-#define IBSQLMonitor_StrPlanCantRetrive 64531
-#define IBSQLMonitor_StrCommitHardComm 64532
-#define IBSQLMonitor_StrCommitRetaining 64533
-#define IBSQLMonitor_StrRollback 64534
-#define IBSQLMonitor_StrRollbackRetainin 64535
-#define IBSQLMonitor_StrStartTransaction 64536
-#define IBSQLMonitor_StrApplication 64537
+#define IBXConst_SUnknownPlan 64528
+#define IBXConst_SFieldSizeMismatch 64529
+#define IBXConst_SEventAlreadyRegistered 64530
+#define IBXConst_SStringTooLarge 64531
+#define IBXConst_SNoTimers 64532
+#define IBXConst_SIB65feature 64533
+#define IBXConst_SLoginPromptFailure 64534
+#define IBXConst_SIB70feature 64535
+#define IBXConst_SIB71feature 64536
+#define IBXConst_SIB80feature 64537
 #define ADOConst_SMissingConnection 64538
 #define ADOConst_SNoDetailFilter 64539
 #define ADOConst_SBookmarksRequired 64540
 #define ADOConst_SMissingCommandText 64541
 #define ADOConst_SNoResultSet 64542
 #define ADOConst_SADOCreateError 64543
-#define IBXConst_SIB65feature 64544
-#define IBXConst_SLoginPromptFailure 64545
-#define IBXConst_SIB70feature 64546
-#define IBXConst_SIB71feature 64547
-#define IBXConst_SIB80feature 64548
-#define IBSQLMonitor_StrConnect 64549
-#define IBSQLMonitor_StrDisconnect 64550
-#define IBSQLMonitor_StrMisc 64551
-#define IBSQLMonitor_StrError 64552
-#define IBSQLMonitor_StrAttach 64553
-#define IBSQLMonitor_StrDetach 64554
-#define IBSQLMonitor_StrQuery 64555
-#define IBSQLMonitor_StrStart 64556
-#define IBSQLMonitor_StrExecute 64557
-#define IBSQLMonitor_StrNULL 64558
-#define IBSQLMonitor_StrBLOB 64559
-#define IBXConst_SNoOptionsSet 64560
-#define IBXConst_SNoDestinationDirectory 64561
-#define IBXConst_SNosourceDirectory 64562
-#define IBXConst_SNoUninstallFile 64563
-#define IBXConst_SOptionNeedsClient 64564
-#define IBXConst_SOptionNeedsServer 64565
-#define IBXConst_SInvalidOption 64566
-#define IBXConst_SInvalidOnErrorResult 64567
-#define IBXConst_SInvalidOnStatusResult 64568
-#define IBXConst_SDPBConstantUnknownEx 64569
-#define IBXConst_STPBConstantUnknownEx 64570
-#define IBXConst_SUnknownPlan 64571
-#define IBXConst_SFieldSizeMismatch 64572
-#define IBXConst_SEventAlreadyRegistered 64573
-#define IBXConst_SStringTooLarge 64574
-#define IBXConst_SNoTimers 64575
-#define IBXConst_SSPBConstantUnknown 64576
-#define IBXConst_SServiceActive 64577
-#define IBXConst_SServiceInActive 64578
-#define IBXConst_SServerNameMissing 64579
-#define IBXConst_SQueryParamsError 64580
-#define IBXConst_SStartParamsError 64581
-#define IBXConst_SOutputParsingError 64582
-#define IBXConst_SUseSpecificProcedures 64583
-#define IBXConst_SSQLMonitorAlreadyPresent 64584
-#define IBXConst_SCantPrintValue 64585
-#define IBXConst_SEOFReached 64586
-#define IBXConst_SEOFInComment 64587
-#define IBXConst_SEOFInString 64588
-#define IBXConst_SParamNameExpected 64589
-#define IBXConst_SSuccess 64590
-#define IBXConst_SDelphiException 64591
-#define IBXConst_SNoProvider 64592
-#define IBXConst_SNoRecordsAffected 64593
-#define IBXConst_SNoTableName 64594
-#define IBXConst_SCannotCreatePrimaryIndex 64595
-#define IBXConst_SCannotDropSystemIndex 64596
-#define IBXConst_STableNameMismatch 64597
-#define IBXConst_SIndexFieldMissing 64598
-#define IBXConst_SInvalidCancellation 64599
-#define IBXConst_SInvalidEvent 64600
-#define IBXConst_SMaximumEvents 64601
-#define IBXConst_SNoEventsRegistered 64602
-#define IBXConst_SInvalidQueueing 64603
-#define IBXConst_SInvalidRegistration 64604
-#define IBXConst_SInvalidBatchMove 64605
-#define IBXConst_SSQLDialectInvalid 64606
-#define IBXConst_SSPBConstantNotSupported 64607
-#define IBXConst_SDataSetUniDirectional 64608
-#define IBXConst_SCannotCreateSharedResource 64609
-#define IBXConst_SWindowsAPIError 64610
-#define IBXConst_SColumnListsDontMatch 64611
-#define IBXConst_SColumnTypesDontMatch 64612
-#define IBXConst_SCantEndSharedTransaction 64613
-#define IBXConst_SFieldUnsupportedType 64614
-#define IBXConst_SCircularDataLink 64615
-#define IBXConst_SEmptySQLStatement 64616
-#define IBXConst_SIsASelectStatement 64617
-#define IBXConst_SRequiredParamNotSet 64618
-#define IBXConst_SNoStoredProcName 64619
-#define IBXConst_SIsAExecuteProcedure 64620
-#define IBXConst_SUpdateFailed 64621
-#define IBXConst_SNotCachedUpdates 64622
-#define IBXConst_SNotLiveRequest 64623
-#define IBXConst_SBlobCannotBeWritten 64624
-#define IBXConst_SEmptyQuery 64625
-#define IBXConst_SCannotOpenNonSQLSelect 64626
-#define IBXConst_SNoFieldAccess 64627
-#define IBXConst_SFieldReadOnly 64628
-#define IBXConst_SFieldNotFound 64629
-#define IBXConst_SNotEditing 64630
-#define IBXConst_SCannotInsert 64631
-#define IBXConst_SCannotPost 64632
-#define IBXConst_SCannotUpdate 64633
-#define IBXConst_SCannotDelete 64634
-#define IBXConst_SCannotRefresh 64635
-#define IBXConst_SBufferNotSet 64636
-#define IBXConst_SCircularReference 64637
-#define IBXConst_SSQLParseError 64638
-#define IBXConst_SUserAbort 64639
-#define IBXConst_STransactionNotAssigned 64640
-#define IBXConst_SXSQLDAIndexOutOfRange 64641
-#define IBXConst_SXSQLDANameDoesNotExist 64642
-#define IBXConst_SEOF 64643
-#define IBXConst_SBOF 64644
-#define IBXConst_SInvalidStatementHandle 64645
-#define IBXConst_SSQLOpen 64646
-#define IBXConst_SSQLClosed 64647
-#define IBXConst_SDatasetOpen 64648
-#define IBXConst_SDatasetClosed 64649
-#define IBXConst_SUnknownSQLDataType 64650
-#define IBXConst_SInvalidColumnIndex 64651
-#define IBXConst_SInvalidParamColumnIndex 64652
-#define IBXConst_SInvalidDataConversion 64653
-#define IBXConst_SColumnIsNotNullable 64654
-#define IBXConst_SBlobCannotBeRead 64655
-#define IBXConst_SCannotSetTransaction 64656
-#define IBXConst_SOperationCancelled 64657
-#define IBXConst_SDPBConstantNotSupported 64658
-#define IBXConst_SDPBConstantUnknown 64659
-#define IBXConst_STPBConstantNotSupported 64660
-#define IBXConst_STPBConstantUnknown 64661
-#define IBXConst_SDatabaseClosed 64662
-#define IBXConst_SDatabaseOpen 64663
-#define IBXConst_SDatabaseNameMissing 64664
-#define IBXConst_SNotInTransaction 64665
-#define IBXConst_SInTransaction 64666
-#define IBXConst_STimeoutNegative 64667
-#define IBXConst_SNoDatabasesInTransaction 64668
-#define IBXConst_SUpdateWrongDB 64669
-#define IBXConst_SUpdateWrongTR 64670
-#define IBXConst_SDatabaseNotAssigned 64671
+#define IBXConst_SEOFInComment 64544
+#define IBXConst_SEOFInString 64545
+#define IBXConst_SParamNameExpected 64546
+#define IBXConst_SSuccess 64547
+#define IBXConst_SDelphiException 64548
+#define IBXConst_SNoOptionsSet 64549
+#define IBXConst_SNoDestinationDirectory 64550
+#define IBXConst_SNosourceDirectory 64551
+#define IBXConst_SNoUninstallFile 64552
+#define IBXConst_SOptionNeedsClient 64553
+#define IBXConst_SOptionNeedsServer 64554
+#define IBXConst_SInvalidOption 64555
+#define IBXConst_SInvalidOnErrorResult 64556
+#define IBXConst_SInvalidOnStatusResult 64557
+#define IBXConst_SDPBConstantUnknownEx 64558
+#define IBXConst_STPBConstantUnknownEx 64559
+#define IBXConst_SInvalidQueueing 64560
+#define IBXConst_SInvalidRegistration 64561
+#define IBXConst_SInvalidBatchMove 64562
+#define IBXConst_SSQLDialectInvalid 64563
+#define IBXConst_SSPBConstantNotSupported 64564
+#define IBXConst_SSPBConstantUnknown 64565
+#define IBXConst_SServiceActive 64566
+#define IBXConst_SServiceInActive 64567
+#define IBXConst_SServerNameMissing 64568
+#define IBXConst_SQueryParamsError 64569
+#define IBXConst_SStartParamsError 64570
+#define IBXConst_SOutputParsingError 64571
+#define IBXConst_SUseSpecificProcedures 64572
+#define IBXConst_SSQLMonitorAlreadyPresent 64573
+#define IBXConst_SCantPrintValue 64574
+#define IBXConst_SEOFReached 64575
+#define IBXConst_SNoStoredProcName 64576
+#define IBXConst_SIsAExecuteProcedure 64577
+#define IBXConst_SUpdateFailed 64578
+#define IBXConst_SNotCachedUpdates 64579
+#define IBXConst_SNotLiveRequest 64580
+#define IBXConst_SNoProvider 64581
+#define IBXConst_SNoRecordsAffected 64582
+#define IBXConst_SNoTableName 64583
+#define IBXConst_SCannotCreatePrimaryIndex 64584
+#define IBXConst_SCannotDropSystemIndex 64585
+#define IBXConst_STableNameMismatch 64586
+#define IBXConst_SIndexFieldMissing 64587
+#define IBXConst_SInvalidCancellation 64588
+#define IBXConst_SInvalidEvent 64589
+#define IBXConst_SMaximumEvents 64590
+#define IBXConst_SNoEventsRegistered 64591
+#define IBXConst_SCannotRefresh 64592
+#define IBXConst_SBufferNotSet 64593
+#define IBXConst_SCircularReference 64594
+#define IBXConst_SSQLParseError 64595
+#define IBXConst_SUserAbort 64596
+#define IBXConst_SDataSetUniDirectional 64597
+#define IBXConst_SCannotCreateSharedResource 64598
+#define IBXConst_SWindowsAPIError 64599
+#define IBXConst_SColumnListsDontMatch 64600
+#define IBXConst_SColumnTypesDontMatch 64601
+#define IBXConst_SCantEndSharedTransaction 64602
+#define IBXConst_SFieldUnsupportedType 64603
+#define IBXConst_SCircularDataLink 64604
+#define IBXConst_SEmptySQLStatement 64605
+#define IBXConst_SIsASelectStatement 64606
+#define IBXConst_SRequiredParamNotSet 64607
+#define IBXConst_SInvalidColumnIndex 64608
+#define IBXConst_SInvalidParamColumnIndex 64609
+#define IBXConst_SInvalidDataConversion 64610
+#define IBXConst_SColumnIsNotNullable 64611
+#define IBXConst_SBlobCannotBeRead 64612
+#define IBXConst_SBlobCannotBeWritten 64613
+#define IBXConst_SEmptyQuery 64614
+#define IBXConst_SCannotOpenNonSQLSelect 64615
+#define IBXConst_SNoFieldAccess 64616
+#define IBXConst_SFieldReadOnly 64617
+#define IBXConst_SFieldNotFound 64618
+#define IBXConst_SNotEditing 64619
+#define IBXConst_SCannotInsert 64620
+#define IBXConst_SCannotPost 64621
+#define IBXConst_SCannotUpdate 64622
+#define IBXConst_SCannotDelete 64623
+#define IBXConst_STimeoutNegative 64624
+#define IBXConst_SNoDatabasesInTransaction 64625
+#define IBXConst_SUpdateWrongDB 64626
+#define IBXConst_SUpdateWrongTR 64627
+#define IBXConst_SDatabaseNotAssigned 64628
+#define IBXConst_STransactionNotAssigned 64629
+#define IBXConst_SXSQLDAIndexOutOfRange 64630
+#define IBXConst_SXSQLDANameDoesNotExist 64631
+#define IBXConst_SEOF 64632
+#define IBXConst_SBOF 64633
+#define IBXConst_SInvalidStatementHandle 64634
+#define IBXConst_SSQLOpen 64635
+#define IBXConst_SSQLClosed 64636
+#define IBXConst_SDatasetOpen 64637
+#define IBXConst_SDatasetClosed 64638
+#define IBXConst_SUnknownSQLDataType 64639
+#define IBXConst_SNotSupported 64640
+#define IBXConst_SNotPermitted 64641
+#define IBXConst_SFileAccessError 64642
+#define IBXConst_SConnectionTimeout 64643
+#define IBXConst_SCannotSetDatabase 64644
+#define IBXConst_SCannotSetTransaction 64645
+#define IBXConst_SOperationCancelled 64646
+#define IBXConst_SDPBConstantNotSupported 64647
+#define IBXConst_SDPBConstantUnknown 64648
+#define IBXConst_STPBConstantNotSupported 64649
+#define IBXConst_STPBConstantUnknown 64650
+#define IBXConst_SDatabaseClosed 64651
+#define IBXConst_SDatabaseOpen 64652
+#define IBXConst_SDatabaseNameMissing 64653
+#define IBXConst_SNotInTransaction 64654
+#define IBXConst_SInTransaction 64655
+#define IBSQLMonitor_StrNULL 64656
+#define IBSQLMonitor_StrBLOB 64657
+#define IBSQLMonitor_StrFetch 64658
+#define IBSQLMonitor_StrPrepare 64659
+#define IBSQLMonitor_StrPlan 64660
+#define IBSQLMonitor_StrPlanCantRetrive 64661
+#define IBSQLMonitor_StrCommitHardComm 64662
+#define IBSQLMonitor_StrCommitRetaining 64663
+#define IBSQLMonitor_StrRollback 64664
+#define IBSQLMonitor_StrRollbackRetainin 64665
+#define IBSQLMonitor_StrStartTransaction 64666
+#define IBSQLMonitor_StrApplication 64667
+#define IBXConst_SUnknownError 64668
+#define IBXConst_SInterBaseMissing 64669
+#define IBXConst_SInterBaseInstallMissing 64670
+#define IBXConst_SIB60feature 64671
 #define VDBConsts_SInsertRecord 64672
 #define VDBConsts_SDeleteRecord 64673
 #define VDBConsts_SEditRecord 64674
@@ -634,15 +634,15 @@
 #define VDBConsts_SCancelEdit 64676
 #define VDBConsts_SRefreshRecord 64677
 #define VDBConsts_SRemoteLogin 64678
-#define IBXConst_SUnknownError 64679
-#define IBXConst_SInterBaseMissing 64680
-#define IBXConst_SInterBaseInstallMissing 64681
-#define IBXConst_SIB60feature 64682
-#define IBXConst_SNotSupported 64683
-#define IBXConst_SNotPermitted 64684
-#define IBXConst_SFileAccessError 64685
-#define IBXConst_SConnectionTimeout 64686
-#define IBXConst_SCannotSetDatabase 64687
+#define IBSQLMonitor_StrConnect 64679
+#define IBSQLMonitor_StrDisconnect 64680
+#define IBSQLMonitor_StrMisc 64681
+#define IBSQLMonitor_StrError 64682
+#define IBSQLMonitor_StrAttach 64683
+#define IBSQLMonitor_StrDetach 64684
+#define IBSQLMonitor_StrQuery 64685
+#define IBSQLMonitor_StrStart 64686
+#define IBSQLMonitor_StrExecute 64687
 #define uDARes_err_CannotFindDefaultItem 64688
 #define uDARes_err_PoolIsNotEmpty 64689
 #define uDARes_err_MaxPoolSizeReached 64690
@@ -915,86 +915,86 @@
 #define JConsts_sJPEGImageFile 64957
 #define JclResources_RsCannotCreateDir 64958
 #define JclResources_RsFileUtilsNoVersionInfo 64959
-#define IdResourceStringsCore_RSIdNoDataToRead 64960
-#define IdResourceStringsCore_RSReadTimeout 64961
-#define IdResourceStringsCore_RSReadLnMaxLineLengthExceeded 64962
-#define IdResourceStringsCore_RSConnectTimeout 64963
-#define IdResourceStringsCore_RSThreadTerminateAndWaitFor 64964
-#define IdResourceStringsCore_RSAlreadyConnected 64965
-#define IdResourceStringsCore_RSMaximumNumberOfCaptureLineExceeded 64966
-#define IdResourceStringsCore_RSchedMaxThreadEx 64967
-#define IdResourceStringsCore_RSTransparentProxyCannotBind 64968
-#define IdResourceStringsCore_RSTransparentProxyCanNotSupportUDP 64969
-#define IdResourceStringsCore_RSBufferMissingTerminator 64970
-#define IdResourceStringsCore_RSBufferInvalidStartPos 64971
-#define IdResourceStringsCore_RSReplyInvalidCode 64972
-#define IdResourceStringsCore_RSThreadSchedulerThreadRequired 64973
-#define IdResourceStringsCore_RSNoOnExecute 64974
-#define IdResourceStringsCore_RSTCPServerSchedulerAlreadyActive 64975
-#define IdResourceStringsCore_RSSocksAuthMethodError 64976
-#define IdResourceStringsCore_RSSocksAuthError 64977
-#define IdResourceStringsCore_RSSocksServerGeneralError 64978
-#define IdResourceStringsCore_RSSocksServerPermissionError 64979
-#define IdResourceStringsCore_RSSocksServerNetUnreachableError 64980
-#define IdResourceStringsCore_RSSocksServerHostUnreachableError 64981
-#define IdResourceStringsCore_RSSocksServerConnectionRefusedError 64982
-#define IdResourceStringsCore_RSSocksServerTTLExpiredError 64983
-#define IdResourceStringsCore_RSSocksServerCommandError 64984
-#define IdResourceStringsCore_RSSocksServerAddressError 64985
-#define IdResourceStringsCore_RSInterceptCircularLink 64986
-#define IdResourceStringsCore_RSNotEnoughDataInBuffer 64987
-#define IdResourceStringsCore_RSTooMuchDataInBuffer 64988
-#define IdResourceStringsCore_RSFileNotFound 64989
-#define IdResourceStringsCore_RSNotConnected 64990
-#define IdResourceStringsCore_RSObjectTypeNotSupported 64991
-#define IdResourceStringsProtocols_RSHTTPBadGateway 64992
-#define IdResourceStringsProtocols_RSHTTPServiceUnavailable 64993
-#define IdResourceStringsProtocols_RSHTTPGatewayTimeout 64994
-#define IdResourceStringsProtocols_RSHTTPHTTPVersionNotSupported 64995
-#define IdResourceStringsProtocols_RSHTTPUnknownResponseCode 64996
-#define IdResourceStringsProtocols_RSHTTPHeaderAlreadyWritten 64997
-#define IdResourceStringsProtocols_RSHTTPErrorParsingCommand 64998
-#define IdResourceStringsProtocols_RSHTTPUnsupportedAuthorisationScheme 64999
-#define IdResourceStringsProtocols_RSHTTPCannotSwitchSessionStateWhenActive 65000
-#define IdResourceStringsProtocols_RSHTTPAuthAlreadyRegistered 65001
-#define IdResourceStringsCore_RSSocksUDPNotSupported 65002
-#define IdResourceStringsCore_RSSocksRequestFailed 65003
-#define IdResourceStringsCore_RSSocksRequestServerFailed 65004
-#define IdResourceStringsCore_RSSocksRequestIdentFailed 65005
-#define IdResourceStringsCore_RSSocksUnknownError 65006
-#define IdResourceStringsCore_RSSocksServerRespondError 65007
-#define IdResourceStringsProtocols_RSHTTPUnauthorized 65008
-#define IdResourceStringsProtocols_RSHTTPForbidden 65009
-#define IdResourceStringsProtocols_RSHTTPNotFound 65010
-#define IdResourceStringsProtocols_RSHTTPMethodNotAllowed 65011
-#define IdResourceStringsProtocols_RSHTTPNotAcceptable 65012
-#define IdResourceStringsProtocols_RSHTTPProxyAuthenticationRequired 65013
-#define IdResourceStringsProtocols_RSHTTPRequestTimeout 65014
-#define IdResourceStringsProtocols_RSHTTPConflict 65015
-#define IdResourceStringsProtocols_RSHTTPGone 65016
-#define IdResourceStringsProtocols_RSHTTPLengthRequired 65017
-#define IdResourceStringsProtocols_RSHTTPPreconditionFailed 65018
-#define IdResourceStringsProtocols_RSHTTPRequestEntityToLong 65019
-#define IdResourceStringsProtocols_RSHTTPRequestURITooLong 65020
-#define IdResourceStringsProtocols_RSHTTPUnsupportedMediaType 65021
-#define IdResourceStringsProtocols_RSHTTPInternalServerError 65022
-#define IdResourceStringsProtocols_RSHTTPNotImplemented 65023
-#define IdResourceStringsProtocols_RSMIMEMIMETypeEmpty 65024
-#define IdResourceStringsProtocols_RSMIMEMIMEExtAlreadyExists 65025
-#define IdResourceStringsProtocols_RSHTTPContinue 65026
-#define IdResourceStringsProtocols_RSHTTPOK 65027
-#define IdResourceStringsProtocols_RSHTTPCreated 65028
-#define IdResourceStringsProtocols_RSHTTPAccepted 65029
-#define IdResourceStringsProtocols_RSHTTPNonAuthoritativeInformation 65030
-#define IdResourceStringsProtocols_RSHTTPNoContent 65031
-#define IdResourceStringsProtocols_RSHTTPResetContent 65032
-#define IdResourceStringsProtocols_RSHTTPPartialContent 65033
-#define IdResourceStringsProtocols_RSHTTPMovedPermanently 65034
-#define IdResourceStringsProtocols_RSHTTPMovedTemporarily 65035
-#define IdResourceStringsProtocols_RSHTTPSeeOther 65036
-#define IdResourceStringsProtocols_RSHTTPNotModified 65037
-#define IdResourceStringsProtocols_RSHTTPUseProxy 65038
-#define IdResourceStringsProtocols_RSHTTPBadRequest 65039
+#define IdResourceStringsProtocols_RSHTTPPreconditionFailed 64960
+#define IdResourceStringsProtocols_RSHTTPRequestEntityToLong 64961
+#define IdResourceStringsProtocols_RSHTTPRequestURITooLong 64962
+#define IdResourceStringsProtocols_RSHTTPUnsupportedMediaType 64963
+#define IdResourceStringsProtocols_RSHTTPInternalServerError 64964
+#define IdResourceStringsProtocols_RSHTTPNotImplemented 64965
+#define IdResourceStringsProtocols_RSHTTPBadGateway 64966
+#define IdResourceStringsProtocols_RSHTTPServiceUnavailable 64967
+#define IdResourceStringsProtocols_RSHTTPGatewayTimeout 64968
+#define IdResourceStringsProtocols_RSHTTPHTTPVersionNotSupported 64969
+#define IdResourceStringsProtocols_RSHTTPUnknownResponseCode 64970
+#define IdResourceStringsProtocols_RSHTTPHeaderAlreadyWritten 64971
+#define IdResourceStringsProtocols_RSHTTPErrorParsingCommand 64972
+#define IdResourceStringsProtocols_RSHTTPUnsupportedAuthorisationScheme 64973
+#define IdResourceStringsProtocols_RSHTTPCannotSwitchSessionStateWhenActive 64974
+#define IdResourceStringsProtocols_RSHTTPAuthAlreadyRegistered 64975
+#define IdResourceStringsProtocols_RSHTTPMovedPermanently 64976
+#define IdResourceStringsProtocols_RSHTTPMovedTemporarily 64977
+#define IdResourceStringsProtocols_RSHTTPSeeOther 64978
+#define IdResourceStringsProtocols_RSHTTPNotModified 64979
+#define IdResourceStringsProtocols_RSHTTPUseProxy 64980
+#define IdResourceStringsProtocols_RSHTTPBadRequest 64981
+#define IdResourceStringsProtocols_RSHTTPUnauthorized 64982
+#define IdResourceStringsProtocols_RSHTTPForbidden 64983
+#define IdResourceStringsProtocols_RSHTTPNotFound 64984
+#define IdResourceStringsProtocols_RSHTTPMethodNotAllowed 64985
+#define IdResourceStringsProtocols_RSHTTPNotAcceptable 64986
+#define IdResourceStringsProtocols_RSHTTPProxyAuthenticationRequired 64987
+#define IdResourceStringsProtocols_RSHTTPRequestTimeout 64988
+#define IdResourceStringsProtocols_RSHTTPConflict 64989
+#define IdResourceStringsProtocols_RSHTTPGone 64990
+#define IdResourceStringsProtocols_RSHTTPLengthRequired 64991
+#define IdResourceStringsCore_RSBufferInvalidStartPos 64992
+#define IdResourceStringsCore_RSReplyInvalidCode 64993
+#define IdResourceStringsCore_RSThreadSchedulerThreadRequired 64994
+#define IdResourceStringsCore_RSNoOnExecute 64995
+#define IdResourceStringsCore_RSTCPServerSchedulerAlreadyActive 64996
+#define IdResourceStringsProtocols_RSMIMEExtensionEmpty 64997
+#define IdResourceStringsProtocols_RSMIMEMIMETypeEmpty 64998
+#define IdResourceStringsProtocols_RSMIMEMIMEExtAlreadyExists 64999
+#define IdResourceStringsProtocols_RSHTTPContinue 65000
+#define IdResourceStringsProtocols_RSHTTPOK 65001
+#define IdResourceStringsProtocols_RSHTTPCreated 65002
+#define IdResourceStringsProtocols_RSHTTPAccepted 65003
+#define IdResourceStringsProtocols_RSHTTPNonAuthoritativeInformation 65004
+#define IdResourceStringsProtocols_RSHTTPNoContent 65005
+#define IdResourceStringsProtocols_RSHTTPResetContent 65006
+#define IdResourceStringsProtocols_RSHTTPPartialContent 65007
+#define IdResourceStringsCore_RSNotEnoughDataInBuffer 65008
+#define IdResourceStringsCore_RSTooMuchDataInBuffer 65009
+#define IdResourceStringsCore_RSFileNotFound 65010
+#define IdResourceStringsCore_RSNotConnected 65011
+#define IdResourceStringsCore_RSObjectTypeNotSupported 65012
+#define IdResourceStringsCore_RSIdNoDataToRead 65013
+#define IdResourceStringsCore_RSReadTimeout 65014
+#define IdResourceStringsCore_RSReadLnMaxLineLengthExceeded 65015
+#define IdResourceStringsCore_RSConnectTimeout 65016
+#define IdResourceStringsCore_RSThreadTerminateAndWaitFor 65017
+#define IdResourceStringsCore_RSAlreadyConnected 65018
+#define IdResourceStringsCore_RSMaximumNumberOfCaptureLineExceeded 65019
+#define IdResourceStringsCore_RSchedMaxThreadEx 65020
+#define IdResourceStringsCore_RSTransparentProxyCannotBind 65021
+#define IdResourceStringsCore_RSTransparentProxyCanNotSupportUDP 65022
+#define IdResourceStringsCore_RSBufferMissingTerminator 65023
+#define IdResourceStringsCore_RSSocksRequestFailed 65024
+#define IdResourceStringsCore_RSSocksRequestServerFailed 65025
+#define IdResourceStringsCore_RSSocksRequestIdentFailed 65026
+#define IdResourceStringsCore_RSSocksUnknownError 65027
+#define IdResourceStringsCore_RSSocksServerRespondError 65028
+#define IdResourceStringsCore_RSSocksAuthMethodError 65029
+#define IdResourceStringsCore_RSSocksAuthError 65030
+#define IdResourceStringsCore_RSSocksServerGeneralError 65031
+#define IdResourceStringsCore_RSSocksServerPermissionError 65032
+#define IdResourceStringsCore_RSSocksServerNetUnreachableError 65033
+#define IdResourceStringsCore_RSSocksServerHostUnreachableError 65034
+#define IdResourceStringsCore_RSSocksServerConnectionRefusedError 65035
+#define IdResourceStringsCore_RSSocksServerTTLExpiredError 65036
+#define IdResourceStringsCore_RSSocksServerCommandError 65037
+#define IdResourceStringsCore_RSSocksServerAddressError 65038
+#define IdResourceStringsCore_RSInterceptCircularLink 65039
 #define IdResourceStrings_RSStackClassUndefined 65040
 #define IdResourceStrings_RSStackAlreadyCreated 65041
 #define IdResourceStrings_RSAntiFreezeOnlyOne 65042
@@ -1010,7 +1010,7 @@
 #define IdResourceStrings_RSNotAllBytesSent 65052
 #define IdResourceStrings_RSPackageSizeTooBig 65053
 #define IdResourceStrings_RSSetSizeExceeded 65054
-#define IdResourceStringsProtocols_RSMIMEExtensionEmpty 65055
+#define IdResourceStringsCore_RSSocksUDPNotSupported 65055
 #define IdResourceStrings_RSStackENETRESET 65056
 #define IdResourceStrings_RSStackECONNABORTED 65057
 #define IdResourceStrings_RSStackECONNRESET 65058
@@ -1123,7 +1123,7 @@
 #define DBConsts_SCircularDataLink 65165
 #define DBConsts_SLookupInfoError 65166
 #define DBConsts_SDataSourceChange 65167
-#define ComConst_STooManyParams 65168
+#define uRODECConst_sNotInitialized 65168
 #define DBConsts_SInvalidFieldSize 65169
 #define DBConsts_SInvalidFieldKind 65170
 #define DBConsts_SUnknownFieldType 65171
@@ -1139,70 +1139,70 @@
 #define DBConsts_SInvalidFloatValue 65181
 #define DBConsts_SFieldTypeMismatch 65182
 #define DBConsts_SFieldSizeMismatch 65183
-#define uRORes_err_SessionNotFound 65184
-#define uRORes_err_ChannelDoesntSupportIROMetadataReader 65185
-#define uRORes_err_TooManySessions 65186
-#define uRORes_err_DOMElementIsNIL 65187
-#define uRORes_err_CannotLoadXMLDocument 65188
-#define uRORes_err_ErrorCreatingMsXmlDoc 65189
-#define uRORes_err_NoXMLParsersAvailable 65190
-#define uRORes_err_IDispatchMarshalingNotSupported 65191
-#define uRORes_err_UnsupportedVariantType 65192
-#define uRORes_err_VariantIsNotArray 65193
-#define uRORes_err_InvalidVarArrayDimCount 65194
-#define uRORes_err_CannotFindParameter 65195
-#define uRORes_err_MessageNotAssigned 65196
-#define ComConst_SOleError 65197
-#define ComConst_SNoMethod 65198
-#define ComConst_SVarNotObject 65199
-#define uRORes_err_TypeNotSupported 65200
-#define uRORes_err_ClassFactoryNotFound 65201
-#define uRORes_err_IROMessageNotSupported 65202
-#define uRORes_err_ClassAlreadyRegistered 65203
-#define uRORes_err_UnknownClass 65204
-#define uRORes_err_UnknownProxyInterface 65205
-#define uRORes_err_DispatcherAlreadyAssigned 65206
-#define uRORes_err_CannotFindMessageDispatcher 65207
-#define uRORes_err_ServerOnlySupportsOneDispatcher 65208
-#define uRORes_err_UnhandledException 65209
-#define uRORes_err_ChannelBusy 65210
-#define uRORes_err_ArrayIndexOutOfBounds 65211
-#define uRORes_err_InvalidHeader 65212
-#define uRORes_err_InvalidHeaderEncrypted 65213
-#define uRORes_err_UnknownClassInStream 65214
-#define uRORes_err_UnexpectedClassInStream 65215
-#define uRORes_err_RodlNoStructElementsDefined 65216
-#define uRORes_err_RodlNoOperationsDefined 65217
-#define uRORes_err_RodlUsedFileDoesNotExist 65218
-#define uRORes_err_RodlInvalidDataType 65219
-#define uRORes_err_RodlStructCannotBeNested 65220
-#define uRORes_err_RodlInvalidAncestorType 65221
-#define uRORes_str_ExceptionOnServer 65222
-#define uRORes_str_ExceptionReraisedFromServer 65223
-#define uRORes_err_AssignError 65224
-#define uRORes_err_InvalidRequestStream 65225
-#define uRORes_err_NILMessage 65226
-#define uRORes_err_UnspecifiedInterface 65227
-#define uRORes_err_UnspecifiedMessage 65228
-#define uRORes_err_UnknownMethod 65229
-#define uRORes_err_ClassFactoryDidNotReturnInstance 65230
-#define uRORes_err_ParameterNotFound 65231
-#define uRODECConst_sFMT_UU 65232
-#define uRODECConst_sFMT_XX 65233
-#define uRODECConst_sInvalidKeySize 65234
-#define uRODECConst_sNotInitialized 65235
-#define uRORes_err_InvalidIndex 65236
-#define uRORes_err_InvalidType 65237
-#define uRORes_err_InvalidLibrary 65238
-#define uRORes_err_InvalidStream 65239
-#define uRORes_err_InvalidTargetEntity 65240
-#define uRORes_err_InvalidParamFlag 65241
-#define uRORes_err_InvalidStringLength 65242
-#define uRORes_str_InvalidClassTypeInStream 65243
-#define uRORes_err_UnexpectedEndOfStream 65244
-#define uRORes_err_RodlDuplicateName 65245
-#define uRORes_err_RodlNoDataTypeSpecified 65246
-#define uRORes_err_RodlNoEnumValues 65247
+#define uRORes_err_UnsupportedVariantType 65184
+#define uRORes_err_VariantIsNotArray 65185
+#define uRORes_err_InvalidVarArrayDimCount 65186
+#define uRORes_err_CannotFindParameter 65187
+#define uRORes_err_MessageNotAssigned 65188
+#define uRODECConst_sProtectionCircular 65189
+#define uRODECConst_sStringFormatExists 65190
+#define uRODECConst_sInvalidStringFormat 65191
+#define uRODECConst_sInvalidFormatString 65192
+#define uRODECConst_sFMT_COPY 65193
+#define uRODECConst_sFMT_HEX 65194
+#define uRODECConst_sFMT_HEXL 65195
+#define uRODECConst_sFMT_MIME64 65196
+#define uRODECConst_sFMT_UU 65197
+#define uRODECConst_sFMT_XX 65198
+#define uRODECConst_sInvalidKeySize 65199
+#define uRORes_err_ServerOnlySupportsOneDispatcher 65200
+#define uRORes_err_UnhandledException 65201
+#define uRORes_err_ChannelBusy 65202
+#define uRORes_err_ArrayIndexOutOfBounds 65203
+#define uRORes_err_InvalidHeader 65204
+#define uRORes_err_InvalidHeaderEncrypted 65205
+#define uRORes_err_UnknownClassInStream 65206
+#define uRORes_err_UnexpectedClassInStream 65207
+#define uRORes_err_SessionNotFound 65208
+#define uRORes_err_ChannelDoesntSupportIROMetadataReader 65209
+#define uRORes_err_TooManySessions 65210
+#define uRORes_err_DOMElementIsNIL 65211
+#define uRORes_err_CannotLoadXMLDocument 65212
+#define uRORes_err_ErrorCreatingMsXmlDoc 65213
+#define uRORes_err_NoXMLParsersAvailable 65214
+#define uRORes_err_IDispatchMarshalingNotSupported 65215
+#define uRORes_err_AssignError 65216
+#define uRORes_err_InvalidRequestStream 65217
+#define uRORes_err_NILMessage 65218
+#define uRORes_err_UnspecifiedInterface 65219
+#define uRORes_err_UnspecifiedMessage 65220
+#define uRORes_err_UnknownMethod 65221
+#define uRORes_err_ClassFactoryDidNotReturnInstance 65222
+#define uRORes_err_ParameterNotFound 65223
+#define uRORes_err_TypeNotSupported 65224
+#define uRORes_err_ClassFactoryNotFound 65225
+#define uRORes_err_IROMessageNotSupported 65226
+#define uRORes_err_ClassAlreadyRegistered 65227
+#define uRORes_err_UnknownClass 65228
+#define uRORes_err_UnknownProxyInterface 65229
+#define uRORes_err_DispatcherAlreadyAssigned 65230
+#define uRORes_err_CannotFindMessageDispatcher 65231
+#define uRORes_err_InvalidTargetEntity 65232
+#define uRORes_err_InvalidParamFlag 65233
+#define uRORes_err_InvalidStringLength 65234
+#define uRORes_str_InvalidClassTypeInStream 65235
+#define uRORes_err_UnexpectedEndOfStream 65236
+#define uRORes_err_RodlDuplicateName 65237
+#define uRORes_err_RodlNoDataTypeSpecified 65238
+#define uRORes_err_RodlNoEnumValues 65239
+#define uRORes_err_RodlNoStructElementsDefined 65240
+#define uRORes_err_RodlNoOperationsDefined 65241
+#define uRORes_err_RodlUsedFileDoesNotExist 65242
+#define uRORes_err_RodlInvalidDataType 65243
+#define uRORes_err_RodlStructCannotBeNested 65244
+#define uRORes_err_RodlInvalidAncestorType 65245
+#define uRORes_str_ExceptionOnServer 65246
+#define uRORes_str_ExceptionReraisedFromServer 65247
 #define Consts_SUnicodeEncoding 65248
 #define Consts_SBigEndianEncoding 65249
 #define Consts_SUTF8Encoding 65250
@@ -1211,14 +1211,14 @@
 #define Consts_STrayIconCreateError 65253
 #define Consts_SPageControlNotSet 65254
 #define Consts_SWindowsVistaRequired 65255
-#define uRODECConst_sProtectionCircular 65256
-#define uRODECConst_sStringFormatExists 65257
-#define uRODECConst_sInvalidStringFormat 65258
-#define uRODECConst_sInvalidFormatString 65259
-#define uRODECConst_sFMT_COPY 65260
-#define uRODECConst_sFMT_HEX 65261
-#define uRODECConst_sFMT_HEXL 65262
-#define uRODECConst_sFMT_MIME64 65263
+#define ComConst_SOleError 65256
+#define ComConst_SNoMethod 65257
+#define ComConst_SVarNotObject 65258
+#define ComConst_STooManyParams 65259
+#define uRORes_err_InvalidIndex 65260
+#define uRORes_err_InvalidType 65261
+#define uRORes_err_InvalidLibrary 65262
+#define uRORes_err_InvalidStream 65263
 #define Consts_SNoDefaultPrinter 65264
 #define Consts_SDuplicateMenus 65265
 #define Consts_SPictureLabel 65266
@@ -1840,9 +1840,9 @@ BEGIN
 	DAConsts_SRefreshFailed,	"Refresh failed. Found %d records"
 	DAConsts_SInvalidFetchRows,	"FetchRows must be 1..10000"
 	DAConsts_SNoCorrespondParam,	"Not found field corresponding parameter %s"
-	SqlConst_SDriverNotInConfigFile,	"Driver (%s) not found in Cfg file (%s)"
-	SqlConst_SObjectTypenameRequired,	"Object type name required as parameter value"
-	SqlConst_SCannotCreateFile,	"Cannot create file %s"
+	DBXPool_SConnectTimeout,	"Connect request timed out after %s milliseconds"
+	DBXPool_SInvalidCommand,	"Unrecognized command:  %s"
+	DBXTrace_SINVALID_TRACE_FLAG,	"%s is an invalid setting for the %s property.\r\nUse '%s' or a semicolon separated list of one or more of the following:\r\n%s %s %s %s %s %s %s %s %s %s %s %s"
 	ZLibConst_sTargetBufferTooSmall,	"ZLib error: target buffer may be too small"
 	ZLibConst_sError,	"Error"
 	DAConsts_SUnknownDataType,	"Unknown data type"
@@ -1856,9 +1856,6 @@ BEGIN
 	DAConsts_SKeyFieldsReq,	"Unique keyfields required"
 	DAConsts_SNoKeyFields,	"Key fields not found"
 	DAConsts_SBadTableInfoName,	"TableInfo name must be provided"
-	SqlConst_SINVALIDPRECISION,	"[0x000D]: Invalid Precision"
-	SqlConst_SINVALIDLEN,	"[0x000E]: Invalid Length"
-	SqlConst_SINVALIDXISOLEVEL,	"[0x000F]: Invalid Transaction Isolation Level"
 	SqlConst_SINVALIDTXNID,	"[0x0010]: Invalid Transaction ID"
 	SqlConst_SDUPLICATETXNID,	"[0x0011]: Duplicate Transaction ID"
 	SqlConst_SDRIVERRESTRICTED,	"[0x0012]: Application is not licensed to use this feature"
@@ -1872,9 +1869,9 @@ BEGIN
 	SqlConst_SMISSINGPARAMINSQL,	"[0x001A] Missing parameter marker in SQL"
 	SqlConst_SNOTIMPLEMENTED,	"[0x001B] Not implemented"
 	SqlConst_SDRIVERINCOMPATIBLE,	"[0x001C] Incompatible driver"
-	SqlConst_SErrorMappingError,	"SQL Error: Error mapping failed"
-	SqlConst_SStoredProcsNotSupported,	"Stored Procedures not supported by '%s' Server"
-	SqlConst_SPackagesNotSupported,	"Packages are not supported by '%s' Server"
+	SqlConst_SDriverNotInConfigFile,	"Driver (%s) not found in Cfg file (%s)"
+	SqlConst_SObjectTypenameRequired,	"Object type name required as parameter value"
+	SqlConst_SCannotCreateFile,	"Cannot create file %s"
 	SqlConst_SNOERROR,	""
 	SqlConst_SWARNING,	"[0x0001]: Warning"
 	SqlConst_SNOMEMORY,	"[0x0002]: Insufficient Memory for Operation"
@@ -1888,9 +1885,9 @@ BEGIN
 	SqlConst_SEOF,	"[0x000A]: Result set at EOF"
 	SqlConst_SSQLPARAMNOTSET,	"dbExpress Error [0x000B]: Parameter Not Set"
 	SqlConst_SINVALIDUSRPASS,	"[0x000C] Invalid Username/Password"
-	SqlConst_SDatabaseClosed,	"Cannot perform this operation on a closed connection"
-	SqlConst_SMissingSQLConnection,	"SQLConnection property required for this operation"
-	SqlConst_SConnectionNameMissing,	"Connection name missing"
+	SqlConst_SINVALIDPRECISION,	"[0x000D]: Invalid Precision"
+	SqlConst_SINVALIDLEN,	"[0x000E]: Invalid Length"
+	SqlConst_SINVALIDXISOLEVEL,	"[0x000F]: Invalid Transaction Isolation Level"
 	SqlConst_SEmptySQLStatement,	"No SQL statement available"
 	SqlConst_SNoParameterValue,	"No value for parameter '%s'"
 	SqlConst_SNoSqlStatement,	"Missing query, table name or procedure name"
@@ -1904,6 +1901,9 @@ BEGIN
 	SqlConst_SMissingDLLName,	"DLL/Shared Library Name not Set"
 	SqlConst_SMissingDriverRegFile,	"Driver/Connection Registry File '%s' not found"
 	SqlConst_SNoCursor,	"Cursor not returned from Query"
+	SqlConst_SErrorMappingError,	"SQL Error: Error mapping failed"
+	SqlConst_SStoredProcsNotSupported,	"Stored Procedures not supported by '%s' Server"
+	SqlConst_SPackagesNotSupported,	"Packages are not supported by '%s' Server"
 	DBXCommon_SDriverLoadError,	"%s driver cannot be loaded.  Make sure your project either uses the %s unit or uses packages so the %s package can be loaded dynamically"
 	DBXCommon_SReaderNew,	"Reader Next method has not been called"
 	DBXCommon_SReaderClosed,	"Reader has no more rows"
@@ -1914,12 +1914,12 @@ BEGIN
 	DBXCommon_SInvalidOrdinal,	"Invalid Ordinal:  %d"
 	DBXCommon_SDefaultErrorMessage,	"DBX Error:  %s"
 	DBXCommon_SAlreadyPrepared,	"Command can only be prepared once"
-	DBXPool_SConnectTimeout,	"Connect request timed out after %s milliseconds"
-	DBXPool_SInvalidCommand,	"Unrecognized command:  %s"
-	DBXTrace_SINVALID_TRACE_FLAG,	"%s is an invalid setting for the %s property.\r\nUse '%s' or a semicolon separated list of one or more of the following:\r\n%s %s %s %s %s %s %s %s %s %s %s %s"
 	SqlConst_SLoginError,	"Cannot connect to database '%s'"
 	SqlConst_SMonitorActive,	"Cannot change connection on Active Monitor"
 	SqlConst_SDatabaseOpen,	"Cannot perform this operation on an open connection"
+	SqlConst_SDatabaseClosed,	"Cannot perform this operation on a closed connection"
+	SqlConst_SMissingSQLConnection,	"SQLConnection property required for this operation"
+	SqlConst_SConnectionNameMissing,	"Connection name missing"
 	bdeconst_SNoCachedUpdates,	"Not in cached update mode"
 	bdeconst_SInvalidAliasName,	"Invalid alias name %s"
 	bdeconst_SNoFieldAccess,	"Cannot access field '%s' in a filter"
@@ -1968,38 +1968,27 @@ BEGIN
 	bdeconst_SInvalidSessionName,	"Invalid session name %s"
 	bdeconst_SDatabaseNameMissing,	"Database name missing"
 	bdeconst_SSessionNameMissing,	"Session name missing"
-	IBSQLMonitor_StrFetch,	": [Fetch] "
-	IBSQLMonitor_StrPrepare,	": [Prepare] "
-	IBSQLMonitor_StrPlan,	"  Plan: "
-	IBSQLMonitor_StrPlanCantRetrive,	"  Plan: Can't retrieve plan - too large"
-	IBSQLMonitor_StrCommitHardComm,	": [Commit (Hard commit)]"
-	IBSQLMonitor_StrCommitRetaining,	": [Commit retaining (Soft commit)]"
-	IBSQLMonitor_StrRollback,	": [Rollback]"
-	IBSQLMonitor_StrRollbackRetainin,	": [Rollback retaining (Soft rollback)]"
-	IBSQLMonitor_StrStartTransaction,	": [Start transaction]"
-	IBSQLMonitor_StrApplication,	"[Application: "
+	IBXConst_SUnknownPlan,	"Unknown Error - Can't retrieve plan"
+	IBXConst_SFieldSizeMismatch,	"Size Mismatch - Field %s size is too small for data"
+	IBXConst_SEventAlreadyRegistered,	"Events already registered"
+	IBXConst_SStringTooLarge,	"Trying to store a string of length %d into a field that can only contain %d"
+	IBXConst_SNoTimers,	"Not enough timers available"
+	IBXConst_SIB65feature,	"%s is an InterBase 6.5 function. Please upgrade to InterBase 6.5 to use this functonality"
+	IBXConst_SLoginPromptFailure,	"Can not find default login prompt dialog.  Please add DBLogDlg to the uses section of your main file."
+	IBXConst_SIB70feature,	"%s is an InterBase 7.0 function. Please upgrade to InterBase 7.0 to use this functonality"
+	IBXConst_SIB71feature,	"%s is an InterBase 7.1 function. Please upgrade to InterBase 7.1 to use this functonality"
+	IBXConst_SIB80feature,	"%s is an InterBase 2007 function. Please upgrade to InterBase 2007 to use this functonality"
 	ADOConst_SMissingConnection,	"Missing Connection or ConnectionString"
 	ADOConst_SNoDetailFilter,	"Filter property cannot be used for detail tables"
 	ADOConst_SBookmarksRequired,	"Dataset does not support bookmarks, which are required for multi-record data controls"
 	ADOConst_SMissingCommandText,	"Missing %s property"
 	ADOConst_SNoResultSet,	"CommandText does not return a result set"
 	ADOConst_SADOCreateError,	"Error creating object.  Please verify that the Microsoft Data Access Components 2.1 (or later) have been properly installed"
-	IBXConst_SIB65feature,	"%s is an InterBase 6.5 function. Please upgrade to InterBase 6.5 to use this functonality"
-	IBXConst_SLoginPromptFailure,	"Can not find default login prompt dialog.  Please add DBLogDlg to the uses section of your main file."
-	IBXConst_SIB70feature,	"%s is an InterBase 7.0 function. Please upgrade to InterBase 7.0 to use this functonality"
-	IBXConst_SIB71feature,	"%s is an InterBase 7.1 function. Please upgrade to InterBase 7.1 to use this functonality"
-	IBXConst_SIB80feature,	"%s is an InterBase 2007 function. Please upgrade to InterBase 2007 to use this functonality"
-	IBSQLMonitor_StrConnect,	": [Connect]"
-	IBSQLMonitor_StrDisconnect,	": [Disconnect]"
-	IBSQLMonitor_StrMisc,	"[Misc] "
-	IBSQLMonitor_StrError,	"[Error] "
-	IBSQLMonitor_StrAttach,	": [Attach]"
-	IBSQLMonitor_StrDetach,	": [Detach]"
-	IBSQLMonitor_StrQuery,	": [Query]"
-	IBSQLMonitor_StrStart,	": [Start]"
-	IBSQLMonitor_StrExecute,	": [Execute] "
-	IBSQLMonitor_StrNULL,	"<NULL>"
-	IBSQLMonitor_StrBLOB,	"<BLOB>"
+	IBXConst_SEOFInComment,	"EOF in comment detected"
+	IBXConst_SEOFInString,	"EOF in string detected"
+	IBXConst_SParamNameExpected,	"Parameter name expected"
+	IBXConst_SSuccess,	"Successful execution"
+	IBXConst_SDelphiException,	"DelphiException %s"
 	IBXConst_SNoOptionsSet,	"No Install Options selected"
 	IBXConst_SNoDestinationDirectory,	"DestinationDirectory is not set"
 	IBXConst_SNosourceDirectory,	"SourceDirectory is not set"
@@ -2011,11 +2000,11 @@ BEGIN
 	IBXConst_SInvalidOnStatusResult,	"Unexpected onStatus return value"
 	IBXConst_SDPBConstantUnknownEx,	"DPB Constant (%s) is unknown"
 	IBXConst_STPBConstantUnknownEx,	"TPB Constant (%s) is unknown"
-	IBXConst_SUnknownPlan,	"Unknown Error - Can't retrieve plan"
-	IBXConst_SFieldSizeMismatch,	"Size Mismatch - Field %s size is too small for data"
-	IBXConst_SEventAlreadyRegistered,	"Events already registered"
-	IBXConst_SStringTooLarge,	"Trying to store a string of length %d into a field that can only contain %d"
-	IBXConst_SNoTimers,	"Not enough timers available"
+	IBXConst_SInvalidQueueing,	"Invalid Queueing"
+	IBXConst_SInvalidRegistration,	"Invalid Registration"
+	IBXConst_SInvalidBatchMove,	"Invalid Batch Move"
+	IBXConst_SSQLDialectInvalid,	"SQL Dialect Invalid"
+	IBXConst_SSPBConstantNotSupported,	"SPB Constant Not supported"
 	IBXConst_SSPBConstantUnknown,	"SPB Constant Unknown"
 	IBXConst_SServiceActive,	"Cannot perform operation -- service is not attached"
 	IBXConst_SServiceInActive,	"Cannot perform operation -- service is attached"
@@ -2027,11 +2016,11 @@ BEGIN
 	IBXConst_SSQLMonitorAlreadyPresent,	"SQL Monitor Instance is already present"
 	IBXConst_SCantPrintValue,	"Cannot print value"
 	IBXConst_SEOFReached,	"SEOFReached"
-	IBXConst_SEOFInComment,	"EOF in comment detected"
-	IBXConst_SEOFInString,	"EOF in string detected"
-	IBXConst_SParamNameExpected,	"Parameter name expected"
-	IBXConst_SSuccess,	"Successful execution"
-	IBXConst_SDelphiException,	"DelphiException %s"
+	IBXConst_SNoStoredProcName,	"No Stored Procedure Name assigned"
+	IBXConst_SIsAExecuteProcedure,	"use ExecProc for Procedure; use TQuery for Select procedures"
+	IBXConst_SUpdateFailed,	"Update Failed"
+	IBXConst_SNotCachedUpdates,	"CachedUpdates not enabled"
+	IBXConst_SNotLiveRequest,	"Request is not live - cannot modify"
 	IBXConst_SNoProvider,	"No Provider"
 	IBXConst_SNoRecordsAffected,	"No Records Affected"
 	IBXConst_SNoTableName,	"No Table Name assigned"
@@ -2043,11 +2032,11 @@ BEGIN
 	IBXConst_SInvalidEvent,	"Invalid Event"
 	IBXConst_SMaximumEvents,	"Exceded Maximum Event limits"
 	IBXConst_SNoEventsRegistered,	"No Events Registered"
-	IBXConst_SInvalidQueueing,	"Invalid Queueing"
-	IBXConst_SInvalidRegistration,	"Invalid Registration"
-	IBXConst_SInvalidBatchMove,	"Invalid Batch Move"
-	IBXConst_SSQLDialectInvalid,	"SQL Dialect Invalid"
-	IBXConst_SSPBConstantNotSupported,	"SPB Constant Not supported"
+	IBXConst_SCannotRefresh,	"Cannot refresh row. (No refresh query)"
+	IBXConst_SBufferNotSet,	"Buffer not set"
+	IBXConst_SCircularReference,	"Circular references not permitted"
+	IBXConst_SSQLParseError,	"SQL Parse Error:\r\n\r\n%s"
+	IBXConst_SUserAbort,	"User abort"
 	IBXConst_SDataSetUniDirectional,	"Data set is uni-directional"
 	IBXConst_SCannotCreateSharedResource,	"Cannot create shared resource. (Windows error %d)"
 	IBXConst_SWindowsAPIError,	"Windows API error. (Windows error %d [$%.8x])"
@@ -2059,11 +2048,11 @@ BEGIN
 	IBXConst_SEmptySQLStatement,	"Empty SQL Statement"
 	IBXConst_SIsASelectStatement,	"use Open for a Select Statement"
 	IBXConst_SRequiredParamNotSet,	"Required Param value not set"
-	IBXConst_SNoStoredProcName,	"No Stored Procedure Name assigned"
-	IBXConst_SIsAExecuteProcedure,	"use ExecProc for Procedure; use TQuery for Select procedures"
-	IBXConst_SUpdateFailed,	"Update Failed"
-	IBXConst_SNotCachedUpdates,	"CachedUpdates not enabled"
-	IBXConst_SNotLiveRequest,	"Request is not live - cannot modify"
+	IBXConst_SInvalidColumnIndex,	"Invalid column index (index exceeds permitted range)"
+	IBXConst_SInvalidParamColumnIndex,	"Invalid parameter index (index exceeds permitted range)"
+	IBXConst_SInvalidDataConversion,	"Invalid data conversion"
+	IBXConst_SColumnIsNotNullable,	"Column cannot be set to null (%s)"
+	IBXConst_SBlobCannotBeRead,	"Blob stream cannot be read"
 	IBXConst_SBlobCannotBeWritten,	"Blob stream cannot be written"
 	IBXConst_SEmptyQuery,	"Empty query"
 	IBXConst_SCannotOpenNonSQLSelect,	"Cannot \"open\" a non-select statement. Use ExecQuery"
@@ -2075,11 +2064,11 @@ BEGIN
 	IBXConst_SCannotPost,	"Cannot post. (No update/insert query)"
 	IBXConst_SCannotUpdate,	"Cannot update. (No update query)"
 	IBXConst_SCannotDelete,	"Cannot delete from dataset. (No delete query)"
-	IBXConst_SCannotRefresh,	"Cannot refresh row. (No refresh query)"
-	IBXConst_SBufferNotSet,	"Buffer not set"
-	IBXConst_SCircularReference,	"Circular references not permitted"
-	IBXConst_SSQLParseError,	"SQL Parse Error:\r\n\r\n%s"
-	IBXConst_SUserAbort,	"User abort"
+	IBXConst_STimeoutNegative,	"Timeout values cannot be negative"
+	IBXConst_SNoDatabasesInTransaction,	"No databases are listed in transaction component"
+	IBXConst_SUpdateWrongDB,	"Updating wrong database"
+	IBXConst_SUpdateWrongTR,	"Updating wrong transaction. Unique transaction expected in set"
+	IBXConst_SDatabaseNotAssigned,	"Database not assigned"
 	IBXConst_STransactionNotAssigned,	"Transaction not assigned"
 	IBXConst_SXSQLDAIndexOutOfRange,	"XSQLDA index out of range"
 	IBXConst_SXSQLDANameDoesNotExist,	"XSQLDA name does not exist (%s)"
@@ -2091,11 +2080,11 @@ BEGIN
 	IBXConst_SDatasetOpen,	"Dataset open"
 	IBXConst_SDatasetClosed,	"Dataset closed"
 	IBXConst_SUnknownSQLDataType,	"Unknown SQL Data type (%d)"
-	IBXConst_SInvalidColumnIndex,	"Invalid column index (index exceeds permitted range)"
-	IBXConst_SInvalidParamColumnIndex,	"Invalid parameter index (index exceeds permitted range)"
-	IBXConst_SInvalidDataConversion,	"Invalid data conversion"
-	IBXConst_SColumnIsNotNullable,	"Column cannot be set to null (%s)"
-	IBXConst_SBlobCannotBeRead,	"Blob stream cannot be read"
+	IBXConst_SNotSupported,	"Unsupported feature"
+	IBXConst_SNotPermitted,	"Not permitted"
+	IBXConst_SFileAccessError,	"Temporary file access error"
+	IBXConst_SConnectionTimeout,	"Database connection timed out"
+	IBXConst_SCannotSetDatabase,	"Cannot set database"
 	IBXConst_SCannotSetTransaction,	"Cannot set transaction"
 	IBXConst_SOperationCancelled,	"Operation cancelled at user's request"
 	IBXConst_SDPBConstantNotSupported,	"DPB Constant (isc_dpb_%s) is unsupported"
@@ -2107,11 +2096,22 @@ BEGIN
 	IBXConst_SDatabaseNameMissing,	"Database name is missing"
 	IBXConst_SNotInTransaction,	"Transaction is not active"
 	IBXConst_SInTransaction,	"Transaction is active"
-	IBXConst_STimeoutNegative,	"Timeout values cannot be negative"
-	IBXConst_SNoDatabasesInTransaction,	"No databases are listed in transaction component"
-	IBXConst_SUpdateWrongDB,	"Updating wrong database"
-	IBXConst_SUpdateWrongTR,	"Updating wrong transaction. Unique transaction expected in set"
-	IBXConst_SDatabaseNotAssigned,	"Database not assigned"
+	IBSQLMonitor_StrNULL,	"<NULL>"
+	IBSQLMonitor_StrBLOB,	"<BLOB>"
+	IBSQLMonitor_StrFetch,	": [Fetch] "
+	IBSQLMonitor_StrPrepare,	": [Prepare] "
+	IBSQLMonitor_StrPlan,	"  Plan: "
+	IBSQLMonitor_StrPlanCantRetrive,	"  Plan: Can't retrieve plan - too large"
+	IBSQLMonitor_StrCommitHardComm,	": [Commit (Hard commit)]"
+	IBSQLMonitor_StrCommitRetaining,	": [Commit retaining (Soft commit)]"
+	IBSQLMonitor_StrRollback,	": [Rollback]"
+	IBSQLMonitor_StrRollbackRetainin,	": [Rollback retaining (Soft rollback)]"
+	IBSQLMonitor_StrStartTransaction,	": [Start transaction]"
+	IBSQLMonitor_StrApplication,	"[Application: "
+	IBXConst_SUnknownError,	"Unknown error"
+	IBXConst_SInterBaseMissing,	"InterBase library gds32.dll not found in the path. Please install InterBase to use this functionality"
+	IBXConst_SInterBaseInstallMissing,	"InterBase Install DLL ibinstall.dll not found in the path. Please install InterBase 6 to use this functionality"
+	IBXConst_SIB60feature,	"%s is an InterBase 6 function. Please upgrade to InterBase 6 to use this functonality"
 	VDBConsts_SInsertRecord,	"Insert record"
 	VDBConsts_SDeleteRecord,	"Delete record"
 	VDBConsts_SEditRecord,	"Edit record"
@@ -2119,15 +2119,15 @@ BEGIN
 	VDBConsts_SCancelEdit,	"Cancel edit"
 	VDBConsts_SRefreshRecord,	"Refresh data"
 	VDBConsts_SRemoteLogin,	"Remote Login"
-	IBXConst_SUnknownError,	"Unknown error"
-	IBXConst_SInterBaseMissing,	"InterBase library gds32.dll not found in the path. Please install InterBase to use this functionality"
-	IBXConst_SInterBaseInstallMissing,	"InterBase Install DLL ibinstall.dll not found in the path. Please install InterBase 6 to use this functionality"
-	IBXConst_SIB60feature,	"%s is an InterBase 6 function. Please upgrade to InterBase 6 to use this functonality"
-	IBXConst_SNotSupported,	"Unsupported feature"
-	IBXConst_SNotPermitted,	"Not permitted"
-	IBXConst_SFileAccessError,	"Temporary file access error"
-	IBXConst_SConnectionTimeout,	"Database connection timed out"
-	IBXConst_SCannotSetDatabase,	"Cannot set database"
+	IBSQLMonitor_StrConnect,	": [Connect]"
+	IBSQLMonitor_StrDisconnect,	": [Disconnect]"
+	IBSQLMonitor_StrMisc,	"[Misc] "
+	IBSQLMonitor_StrError,	"[Error] "
+	IBSQLMonitor_StrAttach,	": [Attach]"
+	IBSQLMonitor_StrDetach,	": [Detach]"
+	IBSQLMonitor_StrQuery,	": [Query]"
+	IBSQLMonitor_StrStart,	": [Start]"
+	IBSQLMonitor_StrExecute,	": [Execute] "
 	uDARes_err_CannotFindDefaultItem,	"Cannot find default %s"
 	uDARes_err_PoolIsNotEmpty,	"Cannot perform this operation when connections are pooled"
 	uDARes_err_MaxPoolSizeReached,	"Maximum pool size reached. Cannot create a new connection"
@@ -2400,6 +2400,59 @@ BEGIN
 	JConsts_sJPEGImageFile,	"JPEG Image File"
 	JclResources_RsCannotCreateDir,	"Unable to create directory"
 	JclResources_RsFileUtilsNoVersionInfo,	"File contains no version information"
+	IdResourceStringsProtocols_RSHTTPPreconditionFailed,	"Precondition Failed"
+	IdResourceStringsProtocols_RSHTTPRequestEntityToLong,	"Request Entity To Long"
+	IdResourceStringsProtocols_RSHTTPRequestURITooLong,	"Request-URI Too Long. 256 Chars max"
+	IdResourceStringsProtocols_RSHTTPUnsupportedMediaType,	"Unsupported Media Type"
+	IdResourceStringsProtocols_RSHTTPInternalServerError,	"Internal Server Error"
+	IdResourceStringsProtocols_RSHTTPNotImplemented,	"Not Implemented"
+	IdResourceStringsProtocols_RSHTTPBadGateway,	"Bad Gateway"
+	IdResourceStringsProtocols_RSHTTPServiceUnavailable,	"Service Unavailable"
+	IdResourceStringsProtocols_RSHTTPGatewayTimeout,	"Gateway timeout"
+	IdResourceStringsProtocols_RSHTTPHTTPVersionNotSupported,	"HTTP version not supported"
+	IdResourceStringsProtocols_RSHTTPUnknownResponseCode,	"Unknown Response Code"
+	IdResourceStringsProtocols_RSHTTPHeaderAlreadyWritten,	"Header has already been written."
+	IdResourceStringsProtocols_RSHTTPErrorParsingCommand,	"Error in parsing command."
+	IdResourceStringsProtocols_RSHTTPUnsupportedAuthorisationScheme,	"Unsupported authorization scheme."
+	IdResourceStringsProtocols_RSHTTPCannotSwitchSessionStateWhenActive,	"Cannot change session state when the server is active."
+	IdResourceStringsProtocols_RSHTTPAuthAlreadyRegistered,	"This authentication method is already registered with class name %s."
+	IdResourceStringsProtocols_RSHTTPMovedPermanently,	"Moved Permanently"
+	IdResourceStringsProtocols_RSHTTPMovedTemporarily,	"Moved Temporarily"
+	IdResourceStringsProtocols_RSHTTPSeeOther,	"See Other"
+	IdResourceStringsProtocols_RSHTTPNotModified,	"Not Modified"
+	IdResourceStringsProtocols_RSHTTPUseProxy,	"Use Proxy"
+	IdResourceStringsProtocols_RSHTTPBadRequest,	"Bad Request"
+	IdResourceStringsProtocols_RSHTTPUnauthorized,	"Unauthorized"
+	IdResourceStringsProtocols_RSHTTPForbidden,	"Forbidden"
+	IdResourceStringsProtocols_RSHTTPNotFound,	"Not Found"
+	IdResourceStringsProtocols_RSHTTPMethodNotAllowed,	"Method not allowed"
+	IdResourceStringsProtocols_RSHTTPNotAcceptable,	"Not Acceptable"
+	IdResourceStringsProtocols_RSHTTPProxyAuthenticationRequired,	"Proxy Authentication Required"
+	IdResourceStringsProtocols_RSHTTPRequestTimeout,	"Request Timeout"
+	IdResourceStringsProtocols_RSHTTPConflict,	"Conflict"
+	IdResourceStringsProtocols_RSHTTPGone,	"Gone"
+	IdResourceStringsProtocols_RSHTTPLengthRequired,	"Length Required"
+	IdResourceStringsCore_RSBufferInvalidStartPos,	"Buffer start position is invalid."
+	IdResourceStringsCore_RSReplyInvalidCode,	"Reply Code is not valid: %s"
+	IdResourceStringsCore_RSThreadSchedulerThreadRequired,	"Thread must be specified for the scheduler."
+	IdResourceStringsCore_RSNoOnExecute,	"You must have an OnExecute event."
+	IdResourceStringsCore_RSTCPServerSchedulerAlreadyActive,	"Cannot change the scheduler while the server is Active."
+	IdResourceStringsProtocols_RSMIMEExtensionEmpty,	"Extension is empty"
+	IdResourceStringsProtocols_RSMIMEMIMETypeEmpty,	"Mimetype is empty"
+	IdResourceStringsProtocols_RSMIMEMIMEExtAlreadyExists,	"Extension already exits"
+	IdResourceStringsProtocols_RSHTTPContinue,	"Continue"
+	IdResourceStringsProtocols_RSHTTPOK,	"OK"
+	IdResourceStringsProtocols_RSHTTPCreated,	"Created"
+	IdResourceStringsProtocols_RSHTTPAccepted,	"Accepted"
+	IdResourceStringsProtocols_RSHTTPNonAuthoritativeInformation,	"Non-authoritative Information"
+	IdResourceStringsProtocols_RSHTTPNoContent,	"No Content"
+	IdResourceStringsProtocols_RSHTTPResetContent,	"Reset Content"
+	IdResourceStringsProtocols_RSHTTPPartialContent,	"Partial Content"
+	IdResourceStringsCore_RSNotEnoughDataInBuffer,	"Not enough data in buffer."
+	IdResourceStringsCore_RSTooMuchDataInBuffer,	"Too much data in buffer."
+	IdResourceStringsCore_RSFileNotFound,	"File \"%s\" not found"
+	IdResourceStringsCore_RSNotConnected,	"Not Connected"
+	IdResourceStringsCore_RSObjectTypeNotSupported,	"Object type not supported."
 	IdResourceStringsCore_RSIdNoDataToRead,	"No data to read."
 	IdResourceStringsCore_RSReadTimeout,	"Read Timeout"
 	IdResourceStringsCore_RSReadLnMaxLineLengthExceeded,	"Max line length exceeded."
@@ -2411,11 +2464,11 @@ BEGIN
 	IdResourceStringsCore_RSTransparentProxyCannotBind,	"Transparent proxy cannot bind."
 	IdResourceStringsCore_RSTransparentProxyCanNotSupportUDP,	"UDP Not supported by this proxy."
 	IdResourceStringsCore_RSBufferMissingTerminator,	"Buffer terminator must be specified."
-	IdResourceStringsCore_RSBufferInvalidStartPos,	"Buffer start position is invalid."
-	IdResourceStringsCore_RSReplyInvalidCode,	"Reply Code is not valid: %s"
-	IdResourceStringsCore_RSThreadSchedulerThreadRequired,	"Thread must be specified for the scheduler."
-	IdResourceStringsCore_RSNoOnExecute,	"You must have an OnExecute event."
-	IdResourceStringsCore_RSTCPServerSchedulerAlreadyActive,	"Cannot change the scheduler while the server is Active."
+	IdResourceStringsCore_RSSocksRequestFailed,	"Request rejected or failed."
+	IdResourceStringsCore_RSSocksRequestServerFailed,	"Request rejected because SOCKS server cannot connect."
+	IdResourceStringsCore_RSSocksRequestIdentFailed,	"Request rejected because the client program and identd report different user-ids."
+	IdResourceStringsCore_RSSocksUnknownError,	"Unknown socks error."
+	IdResourceStringsCore_RSSocksServerRespondError,	"Socks server did not respond."
 	IdResourceStringsCore_RSSocksAuthMethodError,	"Invalid socks authentication method."
 	IdResourceStringsCore_RSSocksAuthError,	"Authentication error to socks server."
 	IdResourceStringsCore_RSSocksServerGeneralError,	"General SOCKS server failure."
@@ -2427,59 +2480,6 @@ BEGIN
 	IdResourceStringsCore_RSSocksServerCommandError,	"Command not supported."
 	IdResourceStringsCore_RSSocksServerAddressError,	"Address type not supported."
 	IdResourceStringsCore_RSInterceptCircularLink,	"%d: Circular links are not allowed"
-	IdResourceStringsCore_RSNotEnoughDataInBuffer,	"Not enough data in buffer."
-	IdResourceStringsCore_RSTooMuchDataInBuffer,	"Too much data in buffer."
-	IdResourceStringsCore_RSFileNotFound,	"File \"%s\" not found"
-	IdResourceStringsCore_RSNotConnected,	"Not Connected"
-	IdResourceStringsCore_RSObjectTypeNotSupported,	"Object type not supported."
-	IdResourceStringsProtocols_RSHTTPBadGateway,	"Bad Gateway"
-	IdResourceStringsProtocols_RSHTTPServiceUnavailable,	"Service Unavailable"
-	IdResourceStringsProtocols_RSHTTPGatewayTimeout,	"Gateway timeout"
-	IdResourceStringsProtocols_RSHTTPHTTPVersionNotSupported,	"HTTP version not supported"
-	IdResourceStringsProtocols_RSHTTPUnknownResponseCode,	"Unknown Response Code"
-	IdResourceStringsProtocols_RSHTTPHeaderAlreadyWritten,	"Header has already been written."
-	IdResourceStringsProtocols_RSHTTPErrorParsingCommand,	"Error in parsing command."
-	IdResourceStringsProtocols_RSHTTPUnsupportedAuthorisationScheme,	"Unsupported authorization scheme."
-	IdResourceStringsProtocols_RSHTTPCannotSwitchSessionStateWhenActive,	"Cannot change session state when the server is active."
-	IdResourceStringsProtocols_RSHTTPAuthAlreadyRegistered,	"This authentication method is already registered with class name %s."
-	IdResourceStringsCore_RSSocksUDPNotSupported,	"UDP is not support in this SOCKS version."
-	IdResourceStringsCore_RSSocksRequestFailed,	"Request rejected or failed."
-	IdResourceStringsCore_RSSocksRequestServerFailed,	"Request rejected because SOCKS server cannot connect."
-	IdResourceStringsCore_RSSocksRequestIdentFailed,	"Request rejected because the client program and identd report different user-ids."
-	IdResourceStringsCore_RSSocksUnknownError,	"Unknown socks error."
-	IdResourceStringsCore_RSSocksServerRespondError,	"Socks server did not respond."
-	IdResourceStringsProtocols_RSHTTPUnauthorized,	"Unauthorized"
-	IdResourceStringsProtocols_RSHTTPForbidden,	"Forbidden"
-	IdResourceStringsProtocols_RSHTTPNotFound,	"Not Found"
-	IdResourceStringsProtocols_RSHTTPMethodNotAllowed,	"Method not allowed"
-	IdResourceStringsProtocols_RSHTTPNotAcceptable,	"Not Acceptable"
-	IdResourceStringsProtocols_RSHTTPProxyAuthenticationRequired,	"Proxy Authentication Required"
-	IdResourceStringsProtocols_RSHTTPRequestTimeout,	"Request Timeout"
-	IdResourceStringsProtocols_RSHTTPConflict,	"Conflict"
-	IdResourceStringsProtocols_RSHTTPGone,	"Gone"
-	IdResourceStringsProtocols_RSHTTPLengthRequired,	"Length Required"
-	IdResourceStringsProtocols_RSHTTPPreconditionFailed,	"Precondition Failed"
-	IdResourceStringsProtocols_RSHTTPRequestEntityToLong,	"Request Entity To Long"
-	IdResourceStringsProtocols_RSHTTPRequestURITooLong,	"Request-URI Too Long. 256 Chars max"
-	IdResourceStringsProtocols_RSHTTPUnsupportedMediaType,	"Unsupported Media Type"
-	IdResourceStringsProtocols_RSHTTPInternalServerError,	"Internal Server Error"
-	IdResourceStringsProtocols_RSHTTPNotImplemented,	"Not Implemented"
-	IdResourceStringsProtocols_RSMIMEMIMETypeEmpty,	"Mimetype is empty"
-	IdResourceStringsProtocols_RSMIMEMIMEExtAlreadyExists,	"Extension already exits"
-	IdResourceStringsProtocols_RSHTTPContinue,	"Continue"
-	IdResourceStringsProtocols_RSHTTPOK,	"OK"
-	IdResourceStringsProtocols_RSHTTPCreated,	"Created"
-	IdResourceStringsProtocols_RSHTTPAccepted,	"Accepted"
-	IdResourceStringsProtocols_RSHTTPNonAuthoritativeInformation,	"Non-authoritative Information"
-	IdResourceStringsProtocols_RSHTTPNoContent,	"No Content"
-	IdResourceStringsProtocols_RSHTTPResetContent,	"Reset Content"
-	IdResourceStringsProtocols_RSHTTPPartialContent,	"Partial Content"
-	IdResourceStringsProtocols_RSHTTPMovedPermanently,	"Moved Permanently"
-	IdResourceStringsProtocols_RSHTTPMovedTemporarily,	"Moved Temporarily"
-	IdResourceStringsProtocols_RSHTTPSeeOther,	"See Other"
-	IdResourceStringsProtocols_RSHTTPNotModified,	"Not Modified"
-	IdResourceStringsProtocols_RSHTTPUseProxy,	"Use Proxy"
-	IdResourceStringsProtocols_RSHTTPBadRequest,	"Bad Request"
 	IdResourceStrings_RSStackClassUndefined,	"Stack Class is undefined."
 	IdResourceStrings_RSStackAlreadyCreated,	"Stack already created."
 	IdResourceStrings_RSAntiFreezeOnlyOne,	"Only one TIdAntiFreeze can exist per application."
@@ -2495,7 +2495,7 @@ BEGIN
 	IdResourceStrings_RSNotAllBytesSent,	"Not all bytes sent."
 	IdResourceStrings_RSPackageSizeTooBig,	"Package Size Too Big."
 	IdResourceStrings_RSSetSizeExceeded,	"Set Size Exceeded."
-	IdResourceStringsProtocols_RSMIMEExtensionEmpty,	"Extension is empty"
+	IdResourceStringsCore_RSSocksUDPNotSupported,	"UDP is not support in this SOCKS version."
 	IdResourceStrings_RSStackENETRESET,	"Net dropped connection or reset."
 	IdResourceStrings_RSStackECONNABORTED,	"Software caused connection abort."
 	IdResourceStrings_RSStackECONNRESET,	"Connection reset by peer."
@@ -2608,7 +2608,7 @@ BEGIN
 	DBConsts_SCircularDataLink,	"Circular datalinks are not allowed"
 	DBConsts_SLookupInfoError,	"Lookup information for field '%s' is incomplete"
 	DBConsts_SDataSourceChange,	"DataSource cannot be changed"
-	ComConst_STooManyParams,	"Dispatch methods do not support more than 64 parameters"
+	uRODECConst_sNotInitialized,	"%s is not initialized, call Init() or InitKey() first."
 	DBConsts_SInvalidFieldSize,	"Invalid field size"
 	DBConsts_SInvalidFieldKind,	"Invalid FieldKind"
 	DBConsts_SUnknownFieldType,	"Field '%s' is of an unknown type"
@@ -2624,78 +2624,11 @@ BEGIN
 	DBConsts_SInvalidFloatValue,	"'%s' is not a valid floating point value for field '%s'"
 	DBConsts_SFieldTypeMismatch,	"Type mismatch for field '%s', expecting: %s actual: %s"
 	DBConsts_SFieldSizeMismatch,	"Size mismatch for field '%s', expecting: %d actual: %d"
-	uRORes_err_SessionNotFound,	"Session %s could not be found"
-	uRORes_err_ChannelDoesntSupportIROMetadataReader,	"Channel does not support IROMetadataReader"
-	uRORes_err_TooManySessions,	"Too many sessions. Try again in %d minute(s)"
-	uRORes_err_DOMElementIsNIL,	"DOMElement is NIL"
-	uRORes_err_CannotLoadXMLDocument,	"Cannot load XML document.\rReason: %s\rLine: %d\rPosition: %d"
-	uRORes_err_ErrorCreatingMsXmlDoc,	"Error creating MSXML Document class\r\r%s: %s"
-	uRORes_err_NoXMLParsersAvailable,	"MSXML is not installed"
-	uRORes_err_IDispatchMarshalingNotSupported,	"Marshaling of IDispatch (%d) type variants is not supported."
 	uRORes_err_UnsupportedVariantType,	"Unsupported variant type \"%d\""
 	uRORes_err_VariantIsNotArray,	"Variant must be Array, but is %d"
 	uRORes_err_InvalidVarArrayDimCount,	"Variant Array DimCount must be 1 but is %d"
 	uRORes_err_CannotFindParameter,	"Cannot find parameter %s"
 	uRORes_err_MessageNotAssigned,	"Message is NIL"
-	ComConst_SOleError,	"OLE error %.8x"
-	ComConst_SNoMethod,	"Method '%s' not supported by automation object"
-	ComConst_SVarNotObject,	"Variant does not reference an automation object"
-	uRORes_err_TypeNotSupported,	"Type \"%s\" not supported"
-	uRORes_err_ClassFactoryNotFound,	"Class factory for interface %s not found"
-	uRORes_err_IROMessageNotSupported,	"Class \"%s\" does not support IROMessage"
-	uRORes_err_ClassAlreadyRegistered,	"Class \"%s\" is already registered"
-	uRORes_err_UnknownClass,	"Unknown class \"%s\""
-	uRORes_err_UnknownProxyInterface,	"Unknown proxy interface \"%s\""
-	uRORes_err_DispatcherAlreadyAssigned,	"Dispatcher for %s already assigned"
-	uRORes_err_CannotFindMessageDispatcher,	"Cannot find message dispatcher. Maybe there is no message component configured for the requested path?"
-	uRORes_err_ServerOnlySupportsOneDispatcher,	"%s servers only support one dispatcher"
-	uRORes_err_UnhandledException,	"Unhandled exception"
-	uRORes_err_ChannelBusy,	"Channel is busy. Try again later."
-	uRORes_err_ArrayIndexOutOfBounds,	"Array index out of bounds (%d)."
-	uRORes_err_InvalidHeader,	"Invalid binary header. Either incompatible or not a binary message."
-	uRORes_err_InvalidHeaderEncrypted,	"Invalid binary header. It seems that encryption is active on the other side of the communication, but not locally?"
-	uRORes_err_UnknownClassInStream,	"Unknown class \"%s\" found in stream."
-	uRORes_err_UnexpectedClassInStream,	"Unexpected class found in stream; class \"%s\" does not descend from \"%s\"."
-	uRORes_err_RodlNoStructElementsDefined,	"Struct does not contain any elements."
-	uRORes_err_RodlNoOperationsDefined,	"Service interface does not contain any elements."
-	uRORes_err_RodlUsedFileDoesNotExist,	"The referenced RODL file \"%s\" could not be found."
-	uRORes_err_RodlInvalidDataType,	"Invalid or undefined data type \"%s\"."
-	uRORes_err_RodlStructCannotBeNested,	"Structs cannot recursively contain themselves."
-	uRORes_err_RodlInvalidAncestorType,	"Invalid or undefined ancestor type \"%s\"."
-	uRORes_str_ExceptionOnServer,	"An exception of type %s was raised on the server: %s"
-	uRORes_str_ExceptionReraisedFromServer,	"An exception was raised on the server: %s"
-	uRORes_err_AssignError,	"Cannot assign a \"%s\" to a \"%s\"."
-	uRORes_err_InvalidRequestStream,	"Invalid request stream (%d bytes)"
-	uRORes_err_NILMessage,	"Message is NIL"
-	uRORes_err_UnspecifiedInterface,	"The message does not have an interface name"
-	uRORes_err_UnspecifiedMessage,	"The message does not have a name"
-	uRORes_err_UnknownMethod,	"Unknown method %s for interface %s"
-	uRORes_err_ClassFactoryDidNotReturnInstance,	"Class factory did not return an instance of \"%s\""
-	uRORes_err_ParameterNotFound,	"Parameter \"%s\" was not found"
-	uRODECConst_sFMT_UU,	"UU Coding"
-	uRODECConst_sFMT_XX,	"XX Coding"
-	uRODECConst_sInvalidKeySize,	"Length from Encryptionkey is invalid.\r\nKeysize for %s must be within %d-%d bytes"
-	uRODECConst_sNotInitialized,	"%s is not initialized, call Init() or InitKey() first."
-	uRORes_err_InvalidIndex,	"Invalid index %d"
-	uRORes_err_InvalidType,	"Invalid type \"%s. Expected \"%s\"\""
-	uRORes_err_InvalidLibrary,	"Invalid library"
-	uRORes_err_InvalidStream,	"Invalid stream"
-	uRORes_err_InvalidTargetEntity,	"Invalid TargetEntity \"%s\""
-	uRORes_err_InvalidParamFlag,	"Invalid Parameter Flag \"%s\""
-	uRORes_err_InvalidStringLength,	"Stream read error: Invalid string length \"%d\""
-	uRORes_str_InvalidClassTypeInStream,	"Stream read error: Invalid class type encountered: \"%s\""
-	uRORes_err_UnexpectedEndOfStream,	"Unexpected end of stream."
-	uRORes_err_RodlDuplicateName,	"Duplicate name."
-	uRORes_err_RodlNoDataTypeSpecified,	"No data type specified."
-	uRORes_err_RodlNoEnumValues,	"Enum does not contain any values."
-	Consts_SUnicodeEncoding,	"Unicode"
-	Consts_SBigEndianEncoding,	"Big Endian Unicode"
-	Consts_SUTF8Encoding,	"UTF-8"
-	Consts_SUTF7Encoding,	"UTF-7"
-	Consts_STrayIconRemoveError,	"Cannot remove shell notification icon"
-	Consts_STrayIconCreateError,	"Cannot create shell notification icon"
-	Consts_SPageControlNotSet,	"PageControl must first be assigned"
-	Consts_SWindowsVistaRequired,	"%s requires Windows Vista or later"
 	uRODECConst_sProtectionCircular,	"Circular Protection detected, Protection Object is invalid."
 	uRODECConst_sStringFormatExists,	"String Format \"%d\" does not exist."
 	uRODECConst_sInvalidStringFormat,	"Input is not a valid %s Format."
@@ -2704,6 +2637,73 @@ BEGIN
 	uRODECConst_sFMT_HEX,	"Hexadecimal"
 	uRODECConst_sFMT_HEXL,	"Hexadecimal lowercase"
 	uRODECConst_sFMT_MIME64,	"MIME Base 64"
+	uRODECConst_sFMT_UU,	"UU Coding"
+	uRODECConst_sFMT_XX,	"XX Coding"
+	uRODECConst_sInvalidKeySize,	"Length from Encryptionkey is invalid.\r\nKeysize for %s must be within %d-%d bytes"
+	uRORes_err_ServerOnlySupportsOneDispatcher,	"%s servers only support one dispatcher"
+	uRORes_err_UnhandledException,	"Unhandled exception"
+	uRORes_err_ChannelBusy,	"Channel is busy. Try again later."
+	uRORes_err_ArrayIndexOutOfBounds,	"Array index out of bounds (%d)."
+	uRORes_err_InvalidHeader,	"Invalid binary header. Either incompatible or not a binary message."
+	uRORes_err_InvalidHeaderEncrypted,	"Invalid binary header. It seems that encryption is active on the other side of the communication, but not locally?"
+	uRORes_err_UnknownClassInStream,	"Unknown class \"%s\" found in stream."
+	uRORes_err_UnexpectedClassInStream,	"Unexpected class found in stream; class \"%s\" does not descend from \"%s\"."
+	uRORes_err_SessionNotFound,	"Session %s could not be found"
+	uRORes_err_ChannelDoesntSupportIROMetadataReader,	"Channel does not support IROMetadataReader"
+	uRORes_err_TooManySessions,	"Too many sessions. Try again in %d minute(s)"
+	uRORes_err_DOMElementIsNIL,	"DOMElement is NIL"
+	uRORes_err_CannotLoadXMLDocument,	"Cannot load XML document.\rReason: %s\rLine: %d\rPosition: %d"
+	uRORes_err_ErrorCreatingMsXmlDoc,	"Error creating MSXML Document class\r\r%s: %s"
+	uRORes_err_NoXMLParsersAvailable,	"MSXML is not installed"
+	uRORes_err_IDispatchMarshalingNotSupported,	"Marshaling of IDispatch (%d) type variants is not supported."
+	uRORes_err_AssignError,	"Cannot assign a \"%s\" to a \"%s\"."
+	uRORes_err_InvalidRequestStream,	"Invalid request stream (%d bytes)"
+	uRORes_err_NILMessage,	"Message is NIL"
+	uRORes_err_UnspecifiedInterface,	"The message does not have an interface name"
+	uRORes_err_UnspecifiedMessage,	"The message does not have a name"
+	uRORes_err_UnknownMethod,	"Unknown method %s for interface %s"
+	uRORes_err_ClassFactoryDidNotReturnInstance,	"Class factory did not return an instance of \"%s\""
+	uRORes_err_ParameterNotFound,	"Parameter \"%s\" was not found"
+	uRORes_err_TypeNotSupported,	"Type \"%s\" not supported"
+	uRORes_err_ClassFactoryNotFound,	"Class factory for interface %s not found"
+	uRORes_err_IROMessageNotSupported,	"Class \"%s\" does not support IROMessage"
+	uRORes_err_ClassAlreadyRegistered,	"Class \"%s\" is already registered"
+	uRORes_err_UnknownClass,	"Unknown class \"%s\""
+	uRORes_err_UnknownProxyInterface,	"Unknown proxy interface \"%s\""
+	uRORes_err_DispatcherAlreadyAssigned,	"Dispatcher for %s already assigned"
+	uRORes_err_CannotFindMessageDispatcher,	"Cannot find message dispatcher. Maybe there is no message component configured for the requested path?"
+	uRORes_err_InvalidTargetEntity,	"Invalid TargetEntity \"%s\""
+	uRORes_err_InvalidParamFlag,	"Invalid Parameter Flag \"%s\""
+	uRORes_err_InvalidStringLength,	"Stream read error: Invalid string length \"%d\""
+	uRORes_str_InvalidClassTypeInStream,	"Stream read error: Invalid class type encountered: \"%s\""
+	uRORes_err_UnexpectedEndOfStream,	"Unexpected end of stream."
+	uRORes_err_RodlDuplicateName,	"Duplicate name."
+	uRORes_err_RodlNoDataTypeSpecified,	"No data type specified."
+	uRORes_err_RodlNoEnumValues,	"Enum does not contain any values."
+	uRORes_err_RodlNoStructElementsDefined,	"Struct does not contain any elements."
+	uRORes_err_RodlNoOperationsDefined,	"Service interface does not contain any elements."
+	uRORes_err_RodlUsedFileDoesNotExist,	"The referenced RODL file \"%s\" could not be found."
+	uRORes_err_RodlInvalidDataType,	"Invalid or undefined data type \"%s\"."
+	uRORes_err_RodlStructCannotBeNested,	"Structs cannot recursively contain themselves."
+	uRORes_err_RodlInvalidAncestorType,	"Invalid or undefined ancestor type \"%s\"."
+	uRORes_str_ExceptionOnServer,	"An exception of type %s was raised on the server: %s"
+	uRORes_str_ExceptionReraisedFromServer,	"An exception was raised on the server: %s"
+	Consts_SUnicodeEncoding,	"Unicode"
+	Consts_SBigEndianEncoding,	"Big Endian Unicode"
+	Consts_SUTF8Encoding,	"UTF-8"
+	Consts_SUTF7Encoding,	"UTF-7"
+	Consts_STrayIconRemoveError,	"Cannot remove shell notification icon"
+	Consts_STrayIconCreateError,	"Cannot create shell notification icon"
+	Consts_SPageControlNotSet,	"PageControl must first be assigned"
+	Consts_SWindowsVistaRequired,	"%s requires Windows Vista or later"
+	ComConst_SOleError,	"OLE error %.8x"
+	ComConst_SNoMethod,	"Method '%s' not supported by automation object"
+	ComConst_SVarNotObject,	"Variant does not reference an automation object"
+	ComConst_STooManyParams,	"Dispatch methods do not support more than 64 parameters"
+	uRORes_err_InvalidIndex,	"Invalid index %d"
+	uRORes_err_InvalidType,	"Invalid type \"%s. Expected \"%s\"\""
+	uRORes_err_InvalidLibrary,	"Invalid library"
+	uRORes_err_InvalidStream,	"Invalid stream"
 	Consts_SNoDefaultPrinter,	"There is no default printer currently selected"
 	Consts_SDuplicateMenus,	"Menu '%s' is already being used by another form"
 	Consts_SPictureLabel,	"Picture:"
@@ -2978,48 +2978,48 @@ BEGIN
 	SysConst_SAccessDenied,	"File access denied"
 END
 
-/* c:\archivos de programa\codegear\rad studio\5.0\lib\Controls.res */
-/* C:\Archivos de programa\RemObjects Software\RemObjects SDK for Delphi\Source\uROPoweredByRemObjectsButton.res */
-/* C:\Archivos de programa\RemObjects Software\RemObjects SDK for Delphi\Source\uROHtmlServerInfo.res */
-/* c:\archivos de programa\codegear\rad studio\5.0\lib\Buttons.res */
-/* c:\archivos de programa\codegear\rad studio\5.0\lib\ExtDlgs.res */
-/* C:\Varela_D2007\Lib\FastReport3\frxProgress.DFM */
-/* C:\Varela_D2007\Lib\FastReport3\frxCtrls.RES */
-/* C:\Varela_D2007\Lib\FastReport3\frxPrintDialog.DFM */
-/* C:\Varela_D2007\Lib\FastReport3\frxDock.DFM */
-/* C:\Varela_D2007\Lib\FastReport3\frxPreviewPageSettings.DFM */
-/* C:\Varela_D2007\Lib\FastReport3\frxSearchDialog.DFM */
-/* C:\Varela_D2007\Lib\FastReport3\frxPreview.DFM */
-/* C:\Varela_D2007\Lib\FastReport3\frxPreview.RES */
-/* C:\Varela_D2007\Lib\FastReport3\frxDialogForm.DFM */
+/* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\controls.res */
+/* C:\Varela_D2007\Lib\RemObjects\RemObjects_SDK\uROPoweredByRemObjectsButton.res */
+/* C:\Varela_D2007\Lib\RemObjects\RemObjects_SDK\uROHtmlServerInfo.res */
+/* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\buttons.res */
+/* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\extdlgs.res */
+/* C:\Varela_D2007\Lib\FastReport3\frxProgress.dfm */
+/* C:\Varela_D2007\Lib\FastReport3\frxCtrls.res */
+/* C:\Varela_D2007\Lib\FastReport3\frxPrintDialog.dfm */
+/* C:\Varela_D2007\Lib\FastReport3\frxDock.dfm */
+/* C:\Varela_D2007\Lib\FastReport3\frxPreviewPageSettings.dfm */
+/* C:\Varela_D2007\Lib\FastReport3\frxSearchDialog.dfm */
+/* C:\Varela_D2007\Lib\FastReport3\frxPreview.dfm */
+/* C:\Varela_D2007\Lib\FastReport3\frxPreview.res */
+/* C:\Varela_D2007\Lib\FastReport3\frxDialogForm.dfm */
 /* C:\Varela_D2007\Lib\FastReport3\frxPassw.dfm */
-/* C:\Varela_D2007\Lib\FastReport3\frxClass.RES */
-/* c:\varela_d2007\lib\jvcl\JvConsts.res */
-/* c:\archivos de programa\codegear\rad studio\5.0\lib\WindowsXP.res */
-/* c:\archivos de programa\codegear\rad studio\5.0\lib\DBPWDlg.dfm */
-/* c:\archivos de programa\codegear\rad studio\5.0\lib\DBLogDlg.dfm */
-/* c:\archivos de programa\codegear\rad studio\5.0\lib\DBCtrls.res */
-/* C:\Archivos de programa\RemObjects Software\Data Abstract for Delphi\Source\uDAReconcileDialogDetails.dfm */
-/* C:\Archivos de programa\RemObjects Software\Data Abstract for Delphi\Source\uDAReconcileDialog.dfm */
-/* C:\Archivos de programa\RemObjects Software\Data Abstract for Delphi\Source\Drivers\DataAbstract_IBXDriver_Glyphs.res */
-/* C:\Archivos de programa\RemObjects Software\Data Abstract for Delphi\Source\Drivers\DataAbstract_ADODriver_Glyphs.res */
-/* c:\varela_d2007\lib\jvcl\JvLogForm.dfm */
-/* C:\Archivos de programa\RemObjects Software\Data Abstract for Delphi\Source\Drivers\DataAbstract_BDEDriver_Glyphs.res */
-/* C:\Archivos de programa\RemObjects Software\Data Abstract for Delphi\Source\Drivers\DataAbstract_DBXDriver_Glyphs.res */
+/* C:\Varela_D2007\Lib\FastReport3\frxClass.res */
+/* C:\Varela_D2007\Lib\JVCL\JvConsts.res */
+/* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\WindowsXP.res */
+/* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\DBPWDlg.dfm */
+/* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\DBLogDlg.dfm */
+/* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\dbctrls.res */
+/* C:\Varela_D2007\Lib\RemObjects\Data_Abstract\uDAReconcileDialogDetails.dfm */
+/* C:\Varela_D2007\Lib\RemObjects\Data_Abstract\uDAReconcileDialog.dfm */
+/* C:\Varela_D2007\Lib\RemObjects\Data_Abstract\DataAbstract_IBXDriver_Glyphs.res */
+/* C:\Varela_D2007\Lib\RemObjects\Data_Abstract\DataAbstract_ADODriver_Glyphs.res */
+/* C:\Varela_D2007\Lib\JVCL\JvLogForm.dfm */
+/* C:\Varela_D2007\Lib\RemObjects\Data_Abstract\DataAbstract_BDEDriver_Glyphs.res */
+/* C:\Varela_D2007\Lib\RemObjects\Data_Abstract\DataAbstract_DBXDriver_Glyphs.res */
 /* C:\Varela_D2007\Lib\SDAC\DBAccess.res */
-/* C:\Archivos de programa\RemObjects Software\Data Abstract for Delphi\Source\Drivers\DataAbstract_SDACDriver_Glyphs.res */
+/* C:\Varela_D2007\Lib\RemObjects\Data_Abstract\DataAbstract_SDACDriver_Glyphs.res */
 /* C:\Varela_D2007\Source\Servidor\uDataModuleServer.dfm */
 /* C:\Varela_D2007\Source\Servidor\Configuracion\uFrameConfiguracion.dfm */
 /* C:\Varela_D2007\Lib\DevExpressVCL\dxOffice11.res */
 /* C:\Varela_D2007\Lib\DevExpressVCL\cxControls.res */
 /* C:\Varela_D2007\Lib\DevExpressVCL\cxLookAndFeelPainters.res */
-/* c:\archivos de programa\codegear\rad studio\5.0\lib\FileCtrl.res */
+/* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\filectrl.res */
 /* C:\Varela_D2007\Lib\DevExpressVCL\cxEdit.res */
 /* C:\Varela_D2007\Lib\DevExpressVCL\cxShellBrowser.dfm */
 /* C:\Varela_D2007\Source\Servidor\Configuracion\uConexionBD.dfm */
 /* C:\Varela_D2007\Source\Servidor\Configuracion\uConfGeneral.dfm */
-/* c:\varela_d2007\lib\jvcl\JvToolEdit.res */
-/* c:\varela_d2007\lib\jvcl\JvSpin.Res */
+/* C:\Varela_D2007\Lib\JVCL\JvToolEdit.res */
+/* C:\Varela_D2007\Lib\JVCL\JvSpin.res */
 /* C:\Varela_D2007\Source\Servidor\Configuracion\uConfFicherosEDI.dfm */
 /* C:\Varela_D2007\Source\Servidor\Configuracion\uConfiguracion.dfm */
 /* C:\Varela_D2007\Source\Servidor\EDI_Log_Impl.dfm */
@@ -3045,5 +3045,5 @@ END
 /* C:\Varela_D2007\Source\Modulos\Stock\Servidor\srvStock_Impl.dfm */
 /* C:\Varela_D2007\Source\Modulos\Parametros\Servidor\srvParametros_Impl.dfm */
 /* C:\Varela_D2007\Source\Servidor\AdminPV_Server.res */
-/* C:\Varela_D2007\Source\Servidor\RODLFile.res */
-/* C:\Varela_D2007\Source\Servidor\AdminPV_Server.drf */
+/* C:\Varela_D2007\Source\Servidor\RODLFILE.res */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf7A.tmp */
diff --git a/Source/Servidor/AdminPV_Server.rc b/Source/Servidor/AdminPV_Server.rc
index 7183ee5..8784de4 100644
--- a/Source/Servidor/AdminPV_Server.rc
+++ b/Source/Servidor/AdminPV_Server.rc
@@ -1,7 +1,7 @@
 MAINICON ICON "C:\Varela_D2007\Resources\Iconos\Servidor.ico"
 1 VERSIONINFO
-FILEVERSION 2,1,0,0
-PRODUCTVERSION 2,1,0,0
+FILEVERSION 2,1,1,0
+PRODUCTVERSION 2,1,1,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@@ -13,10 +13,10 @@ BEGIN
          BLOCK "0C0A04E4"
          BEGIN
               VALUE "CompanyName", "Rodax Software S.L.\0"
-              VALUE "FileVersion", "2.1.0.0\0"
+              VALUE "FileVersion", "2.1.1.0\0"
               VALUE "ProductName", "AdminPV_Server\0"
-              VALUE "ProductVersion", "2.1.0.0\0"
-              VALUE "CompileDate", "jueves, 24 de enero de 2008 19:05\0"
+              VALUE "ProductVersion", "2.1.1.0\0"
+              VALUE "CompileDate", "martes, 11 de marzo de 2008 20:08\0"
          END
     END
     BLOCK "VarFileInfo"
diff --git a/Source/Servidor/AdminPV_Server.res b/Source/Servidor/AdminPV_Server.res
index 15785d723b878b8abc1c7a288f928b3e7b1467f9..e282822f2fbf2c829a5f920cffb7fe10685c3681 100644
GIT binary patch
delta 105
zcmZ3njd8^`#tlZ1oQw>N3``6R42+YlBTq6KPG*fN29lLg>W;Y#i3~*yB@C$y#SA(O
m3JiuosKAf{<SQ^h<f<6*;UY#120&;5<bzmNAok>kQSJcGkrf93

delta 105
zcmZ3njd8^`#tlZ1oD2+%3``6_FxfitB%{G()~I42SsA77n8i@akjhX7#KjCc3<?ZJ
o3?@J_1;|$b;yfTOV#tS!7%><Cp#_j{$Y9A}1!S8}ei-Er0M4ux0ssI2

diff --git a/Source/Servidor/EDI_Log_Impl.dfm b/Source/Servidor/EDI_Log_Impl.dfm
index cc39195..b8401b4 100644
--- a/Source/Servidor/EDI_Log_Impl.dfm
+++ b/Source/Servidor/EDI_Log_Impl.dfm
@@ -52,70 +52,29 @@ object EDI_Log: TEDI_Log
           item
             Name = 'ID'
             DataType = datInteger
-            BlobType = dabtUnknown
             Required = True
-            DisplayWidth = 0
-            Alignment = taLeftJustify
             InPrimaryKey = True
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'REPORT'
             DataType = datString
             Size = 10
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'FECHA'
             DataType = datDateTime
-            BlobType = dabtUnknown
             Required = True
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'OK'
             DataType = datBoolean
-            BlobType = dabtUnknown
             Required = True
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'ERROR_MSG'
             DataType = datString
             Size = 255
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end>
-        BusinessRulesClient.ScriptLanguage = rslPascalScript
-        BusinessRulesServer.ScriptLanguage = rslPascalScript
       end>
     JoinDataTables = <>
     UnionDataTables = <>
@@ -125,7 +84,6 @@ object EDI_Log: TEDI_Log
           item
             Name = 'FECHA'
             DataType = datDateTime
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -133,14 +91,12 @@ object EDI_Log: TEDI_Log
             Name = 'REPORT'
             DataType = datString
             Size = 10
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'OK'
             DataType = datBoolean
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -148,7 +104,6 @@ object EDI_Log: TEDI_Log
             Name = 'ERROR_MSG'
             DataType = datString
             Size = 255
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end>
@@ -171,8 +126,6 @@ object EDI_Log: TEDI_Log
     Top = 16
   end
   object DABINAdapter: TDABINAdapter
-    BufferSize = 262144
-    IsCompatibleV4 = True
     Left = 48
     Top = 80
   end
diff --git a/Source/Servidor/EDI_Log_Impl.pas b/Source/Servidor/EDI_Log_Impl.pas
index 1b06759..356c69f 100644
--- a/Source/Servidor/EDI_Log_Impl.pas
+++ b/Source/Servidor/EDI_Log_Impl.pas
@@ -54,7 +54,7 @@ begin
   cmd := schEDILog.NewCommand(conn, 'Insert_EDILog');
   try
     cmd.ParamByName('FECHA').AsDateTime := Fecha;
-    cmd.ParamByName('REPORT').AsString := Report;    
+    cmd.ParamByName('REPORT').AsString := Report;
     if OK then
       cmd.ParamByName('OK').AsInteger := 1
     else
@@ -63,6 +63,7 @@ begin
     cmd.Execute;
   finally
     conn.CommitTransaction;
+    conn.Close;
     conn := nil;
   end;
 end;
diff --git a/Source/Servidor/Services/EDI_Inventary/uDataModuleEDI_Inventary.dfm b/Source/Servidor/Services/EDI_Inventary/uDataModuleEDI_Inventary.dfm
index 164e687..0c24382 100644
--- a/Source/Servidor/Services/EDI_Inventary/uDataModuleEDI_Inventary.dfm
+++ b/Source/Servidor/Services/EDI_Inventary/uDataModuleEDI_Inventary.dfm
@@ -1,7 +1,7 @@
 object dmEDIInventary: TdmEDIInventary
   OldCreateOrder = False
-  Height = 185
-  Width = 396
+  Height = 79
+  Width = 251
   object schEDIInventary: TDASchema
     ConnectionManager = dmServer.ConnectionManager
     DataDictionary = dmServer.DataDictionary
@@ -65,134 +65,55 @@ object dmEDIInventary: TdmEDIInventary
             Name = 'NUMDOC'
             DataType = datString
             Size = 25
-            BlobType = dabtUnknown
             Required = True
-            DisplayWidth = 0
-            Alignment = taLeftJustify
             InPrimaryKey = True
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'NUMLIN'
             DataType = datFloat
-            BlobType = dabtUnknown
             Required = True
-            DisplayWidth = 0
-            Alignment = taLeftJustify
             InPrimaryKey = True
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'NUMCANT'
             DataType = datFloat
-            BlobType = dabtUnknown
             Required = True
-            DisplayWidth = 0
-            Alignment = taLeftJustify
             InPrimaryKey = True
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'TIPOCANT'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'CANTIDAD'
             DataType = datFloat
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'CENTRO'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'TMOV'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'FACT'
             DataType = datString
             Size = 12
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'DEPTO'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'IDVEN'
             DataType = datString
             Size = 10
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end>
-        BusinessRulesClient.ScriptLanguage = rslPascalScript
-        BusinessRulesServer.ScriptLanguage = rslPascalScript
       end
       item
         Params = <>
@@ -265,174 +186,70 @@ object dmEDIInventary: TdmEDIInventary
             Name = 'NUMDOC'
             DataType = datString
             Size = 25
-            BlobType = dabtUnknown
             Required = True
-            DisplayWidth = 0
-            Alignment = taLeftJustify
             InPrimaryKey = True
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'NUMLIN'
             DataType = datFloat
-            BlobType = dabtUnknown
             Required = True
-            DisplayWidth = 0
-            Alignment = taLeftJustify
             InPrimaryKey = True
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'CODART'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'FAMILIA'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'BARRA'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'TALLA'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'MARCA'
             DataType = datString
             Size = 25
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'TAMANO'
             DataType = datString
             Size = 25
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'SERIE'
             DataType = datString
             Size = 25
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'COLOR'
             DataType = datString
             Size = 25
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'MODELO'
             DataType = datString
             Size = 25
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'DIBUJO'
             DataType = datString
             Size = 25
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'DESCRIP'
             DataType = datString
             Size = 70
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end>
-        BusinessRulesClient.ScriptLanguage = rslPascalScript
-        BusinessRulesServer.ScriptLanguage = rslPascalScript
       end
       item
         Params = <>
@@ -492,132 +309,80 @@ object dmEDIInventary: TdmEDIInventary
             Name = 'NUMDOC'
             DataType = datString
             Size = 25
-            BlobType = dabtUnknown
             Required = True
-            DisplayWidth = 0
-            Alignment = taLeftJustify
             InPrimaryKey = True
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'TIPODOC'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'TIPOLIQ'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'FECHA'
             DataType = datDateTime
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'FECHALIQ'
             DataType = datDateTime
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'EMISOR'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'RECEPTOR'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'DPTO'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'CENTRO'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'FECHA_CARGA'
             DataType = datDateTime
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end>
-        BusinessRulesClient.ScriptLanguage = rslPascalScript
-        BusinessRulesServer.ScriptLanguage = rslPascalScript
+      end
+      item
+        Params = <
+          item
+            Name = 'NUMDOC'
+            Value = ''
+            ParamType = daptInput
+          end>
+        Statements = <
+          item
+            Connection = 'GFT_VARELA'
+            TargetTable = 'RDX_CABINV'
+            SQL = 'SELECT NUMDOC'#10'FROM RDX_CABINV'#10'WHERE'#10' NUMDOC = :NUMDOC'#10
+            StatementType = stSQL
+            ColumnMappings = <
+              item
+                DatasetField = 'NUMDOC'
+                TableField = 'NUMDOC'
+              end>
+          end>
+        Name = 'ExisteNumDoc'
+        Fields = <
+          item
+            Name = 'NUMDOC'
+            DataType = datString
+            Size = 25
+            Required = True
+            InPrimaryKey = True
+          end>
       end>
     JoinDataTables = <>
     UnionDataTables = <>
@@ -627,7 +392,6 @@ object dmEDIInventary: TdmEDIInventary
           item
             Name = 'RETURN_VALUE'
             DataType = datInteger
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptResult
           end>
@@ -645,7 +409,6 @@ object dmEDIInventary: TdmEDIInventary
           item
             Name = 'RETURN_VALUE'
             DataType = datInteger
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptResult
           end>
@@ -664,7 +427,6 @@ object dmEDIInventary: TdmEDIInventary
             Name = 'NUMDOC'
             DataType = datString
             Size = 25
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -672,7 +434,6 @@ object dmEDIInventary: TdmEDIInventary
             Name = 'TIPODOC'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -680,21 +441,18 @@ object dmEDIInventary: TdmEDIInventary
             Name = 'TIPOLIQ'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'FECHA'
             DataType = datDateTime
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'FECHALIQ'
             DataType = datDateTime
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -702,7 +460,6 @@ object dmEDIInventary: TdmEDIInventary
             Name = 'EMISOR'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -710,7 +467,6 @@ object dmEDIInventary: TdmEDIInventary
             Name = 'RECEPTOR'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -718,7 +474,6 @@ object dmEDIInventary: TdmEDIInventary
             Name = 'DPTO'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -726,14 +481,12 @@ object dmEDIInventary: TdmEDIInventary
             Name = 'CENTRO'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'FECHA_CARGA'
             DataType = datDateTime
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end>
@@ -757,14 +510,12 @@ object dmEDIInventary: TdmEDIInventary
             Name = 'NUMDOC'
             DataType = datString
             Size = 25
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'NUMLIN'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -772,7 +523,6 @@ object dmEDIInventary: TdmEDIInventary
             Name = 'CODART'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -780,7 +530,6 @@ object dmEDIInventary: TdmEDIInventary
             Name = 'FAMILIA'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -788,7 +537,6 @@ object dmEDIInventary: TdmEDIInventary
             Name = 'BARRA'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -796,7 +544,6 @@ object dmEDIInventary: TdmEDIInventary
             Name = 'TALLA'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -804,7 +551,6 @@ object dmEDIInventary: TdmEDIInventary
             Name = 'MARCA'
             DataType = datString
             Size = 25
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -812,7 +558,6 @@ object dmEDIInventary: TdmEDIInventary
             Name = 'TAMANO'
             DataType = datString
             Size = 25
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -820,7 +565,6 @@ object dmEDIInventary: TdmEDIInventary
             Name = 'SERIE'
             DataType = datString
             Size = 25
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -828,7 +572,6 @@ object dmEDIInventary: TdmEDIInventary
             Name = 'COLOR'
             DataType = datString
             Size = 25
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -836,7 +579,6 @@ object dmEDIInventary: TdmEDIInventary
             Name = 'MODELO'
             DataType = datString
             Size = 25
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -844,7 +586,6 @@ object dmEDIInventary: TdmEDIInventary
             Name = 'DIBUJO'
             DataType = datString
             Size = 25
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -852,7 +593,6 @@ object dmEDIInventary: TdmEDIInventary
             Name = 'DESCRIP'
             DataType = datString
             Size = 70
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end>
@@ -877,21 +617,18 @@ object dmEDIInventary: TdmEDIInventary
             Name = 'NUMDOC'
             DataType = datString
             Size = 25
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'NUMLIN'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'NUMCANT'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -899,14 +636,12 @@ object dmEDIInventary: TdmEDIInventary
             Name = 'TIPOCANT'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'CANTIDAD'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -914,7 +649,6 @@ object dmEDIInventary: TdmEDIInventary
             Name = 'CENTRO'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -922,7 +656,6 @@ object dmEDIInventary: TdmEDIInventary
             Name = 'TMOV'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -930,7 +663,6 @@ object dmEDIInventary: TdmEDIInventary
             Name = 'FACT'
             DataType = datString
             Size = 12
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -938,7 +670,6 @@ object dmEDIInventary: TdmEDIInventary
             Name = 'DEPTO'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -946,7 +677,6 @@ object dmEDIInventary: TdmEDIInventary
             Name = 'IDVEN'
             DataType = datString
             Size = 10
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end>
@@ -967,7 +697,7 @@ object dmEDIInventary: TdmEDIInventary
     RelationShips = <
       item
         Name = 'FK_RDX_LININV_RDX_CABINV'
-        MasterDatasetName = 'RDX_CABINV'
+        MasterDatasetName = 'ExisteNumDoc'
         MasterFields = 'NUMDOC'
         DetailDatasetName = 'RDX_LININV'
         DetailFields = 'NUMDOC'
@@ -985,7 +715,6 @@ object dmEDIInventary: TdmEDIInventary
       item
         Name = 'Insert RDX_CABINV'
         DoUpdate = False
-        DoInsert = True
         DoDelete = False
         DatasetName = 'RDX_CABINV'
         FailureBehavior = fbRaiseException
@@ -993,7 +722,6 @@ object dmEDIInventary: TdmEDIInventary
       item
         Name = 'Insert RDX_LININV'
         DoUpdate = False
-        DoInsert = True
         DoDelete = False
         DatasetName = 'RDX_LININV'
         FailureBehavior = fbRaiseException
@@ -1001,14 +729,12 @@ object dmEDIInventary: TdmEDIInventary
       item
         Name = 'Insert RDX_CANTINV'
         DoUpdate = False
-        DoInsert = True
         DoDelete = False
         DatasetName = 'RDX_CANTINV'
         FailureBehavior = fbRaiseException
       end
       item
         Name = 'Update RDX_CABINV'
-        DoUpdate = True
         DoInsert = False
         DoDelete = False
         DatasetName = 'RDX_CABINV'
@@ -1016,7 +742,6 @@ object dmEDIInventary: TdmEDIInventary
       end
       item
         Name = 'Update RDX_LININV'
-        DoUpdate = True
         DoInsert = False
         DoDelete = False
         DatasetName = 'RDX_LININV'
@@ -1024,7 +749,6 @@ object dmEDIInventary: TdmEDIInventary
       end
       item
         Name = 'Update RDX_CANTINV'
-        DoUpdate = True
         DoInsert = False
         DoDelete = False
         DatasetName = 'RDX_CANTINV'
@@ -1034,7 +758,6 @@ object dmEDIInventary: TdmEDIInventary
         Name = 'Delete RDX_CANTINV'
         DoUpdate = False
         DoInsert = False
-        DoDelete = True
         DatasetName = 'RDX_CANTINV'
         FailureBehavior = fbRaiseException
       end
@@ -1042,7 +765,6 @@ object dmEDIInventary: TdmEDIInventary
         Name = 'Delete RDX_LININV'
         DoUpdate = False
         DoInsert = False
-        DoDelete = True
         DatasetName = 'RDX_LININV'
         FailureBehavior = fbRaiseException
       end
@@ -1050,7 +772,6 @@ object dmEDIInventary: TdmEDIInventary
         Name = 'Delete RDX_CABINV'
         DoUpdate = False
         DoInsert = False
-        DoDelete = True
         DatasetName = 'RDX_CABINV'
         FailureBehavior = fbRaiseException
       end>
diff --git a/Source/Servidor/Services/EDI_Inventary/uDataModuleEDI_Inventary.pas b/Source/Servidor/Services/EDI_Inventary/uDataModuleEDI_Inventary.pas
index e6b95a2..2f30979 100644
--- a/Source/Servidor/Services/EDI_Inventary/uDataModuleEDI_Inventary.pas
+++ b/Source/Servidor/Services/EDI_Inventary/uDataModuleEDI_Inventary.pas
@@ -12,6 +12,10 @@ type
   TdmEDIInventary = class(TDataModule)
     schEDIInventary: TDASchema;
   private
+    FConnection : IDAConnection;
+    FNumDocCargados : TStringList;
+
+    function ExisteNumDoc(const ANumDoc : String): Boolean;
     function InsertarCabecera(const ACabData : TEDIFileData; var NumRegNuevos : integer) : Boolean;
     function InsertarLineas(const ALinData : TEDIFileData; var NumRegNuevos : integer) : Boolean;
     function InsertarCantidades(const ACantData : TEDIFileData; var NumRegNuevos : integer) : Boolean;
@@ -47,71 +51,100 @@ var
   NumRegNuevosCab : Integer;
   NumRegNuevosLin : Integer;
   NumRegNuevosCant : Integer;
+
+  bContinuar : Boolean; 
 begin
-  Result := True;
+  bContinuar := False;
+
+  FNumDocCargados := TStringList.Create;
+  
+  FConnection := dmServer.ConnectionManager.NewConnection(dmServer.ConnectionName);
+  FConnection.BeginTransaction;
 
   Cab_Reader := TCABINV_Reader.Create;
+  Lin_Reader := TLININV_Reader.Create;
+  Cant_Reader := TCANTINV_Reader.Create;
+
   try
     Cab_Reader.Filename := FicheroCAB;
     Cab_Reader.ReadFile;
-    Result := InsertarCabecera (Cab_Reader.FileData, NumRegNuevosCab);
-  finally
-    FreeAndNIL(Cab_Reader);
-  end;
 
-  if Result then
-  begin
-    Lin_Reader := TLININV_Reader.Create;
+    Lin_Reader.Filename := FicheroLIN;
+    Lin_Reader.ReadFile;
+
+    Cant_Reader.Filename := FicheroCANT;
+    Cant_Reader.ReadFile;
+
     try
-      Lin_Reader.Filename := FicheroLIN;
-      Lin_Reader.ReadFile;
-      Result := InsertarLineas (Lin_Reader.FileData, NumRegNuevosLin);
-    finally
-      FreeAndNIL(Lin_Reader);
-    end;
+      bContinuar := InsertarCabecera (Cab_Reader.FileData, NumRegNuevosCab);
 
-    if Result then
-    begin
-      Cant_Reader := TCANTINV_Reader.Create;
-      try
-        Cant_Reader.Filename := FicheroCANT;
-        Cant_Reader.ReadFile;
-        Result := InsertarCantidades(Cant_Reader.FileData, NumRegNuevosCant);
-      finally
-        Cant_Reader.Free;
+      if bContinuar then
+        bContinuar := InsertarLineas (Lin_Reader.FileData, NumRegNuevosLin);
+
+      if bContinuar then
+        bContinuar := InsertarCantidades(Cant_Reader.FileData, NumRegNuevosCant);
+
+      if bContinuar then
+      begin
+        NumRegNuevos := NumRegNuevosCant;
+        bContinuar := GenerarInventarioEDI;
+      end;
+
+      if bContinuar then
+      begin
+        if MarcarRegistrosUltimoInventarioEDI then
+          FConnection.CommitTransaction
+        else
+          FConnection.RollbackTransaction;
+      end;
+    except
+      on E : Exception do
+      begin
+        FConnection.RollbackTransaction;
+        InsertarLog(False, e.Message + ' (CargarFicheros - InventarioEDI)');
       end;
     end;
+  finally
+    FreeAndNIL(Cab_Reader);
+    FreeAndNIL(Lin_Reader);
+    FreeAndNIL(Cant_Reader);
+    FConnection.Close;
+    FConnection := NIL;
+    FreeAndNIL(FNumDocCargados);
   end;
+  Result := bContinuar;
+end;
 
-  if Result then
-  begin
-    NumRegNuevos := NumRegNuevosCant;
-    Result := GenerarInventarioEDI;
-    if Result then
-      Result := MarcarRegistrosUltimoInventarioEDI;
+function TdmEDIInventary.ExisteNumDoc(const ANumDoc: String): Boolean;
+var
+  ds: IDADataset;
+begin
+  try
+    ds := schEDIInventary.NewDataset(FConnection, 'ExisteNumDoc');
+    ds.ParamByName('NUMDOC').AsString := ANumDoc;
+    ds.Open;
+    Result := (not ds.IsEmpty);
+    ds.Close;
+  finally
+    ds := NIL;
   end;
 end;
 
 function TdmEDIInventary.GenerarInventarioEDI: Boolean;
 var
   ACommand: IDASQLCommand;
-  AConnection : IDAConnection;
 begin
   Result := False;
-  AConnection := dmServer.ConnectionManager.NewConnection(dmServer.ConnectionName);
-  ACommand := schEDIInventary.NewCommand(AConnection, 'RDX_P_CARGAR_INVENTARIOEDI');
+  ACommand := schEDIInventary.NewCommand(FConnection, 'RDX_P_CARGAR_INVENTARIOEDI');
 
-  AConnection.BeginTransaction;
   try
     ACommand.Execute;
-    AConnection.CommitTransaction;
     Result := True;
   except
     on E : Exception do
     begin
-      AConnection.RollbackTransaction;
-      if Pos('PRIMARY KEY', E.Message) = 0 then
-        InsertarLog(False, e.Message + ' (GenerarInventarioEDI)');
+      InsertarLog(False, e.Message + ' (GenerarInventarioEDI)');
+      raise E;
     end
   end;
 end;
@@ -122,11 +155,11 @@ var
   i : integer;
   Registro : PCABINV;
   ACommand: IDASQLCommand;
-  AConnection : IDAConnection;
+  ANumDoc : String;
 begin
+
   Result := False;
   NumRegNuevos := 0;
-  AConnection := dmServer.ConnectionManager.NewConnection(dmServer.ConnectionName);
 
   for i := 0 to ACabData.Count - 1 do
   begin
@@ -135,10 +168,14 @@ begin
     if not Registro.REGISTRO_OK then
       Continue;
 
-    ACommand := schEDIInventary.NewCommand(AConnection, 'Insert_RDX_CABINV');
+    ANumDoc := Trim(Registro.NUMDOC);
+    if ExisteNumDoc(ANumDoc) then
+      Continue;
+
+    ACommand := schEDIInventary.NewCommand(FConnection, 'Insert_RDX_CABINV');
     with ACommand do
     begin
-      ParamByName('NUMDOC').AsString := Trim(Registro.NUMDOC);
+      ParamByName('NUMDOC').AsString := ANumDoc;
       ParamByName('TIPODOC').AsString := Trim(Registro.TIPODOC);
       ParamByName('TIPOLIQ').AsString := Trim(Registro.TIPOLIQ);
       ParamByName('FECHA').AsDateTime := EDIDateToDateF(Trim(Registro.FECHA));
@@ -149,18 +186,16 @@ begin
       ParamByName('CENTRO').AsString := Trim(Registro.CENTRO);
     end;
 
-    AConnection.BeginTransaction;
     try
       ACommand.Execute;
-      AConnection.CommitTransaction;
-      NumRegNuevos := NumRegNuevos + 1;      
+      NumRegNuevos := NumRegNuevos + 1;
+      FNumDocCargados.Add(ANumDoc);
       Result := True;
     except
       on E : Exception do
       begin
-        AConnection.RollbackTransaction;
-        if Pos('PRIMARY KEY', E.Message) = 0 then
-          InsertarLog(False, e.Message + ' (InsertarCabecera INV)');
+        InsertarLog(False, e.Message + ' (InsertarCabecera INV)');
+        raise E;
       end
     end;
   end; //for
@@ -172,11 +207,10 @@ var
   i : integer;
   Registro : PCANTINV;
   ACommand: IDASQLCommand;
-  AConnection : IDAConnection;
+  ANumDoc : String;
 begin
   Result := False;
   NumRegNuevos := 0;
-  AConnection := dmServer.ConnectionManager.NewConnection(dmServer.ConnectionName);
 
   for i := 0 to ACantData.Count - 1 do
   begin
@@ -185,7 +219,11 @@ begin
     if not Registro.REGISTRO_OK then
       Continue;
 
-    ACommand := schEDIInventary.NewCommand(AConnection, 'Insert_RDX_CANTINV');
+    ANumDoc := Trim(Registro.NUMDOC);
+    if FNumDocCargados.IndexOf(ANumDoc) = -1 then
+      Continue;
+
+    ACommand := schEDIInventary.NewCommand(FConnection, 'Insert_RDX_CANTINV');
     with ACommand do
     begin
       ParamByName('NUMDOC').AsString := Trim(Registro.NUMDOC);
@@ -200,18 +238,15 @@ begin
       ParamByName('IDVEN').AsString := Trim(Registro.IDVEN);
     end;
 
-    AConnection.BeginTransaction;
     try
       ACommand.Execute;
-      AConnection.CommitTransaction;
       NumRegNuevos := NumRegNuevos + 1;
       Result := True;
     except
       on E : Exception do
       begin
-        AConnection.RollbackTransaction;
-        if Pos('PRIMARY KEY', E.Message) = 0 then
-          InsertarLog(False, e.Message + ' (InsertarCantidades INV)');
+        InsertarLog(False, e.Message + ' (InsertarCantidades INV)');
+        raise E;
       end
     end;
   end; //for
@@ -223,11 +258,10 @@ var
   i : integer;
   Registro : PLININV;
   ACommand: IDASQLCommand;
-  AConnection : IDAConnection;
+  ANumDoc : String;
 begin
   Result := False;
   NumRegNuevos := 0;
-  AConnection := dmServer.ConnectionManager.NewConnection(dmServer.ConnectionName);
 
   for i := 0 to ALinData.Count - 1 do
   begin
@@ -236,7 +270,11 @@ begin
     if not Registro.REGISTRO_OK then
       Continue;
 
-    ACommand := schEDIInventary.NewCommand(AConnection, 'Insert_RDX_LININV');
+    ANumDoc := Trim(Registro.NUMDOC);
+    if FNumDocCargados.IndexOf(ANumDoc) = -1 then
+      Continue;
+
+    ACommand := schEDIInventary.NewCommand(FConnection, 'Insert_RDX_LININV');
     with ACommand do
     begin
       ParamByName('NUMDOC').AsString := Trim(Registro.NUMDOC);
@@ -254,18 +292,15 @@ begin
       ParamByName('DESCRIP').AsString := Trim(Registro.DESCRIP);
     end;
 
-    AConnection.BeginTransaction;
     try
       ACommand.Execute;
-      AConnection.CommitTransaction;
-      NumRegNuevos := NumRegNuevos + 1;      
+      NumRegNuevos := NumRegNuevos + 1;
       Result := True;
     except
       on E : Exception do
       begin
-        AConnection.RollbackTransaction;
-        if Pos('PRIMARY KEY', E.Message) = 0 then
-          InsertarLog(False, e.Message + ' (InsertarLineas INV)');
+        InsertarLog(False, e.Message + ' (InsertarLineas INV)');
+        raise E;
       end
     end;
   end; //for
@@ -288,23 +323,18 @@ end;
 function TdmEDIInventary.MarcarRegistrosUltimoInventarioEDI: Boolean;
 var
   ACommand: IDASQLCommand;
-  AConnection : IDAConnection;
 begin
   Result := False;
-  AConnection := dmServer.ConnectionManager.NewConnection(dmServer.ConnectionName);
-  ACommand := schEDIInventary.NewCommand(AConnection, 'RDX_P_SET_ULTIMOINVENTARIO');
+  ACommand := schEDIInventary.NewCommand(FConnection, 'RDX_P_SET_ULTIMOINVENTARIO');
 
-  AConnection.BeginTransaction;
   try
     ACommand.Execute;
-    AConnection.CommitTransaction;
     Result := True;
   except
     on E : Exception do
     begin
-      AConnection.RollbackTransaction;
-      if Pos('PRIMARY KEY', E.Message) = 0 then
-        InsertarLog(False, e.Message + ' (MarcarRegistrosUltimoInventarioEDI)');
+      InsertarLog(False, e.Message + ' (MarcarRegistrosUltimoInventarioEDI)');
+      raise E;
     end
   end;
 end;
diff --git a/Source/Servidor/Services/EDI_Sales/uDataModuleEDI_Sales.dfm b/Source/Servidor/Services/EDI_Sales/uDataModuleEDI_Sales.dfm
index 571803f..89bcdaf 100644
--- a/Source/Servidor/Services/EDI_Sales/uDataModuleEDI_Sales.dfm
+++ b/Source/Servidor/Services/EDI_Sales/uDataModuleEDI_Sales.dfm
@@ -226,617 +226,226 @@ object dmEDISales: TdmEDISales
           item
             Name = 'CLAVE1'
             DataType = datFloat
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
             InPrimaryKey = True
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'CLAVE2'
             DataType = datInteger
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
             InPrimaryKey = True
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'CLAVE3'
             DataType = datInteger
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
             InPrimaryKey = True
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'EANART'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'CODCOM'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'NUMVAR'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'CODPRO'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'DESARTCO'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'DESART'
             DataType = datString
             Size = 70
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'NUMCON'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'NUMLIS'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'CONESP1'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'CONESP2'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'CONESP3'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'VALVEN'
             DataType = datFloat
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'PRENETCT'
             DataType = datFloat
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'PREBRUCT'
             DataType = datFloat
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'PREINFET'
             DataType = datFloat
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'PREINFFT'
             DataType = datFloat
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'PRECALCT'
             DataType = datFloat
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'PRENETCA'
             DataType = datFloat
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'PREBRUCA'
             DataType = datFloat
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'PREINFEA'
             DataType = datFloat
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'PREINFFA'
             DataType = datFloat
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'PRECALCA'
             DataType = datFloat
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'BAPRUN1'
             DataType = datInteger
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'UNIMED1'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'BAPRUN2'
             DataType = datInteger
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'UNIMED2'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'BAPRUN3'
             DataType = datInteger
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'UNIMED3'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'BAPRUN4'
             DataType = datInteger
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'UNIMED4'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'BAPRUN5'
             DataType = datInteger
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'UNIMED5'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'CANVEN'
             DataType = datFloat
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'EXIPRO'
             DataType = datFloat
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'DESEXI'
             DataType = datFloat
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'ESPMEDCV'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'ESPMEDEP'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'ESPMEDDE'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'CANDEV'
             DataType = datFloat
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'EANVEN'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'NOMVEN'
             DataType = datString
             Size = 70
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'NUMTALON'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'CANVENNET'
             DataType = datFloat
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'UMEDVENNET'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'CANESP'
             DataType = datFloat
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'UMEDESP'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end>
-        BusinessRulesClient.ScriptLanguage = rslPascalScript
-        BusinessRulesServer.ScriptLanguage = rslPascalScript
       end
       item
         Params = <>
@@ -1037,565 +646,212 @@ object dmEDISales: TdmEDISales
           item
             Name = 'CLAVE1'
             DataType = datFloat
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
             InPrimaryKey = True
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'NUMINF'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'FUNCION'
             DataType = datString
             Size = 10
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'FECINI'
             DataType = datDateTime
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'FECFIN'
             DataType = datDateTime
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'FECINF'
             DataType = datDateTime
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'PERVENINI'
             DataType = datDateTime
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'PERVENFIN'
             DataType = datDateTime
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'EANOFI'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'EANEMI'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'EANREC'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'EANVEN'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'EANALM'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'EANREP'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'EANPRO'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'EANADMSA'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'EANREPSR'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'ADMVENSA'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'REPDEPSR'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'EMAILSA'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'NUMFAXSA'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'NUMTELSA'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'NUMTLXSA'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'X400SA'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'EMAILSR'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'NUMFAXSR'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'NUMTELSR'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'NUMTLXSR'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'X400SR'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'NUMPRE'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'NUMINFSC'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'NUMCON'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'FECPRE'
             DataType = datDateTime
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'FECINFSC'
             DataType = datDateTime
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'FECCON'
             DataType = datDateTime
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'DIVPED'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'DIVPRE'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'DIVPAG'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'DIVPEDF'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'DIVPREF'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'DIVPAGF'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'TASCAM'
             DataType = datFloat
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'FECTAS'
             DataType = datDateTime
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'FECHA_CARGA'
             DataType = datDateTime
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end>
-        BusinessRulesClient.ScriptLanguage = rslPascalScript
-        BusinessRulesServer.ScriptLanguage = rslPascalScript
       end
       item
         Params = <>
@@ -1646,103 +902,68 @@ object dmEDISales: TdmEDISales
           item
             Name = 'CLAVE1'
             DataType = datFloat
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
             InPrimaryKey = True
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'CLAVE2'
             DataType = datInteger
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
             InPrimaryKey = True
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'EANLUG'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'LUGVEN'
             DataType = datString
             Size = 70
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'FECINI'
             DataType = datDateTime
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'FECFIN'
             DataType = datDateTime
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'PERVENINI'
             DataType = datDateTime
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'PERVENFIN'
             DataType = datDateTime
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end>
-        BusinessRulesClient.ScriptLanguage = rslPascalScript
-        BusinessRulesServer.ScriptLanguage = rslPascalScript
+      end
+      item
+        IsPublic = False
+        Params = <
+          item
+            Name = 'CLAVE1'
+            Value = ''
+            ParamType = daptInput
+          end>
+        Statements = <
+          item
+            Connection = 'GFT_VARELA'
+            TargetTable = 'RDX_CABVEN'
+            SQL = 
+              'SELECT '#10'    CLAVE1'#10'  FROM'#10'    RDX_CABVEN'#10'  WHERE CLAVE1 = :CLAVE' +
+              '1'#10
+            StatementType = stSQL
+            ColumnMappings = <
+              item
+                DatasetField = 'CLAVE1'
+                TableField = 'CLAVE1'
+              end>
+          end>
+        Name = 'ExisteClave1'
+        Fields = <
+          item
+            Name = 'CLAVE1'
+            DataType = datDecimal
+          end>
       end>
     JoinDataTables = <>
     UnionDataTables = <>
@@ -1752,7 +973,6 @@ object dmEDISales: TdmEDISales
           item
             Name = 'RETURN_VALUE'
             DataType = datInteger
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptResult
           end>
@@ -1770,7 +990,6 @@ object dmEDISales: TdmEDISales
           item
             Name = 'CLAVE1'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -1778,7 +997,6 @@ object dmEDISales: TdmEDISales
             Name = 'NUMINF'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -1786,28 +1004,24 @@ object dmEDISales: TdmEDISales
             Name = 'FUNCION'
             DataType = datString
             Size = 10
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'FECINI'
             DataType = datDateTime
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'FECFIN'
             DataType = datDateTime
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'FECINF'
             DataType = datDateTime
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -1815,7 +1029,6 @@ object dmEDISales: TdmEDISales
             Name = 'EANOFI'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -1823,7 +1036,6 @@ object dmEDISales: TdmEDISales
             Name = 'EANEMI'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -1831,7 +1043,6 @@ object dmEDISales: TdmEDISales
             Name = 'EANREC'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -1839,7 +1050,6 @@ object dmEDISales: TdmEDISales
             Name = 'EANVEN'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -1847,7 +1057,6 @@ object dmEDISales: TdmEDISales
             Name = 'EANALM'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -1855,7 +1064,6 @@ object dmEDISales: TdmEDISales
             Name = 'EANREP'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -1863,7 +1071,6 @@ object dmEDISales: TdmEDISales
             Name = 'EANPRO'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -1871,7 +1078,6 @@ object dmEDISales: TdmEDISales
             Name = 'EANADMSA'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -1879,7 +1085,6 @@ object dmEDISales: TdmEDISales
             Name = 'EANREPSR'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -1887,7 +1092,6 @@ object dmEDISales: TdmEDISales
             Name = 'ADMVENSA'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -1895,7 +1099,6 @@ object dmEDISales: TdmEDISales
             Name = 'REPDEPSR'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -1903,7 +1106,6 @@ object dmEDISales: TdmEDISales
             Name = 'EMAILSA'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -1911,7 +1113,6 @@ object dmEDISales: TdmEDISales
             Name = 'NUMFAXSA'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -1919,7 +1120,6 @@ object dmEDISales: TdmEDISales
             Name = 'NUMTELSA'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -1927,7 +1127,6 @@ object dmEDISales: TdmEDISales
             Name = 'NUMTLXSA'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -1935,7 +1134,6 @@ object dmEDISales: TdmEDISales
             Name = 'X400SA'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -1943,7 +1141,6 @@ object dmEDISales: TdmEDISales
             Name = 'EMAILSR'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -1951,7 +1148,6 @@ object dmEDISales: TdmEDISales
             Name = 'NUMFAXSR'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -1959,7 +1155,6 @@ object dmEDISales: TdmEDISales
             Name = 'NUMTELSR'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -1967,7 +1162,6 @@ object dmEDISales: TdmEDISales
             Name = 'NUMTLXSR'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -1975,7 +1169,6 @@ object dmEDISales: TdmEDISales
             Name = 'X400SR'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -1983,7 +1176,6 @@ object dmEDISales: TdmEDISales
             Name = 'NUMPRE'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -1991,7 +1183,6 @@ object dmEDISales: TdmEDISales
             Name = 'NUMINFSC'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -1999,28 +1190,24 @@ object dmEDISales: TdmEDISales
             Name = 'NUMCON'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'FECPRE'
             DataType = datDateTime
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'FECINFSC'
             DataType = datDateTime
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'FECCON'
             DataType = datDateTime
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -2028,7 +1215,6 @@ object dmEDISales: TdmEDISales
             Name = 'DIVPED'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -2036,7 +1222,6 @@ object dmEDISales: TdmEDISales
             Name = 'DIVPRE'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -2044,7 +1229,6 @@ object dmEDISales: TdmEDISales
             Name = 'DIVPAG'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -2052,7 +1236,6 @@ object dmEDISales: TdmEDISales
             Name = 'DIVPEDF'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -2060,7 +1243,6 @@ object dmEDISales: TdmEDISales
             Name = 'DIVPREF'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -2068,42 +1250,36 @@ object dmEDISales: TdmEDISales
             Name = 'DIVPAGF'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'TASCAM'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'FECTAS'
             DataType = datDateTime
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'PERVENINI'
             DataType = datDateTime
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'PERVENFIN'
             DataType = datDateTime
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'FECHA_CARGA'
             DataType = datDateTime
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end>
@@ -2137,14 +1313,12 @@ object dmEDISales: TdmEDISales
           item
             Name = 'CLAVE1'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'CLAVE2'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -2152,7 +1326,6 @@ object dmEDISales: TdmEDISales
             Name = 'EANLUG'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -2160,35 +1333,30 @@ object dmEDISales: TdmEDISales
             Name = 'LUGVEN'
             DataType = datString
             Size = 70
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'FECINI'
             DataType = datDateTime
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'FECFIN'
             DataType = datDateTime
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'PERVENINI'
             DataType = datDateTime
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'PERVENFIN'
             DataType = datDateTime
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end>
@@ -2211,21 +1379,18 @@ object dmEDISales: TdmEDISales
           item
             Name = 'CLAVE1'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'CLAVE2'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'CLAVE3'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -2233,7 +1398,6 @@ object dmEDISales: TdmEDISales
             Name = 'EANART'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -2241,7 +1405,6 @@ object dmEDISales: TdmEDISales
             Name = 'CODCOM'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -2249,7 +1412,6 @@ object dmEDISales: TdmEDISales
             Name = 'NUMVAR'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -2257,7 +1419,6 @@ object dmEDISales: TdmEDISales
             Name = 'CODPRO'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -2265,7 +1426,6 @@ object dmEDISales: TdmEDISales
             Name = 'DESARTCO'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -2273,7 +1433,6 @@ object dmEDISales: TdmEDISales
             Name = 'DESART'
             DataType = datString
             Size = 70
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -2281,7 +1440,6 @@ object dmEDISales: TdmEDISales
             Name = 'NUMCON'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -2289,7 +1447,6 @@ object dmEDISales: TdmEDISales
             Name = 'NUMLIS'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -2297,7 +1454,6 @@ object dmEDISales: TdmEDISales
             Name = 'CONESP1'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -2305,7 +1461,6 @@ object dmEDISales: TdmEDISales
             Name = 'CONESP2'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -2313,91 +1468,78 @@ object dmEDISales: TdmEDISales
             Name = 'CONESP3'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'VALVEN'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'PRENETCT'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'PREBRUCT'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'PREINFET'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'PREINFFT'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'PRECALCT'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'PRENETCA'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'PREBRUCA'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'PREINFEA'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'PREINFFA'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'PRECALCA'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'BAPRUN1'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -2405,14 +1547,12 @@ object dmEDISales: TdmEDISales
             Name = 'UNIMED1'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'BAPRUN2'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -2420,14 +1560,12 @@ object dmEDISales: TdmEDISales
             Name = 'UNIMED2'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'BAPRUN3'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -2435,14 +1573,12 @@ object dmEDISales: TdmEDISales
             Name = 'UNIMED3'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'BAPRUN4'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -2450,14 +1586,12 @@ object dmEDISales: TdmEDISales
             Name = 'UNIMED4'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'BAPRUN5'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -2465,28 +1599,24 @@ object dmEDISales: TdmEDISales
             Name = 'UNIMED5'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'CANVEN'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'EXIPRO'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'DESEXI'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -2494,7 +1624,6 @@ object dmEDISales: TdmEDISales
             Name = 'ESPMEDCV'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -2502,7 +1631,6 @@ object dmEDISales: TdmEDISales
             Name = 'ESPMEDEP'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -2510,14 +1638,12 @@ object dmEDISales: TdmEDISales
             Name = 'ESPMEDDE'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'CANDEV'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -2525,7 +1651,6 @@ object dmEDISales: TdmEDISales
             Name = 'EANVEN'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -2533,7 +1658,6 @@ object dmEDISales: TdmEDISales
             Name = 'NOMVEN'
             DataType = datString
             Size = 70
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -2541,14 +1665,12 @@ object dmEDISales: TdmEDISales
             Name = 'NUMTALON'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'CANVENNET'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -2556,14 +1678,12 @@ object dmEDISales: TdmEDISales
             Name = 'UMEDVENNET'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'CANESP'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -2571,7 +1691,6 @@ object dmEDISales: TdmEDISales
             Name = 'UMEDESP'
             DataType = datString
             Size = 3
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end>
@@ -2605,7 +1724,7 @@ object dmEDISales: TdmEDISales
     RelationShips = <
       item
         Name = 'FK_RDX_LUGVEN_RDX_CABVEN'
-        MasterDatasetName = 'RDX_CABVEN'
+        MasterDatasetName = 'ExisteClave1'
         MasterFields = 'CLAVE1'
         DetailDatasetName = 'RDX_LUGVEN'
         DetailFields = 'CLAVE1'
@@ -2623,7 +1742,6 @@ object dmEDISales: TdmEDISales
       item
         Name = 'Insert RDX_CABVEN'
         DoUpdate = False
-        DoInsert = True
         DoDelete = False
         DatasetName = 'RDX_CABVEN'
         FailureBehavior = fbRaiseException
@@ -2631,7 +1749,6 @@ object dmEDISales: TdmEDISales
       item
         Name = 'Insert RDX_LUGVEN'
         DoUpdate = False
-        DoInsert = True
         DoDelete = False
         DatasetName = 'RDX_LUGVEN'
         FailureBehavior = fbRaiseException
@@ -2639,14 +1756,12 @@ object dmEDISales: TdmEDISales
       item
         Name = 'Insert RDX_ARTVEN'
         DoUpdate = False
-        DoInsert = True
         DoDelete = False
         DatasetName = 'RDX_ARTVEN'
         FailureBehavior = fbRaiseException
       end
       item
         Name = 'Update RDX_CABVEN'
-        DoUpdate = True
         DoInsert = False
         DoDelete = False
         DatasetName = 'RDX_CABVEN'
@@ -2654,7 +1769,6 @@ object dmEDISales: TdmEDISales
       end
       item
         Name = 'Update RDX_LUGVEN'
-        DoUpdate = True
         DoInsert = False
         DoDelete = False
         DatasetName = 'RDX_LUGVEN'
@@ -2662,7 +1776,6 @@ object dmEDISales: TdmEDISales
       end
       item
         Name = 'Update RDX_ARTVEN'
-        DoUpdate = True
         DoInsert = False
         DoDelete = False
         DatasetName = 'RDX_ARTVEN'
@@ -2672,7 +1785,6 @@ object dmEDISales: TdmEDISales
         Name = 'Delete RDX_ARTVEN'
         DoUpdate = False
         DoInsert = False
-        DoDelete = True
         DatasetName = 'RDX_ARTVEN'
         FailureBehavior = fbRaiseException
       end
@@ -2680,7 +1792,6 @@ object dmEDISales: TdmEDISales
         Name = 'Delete RDX_LUGVEN'
         DoUpdate = False
         DoInsert = False
-        DoDelete = True
         DatasetName = 'RDX_LUGVEN'
         FailureBehavior = fbRaiseException
       end
@@ -2688,7 +1799,6 @@ object dmEDISales: TdmEDISales
         Name = 'Delete RDX_CABVEN'
         DoUpdate = False
         DoInsert = False
-        DoDelete = True
         DatasetName = 'RDX_CABVEN'
         FailureBehavior = fbRaiseException
       end>
diff --git a/Source/Servidor/Services/EDI_Sales/uDataModuleEDI_Sales.pas b/Source/Servidor/Services/EDI_Sales/uDataModuleEDI_Sales.pas
index 1208366..db01671 100644
--- a/Source/Servidor/Services/EDI_Sales/uDataModuleEDI_Sales.pas
+++ b/Source/Servidor/Services/EDI_Sales/uDataModuleEDI_Sales.pas
@@ -4,13 +4,17 @@ interface
 
 uses
   SysUtils, Classes, uDAScriptingProvider, uDADataTable, uDACDSDataTable,
-  uBizEDISales, uDAEngine, uDAADODriver, uDABINAdapter,
+  uBizEDISales, uDAEngine, uDAADODriver, uDABINAdapter, uDAInterfaces,
   uDABusinessProcessor, uDAClasses, EDI_Reader, JvComponentBase;
 
 type
   TdmEDISales = class(TDataModule)
     schEDISales: TDASchema;
   private
+    FConnection : IDAConnection;
+    FClave1Cargados : TStringList;
+
+    function ExisteClave1(const AClave1 : Float): Boolean;
     function InsertarCabecera(const ACabData : TEDIFileData; var NumRegNuevos : integer) : Boolean;
     function InsertarLugares(const ALugData : TEDIFileData; var NumRegNuevos : integer) : Boolean;
     function InsertarArticulos(const AArtData : TEDIFileData; var NumRegNuevos : integer) : Boolean;
@@ -27,7 +31,7 @@ var
 implementation
 
 uses
-  EDI_Sales_Impl, Controls, Forms, uDataTableUtils, EDI_SLSRPT, uDAInterfaces, 
+  EDI_Sales_Impl, Controls, Forms, uDataTableUtils, EDI_SLSRPT,
   Dialogs, schEDISalesClient_Intf, uDataModuleServer, Variants, EDI_Utils,
   VARELA_Intf, EDI_Log_Impl, DB;
 
@@ -45,69 +49,97 @@ var
   NumRegNuevosCab : Integer;
   NumRegNuevosLug : Integer;
   NumRegNuevosArt : Integer;
+
+  bContinuar : Boolean;
 begin
-  Result := True;
+  bContinuar := False;
+
+  FClave1Cargados := TStringList.Create;
+  
+  FConnection := dmServer.ConnectionManager.NewConnection(dmServer.ConnectionName);
+  FConnection.BeginTransaction;
 
   Cab_Reader := TCABVEN_Reader.Create;
+  Lug_Reader := TLUGVEN_Reader.Create;
+  Art_Reader := TARTVEN_Reader.Create;
+
   try
     Cab_Reader.Filename := FicheroCAB;
     Cab_Reader.ReadFile;
-    Result := InsertarCabecera (Cab_Reader.FileData, NumRegNuevosCab);
-  finally
-    FreeAndNIL(Cab_Reader);
-  end;
 
-  if Result then
-  begin
-    Lug_Reader := TLUGVEN_Reader.Create;
+    Lug_Reader.Filename := FicheroLUG;
+    Lug_Reader.ReadFile;
+
+    Art_Reader.Filename := FicheroART;
+    Art_Reader.ReadFile;
+
     try
-      Lug_Reader.Filename := FicheroLUG;
-      Lug_Reader.ReadFile;
-      Result := InsertarLugares (Lug_Reader.FileData, NumRegNuevosLug);
-    finally
-      FreeAndNIL(Lug_Reader);
-    end;
+      bContinuar := InsertarCabecera (Cab_Reader.FileData, NumRegNuevosCab);
 
-    if Result then
-    begin
-      Art_Reader := TARTVEN_Reader.Create;
-      try
-        Art_Reader.Filename := FicheroART;
-        Art_Reader.ReadFile;
-        Result := InsertarArticulos(Art_Reader.FileData, NumRegNuevosArt);
-      finally
-        FreeAndNil(Art_Reader);
+      if bContinuar then
+        bContinuar := InsertarLugares (Lug_Reader.FileData, NumRegNuevosLug);
+
+      if bContinuar then
+        bContinuar := InsertarArticulos(Art_Reader.FileData, NumRegNuevosArt);
+
+      if bContinuar then
+      begin
+        NumRegNuevos := NumRegNuevosArt;
+        bContinuar := GenerarVentasEDI;
+      end;
+
+      if bContinuar then
+        FConnection.CommitTransaction
+      else
+        FConnection.RollbackTransaction;
+    except
+      on E : Exception do
+      begin
+        FConnection.RollbackTransaction;
+        InsertarLog(False, E.Message + ' (CargarFicheros - VentasEDI)');
       end;
     end;
+  finally
+    FreeAndNIL(Cab_Reader);
+    FreeAndNIL(Lug_Reader);
+    FreeAndNil(Art_Reader);
+    FConnection.Close;
+    FConnection := NIL;
+    FreeAndNIL(FClave1Cargados);
   end;
+  Result := bContinuar;
+end;
 
-  if Result then
-  begin
-    NumRegNuevos := NumRegNuevosArt;
-    Result := GenerarVentasEDI;
+function TdmEDISales.ExisteClave1(const AClave1: Float): Boolean;
+var
+  ds: IDADataset;
+begin
+  try
+    ds := schEDISales.NewDataset(FConnection, 'ExisteClave1');
+    ds.ParamByName('CLAVE1').AsFloat := AClave1;
+    ds.Open;
+    Result := (not ds.IsEmpty);
+    ds.Close;
+  finally
+    ds := NIL;
   end;
 end;
 
 function TdmEDISales.GenerarVentasEDI: Boolean;
 var
   ACommand: IDASQLCommand;
-  AConnection : IDAConnection;
 begin
   Result := False;
-  AConnection := dmServer.ConnectionManager.NewConnection(dmServer.ConnectionName);
-  ACommand := schEDISales.NewCommand(AConnection, 'RDX_P_CARGAR_VENTASEDI');
+  ACommand := schEDISales.NewCommand(FConnection, 'RDX_P_CARGAR_VENTASEDI');
 
-  AConnection.BeginTransaction;
   try
     ACommand.Execute;
-    AConnection.CommitTransaction;
     Result := True;
   except
     on E : Exception do
     begin
-      AConnection.RollbackTransaction;
-      if Pos('PRIMARY KEY', E.Message) = 0 then
-        InsertarLog(False, e.Message + ' (GenerarVentasEDI)');
+      InsertarLog(False, e.Message + ' (GenerarVentasEDI)');
+      raise E;
     end
   end;
 end;
@@ -121,11 +153,10 @@ var
   AuxInt : Integer;
   AuxNum : Double;
   ACommand: IDASQLCommand;
-  AConnection : IDAConnection;
+  AClave1 : String;
 begin
   Result := False;
   NumRegNuevos := 0;
-  AConnection := dmServer.ConnectionManager.NewConnection(dmServer.ConnectionName);
 
   for i := 0 to AArtData.Count - 1 do
   begin
@@ -134,7 +165,11 @@ begin
     if not Registro.REGISTRO_OK then
       Continue;
 
-    ACommand := schEDISales.NewCommand(AConnection, 'Insert_RDX_ARTVEN');
+    AClave1 := Trim(Registro.CLAVE1);
+    if FClave1Cargados.IndexOf(AClave1) = -1 then
+      Continue;
+      
+    ACommand := schEDISales.NewCommand(FConnection, 'Insert_RDX_ARTVEN');
     with ACommand do
     begin
       ParamByName('CLAVE1').AsFloat := StrToFloat(Trim(Registro.CLAVE1));
@@ -280,18 +315,15 @@ begin
       ParamByName('UMEDESP').AsString := Trim(Registro.UMEDESP);
     end;
 
-    AConnection.BeginTransaction;
     try
       ACommand.Execute;
-      AConnection.CommitTransaction;
-      NumRegNuevos := NumRegNuevos + 1;      
+      NumRegNuevos := NumRegNuevos + 1;
       Result := True;
     except
       on E : Exception do
       begin
-        AConnection.RollbackTransaction;
-        if Pos('PRIMARY KEY', E.Message) = 0 then
-          InsertarLog(False, e.Message + ' (InsertarArticulos SLS)');
+        InsertarLog(False, e.Message + ' (InsertarArticulos SLS)');
+        raise E;
       end
     end;
   end; //for
@@ -305,11 +337,10 @@ var
   AuxStr : String;
   AuxNum : Double;
   ACommand: IDASQLCommand;
-  AConnection : IDAConnection;  
+  AClave1 : Float;
 begin
   Result := False;
   NumRegNuevos := 0;
-  AConnection := dmServer.ConnectionManager.NewConnection(dmServer.ConnectionName);
 
   for i := 0 to ACabData.Count - 1 do
   begin
@@ -318,7 +349,11 @@ begin
     if not Registro.REGISTRO_OK then
       Continue;
 
-    ACommand := schEDISales.NewCommand(AConnection, 'Insert_RDX_CABVEN');
+    AClave1 := StrToFloat(Trim(Registro.CLAVE1));
+    if ExisteClave1(AClave1) then
+      Continue;
+
+    ACommand := schEDISales.NewCommand(FConnection, 'Insert_RDX_CABVEN');
     with ACommand do
     begin
       ParamByName('CLAVE1').AsFloat := StrToFloat(Trim(Registro.CLAVE1));
@@ -384,18 +419,16 @@ begin
       ParamByName('FECTAS').AsDateTime := EDIDateToDateF(Trim(Registro.FECTAS));
     end;  // with
 
-    AConnection.BeginTransaction;
     try
       ACommand.Execute;
-      AConnection.CommitTransaction;
       NumRegNuevos := NumRegNuevos + 1;
+      FClave1Cargados.Add(Trim(Registro.CLAVE1));
       Result := True;
     except
       on E : Exception do
       begin
-        AConnection.RollbackTransaction;
-        if Pos('PRIMARY KEY', E.Message) = 0 then
-          InsertarLog(False, e.Message + ' (InsertarCabecera SLS)');
+        InsertarLog(False, e.Message + ' (InsertarCabecera SLS)');
+        raise E;
       end
     end;
 
@@ -421,11 +454,10 @@ var
   i : integer;
   Registro : PLUGVEN;
   ACommand: IDASQLCommand;
-  AConnection : IDAConnection;
+  AClave1 : String;
 begin
   Result := False;
   NumRegNuevos := 0;
-  AConnection := dmServer.ConnectionManager.NewConnection(dmServer.ConnectionName);
 
   for i := 0 to ALugData.Count - 1 do
   begin
@@ -434,7 +466,11 @@ begin
     if not Registro.REGISTRO_OK then
       Continue;
 
-    ACommand := schEDISales.NewCommand(AConnection, 'Insert_RDX_LUGVEN');
+    AClave1 := Trim(Registro.CLAVE1);
+    if FClave1Cargados.IndexOf(AClave1) = -1 then
+      Continue;
+
+    ACommand := schEDISales.NewCommand(FConnection, 'Insert_RDX_LUGVEN');
     with ACommand do
     begin
       ParamByName('CLAVE1').AsFloat := StrToFloat(Trim(Registro.CLAVE1));
@@ -455,18 +491,15 @@ begin
       end
     end;  // with
 
-    AConnection.BeginTransaction;
     try
       ACommand.Execute;
-      AConnection.CommitTransaction;
-      NumRegNuevos := NumRegNuevos + 1;      
+      NumRegNuevos := NumRegNuevos + 1;
       Result := True;
     except
       on E : Exception do
       begin
-        AConnection.RollbackTransaction;
-        if Pos('PRIMARY KEY', E.Message) = 0 then
-          InsertarLog(False, e.Message + '(InsertarLugares SLS)');
+        InsertarLog(False, e.Message + '(InsertarLugares SLS)');
+        raise E;
       end
     end;
   end; //for
diff --git a/Source/Servidor/uDataModuleServer.dfm b/Source/Servidor/uDataModuleServer.dfm
index b1f2b6b..5d325d5 100644
--- a/Source/Servidor/uDataModuleServer.dfm
+++ b/Source/Servidor/uDataModuleServer.dfm
@@ -37,16 +37,10 @@ object dmServer: TdmServer
       item
         Name = 'GFT_VARELA'
         ConnectionString = 
-          'SDAC?Server=roberto;Database=GFT_VARELA_NUEVA_QUE_FALLA;UserID=s' +
-          'a;Password=123456;Schemas=1;'
+          'ADO?AuxDriver=SQLOLEDB.1;Server=localhost;Database=GFT_VARELA;Us' +
+          'erID=sa;Password=12345;Schemas=1;'
         ConnectionType = 'MSSQL'
         Default = True
-      end
-      item
-        Name = 'GFT_VARELA_ADO'
-        ConnectionString = 
-          'ADO?AuxDriver=SQLOLEDB.1;Server=ROBERTO;Database=GFT_VARELA_NUEV' +
-          'A_QUE_FALLA;UserID=sa;Password=123456;'
       end>
     DriverManager = DriverManager
     PoolingEnabled = True
diff --git a/Source/Usuarios/Usuarios.drc b/Source/Usuarios/Usuarios.drc
index 9b6eb83..fa64f59 100644
--- a/Source/Usuarios/Usuarios.drc
+++ b/Source/Usuarios/Usuarios.drc
@@ -18,4 +18,4 @@ END
 /* C:\Varela_D2007\Source\Usuarios\uUsuarios.dfm */
 /* C:\Varela_D2007\Source\Usuarios\uUsuario.dfm */
 /* C:\Varela_D2007\Source\Usuarios\Usuarios.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf10.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf82.tmp */