git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/branches/D2007-DA5@39 0c75b7a4-871f-7646-8a2f-f78d34cc349f

Build/Build.fbp5

@@ -15288,7 +15288,7 @@ Comments=
         <Property name="VariableType" type="TFBVariableType">vtProject</Property>
         </Object>
       <Object Class="TFBVariable" XMLID="{E1F16954-518E-44DB-8598-32BD70D0B552}"><Property MultiValue="0" name="Comment" type="string"></Property>
-        <Property MultiValue="0" name="DefaultValue" type="string">%DELPHI2007DIR%\Lib\Indy10;%project_path%\Lib;%project_path%\Lib\RemObjects\RemObjects_SDK;%project_path%\Lib\RemObjects\Data_Abstract;%project_path%\Lib\CCPack;%project_path%\Lib\CFPack;%project_path%\Lib\GUISDK;%project_path%\Lib\PluginSDK;%project_path%\Lib\DevExpressVCL;%project_path%\Lib\FastReport3;%project_path%\Lib\JCL;%project_path%\Lib\JVCL;%project_path%\Lib\PngComponents;%project_path%\Lib\cxIntl5;%project_path%\Lib\cxIntlPrintSys3;%project_path%\Lib\TB2k+TBX;%project_path%\Lib\Mustangpeak\MPCommonLib;%project_path%\Lib\Mustangpeak\EasyListview;%project_path%\Lib\JSDialog;C:\UserControl\Lib\D11;</Property>
+        <Property MultiValue="0" name="DefaultValue" type="string">%DELPHI2007DIR%\Lib\Indy10;%project_path%\Lib;%project_path%\Lib\RemObjects\RemObjects_SDK;%project_path%\Lib\RemObjects\Data_Abstract;%project_path%\Lib\CCPack;%project_path%\Lib\CFPack;%project_path%\Lib\GUISDK;%project_path%\Lib\PluginSDK;%project_path%\Lib\DevExpressVCL;%project_path%\Lib\FastReport3;%project_path%\Lib\JCL;%project_path%\Lib\JVCL;%project_path%\Lib\PngComponents;%project_path%\Lib\cxIntl5;%project_path%\Lib\cxIntlPrintSys3;%project_path%\Lib\TB2k+TBX;%project_path%\Lib\Mustangpeak\MPCommonLib;%project_path%\Lib\Mustangpeak\EasyListview;%project_path%\Lib\JSDialog;%project_path%\Lib\UserControl;</Property>
         <Property name="IsMacro" type="Boolean">True</Property>
         <Property name="IsPersistent" type="Boolean">False</Property>
         <Property name="MakeEnv" type="Boolean">False</Property>

Database/Database.proj

@@ -1,39 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-   <PropertyGroup>
-      <DBServer Condition=" '$(SqlCmdRunner)' == '' ">localhost</DBServer>
-      <DeploymentBuild Condition=" '$(DeploymentBuild)' == '' ">false</DeploymentBuild>
-	  <SqlScriptsFolder Condition=" '$(SqlScriptsFolder)' == '' ">$(MSBuildProjectDirectory)\Scripts</SqlScriptsFolder>
-	  <ToolsFolder Condition=" '$(ToolsFolder)' == '' ">$(MSBuildProjectDirectory)\..\Tools</ToolsFolder>
-	  <CodeOutputFolder Condition=" '$(CodeOutputFolder)' == '' ">$(MSBuildProjectDirectory)\..\Output</CodeOutputFolder>
-      <SqlCmdRunner Condition=" '$(SqlCmdRunner)' == '' ">$(ToolsFolder)\ISQL\isql.exe</SqlCmdRunner>	  
-   </PropertyGroup>
-
-   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-      <OutputPath>$(CodeOutputFolder)\Debug\Database</OutputPath>
-   </PropertyGroup>
-   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-      <OutputPath>$(CodeOutputFolder)\Release\Database</OutputPath>
-   </PropertyGroup>
-
-   <ItemGroup>
-      <Sql Include="$(SqlScriptsFolder)\factuges.sql" />
-      <Sql Include="db_execute.bat" />
-      <SqlOutput Include="$(OutputPath)\Factuges.fdb" />
-   </ItemGroup>
-
-   <Target Name="Build" 
-           Inputs="@(Sql)" 
-           Outputs="@(SqlOutput)">
-      
-	  <Exec Command="$(SqlCmdRunner) -i $(SqlScriptsFolder)\factuges.sql -u sysdba -p masterkey -q" 
-			WorkingDirectory="$(OutputPath)" />
-   </Target>
-
-   <Target Name="Rebuild" 
-           DependsOnTargets="Clean;Build"/>
-
-   <Target Name="Clean">
-      <Delete Files="@(SqlOutput)"/>
-   </Target>
-
-</Project>

Database/RodaxSoftware.FactuGES.Database.proj

@@ -0,0 +1,57 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+	<!-- ASCII Constants -->
+	<PropertyGroup>
+		<DOUBLE_QUOTES>%22</DOUBLE_QUOTES>
+	</PropertyGroup>
+
+   <PropertyGroup>
+      <DBServer Condition=" '$(SqlCmdRunner)' == '' ">localhost</DBServer>
+      <DeploymentBuild Condition=" '$(DeploymentBuild)' == '' ">false</DeploymentBuild>
+	  <SqlScriptsFolder Condition=" '$(SqlScriptsFolder)' == '' ">$(MSBuildProjectDirectory)\Scripts</SqlScriptsFolder>
+	  <ToolsFolder Condition=" '$(ToolsFolder)' == '' ">$(MSBuildProjectDirectory)\..\Tools</ToolsFolder>
+	  <CodeOutputFolder Condition=" '$(CodeOutputFolder)' == '' ">$(MSBuildProjectDirectory)\..\Output</CodeOutputFolder>
+      <SqlCmdRunner Condition=" '$(SqlCmdRunner)' == '' ">$(ToolsFolder)\ISQL\isql.exe</SqlCmdRunner>	  
+	  <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+   </PropertyGroup>
+
+   <PropertyGroup Condition=" '|$(Configuration)|' == '|Debug|' ">
+      <OutputPath>$(CodeOutputFolder)\Debug\Database</OutputPath>
+   </PropertyGroup>
+   <PropertyGroup Condition=" '|$(Configuration)|' == '|Release|' ">
+      <OutputPath>$(CodeOutputFolder)\Release\Database</OutputPath>
+   </PropertyGroup>
+
+   <ItemGroup>
+      <Sql Include="$(SqlScriptsFolder)\factuges.sql" />
+      <Sql Include="$(SqlScriptsFolder)\factuges_sysdata.sql" />	  
+      <SqlOutput Include="$(OutputPath)\factuges.fdb" />
+   </ItemGroup>
+  
+   <Target Name="Build" 
+           Inputs="@(Sql)" 
+           Outputs="@(SqlOutput)">
+
+		<Exec Command="$(DOUBLE_QUOTES)$(SqlCmdRunner)$(DOUBLE_QUOTES) -i $(DOUBLE_QUOTES)$(SqlScriptsFolder)\factuges.sql$(DOUBLE_QUOTES) -u $(DBUser) -p $(DBPassword) -q" 
+			WorkingDirectory="$(OutputPath)" />
+			
+		<Exec Command="$(DOUBLE_QUOTES)$(SqlCmdRunner)$(DOUBLE_QUOTES) -i $(DOUBLE_QUOTES)$(SqlScriptsFolder)\factuges_sysdata.sql$(DOUBLE_QUOTES) -u $(DBUser) -p $(DBPassword) -q $(DOUBLE_QUOTES)$(OutputPath)\factuges.fdb$(DOUBLE_QUOTES)" 
+			WorkingDirectory="$(OutputPath)" />			
+   </Target>
+
+   <Target Name="Extract" 
+           Inputs="$(OutputPath)\factuges.fdb" 
+           Outputs="$(OutputPath)\factuges_$(Configuration).sql">
+
+		<Exec Command="$(DOUBLE_QUOTES)$(SqlCmdRunner)$(DOUBLE_QUOTES) -a -d factuges.fdb -u $(DBUser) -p $(DBPassword) -o $(DOUBLE_QUOTES)$(OutputPath)\factuges_$(Configuration).sql$(DOUBLE_QUOTES) $(DOUBLE_QUOTES)$(OutputPath)\factuges.fdb$(DOUBLE_QUOTES) -b" 
+			WorkingDirectory="$(OutputPath)" />
+   </Target>
+
+   <Target Name="Rebuild" 
+           DependsOnTargets="Clean;Build"/>
+
+   <Target Name="Clean">
+      <Delete Files="@(SqlOutput)"/>
+   </Target>
+
+</Project>

Database/db_execute.bat

@@ -1,4 +1,4 @@
-@echo off
+rem @echo off
 call _db_enviroment.bat
 
 if "%1" == "drop" goto drop

Database/scripts/factuges.sql

@@ -1,8 +1,6 @@
-Database:  FACTUGES.FDB.ORIGINAL, User: SYSDBA
-
 SET SQL DIALECT 3; 
 
-CREATE DATABASE 'FACTUGES.FDB' DEFAULT CHARACTER SET ISO8859_1;
+CREATE DATABASE 'factuges.fdb' DEFAULT CHARACTER SET ISO8859_1;
 
 /*  External Function declarations */
 DECLARE EXTERNAL FUNCTION F_RTFTOTEXT 
@@ -56,7 +54,7 @@ CREATE GENERATOR GEN_PEDIDOS_CLI_DETALLES_ID;
 CREATE GENERATOR GEN_PEDIDOS_CLI_ID;
 CREATE GENERATOR GEN_PEDIDOS_PROV_DETALLES_ID;
 CREATE GENERATOR GEN_PEDIDOS_PROV_ID;
-CREATE GENERATOR GEN_PERFILES_ID;
+CREATE GENERATOR GEN_F_PERFILES_ID;
 CREATE GENERATOR GEN_RECIBOS_CLIENTE_ID;
 CREATE GENERATOR GEN_RECIBOS_PROVEEDOR_ID;
 CREATE GENERATOR GEN_REMESAS_CLIENTE_ID;
@@ -72,10 +70,9 @@ CREATE DOMAIN TIPO_CONCEPTO AS VARCHAR(2000);
 CREATE DOMAIN TIPO_ID AS INTEGER;
 CREATE DOMAIN TIPO_IMPORTE AS NUMERIC(11, 2);
 CREATE DOMAIN TIPO_NOTAS AS BLOB SUB_TYPE TEXT SEGMENT SIZE 80;
-CREATE DOMAIN TIPO_PASSWORD AS VARCHAR(10);
 CREATE DOMAIN TIPO_PERFIL AS VARCHAR(15);
 CREATE DOMAIN TIPO_PORCENTAJE AS FLOAT;
-CREATE DOMAIN TIPO_USUARIO AS VARCHAR(20);
+CREATE DOMAIN TIPO_USUARIO AS VARCHAR(30);
 
 /* Table: AGENTES_COMISIONES, Owner: SYSDBA */
 CREATE TABLE AGENTES_COMISIONES (ID TIPO_ID NOT NULL,
@@ -517,6 +514,22 @@ CREATE TABLE FORMAS_PAGO_PLAZOS (ID TIPO_ID NOT NULL,
         PORCENTAJE TIPO_PORCENTAJE,
 PRIMARY KEY (ID));
 
+/* Table: F_PERFILES, Owner: SYSDBA */
+CREATE TABLE F_PERFILES (ID TIPO_ID NOT NULL,
+        PERFIL TIPO_PERFIL NOT NULL);
+
+/* Table: F_PERFILES_USUARIOS, Owner: SYSDBA */
+CREATE TABLE F_PERFILES_USUARIOS (ID_PERFIL TIPO_ID NOT NULL,
+        ID_USUARIO TIPO_ID NOT NULL,
+CONSTRAINT PK_PERFILES_USUARIOS PRIMARY KEY (ID_PERFIL, ID_USUARIO));
+
+/* Table: F_USUARIOS, Owner: SYSDBA */
+CREATE TABLE F_USUARIOS (ID TIPO_ID NOT NULL,
+        USUARIO TIPO_USUARIO NOT NULL,
+        ACTIVO TIPO_BOOLEANO,
+        LAST_LOGIN TIMESTAMP,
+        PASS VARCHAR(10));
+
 /* Table: INFORMES, Owner: SYSDBA */
 CREATE TABLE INFORMES (ID SMALLINT NOT NULL,
         ID_EMPRESA TIPO_ID,
@@ -670,15 +683,18 @@ CREATE TABLE PEDIDOS_PROVEEDOR_DETALLES (ID TIPO_ID NOT NULL,
         FECHA_MODIFICACION TIMESTAMP,
 CONSTRAINT PK_PEDIDOS_PROVEEDOR_DETALLES PRIMARY KEY (ID));
 
-/* Table: PERFILES, Owner: SYSDBA */
+/* Table: PERMISOS, Owner: SYSDBA */
-CREATE TABLE PERFILES (ID TIPO_ID NOT NULL,
+CREATE TABLE PERMISOS (ID_USUARIO TIPO_ID,
-        PERFIL TIPO_PERFIL NOT NULL,
+        MODULO VARCHAR(50),
-CONSTRAINT PK_PERFILES PRIMARY KEY (ID));
+        NOMBRECOMP VARCHAR(50),
+        CHECKSUM VARCHAR(250));
 
-/* Table: PERFILES_USUARIOS, Owner: SYSDBA */
+/* Table: PERMISOSEX, Owner: SYSDBA */
-CREATE TABLE PERFILES_USUARIOS (ID_PERFIL TIPO_ID NOT NULL,
+CREATE TABLE PERMISOSEX (ID_USUARIO TIPO_ID,
-        ID_USUARIO TIPO_ID NOT NULL,
+        MODULO VARCHAR(50),
-CONSTRAINT PK_PERFILES_USUARIOS PRIMARY KEY (ID_PERFIL, ID_USUARIO));
+        NOMBRECOMP VARCHAR(50),
+        NOMBREFORM VARCHAR(50),
+        CHECKSUM VARCHAR(250));
 
 /* Table: PROVEEDORES_DATOS, Owner: SYSDBA */
 CREATE TABLE PROVEEDORES_DATOS (ID_PROVEEDOR TIPO_ID NOT NULL,
@@ -788,12 +804,38 @@ PRIMARY KEY (ID));
 
 /* Table: USUARIOS, Owner: SYSDBA */
 CREATE TABLE USUARIOS (ID TIPO_ID NOT NULL,
-        USUARIO TIPO_USUARIO NOT NULL,
+        USERNAME VARCHAR(30),
-        PASS TIPO_PASSWORD,
+        LOGIN TIPO_USUARIO,
-        ACTIVO TIPO_BOOLEANO,
+        PASS VARCHAR(250),
-        LAST_LOGIN TIMESTAMP,
+        PASSEXPIRED DATE,
+        BLOQUEADO TIPO_BOOLEANO,
+        EMAIL VARCHAR(150),
+        USERDAYSSUN INTEGER,
+        PRIVILEGED INTEGER,
+        TIPO CHAR(1),
+        ID_PERFIL TIPO_ID,
+        CHECKSUM VARCHAR(250),
 CONSTRAINT PK_USUARIOS PRIMARY KEY (ID));
 
+/* Table: USUARIOS_EVENTOS, Owner: SYSDBA */
+CREATE TABLE USUARIOS_EVENTOS (APLICACION VARCHAR(250),
+        ID_USUARIO TIPO_ID,
+        FECHA CHAR(10),
+        HORA CHAR(8),
+        FORM VARCHAR(250),
+        TITULO_FORM VARCHAR(100),
+        EVENTO VARCHAR(50),
+        NOTAS TIPO_NOTAS,
+        TNAME VARCHAR(20));
+
+/* Table: USUARIOS_LOGON, Owner: SYSDBA */
+CREATE TABLE USUARIOS_LOGON (LOGONID CHAR(38) NOT NULL,
+        ID_USUARIO TIPO_ID,
+        APLICACION VARCHAR(50),
+        EQUIPO VARCHAR(50),
+        DATA VARCHAR(14),
+CONSTRAINT PK_USUARIOS_LOGON PRIMARY KEY (LOGONID));
+
 /*  Index definitions for all user tables */
 CREATE INDEX IDX_AGENTES_COMISIONES1 ON AGENTES_COMISIONES (ID_AGENTE);
 CREATE INDEX IDX_AGENTES_COMISIONES2 ON AGENTES_COMISIONES (ID_PROVEEDOR);

Database/scripts/factuges_sysdata.sql

@@ -5,29 +5,20 @@ SET NAMES ISO8859_1;
 INSERT INTO CATEGORIAS (ID, CATEGORIA) VALUES (1, 'CLIENTE');
 INSERT INTO CATEGORIAS (ID, CATEGORIA) VALUES (2, 'PROVEEDOR');
 INSERT INTO CATEGORIAS (ID, CATEGORIA) VALUES (3, 'EMPLEADO');
-
+SET GENERATOR GEN_CATEGORIAS_ID TO 4;
 COMMIT WORK;
 
-INSERT INTO INFORMES (ID, ID_EMPRESA, CATEGORIA, CONTROLLER, ICONO, NOMBRE, DESCRIPCION, ORDEN, MODIFICABLE) VALUES (2, 1, 'VENTAS ARTICULOS', 'InfVentasArticuloController', 4, 'Ventas por artículo', 'Informe de ventas por artículo', NULL, 'S');
+INSERT INTO INFORMES (ID, ID_EMPRESA, CATEGORIA, CONTROLLER, ICONO, NOMBRE, DESCRIPCION, ORDEN, MODIFICABLE) VALUES (1, 1, 'VENTAS ARTICULOS', 'InfVentasArticuloController', 4, 'Ventas por artículo', 'Informe de ventas por artículo', NULL, 'S');
-INSERT INTO INFORMES (ID, ID_EMPRESA, CATEGORIA, CONTROLLER, ICONO, NOMBRE, DESCRIPCION, ORDEN, MODIFICABLE) VALUES (5, 1, 'VENTAS ARTICULOS', 'InfVentasArticuloController', 4, 'Ventas por cliente', 'Informe de ventas por cliente y artículo', NULL, 'S');
+INSERT INTO INFORMES (ID, ID_EMPRESA, CATEGORIA, CONTROLLER, ICONO, NOMBRE, DESCRIPCION, ORDEN, MODIFICABLE) VALUES (2, 1, 'VENTAS ARTICULOS', 'InfVentasArticuloController', 4, 'Ventas por cliente', 'Informe de ventas por cliente y artículo', NULL, 'S');
-INSERT INTO INFORMES (ID, ID_EMPRESA, CATEGORIA, CONTROLLER, ICONO, NOMBRE, DESCRIPCION, ORDEN, MODIFICABLE) VALUES (7, 1, 'VENTAS ARTICULOS', 'InfVentasArticuloController', 4, 'Ventas por agente y cliente', 'Informe de ventas por agente y cliente', NULL, 'S');
+INSERT INTO INFORMES (ID, ID_EMPRESA, CATEGORIA, CONTROLLER, ICONO, NOMBRE, DESCRIPCION, ORDEN, MODIFICABLE) VALUES (3, 1, 'VENTAS ARTICULOS', 'InfVentasArticuloController', 4, 'Ventas por agente y cliente', 'Informe de ventas por agente y cliente', NULL, 'S');
-INSERT INTO INFORMES (ID, ID_EMPRESA, CATEGORIA, CONTROLLER, ICONO, NOMBRE, DESCRIPCION, ORDEN, MODIFICABLE) VALUES (17, 1, 'MARGEN ARTICULOS', 'InfMargenArticuloController', 0, 'Margen (promedio) por artículo', 'Informe de margen por artículo teniendo en cuenta el precio neto de venta promedio', NULL, 'S');
+INSERT INTO INFORMES (ID, ID_EMPRESA, CATEGORIA, CONTROLLER, ICONO, NOMBRE, DESCRIPCION, ORDEN, MODIFICABLE) VALUES (4, 1, 'MARGEN ARTICULOS', 'InfMargenArticuloController', 0, 'Margen (promedio) por artículo', 'Informe de margen por artículo teniendo en cuenta el precio neto de venta promedio', NULL, 'S');
-INSERT INTO INFORMES (ID, ID_EMPRESA, CATEGORIA, CONTROLLER, ICONO, NOMBRE, DESCRIPCION, ORDEN, MODIFICABLE) VALUES (15, 1, 'VENTAS ARTICULOS', 'InfVentasArticuloController', 4, 'Ventas por proveedor', 'Informe de ventas por proveedor y artículo', NULL, 'S');
+INSERT INTO INFORMES (ID, ID_EMPRESA, CATEGORIA, CONTROLLER, ICONO, NOMBRE, DESCRIPCION, ORDEN, MODIFICABLE) VALUES (5, 1, 'VENTAS ARTICULOS', 'InfVentasArticuloController', 4, 'Ventas por proveedor', 'Informe de ventas por proveedor y artículo', NULL, 'S');
-INSERT INTO INFORMES (ID, ID_EMPRESA, CATEGORIA, CONTROLLER, ICONO, NOMBRE, DESCRIPCION, ORDEN, MODIFICABLE) VALUES (19, 1, 'MARGEN ARTICULOS', 'InfMargenArticuloController', 0, 'Margen (promedio) por cliente', 'Informe de margen por artículo agrupado por cliente teniendo en cuenta el precio neto de venta promedio', NULL, 'S');
+INSERT INTO INFORMES (ID, ID_EMPRESA, CATEGORIA, CONTROLLER, ICONO, NOMBRE, DESCRIPCION, ORDEN, MODIFICABLE) VALUES (6, 1, 'MARGEN ARTICULOS', 'InfMargenArticuloController', 0, 'Margen (promedio) por cliente', 'Informe de margen por artículo agrupado por cliente teniendo en cuenta el precio neto de venta promedio', NULL, 'S');
-INSERT INTO INFORMES (ID, ID_EMPRESA, CATEGORIA, CONTROLLER, ICONO, NOMBRE, DESCRIPCION, ORDEN, MODIFICABLE) VALUES (20, 1, 'MARGEN ARTICULOS', 'InfMargenArticuloController', 0, 'Margen (promedio) por agente y cliente', 'Informe de margen por artículo agrupado por agente y cliente teniendo en cuenta el precio neto de venta promedio', NULL, 'S');
+INSERT INTO INFORMES (ID, ID_EMPRESA, CATEGORIA, CONTROLLER, ICONO, NOMBRE, DESCRIPCION, ORDEN, MODIFICABLE) VALUES (7, 1, 'MARGEN ARTICULOS', 'InfMargenArticuloController', 0, 'Margen (promedio) por agente y cliente', 'Informe de margen por artículo agrupado por agente y cliente teniendo en cuenta el precio neto de venta promedio', NULL, 'S');
-INSERT INTO INFORMES (ID, ID_EMPRESA, CATEGORIA, CONTROLLER, ICONO, NOMBRE, DESCRIPCION, ORDEN, MODIFICABLE) VALUES (21, 1, 'MARGEN ARTICULOS', 'InfMargenArticuloController', 2, 'Margen (ult. venta) por artículo', 'Informe de margen por artículo teniendo en cuenta el precio neto de última venta', NULL, 'S');
+INSERT INTO INFORMES (ID, ID_EMPRESA, CATEGORIA, CONTROLLER, ICONO, NOMBRE, DESCRIPCION, ORDEN, MODIFICABLE) VALUES (8, 1, 'MARGEN ARTICULOS', 'InfMargenArticuloController', 2, 'Margen (ult. venta) por artículo', 'Informe de margen por artículo teniendo en cuenta el precio neto de última venta', NULL, 'S');
-INSERT INTO INFORMES (ID, ID_EMPRESA, CATEGORIA, CONTROLLER, ICONO, NOMBRE, DESCRIPCION, ORDEN, MODIFICABLE) VALUES (22, 1, 'MARGEN ARTICULOS', 'InfMargenArticuloController', 2, 'Margen (ult.venta) por clientes', 'Informe de margen por artículo agrupado por cliente teniendo en cuenta el precio neto de última venta', NULL, 'S');
+INSERT INTO INFORMES (ID, ID_EMPRESA, CATEGORIA, CONTROLLER, ICONO, NOMBRE, DESCRIPCION, ORDEN, MODIFICABLE) VALUES (9, 1, 'MARGEN ARTICULOS', 'InfMargenArticuloController', 2, 'Margen (ult.venta) por clientes', 'Informe de margen por artículo agrupado por cliente teniendo en cuenta el precio neto de última venta', NULL, 'S');
-INSERT INTO INFORMES (ID, ID_EMPRESA, CATEGORIA, CONTROLLER, ICONO, NOMBRE, DESCRIPCION, ORDEN, MODIFICABLE) VALUES (23, 1, 'MARGEN ARTICULOS', 'InfMargenArticuloController', 2, 'Margen (ult. venta) por agente y cliente', 'Informe de margen por artículo agrupado por agente y cliente teniendo en cuenta el precio neto de última venta', NULL, 'S');
+INSERT INTO INFORMES (ID, ID_EMPRESA, CATEGORIA, CONTROLLER, ICONO, NOMBRE, DESCRIPCION, ORDEN, MODIFICABLE) VALUES (10, 1, 'MARGEN ARTICULOS', 'InfMargenArticuloController', 2, 'Margen (ult. venta) por agente y cliente', 'Informe de margen por artículo agrupado por agente y cliente teniendo en cuenta el precio neto de última venta', NULL, 'S');
-
+SET GENERATOR GEN_INFORMES_ID TO 11;
-COMMIT WORK;
-
-INSERT INTO PERFILES (ID, PERFIL) VALUES (1, 'Administradores');
-INSERT INTO PERFILES (ID, PERFIL) VALUES (2, 'Usuarios');
-
-COMMIT WORK;
-
-INSERT INTO PERFILES_USUARIOS (ID_PERFIL, ID_USUARIO) VALUES (1, 1);
-
 COMMIT WORK;
 
 INSERT INTO REFERENCIAS (CODIGO, VALOR, ID_EMPRESA, DESCRIPCION) VALUES ('REF_FACTURAS_CLIENTE', '00001', 1, 'Ref. facturas de cliente');
@@ -43,16 +34,16 @@ INSERT INTO REFERENCIAS (CODIGO, VALOR, ID_EMPRESA, DESCRIPCION) VALUES ('REF_AL
 INSERT INTO REFERENCIAS (CODIGO, VALOR, ID_EMPRESA, DESCRIPCION) VALUES ('REF_REMESAS_PROVEEDOR', '00001', 1, 'Ref. remesas de proveedor');
 INSERT INTO REFERENCIAS (CODIGO, VALOR, ID_EMPRESA, DESCRIPCION) VALUES ('REF_ABONOS_CLIENTE', '00001', 1, 'Ref. abonos de cliente');
 INSERT INTO REFERENCIAS (CODIGO, VALOR, ID_EMPRESA, DESCRIPCION) VALUES ('REF_ABONOS_PROVEEDOR', '00001', 1, 'Ref. abonos de proveedor');
-
 COMMIT WORK;
 
-INSERT INTO TIPOS_IVA (ID, REFERENCIA, DESCRIPCION, IVA, RE) VALUES (2, 'IVA16', 'IVA16', 16, 4);
+INSERT INTO TIPOS_IVA (ID, REFERENCIA, DESCRIPCION, IVA, RE) VALUES (1, 'IVA16', 'IVA16', 16, 4);
-INSERT INTO TIPOS_IVA (ID, REFERENCIA, DESCRIPCION, IVA, RE) VALUES (3, 'IVA4', 'IVA4', 4, 0.5);
+INSERT INTO TIPOS_IVA (ID, REFERENCIA, DESCRIPCION, IVA, RE) VALUES (2, 'IVA4', 'IVA4', 4, 0.5);
-INSERT INTO TIPOS_IVA (ID, REFERENCIA, DESCRIPCION, IVA, RE) VALUES (4, 'IVA7', 'IVA7', 7, 1);
+INSERT INTO TIPOS_IVA (ID, REFERENCIA, DESCRIPCION, IVA, RE) VALUES (3, 'IVA7', 'IVA7', 7, 1);
-INSERT INTO TIPOS_IVA (ID, REFERENCIA, DESCRIPCION, IVA, RE) VALUES (6, 'EXENTO', 'EXTRANJERO', 0, 0);
+INSERT INTO TIPOS_IVA (ID, REFERENCIA, DESCRIPCION, IVA, RE) VALUES (4, 'EXENTO', 'EXTRANJERO', 0, 0);
-
+SET GENERATOR GEN_TIPOS_IVA_ID TO 5;
 COMMIT WORK;
 
-INSERT INTO USUARIOS (ID, USUARIO, PASS, ACTIVO, LAST_LOGIN) VALUES (1, 'Administrador', '', 1, NULL);
+/* Usuario 'Administrador' (Contraseña en blanco) */
-
+INSERT INTO USUARIOS (ID, USERNAME, LOGIN, PASS, PASSEXPIRED, BLOQUEADO, EMAIL, USERDAYSSUN, PRIVILEGED, TIPO, ID_PERFIL, CHECKSUM) VALUES (1, 'Administrador', 'admin', 'd41d8cd98f00b204e9800998ecf8427e', '2007-07-11', 0, 'admin@correo.net', 30, -1, 'U', 0, '6d1089be77aaaffa4ae01a4dd2fee551');
+SET GENERATOR GEN_USUARIOS_ID TO 2;
 COMMIT WORK;

Enviroment.config

@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<configuration>
+ <appSettings>
+
+   <!-- ENVIRONMENT
+        Use the "Environment" key below to select the environment (DEV | TEST | PROD).
+       
+        For settings common to all environments, add a normal appSetting key (e.g. "Name").
+        To change a setting for a specific environment, add an appSetting key with
+        the environment name (e.g. "DEV.Name"). An environment-specific setting
+        will override a common setting.
+
+        In the example below, the DEV environment will have a connection timeout of
+        2 minutes while the TEST and PROD environments will use 90 minutes.
+   -->
+
+   <add key="Environment" value="DEV"/>
+
+   <add key="DEV.Name"  value="Development"/>
+   <add key="TEST.Name" value="Test"/>
+   <add key="PROD.Name" value="Production"/>
+
+   <add key="ConnectionTimeout"     value="90"/>
+   <add key="DEV.ConnectionTimeout" value="2"/>
+
+ </appSettings>
+</configuration>

RodaxSoftware.FactuGES.Common.targets

@@ -20,7 +20,7 @@
       </RegexMatch>
 
       <!-- Add Code folder to all solution project paths -->
-      <RegexReplace Input="@(Projects)" Expression="(Sanlam.*)\\" Replacement="Code\$1\\" Count="-1">
+      <RegexReplace Input="@(Projects)" Expression="(RodaxSoftware.*)\\" Replacement="Code\$1\\" Count="-1">
          <Output  TaskParameter="Output" ItemName="CSProjects"/>
       </RegexReplace>
 
@@ -94,7 +94,7 @@
 	
 	
 	<Target Name="GetEnvironment" Condition=" '$(DeploymentBuild)' == 'true' ">
-		<!-- Read the the Environment file contents -->
+		<!-- Read the Environment file contents -->
 		<ReadLinesFromFile File="$(EnvironmentFile)">
 			<Output TaskParameter="Lines" ItemName="EnvironmentFileContents"/>
 		</ReadLinesFromFile>
@@ -140,7 +140,7 @@
            AssemblyFileVersion="$(AppVersion)" />
    </Target>
    
-	<Target Name="BackupDatabases" Condition=" '$(DeploymentBuild)' == 'true' ">
+	<Target Name="BackupDatabase" Condition=" '$(DeploymentBuild)' == 'true' ">
 		<Error Text="No DBBackupFolder has been specified" Condition="'$(DBBackupFolder)' == ''" />
 		<Exec Command="$(DOUBLE_QUOTES)$(DBBackupScript)$(DOUBLE_QUOTES) $(SqlCmdRunner) $(DBServer)"
 			WorkingDirectory="$(SqlScriptsFolder)"/>
@@ -155,7 +155,7 @@
 	</Target>
 
   <Target Name="Package"
-           DependsOnTargets="BackupDatabases" 
+           DependsOnTargets="BackupDatabase"
            Condition=" '$(DeploymentBuild)' == 'true' ">
 
       <Error Text="No InstallShieldInputFolder has been specified" Condition="'$(InstallShieldInputFolder)' == ''" />

RodaxSoftware.FactuGES.proj

@@ -27,10 +27,12 @@
 	 
      <!-- Environment Settings -->
      <PropertyGroup>
-        <DBServer Condition=" '$(DBServer)' == '' ">localhost</DBServer>
-        <DBMS>firebird2</DBMS>
-        <SqlCmdRunner>$(ToolsFolder)\ISQL\isql.exe</SqlCmdRunner>
         <Environment>DEV</Environment>		
+		<DBServer Condition=" '$(DBServer)' == '' ">localhost</DBServer>
+        <DBMS>firebird2</DBMS>
+		<DBUser Condition=" '$(DBUser)' == '' ">sysdba</DBUser>
+		<DBPassword Condition=" '$(DBPassword)' == '' ">masterkey</DBPassword>
+        <SqlCmdRunner>$(ToolsFolder)\ISQL\isql.exe</SqlCmdRunner>
         <SmtpServer>smtp.somewhere.co.za</SmtpServer>
      </PropertyGroup>
   
@@ -109,7 +111,7 @@
      </PropertyGroup>
   
      <!-- Only import the other targets here after the property definitions above have been defined -->
-     <Import Project="$(MSBuildProjectDirectory)\Sanlam.SanQuote.Common.targets"/>
+     <Import Project="$(MSBuildProjectDirectory)\RodaxSoftware.FactuGES.Common.targets"/>
 	 <Import Project="C:\Archivos de programa\MSBuild\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets"/>
      <!-- <Import Project="C:\Program Files\TypeMock\TypeMock.NET\TypeMock.MSBuild.Tasks"/>-->
      <!--<Import Project="$(MSBuildExtensionsPath)\NCoverExplorerTasks\NCoverExplorer.MSBuildTasks.targets"/>-->
@@ -118,7 +120,7 @@
      <PropertyGroup>
         <CleanDependsOn>
            $(CleanDependsOn);
-		   CleanDatabases
+		   CleanDatabase
            CleanCode
         </CleanDependsOn>
      </PropertyGroup>
@@ -147,13 +149,19 @@
 
 
 
-	<Target Name="BuildDatabases">
+	<Target Name="BuildDatabase">
 		<MSBuild Projects="@(SqlProjects)" 
 			Targets="$(BuildTargets)" 
-			Properties="Configuration=$(Configuration);Platform=$(Platform);SqlCmdRunner=$(SqlCmdRunner);DBServer=$(DBServer)"/>
+			Properties="Configuration=$(Configuration);SqlCmdRunner=$(SqlCmdRunner);DBServer=$(DBServer);DBUser=$(DBUser);DBPassword=$(DBPassword);"/>
 	</Target>
 	 
-	<Target Name="CleanDatabases">
+	<Target Name="ExtractDatabase">
+		<MSBuild Projects="@(SqlProjects)" 
+			Targets="Extract" 
+			Properties="Configuration=$(Configuration);SqlCmdRunner=$(SqlCmdRunner);DBServer=$(DBServer);DBUser=$(DBUser);DBPassword=$(DBPassword);"/>
+	</Target>
+
+	 <Target Name="CleanDatabase">
 		<MSBuild Projects="@(SqlProjects)" 
 			Targets="Clean" 
 			Properties="Configuration=$(Configuration);Platform=$(Platform);SqlCmdRunner=$(SqlCmdRunner);DBServer=$(DBServer)"/>
@@ -185,10 +193,10 @@
 	</Target>	 
 	 
 	<Target Name="BuildAll"
-		DependsOnTargets="BuildDatabases;BuildCode;BuildTests"/>
+		DependsOnTargets="BuildDatabase;BuildCode;BuildTests"/>
 		
 	<Target Name="CleanAll"
-		DependsOnTargets="CleanDatabases;CleanCode"/>
+		DependsOnTargets="CleanDatabase;CleanCode"/>
 
 	<Target Name="Rebuild"
 		DependsOnTargets="CleanCode;BuildCode"/>

Source/ApplicationBase/ApplicationBase.dpk

@@ -74,8 +74,6 @@ contains
   uEditorEmpresa in 'Empresas\Views\uEditorEmpresa.pas',
   uEmpresasViewRegister in 'Empresas\Views\uEmpresasViewRegister.pas',
   uViewDatosBancarios in 'Empresas\Views\uViewDatosBancarios.pas',
-  uCambiarPassword in 'Usuarios\Data\uCambiarPassword.pas',
-  uLoginForm in 'Usuarios\Data\uLoginForm.pas',
   uUsuarios in 'Usuarios\Model\uUsuarios.pas',
   schUsuariosServer_Intf in 'Usuarios\Model\schUsuariosServer_Intf.pas',
   schUsuariosClient_Intf in 'Usuarios\Model\schUsuariosClient_Intf.pas',

Source/ApplicationBase/ApplicationBase.dproj

@@ -56,31 +56,31 @@
     <DelphiCompile Include="ApplicationBase.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="$(SystemRoot)\Fonts\Base.dcp" />
+    <DCCReference Include="..\Servidor\Base.dcp" />
-    <DCCReference Include="$(SystemRoot)\Fonts\cxDataD10.dcp" />
+    <DCCReference Include="..\Servidor\cxDataD10.dcp" />
-    <DCCReference Include="$(SystemRoot)\Fonts\cxEditorsD10.dcp" />
+    <DCCReference Include="..\Servidor\cxEditorsD10.dcp" />
-    <DCCReference Include="$(SystemRoot)\Fonts\cxLibraryD10.dcp" />
+    <DCCReference Include="..\Servidor\cxLibraryD10.dcp" />
-    <DCCReference Include="$(SystemRoot)\Fonts\dbrtl.dcp" />
+    <DCCReference Include="..\Servidor\dbrtl.dcp" />
-    <DCCReference Include="$(SystemRoot)\Fonts\dxThemeD10.dcp" />
+    <DCCReference Include="..\Servidor\dxThemeD10.dcp" />
-    <DCCReference Include="$(SystemRoot)\Fonts\GUIBase.dcp" />
+    <DCCReference Include="..\Servidor\GUIBase.dcp" />
-    <DCCReference Include="$(SystemRoot)\Fonts\Jcl.dcp" />
+    <DCCReference Include="..\Servidor\Jcl.dcp" />
-    <DCCReference Include="$(SystemRoot)\Fonts\JclVcl.dcp" />
+    <DCCReference Include="..\Servidor\JclVcl.dcp" />
-    <DCCReference Include="$(SystemRoot)\Fonts\JvCoreD11R.dcp" />
+    <DCCReference Include="..\Servidor\JvCoreD11R.dcp" />
-    <DCCReference Include="$(SystemRoot)\Fonts\JvCtrlsD11R.dcp" />
+    <DCCReference Include="..\Servidor\JvCtrlsD11R.dcp" />
-    <DCCReference Include="$(SystemRoot)\Fonts\JvJansD11R.dcp" />
+    <DCCReference Include="..\Servidor\JvJansD11R.dcp" />
-    <DCCReference Include="$(SystemRoot)\Fonts\JvMMD11R.dcp" />
+    <DCCReference Include="..\Servidor\JvMMD11R.dcp" />
-    <DCCReference Include="$(SystemRoot)\Fonts\JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="..\Servidor\JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="$(SystemRoot)\Fonts\JvSystemD11R.dcp" />
+    <DCCReference Include="..\Servidor\JvSystemD11R.dcp" />
-    <DCCReference Include="$(SystemRoot)\Fonts\pckUCDataConnector.dcp" />
+    <DCCReference Include="..\Servidor\pckUCDataConnector.dcp" />
-    <DCCReference Include="$(SystemRoot)\Fonts\pckUserControl_RT.dcp" />
+    <DCCReference Include="..\Servidor\pckUserControl_RT.dcp" />
-    <DCCReference Include="$(SystemRoot)\Fonts\PngComponentsD10.dcp" />
+    <DCCReference Include="..\Servidor\PngComponentsD10.dcp" />
-    <DCCReference Include="$(SystemRoot)\Fonts\PNG_D10.dcp" />
+    <DCCReference Include="..\Servidor\PNG_D10.dcp" />
-    <DCCReference Include="$(SystemRoot)\Fonts\rtl.dcp" />
+    <DCCReference Include="..\Servidor\rtl.dcp" />
-    <DCCReference Include="$(SystemRoot)\Fonts\vcl.dcp" />
+    <DCCReference Include="..\Servidor\vcl.dcp" />
-    <DCCReference Include="$(SystemRoot)\Fonts\vclactnband.dcp" />
+    <DCCReference Include="..\Servidor\vclactnband.dcp" />
-    <DCCReference Include="$(SystemRoot)\Fonts\vcldb.dcp" />
+    <DCCReference Include="..\Servidor\vcldb.dcp" />
-    <DCCReference Include="$(SystemRoot)\Fonts\vcljpg.dcp" />
+    <DCCReference Include="..\Servidor\vcljpg.dcp" />
-    <DCCReference Include="$(SystemRoot)\Fonts\vclx.dcp" />
+    <DCCReference Include="..\Servidor\vclx.dcp" />
     <DCCReference Include="Empresas\Controller\uDatosBancariosEmpresaController.pas" />
     <DCCReference Include="Empresas\Controller\uEmpresasController.pas" />
     <DCCReference Include="Empresas\Controller\View\uIEditorDatosBancarioEmpresa.pas" />
@@ -100,9 +100,7 @@
     <DCCReference Include="uFactuGES_App.pas" />
     <DCCReference Include="Usuarios\Controller\uUsuariosController.pas" />
     <DCCReference Include="Usuarios\Controller\View\uIEditorLogin.pas" />
-    <DCCReference Include="Usuarios\Data\uCambiarPassword.pas" />
     <DCCReference Include="Usuarios\Data\uDataModuleUsuarios.pas" />
-    <DCCReference Include="Usuarios\Data\uLoginForm.pas" />
     <DCCReference Include="Usuarios\Data\uUCROConn.pas" />
     <DCCReference Include="Usuarios\Model\Data\uIDataModuleUsuarios.pas" />
     <DCCReference Include="Usuarios\Model\schUsuariosClient_Intf.pas" />

Source/ApplicationBase/Empresas/Views/uEditorDatosBancariosEmpresa.pas

@@ -6,7 +6,7 @@ uses Windows, SysUtils, Classes, Graphics, Forms, Controls, StdCtrls,
   Buttons, ExtCtrls, Mask, DBCtrls, DB, uDADataTable, PngSpeedButton,
   cxControls, cxContainer, cxEdit, cxTextEdit, cxHyperLinkEdit, cxDBEdit,
   uIEditorDatosBancarioEmpresa, uDatosBancariosEmpresaController, uBizEmpresasDatosBancarios,
-  cxCurrencyEdit;
+  cxCurrencyEdit, uDAInterfaces;
 
 type
   TfEditorDatosBancariosEmpresa = class(TForm, IEditorDatosBancariosEmpresa)

Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm

@@ -8,13 +8,13 @@ inherited fEditorEmpresa: TfEditorEmpresa
   ClientWidth = 674
   Scaled = False
   ExplicitWidth = 682
-  ExplicitHeight = 588
+  ExplicitHeight = 581
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
     Width = 674
     Caption = 'Empresa'
-    ExplicitWidth = 660
+    ExplicitWidth = 674
     inherited Image1: TImage
       Left = 647
       ExplicitLeft = 607
@@ -22,9 +22,9 @@ inherited fEditorEmpresa: TfEditorEmpresa
   end
   inherited TBXDock: TTBXDock
     Width = 674
-    ExplicitWidth = 660
+    ExplicitWidth = 674
     inherited tbxMain: TTBXToolbar
-      ExplicitWidth = 324
+      ExplicitWidth = 330
       inherited TBXItem2: TTBXItem
         Visible = False
       end
@@ -77,13 +77,13 @@ inherited fEditorEmpresa: TfEditorEmpresa
   inherited pgPaginas: TPageControl
     Width = 674
     Height = 459
-    ExplicitWidth = 660
+    ExplicitWidth = 674
-    ExplicitHeight = 451
+    ExplicitHeight = 459
     inherited pagGeneral: TTabSheet
       ExplicitLeft = 4
       ExplicitTop = 24
-      ExplicitWidth = 652
+      ExplicitWidth = 666
-      ExplicitHeight = 423
+      ExplicitHeight = 431
       inline frViewEmpresa1: TfrViewEmpresa
         Left = 0
         Top = 0
@@ -98,14 +98,14 @@ inherited fEditorEmpresa: TfEditorEmpresa
         ParentFont = False
         TabOrder = 0
         ReadOnly = False
-        ExplicitWidth = 652
+        ExplicitWidth = 666
-        ExplicitHeight = 423
+        ExplicitHeight = 431
         inherited dxLayoutControl1: TdxLayoutControl
           Width = 666
           Height = 431
           LookAndFeel = dxLayoutOfficeLookAndFeel1
-          ExplicitWidth = 652
+          ExplicitWidth = 666
-          ExplicitHeight = 423
+          ExplicitHeight = 431
           inherited PngSpeedButton1: TPngSpeedButton
             Left = 621
             Top = 295
@@ -244,8 +244,6 @@ inherited fEditorEmpresa: TfEditorEmpresa
     object TabSheet1: TTabSheet
       Caption = 'Datos bancarios'
       ImageIndex = 1
-      ExplicitWidth = 652
-      ExplicitHeight = 423
       inline frViewDatosBancarios1: TfrViewDatosBancarios
         Left = 0
         Top = 0
@@ -260,13 +258,13 @@ inherited fEditorEmpresa: TfEditorEmpresa
         ParentFont = False
         TabOrder = 0
         ReadOnly = False
-        ExplicitWidth = 652
+        ExplicitWidth = 666
-        ExplicitHeight = 423
+        ExplicitHeight = 431
         inherited cxGrid: TcxGrid
           Width = 666
           Height = 406
-          ExplicitWidth = 652
+          ExplicitWidth = 666
-          ExplicitHeight = 398
+          ExplicitHeight = 406
         end
         inherited ToolBar1: TToolBar
           Width = 666
@@ -294,8 +292,8 @@ inherited fEditorEmpresa: TfEditorEmpresa
       item
         Width = 200
       end>
-    ExplicitTop = 527
+    ExplicitTop = 535
-    ExplicitWidth = 660
+    ExplicitWidth = 674
   end
   inherited EditorActionList: TActionList
     Top = 128

Source/ApplicationBase/Empresas/Views/uEditorEmpresa.pas

@@ -12,7 +12,8 @@ uses
   TBXDkPanels, JvButton, AppEvnts, uCustomView, uViewBase, 
   JvAppStorage, JvAppRegistryStorage, JvFormPlacement, JvComponentBase,
   uViewEmpresa, uIEditorEmpresa, uEmpresasController, dxLayoutLookAndFeels,
-  JvExComCtrls, JvStatusBar, uViewDetallesGenerico, uViewDatosBancarios;
+  JvExComCtrls, JvStatusBar, uViewDetallesGenerico, uViewDatosBancarios,
+  uDAInterfaces;
 
 type
   TfEditorEmpresa = class(TfEditorDBItem, IEditorEmpresa)

Source/ApplicationBase/Empresas/Views/uViewDatosBancarios.dfm

@@ -48,5 +48,23 @@ inherited frViewDatosBancarios: TfrViewDatosBancarios
   inherited ToolBar1: TToolBar
     Width = 583
     ExplicitWidth = 583
+    inherited ToolButton1: TToolButton
+      Top = 0
+    end
+    inherited ToolButton4: TToolButton
+      Top = 0
+    end
+    inherited ToolButton5: TToolButton
+      Top = 0
+    end
+    inherited ToolButton2: TToolButton
+      Top = 0
+    end
+    inherited ToolButton6: TToolButton
+      Top = 0
+    end
+    inherited ToolButton7: TToolButton
+      Top = 0
+    end
   end
 end

Source/ApplicationBase/Empresas/Views/uViewDatosBancarios.pas

@@ -9,7 +9,8 @@ uses
   cxGridCustomTableView, cxGridTableView, cxGridBandedTableView,
   cxGridDBBandedTableView, cxClasses, cxControls, cxGridCustomView, cxGrid,
   uDADataTable, Grids, DBGrids, ActnList, ImgList, PngImageList, ComCtrls,
-  ToolWin, cxGridDBTableView, uViewDetallesGenerico, cxCurrencyEdit;
+  ToolWin, cxGridDBTableView, uViewDetallesGenerico, cxCurrencyEdit,
+  uDAInterfaces;
 
 type
   TfrViewDatosBancarios = class(TfrViewDetallesGenerico)

Source/ApplicationBase/Empresas/Views/uViewEmpresa.pas

@@ -9,7 +9,7 @@ uses
   JvComponent, JvFormAutoSize, cxControls, cxContainer, cxEdit, cxTextEdit,
   cxDBEdit, dxLayoutControl, dxLayoutLookAndFeels, cxMemo, cxMaskEdit,
   cxSpinEdit, cxImage, JvExControls, JvBitmapButton, ActnList, ImgList,
-  PngImageList, TB2Item, TBX, TB2Dock, TB2Toolbar, PngSpeedButton;
+  PngImageList, TB2Item, TBX, TB2Dock, TB2Toolbar, PngSpeedButton, uDAInterfaces;
 
 type
   IViewEmpresa = interface(IViewBase)

Source/ApplicationBase/Usuarios/Controller/uUsuariosController.pas

@@ -18,11 +18,16 @@ type
     procedure ShowLogManager;
     procedure ShowChangePassword;
     function ComprobarUsuario(const User : String; const Password: String): Boolean;
+    procedure CambiarPassword(const AIDUser: Integer; const ANewPassword: String);
 
     function GetMaxIntentosLogin: Integer;
     procedure SetMaxIntentosLogin(const Value: Integer);
     property MaxIntentosLogin : Integer read GetMaxIntentosLogin write SetMaxIntentosLogin;
 
+    function GetCurrentUser: TUCCurrentUser;
+    property CurrentUser: TUCCurrentUser read GetCurrentUser;
+
+
 {    procedure ChangeUser(IDUser: Integer; Login, Name, Mail: String; Profile,UserExpired,UserDaysSun: Integer; PrivUser: Boolean);
     procedure ChangePassword(IDUser: Integer; NewPassword: String);
     procedure AddRight(idUser: Integer; ItemRight: TObject; FullPath: Boolean = True); overload;
@@ -64,6 +69,7 @@ type
     procedure AsignarDataModule;
     procedure InicializarUserControl;
     procedure ComprobarUsuarioInicial;
+    function GetCurrentUser: TUCCurrentUser;
 
     procedure OnLoginForm(Sender: TObject; var CustomForm: TCustomForm);
   public
@@ -77,6 +83,7 @@ type
     procedure ShowLogManager;
     procedure ShowChangePassword;
     function ComprobarUsuario(const User : String; const Password: String): Boolean;
+    procedure CambiarPassword(const AIDUser: Integer; const ANewPassword: String);
     
 {    function Eliminar(AFormaPago : IBizFormaPago): Boolean;
     function Guardar(AFormaPago : IBizFormaPago): Boolean; virtual;
@@ -90,14 +97,15 @@ type
     function DarListaUsuarios: TStringList;}
     property UserControl : TUserControl read FUserControl;
     property MaxIntentosLogin : Integer read GetMaxIntentosLogin write SetMaxIntentosLogin;
+    property CurrentUser: TUCCurrentUser read GetCurrentUser;
   end;
 
 implementation
 
 uses
   cxControls, DB, uEditorRegistryUtils, schUsuariosClient_Intf,
-  uDAInterfaces, uDataTableUtils, uDialogUtils, 
+  uDAInterfaces, uDataTableUtils, uDialogUtils, uFactuGES_App,
-  uDateUtils, uROTypes, DateUtils, Controls, Windows, uLoginForm, uIEditorLogin;
+  uDateUtils, uROTypes, DateUtils, Controls, Windows, uIEditorLogin;
 
 { TUsuariosController }
 
@@ -134,6 +142,12 @@ begin
   Result := FDataModule.GetItems;
 end;}
 
+procedure TUsuariosController.CambiarPassword(const AIDUser: Integer;
+  const ANewPassword: String);
+begin
+  FUserControl.ChangePassword(AIDUser, ANewPassword);
+end;
+
 function TUsuariosController.ComprobarUsuario(const User,
   Password: String): Boolean;
 begin
@@ -205,6 +219,12 @@ begin
   FDataModule := NIL;
   inherited;
 end;
+
+function TUsuariosController.GetCurrentUser: TUCCurrentUser;
+begin
+  Result := FUserControl.CurrentUser;
+end;
+
 function TUsuariosController.GetMaxIntentosLogin: Integer;
 begin
   Result := FUserControl.Login.MaxLoginAttempts;
@@ -214,11 +234,15 @@ procedure TUsuariosController.InicializarUserControl;
 begin
   with FUserControl do
   begin
+    ApplicationID := AppFactuGES.AppName;
     AutoStart := False;
     Criptografia := cMD5;
+    CheckValidationKey := True;
+    Login.MaxLoginAttempts := 3;
+
     OnCustomLoginForm := OnLoginForm;
   end;
-  FDataModule.InicializarCamposUserControl(FUserControl);
+  FDataModule.InicializarUserControl(FUserControl);
 end;
 
 procedure TUsuariosController.Logoff;
@@ -229,7 +253,7 @@ end;
 procedure TUsuariosController.OnLoginForm(Sender: TObject;
   var CustomForm: TCustomForm);
 begin
-  CustomForm := TfLoginForm.Create(NIL);
+//  CustomForm := TfLoginForm.Create(NIL);
 end;
 
 {
@@ -365,12 +389,14 @@ begin
   end;
 
   if Assigned(AEditor) then
+  begin
     try
       Result := (AEditor.ShowModal = mrOk);
       AEditor.Release;
     finally
       AEditor := NIL;
     end;
+  end;
 end;
 
 {function TUsuariosController.Guardar(AFormaPago: IBizFormaPago): Boolean;

Source/ApplicationBase/Usuarios/Data/uCambiarPassword.dfm

@@ -1,94 +0,0 @@
-object fCambiarPassword: TfCambiarPassword
-  Left = 460
-  Top = 492
-  Width = 361
-  Height = 299
-  Caption = 'Cambiar la contrase'#241'a'
-  Color = clBtnFace
-  Font.Charset = DEFAULT_CHARSET
-  Font.Color = clWindowText
-  Font.Height = -11
-  Font.Name = 'MS Sans Serif'
-  Font.Style = []
-  OldCreateOrder = False
-  Position = poScreenCenter
-  PixelsPerInch = 96
-  TextHeight = 13
-  object bAceptar: TButton
-    Left = 136
-    Top = 230
-    Width = 120
-    Height = 25
-    Caption = '&Cambiar la contrase'#241'a'
-    Default = True
-    TabOrder = 0
-    OnClick = bAceptarClick
-  end
-  object bCancelar: TButton
-    Left = 269
-    Top = 230
-    Width = 75
-    Height = 25
-    Cancel = True
-    Caption = '&Cancelar'
-    ModalResult = 2
-    TabOrder = 1
-  end
-  object PageControl1: TPageControl
-    Left = 2
-    Top = 2
-    Width = 349
-    Height = 217
-    ActivePage = pagContrasena
-    TabOrder = 2
-    object pagContrasena: TTabSheet
-      Caption = 'Cambiar la contrase'#241'a'
-      object Label4: TLabel
-        Left = 16
-        Top = 19
-        Width = 167
-        Height = 13
-        Caption = 'Escriba la nueva contrase'#241'a:'
-        Font.Charset = DEFAULT_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -11
-        Font.Name = 'MS Sans Serif'
-        Font.Style = [fsBold]
-        ParentFont = False
-        Transparent = True
-      end
-      object Label1: TLabel
-        Left = 16
-        Top = 72
-        Width = 257
-        Height = 13
-        Caption = 'Repita la nueva contrase'#241'a para confirmarla:'
-        Font.Charset = DEFAULT_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -11
-        Font.Name = 'MS Sans Serif'
-        Font.Style = [fsBold]
-        ParentFont = False
-        Transparent = True
-      end
-      object edtPassword2: TEdit
-        Left = 16
-        Top = 88
-        Width = 295
-        Height = 21
-        CharCase = ecLowerCase
-        PasswordChar = '*'
-        TabOrder = 0
-      end
-      object edtPassword: TEdit
-        Left = 16
-        Top = 39
-        Width = 295
-        Height = 21
-        CharCase = ecLowerCase
-        PasswordChar = '*'
-        TabOrder = 1
-      end
-    end
-  end
-end

Source/ApplicationBase/Usuarios/Data/uCambiarPassword.pas

@@ -1,41 +0,0 @@
-unit uCambiarPassword;
-
-interface
-
-uses
-  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
-  Dialogs, StdCtrls, ComCtrls;
-
-type
-  TfCambiarPassword = class(TForm)
-    bAceptar: TButton;
-    bCancelar: TButton;
-    Label4: TLabel;
-    edtPassword: TEdit;
-    Label1: TLabel;
-    edtPassword2: TEdit;
-    PageControl1: TPageControl;
-    pagContrasena: TTabSheet;
-    procedure bAceptarClick(Sender: TObject);
-  private
-    { Private declarations }
-  public
-    { Public declarations }
-  end;
-
-var
-  fCambiarPassword: TfCambiarPassword;
-
-implementation
-
-{$R *.dfm}
-
-procedure TfCambiarPassword.bAceptarClick(Sender: TObject);
-begin
-  if edtPassword2.Text <> edtPassword.Text then
-    raise Exception.Create('Por favor, introduzca la MISMA contraseña en los dos campos')
-  else
-    ModalResult := mrOK;
-end;
-
-end.

Source/ApplicationBase/Usuarios/Data/uDataModuleUsuarios.dfm

@@ -21,4 +21,254 @@ object DataModuleUsuarios: TDataModuleUsuarios
     Left = 48
     Top = 104
   end
+  object UCSettingsSpanish: TUCSettings
+    AppMessages.MsgsForm_BtNew = '&Nuevo mensaje'
+    AppMessages.MsgsForm_BtReplay = '&Repetir'
+    AppMessages.MsgsForm_BtForward = '&Siguiente'
+    AppMessages.MsgsForm_BtDelete = '&Eliminar'
+    AppMessages.MsgsForm_BtClose = '&Cerrar'
+    AppMessages.MsgsForm_WindowCaption = 'Mensajes del sistema'
+    AppMessages.MsgsForm_ColFrom = 'De'
+    AppMessages.MsgsForm_ColSubject = 'Asunto'
+    AppMessages.MsgsForm_ColDate = 'Fecha'
+    AppMessages.MsgsForm_PromptDelete = #194#191'Desea eliminar los mensajes seleccionados?'
+    AppMessages.MsgsForm_PromptDelete_WindowCaption = 'Eliminar mensajes'
+    AppMessages.MsgsForm_NoMessagesSelected = 'No hay mensajes seleccionados'
+    AppMessages.MsgsForm_NoMessagesSelected_WindowCaption = 'Informaci'#195#179'n'
+    AppMessages.MsgRec_BtClose = '&Cerrar'
+    AppMessages.MsgRec_WindowCaption = 'Mensaje'
+    AppMessages.MsgRec_Title = 'Mensaje recibido'
+    AppMessages.MsgRec_LabelFrom = 'De:'
+    AppMessages.MsgRec_LabelDate = 'Fecha'
+    AppMessages.MsgRec_LabelSubject = 'Asunto'
+    AppMessages.MsgRec_LabelMessage = 'Mensaje'
+    AppMessages.MsgSend_BtSend = '&Enviar'
+    AppMessages.MsgSend_BtCancel = '&Cancelar'
+    AppMessages.MsgSend_WindowCaption = 'Mensaje'
+    AppMessages.MsgSend_Title = 'Enviar un nuevo mensaje'
+    AppMessages.MsgSend_GroupTo = 'A'
+    AppMessages.MsgSend_RadioUser = 'Usuario:'
+    AppMessages.MsgSend_RadioAll = 'Todos'
+    AppMessages.MsgSend_GroupMessage = 'Mensaje'
+    AppMessages.MsgSend_LabelSubject = 'Asunto'
+    AppMessages.MsgSend_LabelMessageText = 'Texto del mensaje'
+    CommonMessages.AutoLogonError = 'Fault of Car Logon !'#13#10'Inform a valid user and password.'
+    CommonMessages.ChangePasswordError.InvalidCurrentPassword = 'Current password does not tally!'
+    CommonMessages.ChangePasswordError.NewPasswordError = 
+      'Los campos de nueva contrase'#195#177'a y confirmaci'#195#179'n deben ser iguale' +
+      's.'
+    CommonMessages.ChangePasswordError.NewEqualCurrent = 'La nueva contrase'#195#177'a es la misma que la contrase'#195#177'a actual '
+    CommonMessages.ChangePasswordError.PasswordRequired = 'The password is compulsory '
+    CommonMessages.ChangePasswordError.MinPasswordLength = 'La contrase'#195#177'a debe contener al menos %d caracteres '
+    CommonMessages.ChangePasswordError.InvalidNewPassword = #194#161'La nueva contrase'#195#177'a no es v'#195#161'lida por ser demasiado f'#195#161'cil!'
+    CommonMessages.InvalidLogin = 'User invalids or password !'
+    CommonMessages.InitialMessage.Strings = (
+      'ATTENTION, Inicial Login :'
+      ''
+      'User: :user'
+      'Password : :password'
+      ''
+      'Define the permissions for this user.')
+    CommonMessages.MaxLoginAttemptsError = 
+      '%d Attempts of login invalid. By reasons of segun'#231'a the system w' +
+      'ill be closed.'
+    CommonMessages.PasswordChanged = #194#161'Contrase'#195#177'a cambiada!'
+    CommonMessages.BlankPassword = 'Retired password of the Login %s'
+    CommonMessages.UsuarioExiste = 'The User "%s" is already set up in the system !!'
+    CommonMessages.PasswordExpired = 'Attention, his sign died, favor exchanges it '
+    CommonMessages.ForcaTrocaSenha = 'Mudan'#231'a de senha obrigat'#243'ria'
+    Login.WindowCaption = 'Login'
+    Login.LabelUser = 'Usuario :'
+    Login.LabelPassword = 'Contrase'#195#177'a :'
+    Login.BtOk = '&Aceptar'
+    Login.BtCancel = '&Cancelar'
+    Login.LeftImage.Data = {
+      07544269746D617016090000424D160900000000000036040000280000003200
+      0000180000000100080000000000E00400000000000000000000000100000000
+      000000000000000080000080000000808000800000008000800080800000C0C0
+      C000C0DCC000F0CAA6000020400000206000002080000020A0000020C0000020
+      E00000400000004020000040400000406000004080000040A0000040C0000040
+      E00000600000006020000060400000606000006080000060A0000060C0000060
+      E00000800000008020000080400000806000008080000080A0000080C0000080
+      E00000A0000000A0200000A0400000A0600000A0800000A0A00000A0C00000A0
+      E00000C0000000C0200000C0400000C0600000C0800000C0A00000C0C00000C0
+      E00000E0000000E0200000E0400000E0600000E0800000E0A00000E0C00000E0
+      E00040000000400020004000400040006000400080004000A0004000C0004000
+      E00040200000402020004020400040206000402080004020A0004020C0004020
+      E00040400000404020004040400040406000404080004040A0004040C0004040
+      E00040600000406020004060400040606000406080004060A0004060C0004060
+      E00040800000408020004080400040806000408080004080A0004080C0004080
+      E00040A0000040A0200040A0400040A0600040A0800040A0A00040A0C00040A0
+      E00040C0000040C0200040C0400040C0600040C0800040C0A00040C0C00040C0
+      E00040E0000040E0200040E0400040E0600040E0800040E0A00040E0C00040E0
+      E00080000000800020008000400080006000800080008000A0008000C0008000
+      E00080200000802020008020400080206000802080008020A0008020C0008020
+      E00080400000804020008040400080406000804080008040A0008040C0008040
+      E00080600000806020008060400080606000806080008060A0008060C0008060
+      E00080800000808020008080400080806000808080008080A0008080C0008080
+      E00080A0000080A0200080A0400080A0600080A0800080A0A00080A0C00080A0
+      E00080C0000080C0200080C0400080C0600080C0800080C0A00080C0C00080C0
+      E00080E0000080E0200080E0400080E0600080E0800080E0A00080E0C00080E0
+      E000C0000000C0002000C0004000C0006000C0008000C000A000C000C000C000
+      E000C0200000C0202000C0204000C0206000C0208000C020A000C020C000C020
+      E000C0400000C0402000C0404000C0406000C0408000C040A000C040C000C040
+      E000C0600000C0602000C0604000C0606000C0608000C060A000C060C000C060
+      E000C0800000C0802000C0804000C0806000C0808000C080A000C080C000C080
+      E000C0A00000C0A02000C0A04000C0A06000C0A08000C0A0A000C0A0C000C0A0
+      E000C0C00000C0C02000C0C04000C0C06000C0C08000C0C0A000F0FBFF00A4A0
+      A000808080000000FF0000FF000000FFFF00FF000000FF00FF00FFFF0000FFFF
+      FF00FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD
+      FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD0000FDFDFDFDFDFDFDFDFDFD
+      FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD525252525252525252525252
+      5252FDFDFDFDFDFD0000FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD
+      FDFDFDFDFDFDFDAFB75E5E5E66666767676F6F6F6FB752FDFDFDFDFD0000FDFD
+      FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDAFBF6FBFBF
+      BFBFBFBFBFBFBFBFBFB752FDFDFDFDFD0000FDFDFDFDFDFDFDFDFDFDFDFDFDFD
+      FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDAFB76F676F6FB7B7B7B7B7776F5EB752FD
+      FDFDFDFD0000FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD
+      FDFDFDAFBF6FBFBFBFBFBFBFBFBFBFBFBFB752FDFDFDFDFD0000FDFDFDFDFDFD
+      FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDAFB76F676F6F6FB7B7
+      B7B7776F5EB752FDFDFDFDFD0000FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD
+      FDFDFDFDFDFDFDFDFDFDFDAFBF6FBFBFBFBFBFBFBFBFBFBFBFBF52FDFDFDFDFD
+      0000FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDAF
+      B76767676F6F6FB7B7B7776F5EB752FDFDFDFDFD0000FDFDFDFDFDFDFDFDFDFD
+      FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDAFBF6FBFBFBFBFBFBFBFBFBFBF
+      BFBF52FDFDFDFDFD0000FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD
+      FDFDFDFDFDFDFDAFB76767676F6F6F6FB7B7776F5EB752FDFDFDFDFD0000FDFD
+      FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDAFBF6FBFBF
+      BFBFBFBFBFBFBFBFBFBF52FDFDFDFDFD0000FDFDFDFDFDFDFDFDFDFDFDFDFDFD
+      FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDAFBFB7AFAFB7B7B7B7BFBFBFBFB7B752FD
+      FDFDFDFD0000FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD
+      FDFDFDFDAFB76F675E5E5E5E5E5E676FB7A5FDFDFDFDFDFD0000FDFDFDFDFDFD
+      FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDF7F79BFDFDFDFD
+      FDFDA4F7A3FDFDFDFDFDFDFD0000FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD
+      FDFDFDFDFDFDFDFDFDFDFDFDFDF7F79BFDFDFDFDFDFDA407A3FDFDFDFDFDFDFD
+      0000FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD
+      FDF7F79BFDFDFDFDFDFDA407A3FDFDFDFDFDFDFD0000FDFDFDFDFDFDFDFDFDFD
+      FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDF7F7A4FDFDFDFDFDFDF707
+      A3FDFDFDFDFDFDFD0000FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD
+      FDFDFDFDFDFDFDFDFDF707A49AFDFDFDFDA30707A3FDFDFDFDFDFDFD0000FDFD
+      FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDF7F6A4
+      A49B9A9AA3A407079AFDFDFDFDFDFDFD0000FDFDFDFDFDFDFDFDFDFDFDFDFDFD
+      FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDF7F6F7F7A4A4F70707A3FDFDFDFD
+      FDFDFDFD0000FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD
+      FDFDFDFDFDFDFDF7F6F6F6F6F607A3FDFDFDFDFDFDFDFDFD0000FDFDFDFDFDFD
+      FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDF7A3A3A3
+      A3A3FDFDFDFDFDFDFDFDFDFD0000FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD
+      FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD
+      0000}
+    Login.LabelTentativa = 'Attempt : '
+    Login.LabelTentativas = 'Max of Attempts: '
+    Log.WindowCaption = 'Security'
+    Log.LabelDescription = 'Log of system'
+    Log.LabelUser = 'User :'
+    Log.LabelDate = 'Date :'
+    Log.LabelLevel = 'Least level:'
+    Log.ColAppID = 'AppID'
+    Log.ColLevel = 'Level '
+    Log.ColMessage = 'Message'
+    Log.ColUser = 'User'
+    Log.ColDate = 'Date'
+    Log.BtFilter = '&Apply Filter'
+    Log.BtDelete = '&Erase Log'
+    Log.BtClose = '&Close'
+    Log.PromptDelete = 'It confirms to exclude all the registers of log selected ?'
+    Log.PromptDelete_WindowCaption = 'Delete confirmation'
+    Log.OptionUserAll = 'All'
+    Log.OptionLevelLow = 'Low'
+    Log.OptionLevelNormal = 'Normal'
+    Log.OptionLevelHigh = 'High'
+    Log.OptionLevelCritic = 'Critic'
+    Log.DeletePerformed = 
+      'Deletion of system log done: User = "%s" | Date = %s a %s | Leve' +
+      'l <= %s'
+    UsersForm.WindowCaption = 'Security'
+    UsersForm.LabelDescription = 'Users register '
+    UsersForm.ColName = 'Name'
+    UsersForm.ColLogin = 'Login'
+    UsersForm.ColEmail = 'Email'
+    UsersForm.BtAdd = '&Add'
+    UsersForm.BtChange = 'A&lter'
+    UsersForm.BtDelete = '&Erase'
+    UsersForm.PromptDelete = 'Confirm erase the user "%s" ?'
+    UsersForm.PromptDelete_WindowCaption = 'Delete user'
+    UsersForm.BtRights = 'A&ccesses'
+    UsersForm.BtPassword = '&Password'
+    UsersForm.BtClose = '&Close'
+    AddChangeUser.WindowCaption = 'Users register '
+    AddChangeUser.LabelAdd = 'Add User'
+    AddChangeUser.LabelChange = 'Change User'
+    AddChangeUser.LabelName = 'Name :'
+    AddChangeUser.LabelLogin = 'Login :'
+    AddChangeUser.LabelEmail = 'Email :'
+    AddChangeUser.LabelPerfil = 'Profile :'
+    AddChangeUser.CheckPrivileged = 'Privileged user '
+    AddChangeUser.BtSave = '&Save'
+    AddChangeUser.BtCancel = 'Cancel'
+    AddChangeUser.CheckExpira = 'Senha do usu'#225'rio n'#227'o expira'
+    AddChangeUser.Day = 'Dias'
+    AddChangeUser.ExpiredIn = 'Expira em'
+    AddChangeProfile.WindowCaption = 'Profile the Users'
+    AddChangeProfile.LabelAdd = 'Add Profile'
+    AddChangeProfile.LabelChange = 'Change Profile '
+    AddChangeProfile.LabelName = 'Description :'
+    AddChangeProfile.BtSave = '&Save'
+    AddChangeProfile.BtCancel = 'Cancel'
+    UsersProfile.WindowCaption = 'Security'
+    UsersProfile.LabelDescription = 'Users profile '
+    UsersProfile.ColProfile = 'Profile'
+    UsersProfile.BtAdd = '&Add'
+    UsersProfile.BtChange = 'A&lter'
+    UsersProfile.BtDelete = '&Delete'
+    UsersProfile.BtRights = 'A&ccesses'
+    UsersProfile.PromptDelete = 'There are users with the profile  "%s". Confirm erase ?'
+    UsersProfile.PromptDelete_WindowCaption = 'Delete profile'
+    UsersProfile.BtClose = '&Close'
+    Rights.WindowCaption = 'Seguridad'
+    Rights.LabelUser = 'Permissions of the User :'
+    Rights.LabelProfile = 'Permissions of the Profile  :'
+    Rights.PageMenu = 'Items of the Menu'
+    Rights.PageActions = 'Actions'
+    Rights.PageControls = 'Controls'
+    Rights.BtUnlock = '&Desbloquear'
+    Rights.BtLock = '&Bloquear'
+    Rights.BtSave = '&Guardar'
+    Rights.BtCancel = '&Cancelar'
+    ChangePassword.WindowCaption = 'Seguridad'
+    ChangePassword.LabelDescription = 'Cambiar la contrase'#195#177'a'
+    ChangePassword.LabelCurrentPassword = 'Contrase'#195#177'a actual: '
+    ChangePassword.LabelNewPassword = 'Nueva contrase'#195#177'a: '
+    ChangePassword.LabelConfirm = 'Confirmar contrase'#195#177'a: '
+    ChangePassword.BtSave = 'C&ambiar'
+    ChangePassword.BtCancel = 'Cancelar'
+    ResetPassword.WindowCaption = 'Define Password of the user  : "%s"'
+    ResetPassword.LabelPassword = 'Password :'
+    History.Evento_Insert = 'Inserido'
+    History.Evento_Delete = 'Apagado'
+    History.Evento_Edit = 'Editado'
+    History.Evento_NewRecord = 'Novo registro'
+    History.Hist_All = 'Todos'
+    History.Msg_LimpHistorico = 'Excluir todo o conte'#250'do do hist'#243'rico ?'
+    History.Msg_MensConfirma = 'Confirma'#231#227'o'
+    History.Msg_LogEmptyHistory = 'Usu'#225'rio %s apagou todo o hist'#243'rico as %s'
+    History.LabelDescricao = 'Hist'#243'rico de tabelas'
+    History.LabelUser = 'Usu'#225'rio'
+    History.LabelForm = 'Formul'#225'rio'
+    History.LabelEvento = 'Evento'
+    History.LabelTabela = 'Tabela'
+    History.LabelDataEvento = 'Data'
+    History.LabelHoraEvento = 'Hora'
+    History.Msg_NewRecord = '%s inseriu um novo registro'
+    History.Hist_MsgExceptPropr = 'Favor informar a propriedade %s'
+    History.Hist_BtnFiltro = '&Aplicar Filtro'
+    History.Hist_BtnExcluir = '&Excluir Hist'#243'rico'
+    History.Hist_BtnFechar = '&Fechar'
+    TypeFieldsDB.Type_VarChar = 'VarChar'
+    TypeFieldsDB.Type_Char = 'Char'
+    TypeFieldsDB.Type_Int = 'Int'
+    TypeFieldsDB.Type_MemoField = 'BLOB SUB_TYPE 1 SEGMENT SIZE 1024'
+    Language = ucPortuguesBr
+    Left = 152
+    Top = 104
+  end
 end

Source/ApplicationBase/Usuarios/Data/uDataModuleUsuarios.pas

@@ -7,7 +7,7 @@ uses
   FactuGES_Intf, uIntegerListUtils, uBizEmpresas,
   UCBase, UCDataConnector, uUCROConn, uDARemoteDataAdapter,
   uDARemoteCommand, uROClient, uRORemoteService, uDADataStreamer,
-  uDABin2DataStreamer, uDAScriptingProvider, uIDataModuleUsuarios;
+  uDABin2DataStreamer, uDAScriptingProvider, uIDataModuleUsuarios, UCSettings;
 
 const
   PERFIL_ADMINISTRADORES = 'Administradores';
@@ -17,6 +17,7 @@ type
     ROLoginService: TRORemoteService;
     srvUsuarios: TRORemoteService;
     Bin2DataStreamer: TDABin2DataStreamer;
+    UCSettingsSpanish: TUCSettings;
     procedure DAClientDataModuleCreate(Sender: TObject);
     procedure DAClientDataModuleDestroy(Sender: TObject);
   private
@@ -25,29 +26,31 @@ type
     FPassword : String;   // Lo guardo para poder hacer una reconexión
 
     FLoginInfo: TRdxLoginInfo;
-    FEmpresaActual: IBizEmpresa;
+//    function GetEsAdministrador: Boolean;
-    function CambiarPassword (const APassword : String) : boolean; overload;
-    function GetEsAdministrador: Boolean;
 
-    function GetEmpresas: TIntegerList;
+    //function GetEmpresas: TIntegerList;
 
-    procedure SetEmpresaActual(const Value: IBizEmpresa);
+    {procedure SetEmpresaActual(const Value: IBizEmpresa);
     function GetIDEmpresaActual: Integer;
-    procedure SetIDEmpresaActual(const Value: Integer);
+    procedure SetIDEmpresaActual(const Value: Integer);}
     function GetDataConnector : TUCDataConnector;
+    function GetUCSettings : TUCSettings;
+    procedure InicializarCamposUserControl(AUserControl: TUserControl);
+    procedure InicializarSettingsUserControl(AUserControl: TUserControl);
   public
-    procedure InicializarCamposUserControl (AUserControl : TUserControl);
+    procedure InicializarUserControl (AUserControl : TUserControl);
-    function Login: Boolean; overload;
+{    function Login: Boolean; overload;
     function Login(Usuario: String; Password: String): Boolean; overload;
     procedure Logout;
-    procedure CambiarPassword; overload;
+    procedure CambiarPassword; overload;}
 
-    property EsAdministrador : Boolean read GetEsAdministrador;
+//    property EsAdministrador : Boolean read GetEsAdministrador;
-    property IDEmpresaActual : Integer read GetIDEmpresaActual write SetIDEmpresaActual;
+//    property IDEmpresaActual : Integer read GetIDEmpresaActual write SetIDEmpresaActual;
-    property EmpresaActual : IBizEmpresa read FEmpresaActual write SetEmpresaActual;
+//    property EmpresaActual : IBizEmpresa read FEmpresaActual write SetEmpresaActual;
-    property Empresas : TIntegerList read GetEmpresas;
+//    property Empresas : TIntegerList read GetEmpresas;
-    property LoginInfo: TRdxLoginInfo read FLoginInfo;
+//    property LoginInfo: TRdxLoginInfo read FLoginInfo;
     property DataConnector : TUCDataConnector read GetDataConnector;
+    property UCSettings: TUCSettings read GetUCSettings;
   end;
 
 implementation
@@ -55,8 +58,8 @@ implementation
 {$R *.DFM}
 
 uses
-  Forms, Controls, uDataTableUtils, uDataModuleConexion, uLoginForm,
+  Forms, Controls, uDataTableUtils, uDataModuleConexion,
-  uCambiarPassword, Dialogs, Windows, uEmpresasController,
+  Dialogs, Windows, uEmpresasController,
   schUsuariosClient_Intf;
 
 { TDAClientDataModule1 }
@@ -74,7 +77,7 @@ begin
   FLoginInfo := NIL;
 end;
 
-function TDataModuleUsuarios.Login: Boolean;
+{function TDataModuleUsuarios.Login: Boolean;
 begin
   // Intento hacer login si el usuario ya lo había hecho antes
   if (Length(FUsuario) > 0) then
@@ -94,9 +97,9 @@ begin
     finally
       Free;
     end;
-end;
+end;}
 
-function TDataModuleUsuarios.Login(Usuario: String; Password: String): Boolean;
+{function TDataModuleUsuarios.Login(Usuario: String; Password: String): Boolean;
 begin
   // Libero la información del login anterior (sesión, etc)
   if Assigned(FLoginInfo) then
@@ -110,24 +113,24 @@ begin
     FUsuario := Usuario;
     FPassword := Password;
   end;
-end;
+end;}
 
-procedure TDataModuleUsuarios.Logout;
+{procedure TDataModuleUsuarios.Logout;
 begin
   (ROLoginService as IsrvLogin).Logout;
   if Assigned(FLoginInfo) then
     FreeANDNil(FLoginInfo);
   FUsuario := '';
   FPassword := '';
-end;
+end;}
 
-procedure TDataModuleUsuarios.SetEmpresaActual(const Value: IBizEmpresa);
+{procedure TDataModuleUsuarios.SetEmpresaActual(const Value: IBizEmpresa);
 begin
   FEmpresaActual := Value;
   FEmpresaActual.DataTable.Active := True;
-end;
+end;}
 
-procedure TDataModuleUsuarios.SetIDEmpresaActual(const Value: Integer);
+{procedure TDataModuleUsuarios.SetIDEmpresaActual(const Value: Integer);
 var
   AEmpresasController : IEmpresasController;
   AEmpresa : IBizEmpresa;
@@ -143,7 +146,7 @@ begin
   end
   else
     FEmpresaActual := NIL;
-end;
+end;}
 
 procedure TDataModuleUsuarios.DAClientDataModuleDestroy(Sender: TObject);
 begin
@@ -159,7 +162,7 @@ begin
   Result := FDataConnector;
 end;
 
-function TDataModuleUsuarios.GetEmpresas: TIntegerList;
+{function TDataModuleUsuarios.GetEmpresas: TIntegerList;
 var
   i : integer;
 begin
@@ -195,6 +198,11 @@ begin
     Result := ID_NULO
   else
     Result := FEmpresaActual.ID;
+end;   }
+
+function TDataModuleUsuarios.GetUCSettings: TUCSettings;
+begin
+  Result := UCSettingsSpanish;
 end;
 
 procedure TDataModuleUsuarios.InicializarCamposUserControl(
@@ -258,14 +266,261 @@ begin
       FieldTableName := fld_USUARIOS_EVENTOSTNAME;
     end;
 
-    with TableEmpresa do
-    begin
-      Active := False;
-    end;
   end;
 end;
 
-procedure TDataModuleUsuarios.CambiarPassword;
+procedure TDataModuleUsuarios.InicializarSettingsUserControl(
+  AUserControl: TUserControl);
+var
+  SourceSettings : TUCSettings;
+begin
+  SourceSettings := UCSettingsSpanish;
+
+  with AUserControl do
+  begin
+    with UserSettings.CommonMessages do
+    begin
+      BlankPassword         := SourceSettings.CommonMessages.BlankPassword;
+      PasswordChanged       := SourceSettings.CommonMessages.PasswordChanged;
+      InitialMessage.Text   := SourceSettings.CommonMessages.InitialMessage.Text;
+      MaxLoginAttemptsError := SourceSettings.CommonMessages.MaxLoginAttemptsError;
+      InvalidLogin          := SourceSettings.CommonMessages.InvalidLogin;
+      AutoLogonError        := SourceSettings.CommonMessages.AutoLogonError;
+      UsuarioExiste         := SourceSettings.CommonMessages.UsuarioExiste; // Luiz Benevenuto 20/04/06
+      PasswordExpired       := SourceSettings.CommonMessages.PasswordExpired; // vicente barros leonel
+      ForcaTrocaSenha       := SourceSettings.CommonMessages.ForcaTrocaSenha;
+    end;
+
+    with UserSettings.Login do
+    begin
+      BtCancel        := SourceSettings.Login.BtCancel;
+      BtOK            := SourceSettings.Login.BtOK;
+      LabelPassword   := SourceSettings.Login.LabelPassword;
+      LabelUser       := SourceSettings.Login.LabelUser;
+      WindowCaption   := SourceSettings.Login.WindowCaption;
+      LabelTentativa  := SourceSettings.Login.LabelTentativa;
+      LabelTentativas := SourceSettings.Login.LabelTentativas;
+
+      if Assigned(SourceSettings.Login.LeftImage.Bitmap) then
+        LeftImage.Bitmap := SourceSettings.Login.LeftImage.Bitmap
+      else
+        LeftImage.Bitmap := nil;
+
+      if Assigned(SourceSettings.Login.TopImage.Bitmap) then
+        TopImage.Bitmap := SourceSettings.Login.TopImage.Bitmap
+      else
+        TopImage.Bitmap := nil;
+
+      if Assigned(SourceSettings.Login.BottomImage.Bitmap) then
+        BottomImage.Bitmap := SourceSettings.Login.BottomImage.Bitmap
+      else
+        BottomImage.Bitmap := nil;
+    end;
+
+    with UserSettings.UsersForm do
+    begin
+      WindowCaption              := SourceSettings.UsersForm.WindowCaption;
+      LabelDescription           := SourceSettings.UsersForm.LabelDescription;
+      ColName                    := SourceSettings.UsersForm.ColName;
+      ColLogin                   := SourceSettings.UsersForm.ColLogin;
+      ColEmail                   := SourceSettings.UsersForm.ColEmail;
+      BtAdd                      := SourceSettings.UsersForm.BtAdd;
+      BtChange                   := SourceSettings.UsersForm.BtChange;
+      BtDelete                   := SourceSettings.UsersForm.BtDelete;
+      BtRights                   := SourceSettings.UsersForm.BtRights;
+      BtPassword                 := SourceSettings.UsersForm.BtPassword;
+      BtClose                    := SourceSettings.UsersForm.BtClose;
+      PromptDelete               := SourceSettings.UsersForm.PromptDelete;
+      PromptDelete_WindowCaption := SourceSettings.UsersForm.PromptDelete_WindowCaption; //added by fduenas
+    end;
+
+    with UserSettings.UsersProfile do
+    begin
+      WindowCaption              := SourceSettings.UsersProfile.WindowCaption;
+      LabelDescription           := SourceSettings.UsersProfile.LabelDescription;
+      ColProfile                 := SourceSettings.UsersProfile.ColProfile;
+      BtAdd                      := SourceSettings.UsersProfile.BtAdd;
+      BtChange                   := SourceSettings.UsersProfile.BtChange;
+      BtDelete                   := SourceSettings.UsersProfile.BtDelete;
+      BtRights                   := SourceSettings.UsersProfile.BtRights; //added by fduenas
+      BtClose                    := SourceSettings.UsersProfile.BtClose;
+      PromptDelete               := SourceSettings.UsersProfile.PromptDelete;
+      PromptDelete_WindowCaption := SourceSettings.UsersProfile.PromptDelete_WindowCaption; //added by fduenas
+    end;
+
+    with UserSettings.AddChangeUser do
+    begin
+      WindowCaption   := SourceSettings.AddChangeUser.WindowCaption;
+      LabelAdd        := SourceSettings.AddChangeUser.LabelAdd;
+      LabelChange     := SourceSettings.AddChangeUser.LabelChange;
+      LabelName       := SourceSettings.AddChangeUser.LabelName;
+      LabelLogin      := SourceSettings.AddChangeUser.LabelLogin;
+      LabelEmail      := SourceSettings.AddChangeUser.LabelEmail;
+      CheckPrivileged := SourceSettings.AddChangeUser.CheckPrivileged;
+      BtSave          := SourceSettings.AddChangeUser.BtSave;
+      BtCancel        := SourceSettings.AddChangeUser.BtCancel;
+      CheckExpira     := SourceSettings.AddChangeUser.CheckExpira;
+      Day             := SourceSettings.AddChangeUser.Day;
+      ExpiredIn       := SourceSettings.AddChangeUser.ExpiredIn;
+    end;
+
+    with UserSettings.AddChangeProfile do
+    begin
+      WindowCaption := SourceSettings.AddChangeProfile.WindowCaption;
+      LabelAdd      := SourceSettings.AddChangeProfile.LabelAdd;
+      LabelChange   := SourceSettings.AddChangeProfile.LabelChange;
+      LabelName     := SourceSettings.AddChangeProfile.LabelName;
+      BtSave        := SourceSettings.AddChangeProfile.BtSave;
+      BtCancel      := SourceSettings.AddChangeProfile.BtCancel;
+    end;
+
+    with UserSettings.Rights do
+    begin
+      WindowCaption := SourceSettings.Rights.WindowCaption;
+      LabelUser     := SourceSettings.Rights.LabelUser;
+      LabelProfile  := SourceSettings.Rights.LabelProfile;
+      PageMenu      := SourceSettings.Rights.PageMenu;
+      PageActions   := SourceSettings.Rights.PageActions;
+      PageControls  := SourceSettings.Rights.PageControls;
+      BtUnlock      := SourceSettings.Rights.BtUnlock;
+      BtLock        := SourceSettings.Rights.BtLock;
+      BtSave        := SourceSettings.Rights.BtSave;
+      BtCancel      := SourceSettings.Rights.BtCancel;
+    end;
+
+    with UserSettings.ChangePassword do
+    begin
+      WindowCaption        := SourceSettings.ChangePassword.WindowCaption;
+      LabelDescription     := SourceSettings.ChangePassword.LabelDescription;
+      LabelCurrentPassword := SourceSettings.ChangePassword.LabelCurrentPassword;
+      LabelNewPassword     := SourceSettings.ChangePassword.LabelNewPassword;
+      LabelConfirm         := SourceSettings.ChangePassword.LabelConfirm;
+      BtSave               := SourceSettings.ChangePassword.BtSave;
+      BtCancel             := SourceSettings.ChangePassword.BtCancel;
+    end;
+
+    with UserSettings.CommonMessages.ChangePasswordError do
+    begin
+      InvalidCurrentPassword := SourceSettings.CommonMessages.ChangePasswordError.InvalidCurrentPassword;
+      NewPasswordError       := SourceSettings.CommonMessages.ChangePasswordError.NewPasswordError;
+      NewEqualCurrent        := SourceSettings.CommonMessages.ChangePasswordError.NewEqualCurrent;
+      PasswordRequired       := SourceSettings.CommonMessages.ChangePasswordError.PasswordRequired;
+      MinPasswordLength      := SourceSettings.CommonMessages.ChangePasswordError.MinPasswordLength;
+      InvalidNewPassword     := SourceSettings.CommonMessages.ChangePasswordError.InvalidNewPassword;
+    end;
+
+    with UserSettings.ResetPassword do
+    begin
+      WindowCaption := SourceSettings.ResetPassword.WindowCaption;
+      LabelPassword := SourceSettings.ResetPassword.LabelPassword;
+    end;
+
+    with UserSettings.Log do
+    begin
+      WindowCaption              := SourceSettings.Log.WindowCaption;
+      LabelDescription           := SourceSettings.Log.LabelDescription;
+      LabelUser                  := SourceSettings.Log.LabelUser;
+      LabelDate                  := SourceSettings.Log.LabelDate;
+      LabelLevel                 := SourceSettings.Log.LabelLevel;
+      ColLevel                   := SourceSettings.Log.ColLevel;
+      ColMessage                 := SourceSettings.Log.ColMessage;
+      ColUser                    := SourceSettings.Log.ColUser;
+      ColDate                    := SourceSettings.Log.ColDate;
+      BtFilter                   := SourceSettings.Log.BtFilter;
+      BtDelete                   := SourceSettings.Log.BtDelete;
+      BtClose                    := SourceSettings.Log.BtClose;
+      PromptDelete               := SourceSettings.Log.PromptDelete;
+      PromptDelete_WindowCaption := SourceSettings.Log.PromptDelete_WindowCaption; //added by fduenas
+      OptionUserAll              := SourceSettings.Log.OptionUserAll;  //added by fduenas
+      OptionLevelLow             := SourceSettings.Log.OptionLevelLow; //added by fduenas
+      OptionLevelNormal          := SourceSettings.Log.OptionLevelNormal; //added by fduenas
+      OptionLevelHigh            := SourceSettings.Log.OptionLevelHigh; //added by fduenas
+      OptionLevelCritic          := SourceSettings.Log.OptionLevelCritic; //added by fduenas
+      DeletePerformed            := SourceSettings.Log.DeletePerformed; //added by fduenas
+    end;
+
+    with UserSettings.AppMessages do
+    begin
+      MsgsForm_BtNew                            := SourceSettings.AppMessages.MsgsForm_BtNew;
+      MsgsForm_BtReplay                         := SourceSettings.AppMessages.MsgsForm_BtReplay;
+      MsgsForm_BtForward                        := SourceSettings.AppMessages.MsgsForm_BtForward;
+      MsgsForm_BtDelete                         := SourceSettings.AppMessages.MsgsForm_BtDelete;
+      MsgsForm_BtClose                          := SourceSettings.AppMessages.MsgsForm_BtClose; //added by fduenas
+      MsgsForm_WindowCaption                    := SourceSettings.AppMessages.MsgsForm_WindowCaption;
+      MsgsForm_ColFrom                          := SourceSettings.AppMessages.MsgsForm_ColFrom;
+      MsgsForm_ColSubject                       := SourceSettings.AppMessages.MsgsForm_ColSubject;
+      MsgsForm_ColDate                          := SourceSettings.AppMessages.MsgsForm_ColDate;
+      MsgsForm_PromptDelete                     := SourceSettings.AppMessages.MsgsForm_PromptDelete;
+      MsgsForm_PromptDelete_WindowCaption       := SourceSettings.AppMessages.MsgsForm_PromptDelete_WindowCaption; //added by fduenas
+      MsgsForm_NoMessagesSelected               := SourceSettings.AppMessages.MsgsForm_NoMessagesSelected; //added by fduenas
+      MsgsForm_NoMessagesSelected_WindowCaption := SourceSettings.AppMessages.MsgsForm_NoMessagesSelected_WindowCaption; //added by fduenas
+
+      MsgRec_BtClose           := SourceSettings.AppMessages.MsgRec_BtClose;
+      MsgRec_WindowCaption     := SourceSettings.AppMessages.MsgRec_WindowCaption;
+      MsgRec_Title             := SourceSettings.AppMessages.MsgRec_Title;
+      MsgRec_LabelFrom         := SourceSettings.AppMessages.MsgRec_LabelFrom;
+      MsgRec_LabelDate         := SourceSettings.AppMessages.MsgRec_LabelDate;
+      MsgRec_LabelSubject      := SourceSettings.AppMessages.MsgRec_LabelSubject;
+      MsgRec_LabelMessage      := SourceSettings.AppMessages.MsgRec_LabelMessage;
+      MsgSend_BtSend           := SourceSettings.AppMessages.MsgSend_BtSend;
+      MsgSend_BtCancel         := SourceSettings.AppMessages.MsgSend_BtCancel;
+      MsgSend_WindowCaption    := SourceSettings.AppMessages.MsgSend_WindowCaption;
+      MsgSend_Title            := SourceSettings.AppMessages.MsgSend_Title;
+      MsgSend_GroupTo          := SourceSettings.AppMessages.MsgSend_GroupTo;
+      MsgSend_RadioUser        := SourceSettings.AppMessages.MsgSend_RadioUser;
+      MsgSend_RadioAll         := SourceSettings.AppMessages.MsgSend_RadioAll;
+      MsgSend_GroupMessage     := SourceSettings.AppMessages.MsgSend_GroupMessage;
+      MsgSend_LabelSubject     := SourceSettings.AppMessages.MsgSend_LabelSubject; //added by fduenas
+      MsgSend_LabelMessageText := SourceSettings.AppMessages.MsgSend_LabelMessageText; //added by fduenas
+    end;
+
+    With UserSettings.History do
+      Begin
+        Evento_edit         := SourceSettings.History.Evento_edit;
+        Evento_NewRecord    := SourceSettings.History.Evento_NewRecord;
+        Evento_Insert       := SourceSettings.History.Evento_Insert;
+        Evento_delete       := SourceSettings.History.Evento_Delete;
+        LabelTabela         := SourceSettings.History.LabelTabela;
+        Msg_LogEmptyHistory := SourceSettings.History.Msg_LogEmptyHistory;
+        Msg_MensConfirma    := SourceSettings.History.Msg_MensConfirma;
+        LabelDescricao      := SourceSettings.History.LabelDescricao;
+        Hist_BtnExcluir     := SourceSettings.History.Hist_BtnExcluir;
+        Hist_BtnFiltro      := SourceSettings.History.Hist_BtnFiltro;
+        LabelForm           := SourceSettings.History.LabelForm;
+        Hist_BtnFechar      := SourceSettings.History.Hist_BtnFechar;
+        LabelDataEvento     := SourceSettings.History.LabelDataEvento;
+        LabelEvento         := SourceSettings.History.LabelEvento;
+        Msg_NewRecord       := SourceSettings.History.Msg_NewRecord;
+        Hist_All            := SourceSettings.History.Hist_All;
+        Msg_LimpHistorico   := SourceSettings.History.Msg_LimpHistorico;
+        LabelHoraEvento     := SourceSettings.History.LabelHoraEvento;
+        LabelUser           := SourceSettings.History.LabelUser;
+        Hist_MsgExceptPropr := SourceSettings.History.Hist_MsgExceptPropr;
+      End;
+
+    with UserSettings.TypeFieldsDB do
+      Begin
+        Type_VarChar   := SourceSettings.TypeFieldsDB.Type_VarChar;
+        Type_Char      := SourceSettings.TypeFieldsDB.Type_Char;
+        Type_Int       := SourceSettings.TypeFieldsDB.Type_Int;
+        Type_MemoField := SourceSettings.TypeFieldsDB.Type_MemoField;
+      end;
+
+    UserSettings.WindowsPosition := SourceSettings.WindowsPosition;
+  end;
+end;
+
+procedure TDataModuleUsuarios.InicializarUserControl(
+  AUserControl: TUserControl);
+begin
+  if Assigned(AUserControl) then
+  begin
+    InicializarCamposUserControl(AUserControl);
+    InicializarSettingsUserControl(AUserControl);
+  end;
+end;
+
+{procedure TDataModuleUsuarios.CambiarPassword;
 begin
   with TfCambiarPassword.Create(NIL) do
     try
@@ -275,13 +530,6 @@ begin
     finally
       Free;
     end;
-end;
+end;}
-
-function TDataModuleUsuarios.CambiarPassword(const APassword: String): boolean;
-begin
-{  if not (ROLoginService as IsrvLogin).SetUserPassword(LoginInfo.UserID, APassword) then
-    raise Exception.Create('Error en el servidor. No se ha podido cambiar la contraseña');}
-  Result := True;
-end;
 
 end.

Source/ApplicationBase/Usuarios/Data/uLoginForm.pas

@@ -1,112 +0,0 @@
-unit uLoginForm;
-
-interface
-
-uses
-  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
-  Dialogs, StdCtrls, ExtCtrls, ComCtrls, cxGraphics, cxControls,
-  cxContainer, cxEdit, cxTextEdit, cxMaskEdit, cxDropDownEdit,
-  cxImageComboBox, ImgList, PngImageList, pngimage, ToolWin, JvExControls,
-  JvComponent, JvGradient, JvGIF, JvComponentBase, JvFormPlacement,
-  JvAppStorage, JvAppRegistryStorage;
-
-type
-  TfLoginForm = class(TForm)
-    Panel1: TPanel;
-    Label3: TLabel;
-    Label4: TLabel;
-    edtPassword: TEdit;
-    bAceptar: TButton;
-    bCancelar: TButton;
-    Label1: TLabel;
-    edtUser: TEdit;
-    JvGradient1: TJvGradient;
-    Button1: TButton;
-    Timer1: TTimer;
-    JvAppRegistryStorage1: TJvAppRegistryStorage;
-    JvFormStorage1: TJvFormStorage;
-    Image1: TImage;
-    procedure bAceptarClick(Sender: TObject);
-    procedure FormCreate(Sender: TObject);
-    procedure ToolButton4Click(Sender: TObject);
-    procedure FormShow(Sender: TObject);
-    procedure Timer1Timer(Sender: TObject);
-  private
-    FIntentos: Integer;
-  end;
-  
-var
-  fLoginForm: TfLoginForm;
-
-implementation
-
-uses
-  uFactuGES_App, uDataModuleConexion;
-  {uDataModuleUsuarios, uDataModuleBase}
-
-{$R *.dfm}
-
-{
-********************************* TfLoginForm **********************************
-}
-procedure TfLoginForm.bAceptarClick(Sender: TObject);
-//var
-//  bOk : Boolean;
-begin
-{  ShowHourglassCursor;
-  try
-    bOK := dmUsuarios.Login(edtUser.Text, edtPassword.Text);
-  finally
-    HideHourglassCursor;
-  end;
-
-  if bOk then
-    ModalResult := mrOK
-  else begin
-    Application.MessageBox('Usuario no válido. Compruebe si ha escrito correctamente'
-      + #13 + #10 + 'el usuario y la contraseña.', 'Atención', MB_OK);
-    Dec(FIntentos);
-    if (FIntentos <= 0) then
-      ModalResult := mrCancel;
-  end;}
-end;
-
-procedure TfLoginForm.FormCreate(Sender: TObject);
-begin
-  FIntentos := 3;
-end;
-
-procedure TfLoginForm.ToolButton4Click(Sender: TObject);
-var
-  ATimer : Boolean;
-begin
-  if Timer1.Enabled then
-  begin
-    ATimer := True;
-    Timer1.Enabled := False;
-  end;
-
-  dmConexion.ConfigurarConexion;
-
-  if ATimer then
-    Timer1.Enabled := True;
-end;
-
-procedure TfLoginForm.FormShow(Sender: TObject);
-begin
-  Self.Caption := Self.Caption + ' - ' + AppFactuGES.AppVersion;
-  JvFormStorage1.RestoreFormPlacement;
-  // Hacer login automática si hay usuario/password y no hay más de una base
-  // de datos como opción para conectarse.
-
-  if ((Length(edtUser.Text) > 0) and (Length(edtPassword.Text) > 0)) then
-    Timer1.Enabled := True;
-end;
-
-procedure TfLoginForm.Timer1Timer(Sender: TObject);
-begin
-  Timer1.Enabled := False;
-  bAceptar.Click;
-end;
-
-end.

Source/ApplicationBase/Usuarios/Model/Data/uIDataModuleUsuarios.pas

@@ -3,12 +3,12 @@ unit uIDataModuleUsuarios;
 interface
 
 uses
-  UCBase, UCDataConnector;
+  UCBase, UCDataConnector, UCSettings;
 
 type
   IDataModuleUsuarios = interface
   ['{F2D2E969-5E87-42DE-A550-E839C4607C72}']
-    procedure InicializarCamposUserControl (AUserControl : TUserControl);  
+    procedure InicializarUserControl (AUserControl : TUserControl);  
     function GetDataConnector : TUCDataConnector;
     property DataConnector : TUCDataConnector read GetDataConnector;
   end;

Source/ApplicationBase/Usuarios/Model/uUsuarios.pas

@@ -6,9 +6,7 @@ uses
   UCBase;
 
 type
-  TUsuario = class(TUCUser)
+  TUsuario = TUCCurrentUser;
-    
-  end;
 
 implementation
 

Source/ApplicationBase/uFactuGES_App.pas

@@ -13,14 +13,12 @@ type
     FEmpresasController : IEmpresasController;
     FUsuariosController: IUsuariosController;
     FEmpresaActiva: IBizEmpresa;
-    FUsuarioActivo: TUsuario;
     function GetAppForm: TCustomForm;
-    procedure SetEmpresaActiva(const Value: IBizEmpresa);
-    procedure SetUsuarioActivo(const Value: TUsuario);
     function GetEmpresasController: IEmpresasController;
     function GetUsuariosController: IUsuariosController;
     function GetAppName: String;
     function GetAppVersion: String;
+    function GetUsuarioActivo: TUsuario;
   protected
     procedure InitializeInstance; virtual;
     procedure DestroyInstance; virtual;
@@ -28,11 +26,12 @@ type
     class function NewInstance: TObject; override;
     procedure FreeInstance; override;
     class function RefCount: Integer;
+    procedure CambarEmpresa(const AIDEmpresa : Integer);
     property AppVersion : String read GetAppVersion;
     property AppName : String read GetAppName;
     property AppForm : TCustomForm read GetAppForm;
-    property EmpresaActiva : IBizEmpresa read FEmpresaActiva write SetEmpresaActiva;
+    property EmpresaActiva : IBizEmpresa read FEmpresaActiva;
-    property UsuarioActivo : TUsuario read FUsuarioActivo write SetUsuarioActivo;
+    property UsuarioActivo : TUsuario read GetUsuarioActivo;
     property EmpresasController : IEmpresasController read GetEmpresasController;
     property UsuariosController : IUsuariosController read GetUsuariosController;
   end;
@@ -43,14 +42,27 @@ var
 implementation
 
 uses
-  uDataModuleBase, uUsuariosViewRegister;
+  uDataModuleBase, uUsuariosViewRegister, uEmpresasViewRegister;
 
 var
   Ref_Count : Integer = 0;
 
+procedure TAppFactuGES.CambarEmpresa(const AIDEmpresa: Integer);
+var
+  Aux : IBizEmpresa;
+begin
+  Aux := EmpresasController.Buscar(AIDEmpresa);
+  if Assigned(Aux) then
+  begin
+    Aux.DataTable.Active := True;
+    if not Aux.IsEmpty then
+      FEmpresaActiva := Aux;
+  end;
+end;
+
 procedure TAppFactuGES.DestroyInstance;
 begin
-
+  FreeAndNIL(FAppInfo);
 end;
 
 procedure TAppFactuGES.FreeInstance;
@@ -59,9 +71,9 @@ begin
   if (Ref_Count = 0) then
   begin
     AppFactuGES := NIL;
+
     // Destroy private variables here
-
+    DestroyInstance;
-
 
     inherited FreeInstance;
   end;
@@ -87,6 +99,11 @@ begin
   Result := FEmpresasController;
 end;
 
+function TAppFactuGES.GetUsuarioActivo: TUsuario;
+begin
+  Result := FUsuariosController.CurrentUser;
+end;
+
 function TAppFactuGES.GetUsuariosController: IUsuariosController;
 begin
   Result := FUsuariosController;
@@ -95,7 +112,6 @@ end;
 procedure TAppFactuGES.InitializeInstance;
 begin
   FEmpresaActiva := NIL;
-  FUsuarioActivo := NIL;
   FAppInfo := TJclFileVersionInfo.Create(Application.ExeName);
   FUsuariosController := TUsuariosController.Create;
   FEmpresasController := TEmpresasController.Create;
@@ -118,28 +134,19 @@ begin
   Result := Ref_Count;
 end;
 
-procedure TAppFactuGES.SetEmpresaActiva(const Value: IBizEmpresa);
-begin
-  FEmpresaActiva := Value;
-end;
-
-procedure TAppFactuGES.SetUsuarioActivo(const Value: TUsuario);
-begin
-  if Assigned(FUsuarioActivo) and (FUsuarioActivo <> Value) then
-    FreeAndNIL(FUsuarioActivo);
-  FUsuarioActivo := Value;
-end;
 
 initialization
   AppFactuGES := TAppFactuGES.Create;
 
   // Pongo esto aquí por ahora
   uUsuariosViewRegister.RegisterViews;
+  uEmpresasViewRegister.RegisterViews;
 
 finalization
   FreeAndNIL(AppFactuGES);
 
   // Pongo esto aquí por ahora
   uUsuariosViewRegister.UnregisterViews;
+  uEmpresasViewRegister.UnregisterViews;
   
 end.

Source/Cliente/FactuGES.dpr

@@ -1,7 +1,6 @@
 program FactuGES;
 
 uses
-  ExceptionLog,
   Forms,
   Windows,
   SysUtils,

Source/Cliente/FactuGES.dproj

@@ -45,13 +45,73 @@
     <DCC_ResourcePath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib</DCC_ResourcePath>
     <DCC_ObjPath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib</DCC_ObjPath>
     <DCC_IncludePath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib</DCC_IncludePath>
-    <DCC_Define>DEBUG;EUREKALOG;EUREKALOG_VER6</DCC_Define>
+    <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="DebugSourceDirs">T:\Codigo (Luis Leon)\Source\Modulos\Pedidos de cliente\Controller\</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">2</VersionInfo><VersionInfo Name="Release">2</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.2.2.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1.4</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
       <Excluded_Packages Name="$(BDS)\bin\applet100.bpl">CodeGear Control Panel Applet Package</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>
@@ -86,7 +146,7 @@
 <!-- EurekaLog First Line
 [Exception Log]
 EurekaLog Version=6006
-Activate=1
+Activate=0
 Activate Handle=1
 Save Log File=1
 Foreground Tab=0

Source/Cliente/FactuGES.drc

@@ -12,11 +12,10 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Archivos de programa\EurekaLog 6\Delphi11\DIALOG.RES */
 /* c:\archivos de programa\codegear\rad studio\5.0\lib\WindowsXP.res */
 /* C:\Codigo Tecsitel\Lib\jvcl\JvXPCore.res */
-/* uSplash.dfm */
+/* C:\Codigo Tecsitel\Source\Cliente\uSplash.dfm */
-/* uAcercaDe.dfm */
+/* C:\Codigo Tecsitel\Source\Cliente\uAcercaDe.dfm */
 /* C:\Codigo Tecsitel\Source\Cliente\uPantallaPrincipal.dfm */
 /* C:\Codigo Tecsitel\Source\Cliente\FactuGES.res */
 /* C:\Codigo Tecsitel\Source\Cliente\FactuGES.drf */

Source/Cliente/uMainMenuController.pas

@@ -64,8 +64,7 @@ end;
 
 procedure TMainMenuController.CambiarEmpresaClick(Sender: TObject);
 begin
-  // OJOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
+  AppFactuGES.CambarEmpresa((Sender as TMenuItem).Tag);
-  //  dmUsuarios.IDEmpresaActual := (Sender as TMenuItem).Tag;
 end;
 
 procedure TMainMenuController.InitMainMenu;

Source/Cliente/uPantallaPrincipal.dfm

@@ -2,7 +2,7 @@ object fPantallaPrincipal: TfPantallaPrincipal
   Left = 358
   Top = 250
   Caption = 'Pantalla principal'
-  ClientHeight = 525
+  ClientHeight = 563
   ClientWidth = 751
   Color = clWindow
   Font.Charset = DEFAULT_CHARSET
@@ -23,7 +23,7 @@ object fPantallaPrincipal: TfPantallaPrincipal
     Left = 0
     Top = 0
     Width = 751
-    Height = 503
+    Height = 541
     Margins.Left = 5
     Margins.Top = 5
     Margins.Right = 5
@@ -31,12 +31,12 @@ object fPantallaPrincipal: TfPantallaPrincipal
     ParentColor = True
     Align = alClient
     TabOrder = 0
-    ExplicitHeight = 484
+    ExplicitHeight = 522
     object JvSyncSplitter1: TJvSyncSplitter
       Left = 215
       Top = 5
       Width = 5
-      Height = 493
+      Height = 531
       ResizeStyle = rsPattern
       ExplicitLeft = 210
       ExplicitHeight = 570
@@ -45,7 +45,7 @@ object fPantallaPrincipal: TfPantallaPrincipal
       Left = 5
       Top = 5
       Width = 210
-      Height = 493
+      Height = 531
       ActivePage = pagInicio
       Align = alLeft
       AutoHeaders = True
@@ -86,12 +86,12 @@ object fPantallaPrincipal: TfPantallaPrincipal
       NavPanelHotTrackFont.Style = []
       SmallImages = ModulesSmallImageList
       OnChange = JvNavigationPaneChange
-      ExplicitHeight = 474
+      ExplicitHeight = 512
       object pagInicio: TJvNavPanelPage
         Left = 0
         Top = 0
         Width = 208
-        Height = 420
+        Height = 458
         Background.Stretch = False
         Background.Proportional = False
         Background.Center = False
@@ -99,17 +99,17 @@ object fPantallaPrincipal: TfPantallaPrincipal
         Background.Transparent = False
         Caption = 'Inicio'
         ImageIndex = 0
-        ExplicitHeight = 401
+        ExplicitHeight = 439
         object Panel1: TPanel
           Left = 0
-          Top = 334
+          Top = 372
           Width = 208
           Height = 86
           Align = alBottom
           Color = clWindow
           ParentBackground = False
           TabOrder = 1
-          ExplicitTop = 315
+          ExplicitTop = 353
           object Label1: TLabel
             Left = 38
             Top = 29
@@ -157,21 +157,21 @@ object fPantallaPrincipal: TfPantallaPrincipal
       Left = 220
       Top = 5
       Width = 526
-      Height = 493
+      Height = 531
       BoundColor = clActiveCaption
       BoundLines = [blLeft, blTop, blRight, blBottom]
       Caption = 'pnlBorde'
       Align = alClient
-      ExplicitHeight = 474
+      ExplicitHeight = 512
       object pnlMain: TTBXAlignmentPanel
         Left = 1
         Top = 1
         Width = 524
-        Height = 491
+        Height = 529
         Align = alClient
         Color = clWindow
         TabOrder = 0
-        ExplicitHeight = 472
+        ExplicitHeight = 510
         object lblBienvenido: TLabel
           Left = 8
           Top = 8
@@ -208,7 +208,7 @@ object fPantallaPrincipal: TfPantallaPrincipal
   end
   object TBXStatusBar1: TTBXStatusBar
     Left = 0
-    Top = 503
+    Top = 541
     Width = 751
     Images = StatusPanelImageList
     Panels = <
@@ -230,7 +230,7 @@ object fPantallaPrincipal: TfPantallaPrincipal
         Tag = 0
       end>
     UseSystemFont = False
-    ExplicitTop = 484
+    ExplicitTop = 522
   end
   object XPManifest1: TXPManifest
     Left = 248
@@ -260,7 +260,6 @@ object fPantallaPrincipal: TfPantallaPrincipal
       Tag = -9000
       Category = 'Archivo'
       Caption = 'Cambiar mi contrase'#241'a'
-      Enabled = False
       OnExecute = actCambiarPassExecute
     end
     object actConexion: TAction
@@ -562,11 +561,28 @@ object fPantallaPrincipal: TfPantallaPrincipal
     object Opciones1_OLD: TMenuItem
       Tag = -7000
       Caption = 'Opciones'
+      object Administracin1: TMenuItem
+        Tag = 1
+        Caption = 'Administraci'#243'n'
+        object Usuarios1: TMenuItem
+          Caption = 'Usuarios'
+          OnClick = Usuarios1Click
+        end
+        object Perfiles1: TMenuItem
+          Caption = 'Perfiles'
+          OnClick = Perfiles1Click
+        end
+      end
+      object N2: TMenuItem
+        Tag = 2
+        Caption = '-'
+      end
       object Configuraractualizaciones1: TMenuItem
+        Tag = 100
         Action = actActualizaciones
       end
       object Configurarconexin2_OLD: TMenuItem
-        Tag = 3
+        Tag = 101
         Action = actConexion
       end
     end
@@ -592,6 +608,10 @@ object fPantallaPrincipal: TfPantallaPrincipal
         Caption = '-'
         Visible = False
       end
+      object Informacindeempresa1: TMenuItem
+        Caption = 'Informaci'#243'n de empresa'
+        OnClick = Informacindeempresa1Click
+      end
     end
     object Logstica1: TMenuItem
       Tag = 100

Source/Cliente/uPantallaPrincipal.pas

@@ -77,6 +77,11 @@ type
     actVerBarraEstado: TAction;
     Paneldeexploracin1: TMenuItem;
     Paneldeexploracin2: TMenuItem;
+    Informacindeempresa1: TMenuItem;
+    Administracin1: TMenuItem;
+    N2: TMenuItem;
+    Usuarios1: TMenuItem;
+    Perfiles1: TMenuItem;
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
     procedure HostManagerAfterLoad(Sender: TObject; AModuleInfo: TModuleInfo);
@@ -99,6 +104,9 @@ type
     procedure actVerBarraEstadoUpdate(Sender: TObject);
     procedure actVerBarraEstadoExecute(Sender: TObject);
     procedure Acercade1Click(Sender: TObject);
+    procedure Informacindeempresa1Click(Sender: TObject);
+    procedure Usuarios1Click(Sender: TObject);
+    procedure Perfiles1Click(Sender: TObject);
   private
     FContenido : TCustomEditor;
     procedure ShowEmbedded(AEditor : ICustomEditor);
@@ -127,7 +135,7 @@ var
 implementation
 
 uses
-  uSplash, uAcercaDe, UxTheme, Themes, uMenuUtils,
+  uSplash, uAcercaDe, UxTheme, Themes, uMenuUtils, uBizEmpresas,
   uFactuGES_App, uDataModuleBase, uDataModuleConexion,
   uModuleController, uMainMenuController, uNavPaneController,
   uDialogUtils, cxControls;
@@ -150,7 +158,7 @@ end;
 procedure TfPantallaPrincipal.FormCreate(Sender: TObject);
 begin
   ApplicationEvents.Activate;
-  Caption := AppFactuGES.AppName + ' - ' + AppFactuGES.AppVersion;
+  Caption := AppFactuGES.AppName + ' ' + AppFactuGES.AppVersion;
   SplashScreen := TSplashScreen.Create(Application) ;
   SplashScreen.Show;
 
@@ -186,11 +194,10 @@ procedure TfPantallaPrincipal.RefrescarUI;
 var
   ATitulo : String;
 begin
-  ATitulo := AppFactuGES.AppName + AppFactuGES.AppVersion;
+  ATitulo := AppFactuGES.AppName + ' ' + AppFactuGES.AppVersion;
 
-  // OJOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
+  if Assigned(AppFactuGES.EmpresaActiva) then
-{  if Assigned(dmUsuarios.EmpresaActual) then
+    ATitulo := AppFactuGES.EmpresaActiva.NOMBRE + ' - ' + ATitulo;
-    ATitulo := ATitulo + ' - ' + dmUsuarios.EmpresaActual.NOMBRE;}
 
   Caption := ATitulo;
 
@@ -199,10 +206,9 @@ begin
   else
     TBXStatusBar1.Panels[0].Caption := 'Desconectado';
 
-    // OJOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
+  if Assigned(AppFactuGES.UsuarioActivo) then
-{  if Assigned(dmUsuarios.LoginInfo) then
+    TBXStatusBar1.Panels[1].Caption := AppFactuGES.UsuarioActivo.UserName
-    TBXStatusBar1.Panels[1].Caption := dmUsuarios.LoginInfo.Usuario
+  else
-  else}
     TBXStatusBar1.Panels[1].Caption := '';
 end;
 
@@ -302,8 +308,15 @@ begin
   Result := pnlMain;
 end;
 
+procedure TfPantallaPrincipal.Informacindeempresa1Click(Sender: TObject);
+begin
+  //
+  AppFactuGES.EmpresasController.Ver(AppFactuGES.EmpresaActiva);
+end;
+
 procedure TfPantallaPrincipal.InicializarUI;
 var
+  AListaEmpresas : IBizEmpresa;
   i : Integer;
 begin
   for i := 0 to HostManager.ModulesCount - 1 do
@@ -317,15 +330,19 @@ begin
 
   NavPaneController.InitNavPane;
 
-  // OJOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
+  AListaEmpresas := AppFactuGES.EmpresasController.BuscarTodos;
-  {  if dmUsuarios.Empresas.Count = 1 then
+  if Assigned(AListaEmpresas) then
   begin
-    // Oculto la página de inicio para que no parezca
+    AListaEmpresas.Active := True;
-    // que se pueden manejar varias empresas.
+    if AListaEmpresas.RecordCount = 1 then
-    JvNavigationPane.ActivePageIndex := 1;
+    begin
-    pagInicio.PageList := NIL;
+      // Oculto la página de inicio para que no parezca
-    pagInicio.Visible := False;
+      // que se pueden manejar varias empresas.
-  end;}
+      JvNavigationPane.ActivePageIndex := 1;
+      pagInicio.PageList := NIL;
+      pagInicio.Visible := False;
+    end;
+  end;
 
   RefrescarUI;
 end;
@@ -364,8 +381,7 @@ end;
 
 procedure TfPantallaPrincipal.actMenuComprasUpdate(Sender: TObject);
 begin
-// OJOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
+  (Sender as TAction).Enabled := Assigned(AppFactuGES.EmpresaActiva);
-//  (Sender as TAction).Enabled := Assigned(dmUsuarios.EmpresaActual);
 end;
 
 procedure TfPantallaPrincipal.actLogisticaMenuExecute(Sender: TObject);
@@ -411,6 +427,11 @@ begin
   //
 end;
 
+procedure TfPantallaPrincipal.Perfiles1Click(Sender: TObject);
+begin
+  AppFactuGES.UsuariosController.ShowProfileManager;
+end;
+
 procedure TfPantallaPrincipal.ShowEmbedded(AEditor: ICustomEditor);
 begin
   if Assigned(FContenido) and not FContenido.CloseQuery then
@@ -443,6 +464,11 @@ begin
   OnWorkPanelChanged(FContenido);
 end;
 
+procedure TfPantallaPrincipal.Usuarios1Click(Sender: TObject);
+begin
+  AppFactuGES.UsuariosController.ShowUserManager;
+end;
+
 procedure TfPantallaPrincipal.WMSysCommand(var Msg: TMessage);
 begin
   //No tocar, sirve para recuperar el foco el formulario principal cuando
@@ -538,7 +564,7 @@ end;
 
 procedure TfPantallaPrincipal.actCambiarPassExecute(Sender: TObject);
 begin
-//  dmUsuarios.CambiarPassword;
+  AppFactuGES.UsuariosController.ShowChangePassword;
   RefrescarUI;
 end;
 
@@ -595,8 +621,7 @@ begin
   //Se libera el contenido que tenga ya que cambiamos de empresa;
   ReleaseEmbedded;
 
-  // OJOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
+  AppFactuGES.CambarEmpresa(JvNavigationPane.ActivePage.Tag);
-  //dmUsuarios.IDEmpresaActual := JvNavigationPane.ActivePage.Tag;
   RefrescarUI;
 end;
 

Source/GUIBase/GUIBase.dproj

@@ -57,22 +57,22 @@
     <DelphiCompile Include="GUIBase.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
+    <DCCReference Include="..\Servidor\Base.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
+    <DCCReference Include="..\Servidor\dbrtl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxBarD10.dcp" />
+    <DCCReference Include="..\Servidor\dxBarD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxBarExtItemsD10.dcp" />
+    <DCCReference Include="..\Servidor\dxBarExtItemsD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxLayoutControlD10.dcp" />
+    <DCCReference Include="..\Servidor\dxLayoutControlD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxPScxCommonD10.dcp" />
+    <DCCReference Include="..\Servidor\dxPScxCommonD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxPScxGridLnkD10.dcp" />
+    <DCCReference Include="..\Servidor\dxPScxGridLnkD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxPsPrVwAdvD10.dcp" />
+    <DCCReference Include="..\Servidor\dxPsPrVwAdvD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\frx10.dcp" />
+    <DCCReference Include="..\Servidor\frx10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\frxe10.dcp" />
+    <DCCReference Include="..\Servidor\frxe10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\fs10.dcp" />
+    <DCCReference Include="..\Servidor\fs10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvAppFrmD11R.dcp" />
+    <DCCReference Include="..\Servidor\JvAppFrmD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvCtrlsD11R.dcp" />
+    <DCCReference Include="..\Servidor\JvCtrlsD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
+    <DCCReference Include="..\Servidor\rtl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
+    <DCCReference Include="..\Servidor\vcl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
+    <DCCReference Include="..\Servidor\vcldb.dcp" />
     <DCCReference Include="uDialogBase.pas">
       <Form>fDialogBase</Form>
     </DCCReference>

Source/Servidor/FactuGES_Server.dpr

@@ -3,6 +3,7 @@ program FactuGES_Server;
 {#ROGEN:..\Servicios\FactuGES.rodl} // RemObjects: Careful, do not remove!
 
 uses
+  ExceptionLog,
   uROComInit,
   Forms,
   uServerMainForm in 'uServerMainForm.pas' {fServerForm},
@@ -52,10 +53,13 @@ uses
 
 begin
   Application.Initialize;
+  ReportMemoryLeaksOnShutdown := True;
+
   Application.Title := 'FactuGES (Servidor)';
   Application.CreateForm(TfServerForm, fServerForm);
   Application.CreateForm(TdmServer, dmServer);
   Application.ShowMainForm := False;
+
   Application.Run;
   Application.Terminate;
 end.

Source/Servidor/FactuGES_Server.dproj

@@ -20,7 +20,8 @@
     <Version>7.0</Version>
     <DCC_MapFile>3</DCC_MapFile>
     <DCC_ExeOutput>..\..\Output\Debug\Servidor</DCC_ExeOutput>
-    <DCC_Define>DEBUG</DCC_Define>
+    <DCC_Define>DEBUG;EUREKALOG;EUREKALOG_VER6</DCC_Define>
+    <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
   </PropertyGroup>
   <ProjectExtensions>
     <Borland.Personality>Delphi.Personality</Borland.Personality>
@@ -103,12 +104,12 @@
 <!-- EurekaLog First Line
 [Exception Log]
 EurekaLog Version=6006
-Activate=0
+Activate=1
 Activate Handle=1
 Save Log File=1
 Foreground Tab=0
 Freeze Activate=0
-Freeze Timeout=0
+Freeze Timeout=1
 SMTP From=eurekalog@email.com
 SMTP Host=
 SMTP Port=25
@@ -255,7 +256,7 @@ boSaveCompressedCopyInCaseOfError=0
 boHandleSafeCallExceptions=1
 boCallRTLExceptionEvent=0
 boCatchHandledExceptions=0
-loCatchLeaks=0
+loCatchLeaks=1
 loGroupsSonLeaks=1
 loHideBorlandLeaks=1
 loFreeAllLeaks=1

Source/Servidor/FactuGES_Server.drc

@@ -501,12 +501,12 @@
 #define JclResources_RsWrongDataType 64989
 #define JclResources_RsInconsistentPath 64990
 #define JclResources_RsHKCRLong 64991
-#define IdResourceStringsProtocols_RSHTTPUnknownResponseCode 64992
+#define IdResourceStringsCore_RSBufferMissingTerminator 64992
-#define IdResourceStringsProtocols_RSHTTPHeaderAlreadyWritten 64993
+#define IdResourceStringsCore_RSBufferInvalidStartPos 64993
-#define IdResourceStringsProtocols_RSHTTPErrorParsingCommand 64994
+#define IdResourceStringsCore_RSReplyInvalidCode 64994
-#define IdResourceStringsProtocols_RSHTTPUnsupportedAuthorisationScheme 64995
+#define IdResourceStringsCore_RSThreadSchedulerThreadRequired 64995
-#define IdResourceStringsProtocols_RSHTTPCannotSwitchSessionStateWhenActive 64996
+#define IdResourceStringsCore_RSNoOnExecute 64996
-#define IdResourceStringsProtocols_RSHTTPAuthAlreadyRegistered 64997
+#define IdResourceStringsCore_RSTCPServerSchedulerAlreadyActive 64997
 #define ComStrs_sTabFailClear 64998
 #define ComStrs_sTabFailDelete 64999
 #define ComStrs_sTabFailRetrieve 65000
@@ -517,86 +517,86 @@
 #define ComStrs_sInvalidIndex 65005
 #define ComStrs_sInsertError 65006
 #define ComStrs_sUDAssociated 65007
-#define IdResourceStringsProtocols_RSHTTPNotAcceptable 65008
+#define IdResourceStringsCore_RSInterceptCircularLink 65008
-#define IdResourceStringsProtocols_RSHTTPProxyAuthenticationRequired 65009
+#define IdResourceStringsCore_RSNotEnoughDataInBuffer 65009
-#define IdResourceStringsProtocols_RSHTTPRequestTimeout 65010
+#define IdResourceStringsCore_RSTooMuchDataInBuffer 65010
-#define IdResourceStringsProtocols_RSHTTPConflict 65011
+#define IdResourceStringsCore_RSFileNotFound 65011
-#define IdResourceStringsProtocols_RSHTTPGone 65012
+#define IdResourceStringsCore_RSNotConnected 65012
-#define IdResourceStringsProtocols_RSHTTPLengthRequired 65013
+#define IdResourceStringsCore_RSObjectTypeNotSupported 65013
-#define IdResourceStringsProtocols_RSHTTPPreconditionFailed 65014
+#define IdResourceStringsCore_RSIdNoDataToRead 65014
-#define IdResourceStringsProtocols_RSHTTPRequestEntityToLong 65015
+#define IdResourceStringsCore_RSReadTimeout 65015
-#define IdResourceStringsProtocols_RSHTTPRequestURITooLong 65016
+#define IdResourceStringsCore_RSReadLnMaxLineLengthExceeded 65016
-#define IdResourceStringsProtocols_RSHTTPUnsupportedMediaType 65017
+#define IdResourceStringsCore_RSConnectTimeout 65017
-#define IdResourceStringsProtocols_RSHTTPInternalServerError 65018
+#define IdResourceStringsCore_RSThreadTerminateAndWaitFor 65018
-#define IdResourceStringsProtocols_RSHTTPNotImplemented 65019
+#define IdResourceStringsCore_RSAlreadyConnected 65019
-#define IdResourceStringsProtocols_RSHTTPBadGateway 65020
+#define IdResourceStringsCore_RSMaximumNumberOfCaptureLineExceeded 65020
-#define IdResourceStringsProtocols_RSHTTPServiceUnavailable 65021
+#define IdResourceStringsCore_RSchedMaxThreadEx 65021
-#define IdResourceStringsProtocols_RSHTTPGatewayTimeout 65022
+#define IdResourceStringsCore_RSTransparentProxyCannotBind 65022
-#define IdResourceStringsProtocols_RSHTTPHTTPVersionNotSupported 65023
+#define IdResourceStringsCore_RSTransparentProxyCanNotSupportUDP 65023
-#define IdResourceStringsProtocols_RSHTTPCreated 65024
+#define IdResourceStringsCore_RSSocksUDPNotSupported 65024
-#define IdResourceStringsProtocols_RSHTTPAccepted 65025
+#define IdResourceStringsCore_RSSocksRequestFailed 65025
-#define IdResourceStringsProtocols_RSHTTPNonAuthoritativeInformation 65026
+#define IdResourceStringsCore_RSSocksRequestServerFailed 65026
-#define IdResourceStringsProtocols_RSHTTPNoContent 65027
+#define IdResourceStringsCore_RSSocksRequestIdentFailed 65027
-#define IdResourceStringsProtocols_RSHTTPResetContent 65028
+#define IdResourceStringsCore_RSSocksUnknownError 65028
-#define IdResourceStringsProtocols_RSHTTPPartialContent 65029
+#define IdResourceStringsCore_RSSocksServerRespondError 65029
-#define IdResourceStringsProtocols_RSHTTPMovedPermanently 65030
+#define IdResourceStringsCore_RSSocksAuthMethodError 65030
-#define IdResourceStringsProtocols_RSHTTPMovedTemporarily 65031
+#define IdResourceStringsCore_RSSocksAuthError 65031
-#define IdResourceStringsProtocols_RSHTTPSeeOther 65032
+#define IdResourceStringsCore_RSSocksServerGeneralError 65032
-#define IdResourceStringsProtocols_RSHTTPNotModified 65033
+#define IdResourceStringsCore_RSSocksServerPermissionError 65033
-#define IdResourceStringsProtocols_RSHTTPUseProxy 65034
+#define IdResourceStringsCore_RSSocksServerNetUnreachableError 65034
-#define IdResourceStringsProtocols_RSHTTPBadRequest 65035
+#define IdResourceStringsCore_RSSocksServerHostUnreachableError 65035
-#define IdResourceStringsProtocols_RSHTTPUnauthorized 65036
+#define IdResourceStringsCore_RSSocksServerConnectionRefusedError 65036
-#define IdResourceStringsProtocols_RSHTTPForbidden 65037
+#define IdResourceStringsCore_RSSocksServerTTLExpiredError 65037
-#define IdResourceStringsProtocols_RSHTTPNotFound 65038
+#define IdResourceStringsCore_RSSocksServerCommandError 65038
-#define IdResourceStringsProtocols_RSHTTPMethodNotAllowed 65039
+#define IdResourceStringsCore_RSSocksServerAddressError 65039
-#define IdResourceStringsCore_RSAlreadyConnected 65040
+#define IdResourceStringsProtocols_RSHTTPPreconditionFailed 65040
-#define IdResourceStringsCore_RSMaximumNumberOfCaptureLineExceeded 65041
+#define IdResourceStringsProtocols_RSHTTPRequestEntityToLong 65041
-#define IdResourceStringsCore_RSchedMaxThreadEx 65042
+#define IdResourceStringsProtocols_RSHTTPRequestURITooLong 65042
-#define IdResourceStringsCore_RSTransparentProxyCannotBind 65043
+#define IdResourceStringsProtocols_RSHTTPUnsupportedMediaType 65043
-#define IdResourceStringsCore_RSTransparentProxyCanNotSupportUDP 65044
+#define IdResourceStringsProtocols_RSHTTPInternalServerError 65044
-#define IdResourceStringsCore_RSBufferMissingTerminator 65045
+#define IdResourceStringsProtocols_RSHTTPNotImplemented 65045
-#define IdResourceStringsCore_RSBufferInvalidStartPos 65046
+#define IdResourceStringsProtocols_RSHTTPBadGateway 65046
-#define IdResourceStringsCore_RSReplyInvalidCode 65047
+#define IdResourceStringsProtocols_RSHTTPServiceUnavailable 65047
-#define IdResourceStringsCore_RSThreadSchedulerThreadRequired 65048
+#define IdResourceStringsProtocols_RSHTTPGatewayTimeout 65048
-#define IdResourceStringsCore_RSNoOnExecute 65049
+#define IdResourceStringsProtocols_RSHTTPHTTPVersionNotSupported 65049
-#define IdResourceStringsCore_RSTCPServerSchedulerAlreadyActive 65050
+#define IdResourceStringsProtocols_RSHTTPUnknownResponseCode 65050
-#define IdResourceStringsProtocols_RSMIMEExtensionEmpty 65051
+#define IdResourceStringsProtocols_RSHTTPHeaderAlreadyWritten 65051
-#define IdResourceStringsProtocols_RSMIMEMIMETypeEmpty 65052
+#define IdResourceStringsProtocols_RSHTTPErrorParsingCommand 65052
-#define IdResourceStringsProtocols_RSMIMEMIMEExtAlreadyExists 65053
+#define IdResourceStringsProtocols_RSHTTPUnsupportedAuthorisationScheme 65053
-#define IdResourceStringsProtocols_RSHTTPContinue 65054
+#define IdResourceStringsProtocols_RSHTTPCannotSwitchSessionStateWhenActive 65054
-#define IdResourceStringsProtocols_RSHTTPOK 65055
+#define IdResourceStringsProtocols_RSHTTPAuthAlreadyRegistered 65055
-#define IdResourceStringsCore_RSSocksServerHostUnreachableError 65056
+#define IdResourceStringsProtocols_RSHTTPMovedPermanently 65056
-#define IdResourceStringsCore_RSSocksServerConnectionRefusedError 65057
+#define IdResourceStringsProtocols_RSHTTPMovedTemporarily 65057
-#define IdResourceStringsCore_RSSocksServerTTLExpiredError 65058
+#define IdResourceStringsProtocols_RSHTTPSeeOther 65058
-#define IdResourceStringsCore_RSSocksServerCommandError 65059
+#define IdResourceStringsProtocols_RSHTTPNotModified 65059
-#define IdResourceStringsCore_RSSocksServerAddressError 65060
+#define IdResourceStringsProtocols_RSHTTPUseProxy 65060
-#define IdResourceStringsCore_RSInterceptCircularLink 65061
+#define IdResourceStringsProtocols_RSHTTPBadRequest 65061
-#define IdResourceStringsCore_RSNotEnoughDataInBuffer 65062
+#define IdResourceStringsProtocols_RSHTTPUnauthorized 65062
-#define IdResourceStringsCore_RSTooMuchDataInBuffer 65063
+#define IdResourceStringsProtocols_RSHTTPForbidden 65063
-#define IdResourceStringsCore_RSFileNotFound 65064
+#define IdResourceStringsProtocols_RSHTTPNotFound 65064
-#define IdResourceStringsCore_RSNotConnected 65065
+#define IdResourceStringsProtocols_RSHTTPMethodNotAllowed 65065
-#define IdResourceStringsCore_RSObjectTypeNotSupported 65066
+#define IdResourceStringsProtocols_RSHTTPNotAcceptable 65066
-#define IdResourceStringsCore_RSIdNoDataToRead 65067
+#define IdResourceStringsProtocols_RSHTTPProxyAuthenticationRequired 65067
-#define IdResourceStringsCore_RSReadTimeout 65068
+#define IdResourceStringsProtocols_RSHTTPRequestTimeout 65068
-#define IdResourceStringsCore_RSReadLnMaxLineLengthExceeded 65069
+#define IdResourceStringsProtocols_RSHTTPConflict 65069
-#define IdResourceStringsCore_RSConnectTimeout 65070
+#define IdResourceStringsProtocols_RSHTTPGone 65070
-#define IdResourceStringsCore_RSThreadTerminateAndWaitFor 65071
+#define IdResourceStringsProtocols_RSHTTPLengthRequired 65071
 #define IdResourceStrings_RSInvalidIPv6Address 65072
 #define IdResourceStrings_RSIPVersionUnsupported 65073
 #define IdResourceStrings_RSNotAllBytesSent 65074
 #define IdResourceStrings_RSPackageSizeTooBig 65075
 #define IdResourceStrings_RSSetSizeExceeded 65076
-#define IdResourceStringsCore_RSSocksUDPNotSupported 65077
+#define IdResourceStringsProtocols_RSMIMEExtensionEmpty 65077
-#define IdResourceStringsCore_RSSocksRequestFailed 65078
+#define IdResourceStringsProtocols_RSMIMEMIMETypeEmpty 65078
-#define IdResourceStringsCore_RSSocksRequestServerFailed 65079
+#define IdResourceStringsProtocols_RSMIMEMIMEExtAlreadyExists 65079
-#define IdResourceStringsCore_RSSocksRequestIdentFailed 65080
+#define IdResourceStringsProtocols_RSHTTPContinue 65080
-#define IdResourceStringsCore_RSSocksUnknownError 65081
+#define IdResourceStringsProtocols_RSHTTPOK 65081
-#define IdResourceStringsCore_RSSocksServerRespondError 65082
+#define IdResourceStringsProtocols_RSHTTPCreated 65082
-#define IdResourceStringsCore_RSSocksAuthMethodError 65083
+#define IdResourceStringsProtocols_RSHTTPAccepted 65083
-#define IdResourceStringsCore_RSSocksAuthError 65084
+#define IdResourceStringsProtocols_RSHTTPNonAuthoritativeInformation 65084
-#define IdResourceStringsCore_RSSocksServerGeneralError 65085
+#define IdResourceStringsProtocols_RSHTTPNoContent 65085
-#define IdResourceStringsCore_RSSocksServerPermissionError 65086
+#define IdResourceStringsProtocols_RSHTTPResetContent 65086
-#define IdResourceStringsCore_RSSocksServerNetUnreachableError 65087
+#define IdResourceStringsProtocols_RSHTTPPartialContent 65087
 #define IdResourceStrings_RSStackELOOP 65088
 #define IdResourceStrings_RSStackENAMETOOLONG 65089
 #define IdResourceStrings_RSStackEHOSTDOWN 65090
@@ -693,11 +693,11 @@
 #define DBConsts_SLookupInfoError 65181
 #define DBConsts_SDataSourceChange 65182
 #define DBConsts_SDataSetOpen 65183
-#define uRODECConst_sFMT_MIME64 65184
+#define uRORes_err_MessageNotAssigned 65184
-#define uRODECConst_sFMT_UU 65185
+#define ComConst_SOleError 65185
-#define uRODECConst_sFMT_XX 65186
+#define ComConst_SNoMethod 65186
-#define uRODECConst_sInvalidKeySize 65187
+#define ComConst_SVarNotObject 65187
-#define uRODECConst_sNotInitialized 65188
+#define ComConst_STooManyParams 65188
 #define DBConsts_SInvalidFieldSize 65189
 #define DBConsts_SInvalidFieldKind 65190
 #define DBConsts_SUnknownFieldType 65191
@@ -709,70 +709,70 @@
 #define DBConsts_SFieldRangeError 65197
 #define DBConsts_SBcdFieldRangeError 65198
 #define DBConsts_SInvalidIntegerValue 65199
-#define uRORes_err_CannotLoadXMLDocument 65200
+#define uRORes_err_InvalidHeader 65200
-#define uRORes_err_ErrorCreatingMsXmlDoc 65201
+#define uRORes_err_InvalidHeaderEncrypted 65201
-#define uRORes_err_NoXMLParsersAvailable 65202
+#define uRORes_err_UnknownClassInStream 65202
-#define uRORes_err_IDispatchMarshalingNotSupported 65203
+#define uRORes_err_UnexpectedClassInStream 65203
-#define uRORes_err_UnsupportedVariantType 65204
+#define uRORes_err_SessionNotFound 65204
-#define uRORes_err_VariantIsNotArray 65205
+#define uRORes_err_ChannelDoesntSupportIROMetadataReader 65205
-#define uRORes_err_InvalidVarArrayDimCount 65206
+#define uRORes_err_TooManySessions 65206
-#define uRORes_err_CannotFindParameter 65207
+#define uRORes_err_DOMElementIsNIL 65207
-#define uRORes_err_MessageNotAssigned 65208
+#define uRORes_err_CannotLoadXMLDocument 65208
-#define uRODECConst_sProtectionCircular 65209
+#define uRORes_err_ErrorCreatingMsXmlDoc 65209
-#define uRODECConst_sStringFormatExists 65210
+#define uRORes_err_NoXMLParsersAvailable 65210
-#define uRODECConst_sInvalidStringFormat 65211
+#define uRORes_err_IDispatchMarshalingNotSupported 65211
-#define uRODECConst_sInvalidFormatString 65212
+#define uRORes_err_UnsupportedVariantType 65212
-#define uRODECConst_sFMT_COPY 65213
+#define uRORes_err_VariantIsNotArray 65213
-#define uRODECConst_sFMT_HEX 65214
+#define uRORes_err_InvalidVarArrayDimCount 65214
-#define uRODECConst_sFMT_HEXL 65215
+#define uRORes_err_CannotFindParameter 65215
-#define uRORes_err_UnknownClass 65216
+#define uRORes_err_UnspecifiedInterface 65216
-#define uRORes_err_UnknownProxyInterface 65217
+#define uRORes_err_UnspecifiedMessage 65217
-#define uRORes_err_DispatcherAlreadyAssigned 65218
+#define uRORes_err_UnknownMethod 65218
-#define uRORes_err_CannotFindMessageDispatcher 65219
+#define uRORes_err_ClassFactoryDidNotReturnInstance 65219
-#define uRORes_err_ServerOnlySupportsOneDispatcher 65220
+#define uRORes_err_TypeNotSupported 65220
-#define uRORes_err_UnhandledException 65221
+#define uRORes_err_ClassFactoryNotFound 65221
-#define uRORes_err_ChannelBusy 65222
+#define uRORes_err_IROMessageNotSupported 65222
-#define uRORes_err_ArrayIndexOutOfBounds 65223
+#define uRORes_err_ClassAlreadyRegistered 65223
-#define uRORes_err_InvalidHeader 65224
+#define uRORes_err_UnknownClass 65224
-#define uRORes_err_InvalidHeaderEncrypted 65225
+#define uRORes_err_UnknownProxyInterface 65225
-#define uRORes_err_UnknownClassInStream 65226
+#define uRORes_err_DispatcherAlreadyAssigned 65226
-#define uRORes_err_UnexpectedClassInStream 65227
+#define uRORes_err_CannotFindMessageDispatcher 65227
-#define uRORes_err_SessionNotFound 65228
+#define uRORes_err_ServerOnlySupportsOneDispatcher 65228
-#define uRORes_err_ChannelDoesntSupportIROMetadataReader 65229
+#define uRORes_err_UnhandledException 65229
-#define uRORes_err_TooManySessions 65230
+#define uRORes_err_ChannelBusy 65230
-#define uRORes_err_DOMElementIsNIL 65231
+#define uRORes_err_ArrayIndexOutOfBounds 65231
-#define uRORes_err_RodlInvalidDataType 65232
+#define uRORes_str_InvalidClassTypeInStream 65232
-#define uRORes_err_RodlStructCannotBeNested 65233
+#define uRORes_err_UnexpectedEndOfStream 65233
-#define uRORes_err_RodlInvalidAncestorType 65234
+#define uRORes_err_RodlDuplicateName 65234
-#define uRORes_str_ExceptionOnServer 65235
+#define uRORes_err_RodlNoDataTypeSpecified 65235
-#define uRORes_str_ExceptionReraisedFromServer 65236
+#define uRORes_err_RodlNoEnumValues 65236
-#define uRORes_err_AssignError 65237
+#define uRORes_err_RodlNoStructElementsDefined 65237
-#define uRORes_err_InvalidRequestStream 65238
+#define uRORes_err_RodlNoOperationsDefined 65238
-#define uRORes_err_NILMessage 65239
+#define uRORes_err_RodlUsedFileDoesNotExist 65239
-#define uRORes_err_UnspecifiedInterface 65240
+#define uRORes_err_RodlInvalidDataType 65240
-#define uRORes_err_UnspecifiedMessage 65241
+#define uRORes_err_RodlStructCannotBeNested 65241
-#define uRORes_err_UnknownMethod 65242
+#define uRORes_err_RodlInvalidAncestorType 65242
-#define uRORes_err_ClassFactoryDidNotReturnInstance 65243
+#define uRORes_str_ExceptionOnServer 65243
-#define uRORes_err_TypeNotSupported 65244
+#define uRORes_str_ExceptionReraisedFromServer 65244
-#define uRORes_err_ClassFactoryNotFound 65245
+#define uRORes_err_AssignError 65245
-#define uRORes_err_IROMessageNotSupported 65246
+#define uRORes_err_InvalidRequestStream 65246
-#define uRORes_err_ClassAlreadyRegistered 65247
+#define uRORes_err_NILMessage 65247
-#define ComConst_STooManyParams 65248
+#define uRODECConst_sInvalidFormatString 65248
-#define uRORes_err_InvalidIndex 65249
+#define uRODECConst_sFMT_COPY 65249
-#define uRORes_err_InvalidType 65250
+#define uRODECConst_sFMT_HEX 65250
-#define uRORes_err_InvalidLibrary 65251
+#define uRODECConst_sFMT_HEXL 65251
-#define uRORes_err_InvalidStream 65252
+#define uRODECConst_sFMT_MIME64 65252
-#define uRORes_err_InvalidTargetEntity 65253
+#define uRODECConst_sFMT_UU 65253
-#define uRORes_err_InvalidParamFlag 65254
+#define uRODECConst_sFMT_XX 65254
-#define uRORes_err_InvalidStringLength 65255
+#define uRODECConst_sInvalidKeySize 65255
-#define uRORes_str_InvalidClassTypeInStream 65256
+#define uRODECConst_sNotInitialized 65256
-#define uRORes_err_UnexpectedEndOfStream 65257
+#define uRORes_err_InvalidIndex 65257
-#define uRORes_err_RodlDuplicateName 65258
+#define uRORes_err_InvalidType 65258
-#define uRORes_err_RodlNoDataTypeSpecified 65259
+#define uRORes_err_InvalidLibrary 65259
-#define uRORes_err_RodlNoEnumValues 65260
+#define uRORes_err_InvalidStream 65260
-#define uRORes_err_RodlNoStructElementsDefined 65261
+#define uRORes_err_InvalidTargetEntity 65261
-#define uRORes_err_RodlNoOperationsDefined 65262
+#define uRORes_err_InvalidParamFlag 65262
-#define uRORes_err_RodlUsedFileDoesNotExist 65263
+#define uRORes_err_InvalidStringLength 65263
 #define Consts_SSeparator 65264
 #define Consts_SErrorSettingCount 65265
 #define Consts_SListBoxMustBeVirtual 65266
@@ -786,9 +786,9 @@
 #define Consts_STrayIconCreateError 65274
 #define Consts_SPageControlNotSet 65275
 #define Consts_SWindowsVistaRequired 65276
-#define ComConst_SOleError 65277
+#define uRODECConst_sProtectionCircular 65277
-#define ComConst_SNoMethod 65278
+#define uRODECConst_sStringFormatExists 65278
-#define ComConst_SVarNotObject 65279
+#define uRODECConst_sInvalidStringFormat 65279
 #define Consts_srNone 65280
 #define Consts_SOutOfRange 65281
 #define Consts_SInsertLineError 65282
@@ -1540,12 +1540,12 @@ BEGIN
 	JclResources_RsWrongDataType,	"\"%s\\%s\\%s\" is of wrong kind or size"
 	JclResources_RsInconsistentPath,	"\"%s\" does not match RootKey"
 	JclResources_RsHKCRLong,	"HKEY_CLASSES_ROOT"
-	IdResourceStringsProtocols_RSHTTPUnknownResponseCode,	"Unknown Response Code"
+	IdResourceStringsCore_RSBufferMissingTerminator,	"Buffer terminator must be specified."
-	IdResourceStringsProtocols_RSHTTPHeaderAlreadyWritten,	"Header has already been written."
+	IdResourceStringsCore_RSBufferInvalidStartPos,	"Buffer start position is invalid."
-	IdResourceStringsProtocols_RSHTTPErrorParsingCommand,	"Error in parsing command."
+	IdResourceStringsCore_RSReplyInvalidCode,	"Reply Code is not valid: %s"
-	IdResourceStringsProtocols_RSHTTPUnsupportedAuthorisationScheme,	"Unsupported authorization scheme."
+	IdResourceStringsCore_RSThreadSchedulerThreadRequired,	"Thread must be specified for the scheduler."
-	IdResourceStringsProtocols_RSHTTPCannotSwitchSessionStateWhenActive,	"Cannot change session state when the server is active."
+	IdResourceStringsCore_RSNoOnExecute,	"You must have an OnExecute event."
-	IdResourceStringsProtocols_RSHTTPAuthAlreadyRegistered,	"This authentication method is already registered with class name %s."
+	IdResourceStringsCore_RSTCPServerSchedulerAlreadyActive,	"Cannot change the scheduler while the server is Active."
 	ComStrs_sTabFailClear,	"Failed to clear tab control"
 	ComStrs_sTabFailDelete,	"Failed to delete tab at index %d"
 	ComStrs_sTabFailRetrieve,	"Failed to retrieve tab at index %d"
@@ -1556,59 +1556,6 @@ BEGIN
 	ComStrs_sInvalidIndex,	"Invalid index"
 	ComStrs_sInsertError,	"Unable to insert an item"
 	ComStrs_sUDAssociated,	"%s is already associated with %s"
-	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_RSHTTPBadGateway,	"Bad Gateway"
-	IdResourceStringsProtocols_RSHTTPServiceUnavailable,	"Service Unavailable"
-	IdResourceStringsProtocols_RSHTTPGatewayTimeout,	"Gateway timeout"
-	IdResourceStringsProtocols_RSHTTPHTTPVersionNotSupported,	"HTTP version not supported"
-	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"
-	IdResourceStringsProtocols_RSHTTPUnauthorized,	"Unauthorized"
-	IdResourceStringsProtocols_RSHTTPForbidden,	"Forbidden"
-	IdResourceStringsProtocols_RSHTTPNotFound,	"Not Found"
-	IdResourceStringsProtocols_RSHTTPMethodNotAllowed,	"Method not allowed"
-	IdResourceStringsCore_RSAlreadyConnected,	"Already connected."
-	IdResourceStringsCore_RSMaximumNumberOfCaptureLineExceeded,	"Maximum number of line allowed exceeded"
-	IdResourceStringsCore_RSchedMaxThreadEx,	"The maximum number of threads for this scheduler is exceeded."
-	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."
-	IdResourceStringsProtocols_RSMIMEExtensionEmpty,	"Extension is empty"
-	IdResourceStringsProtocols_RSMIMEMIMETypeEmpty,	"Mimetype is empty"
-	IdResourceStringsProtocols_RSMIMEMIMEExtAlreadyExists,	"Extension already exits"
-	IdResourceStringsProtocols_RSHTTPContinue,	"Continue"
-	IdResourceStringsProtocols_RSHTTPOK,	"OK"
-	IdResourceStringsCore_RSSocksServerHostUnreachableError,	"Host unreachable."
-	IdResourceStringsCore_RSSocksServerConnectionRefusedError,	"Connection refused."
-	IdResourceStringsCore_RSSocksServerTTLExpiredError,	"TTL expired."
-	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."
@@ -1620,11 +1567,11 @@ BEGIN
 	IdResourceStringsCore_RSReadLnMaxLineLengthExceeded,	"Max line length exceeded."
 	IdResourceStringsCore_RSConnectTimeout,	"Connect timed out."
 	IdResourceStringsCore_RSThreadTerminateAndWaitFor,	"Cannot call TerminateAndWaitFor on FreeAndTerminate threads"
-	IdResourceStrings_RSInvalidIPv6Address,	"%s is not a valid IPv6 address"
+	IdResourceStringsCore_RSAlreadyConnected,	"Already connected."
-	IdResourceStrings_RSIPVersionUnsupported,	"The requested IPVersion / Address family is not supported."
+	IdResourceStringsCore_RSMaximumNumberOfCaptureLineExceeded,	"Maximum number of line allowed exceeded"
-	IdResourceStrings_RSNotAllBytesSent,	"Not all bytes sent."
+	IdResourceStringsCore_RSchedMaxThreadEx,	"The maximum number of threads for this scheduler is exceeded."
-	IdResourceStrings_RSPackageSizeTooBig,	"Package Size Too Big."
+	IdResourceStringsCore_RSTransparentProxyCannotBind,	"Transparent proxy cannot bind."
-	IdResourceStrings_RSSetSizeExceeded,	"Set Size Exceeded."
+	IdResourceStringsCore_RSTransparentProxyCanNotSupportUDP,	"UDP Not supported by this proxy."
 	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."
@@ -1636,6 +1583,59 @@ BEGIN
 	IdResourceStringsCore_RSSocksServerGeneralError,	"General SOCKS server failure."
 	IdResourceStringsCore_RSSocksServerPermissionError,	"Connection not allowed by ruleset."
 	IdResourceStringsCore_RSSocksServerNetUnreachableError,	"Network unreachable."
+	IdResourceStringsCore_RSSocksServerHostUnreachableError,	"Host unreachable."
+	IdResourceStringsCore_RSSocksServerConnectionRefusedError,	"Connection refused."
+	IdResourceStringsCore_RSSocksServerTTLExpiredError,	"TTL expired."
+	IdResourceStringsCore_RSSocksServerCommandError,	"Command not supported."
+	IdResourceStringsCore_RSSocksServerAddressError,	"Address type not supported."
+	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"
+	IdResourceStrings_RSInvalidIPv6Address,	"%s is not a valid IPv6 address"
+	IdResourceStrings_RSIPVersionUnsupported,	"The requested IPVersion / Address family is not supported."
+	IdResourceStrings_RSNotAllBytesSent,	"Not all bytes sent."
+	IdResourceStrings_RSPackageSizeTooBig,	"Package Size Too Big."
+	IdResourceStrings_RSSetSizeExceeded,	"Set Size Exceeded."
+	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"
 	IdResourceStrings_RSStackELOOP,	"Too many levels of symbolic links."
 	IdResourceStrings_RSStackENAMETOOLONG,	"File name too long."
 	IdResourceStrings_RSStackEHOSTDOWN,	"Host is down."
@@ -1732,11 +1732,11 @@ BEGIN
 	DBConsts_SLookupInfoError,	"Lookup information for field '%s' is incomplete"
 	DBConsts_SDataSourceChange,	"DataSource cannot be changed"
 	DBConsts_SDataSetOpen,	"Cannot perform this operation on an open dataset"
-	uRODECConst_sFMT_MIME64,	"MIME Base 64"
+	uRORes_err_MessageNotAssigned,	"Message is NIL"
-	uRODECConst_sFMT_UU,	"UU Coding"
+	ComConst_SOleError,	"OLE error %.8x"
-	uRODECConst_sFMT_XX,	"XX Coding"
+	ComConst_SNoMethod,	"Method '%s' not supported by automation object"
-	uRODECConst_sInvalidKeySize,	"Length from Encryptionkey is invalid.\r\nKeysize for %s must be within %d-%d bytes"
+	ComConst_SVarNotObject,	"Variant does not reference an automation object"
-	uRODECConst_sNotInitialized,	"%s is not initialized, call Init() or InitKey() first."
+	ComConst_STooManyParams,	"Dispatch methods do not support more than 64 parameters"
 	DBConsts_SInvalidFieldSize,	"Invalid field size"
 	DBConsts_SInvalidFieldKind,	"Invalid FieldKind"
 	DBConsts_SUnknownFieldType,	"Field '%s' is of an unknown type"
@@ -1748,30 +1748,6 @@ BEGIN
 	DBConsts_SFieldRangeError,	"%g is not a valid value for field '%s'. The allowed range is %g to %g"
 	DBConsts_SBcdFieldRangeError,	"%s is not a valid value for field '%s'. The allowed range is %s to %s"
 	DBConsts_SInvalidIntegerValue,	"'%s' is not a valid integer value for field '%s'"
-	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"
-	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."
-	uRODECConst_sInvalidFormatString,	"Input cannot be converted to %s Format."
-	uRODECConst_sFMT_COPY,	"copy Input to Output"
-	uRODECConst_sFMT_HEX,	"Hexadecimal"
-	uRODECConst_sFMT_HEXL,	"Hexadecimal lowercase"
-	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."
@@ -1780,14 +1756,14 @@ BEGIN
 	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_RodlInvalidDataType,	"Invalid or undefined data type \"%s\"."
+	uRORes_err_CannotLoadXMLDocument,	"Cannot load XML document.\rReason: %s\rLine: %d\rPosition: %d"
-	uRORes_err_RodlStructCannotBeNested,	"Structs cannot recursively contain themselves."
+	uRORes_err_ErrorCreatingMsXmlDoc,	"Error creating MSXML Document class\r\r%s: %s"
-	uRORes_err_RodlInvalidAncestorType,	"Invalid or undefined ancestor type \"%s\"."
+	uRORes_err_NoXMLParsersAvailable,	"MSXML is not installed"
-	uRORes_str_ExceptionOnServer,	"An exception of type %s was raised on the server: %s"
+	uRORes_err_IDispatchMarshalingNotSupported,	"Marshaling of IDispatch (%d) type variants is not supported."
-	uRORes_str_ExceptionReraisedFromServer,	"An exception was raised on the server: %s"
+	uRORes_err_UnsupportedVariantType,	"Unsupported variant type \"%d\""
-	uRORes_err_AssignError,	"Cannot assign a \"%s\" to a \"%s\"."
+	uRORes_err_VariantIsNotArray,	"Variant must be Array, but is %d"
-	uRORes_err_InvalidRequestStream,	"Invalid request stream (%d bytes)"
+	uRORes_err_InvalidVarArrayDimCount,	"Variant Array DimCount must be 1 but is %d"
-	uRORes_err_NILMessage,	"Message is NIL"
+	uRORes_err_CannotFindParameter,	"Cannot find parameter %s"
 	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"
@@ -1796,14 +1772,14 @@ BEGIN
 	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"
-	ComConst_STooManyParams,	"Dispatch methods do not support more than 64 parameters"
+	uRORes_err_UnknownClass,	"Unknown class \"%s\""
-	uRORes_err_InvalidIndex,	"Invalid index %d"
+	uRORes_err_UnknownProxyInterface,	"Unknown proxy interface \"%s\""
-	uRORes_err_InvalidType,	"Invalid type \"%s. Expected \"%s\"\""
+	uRORes_err_DispatcherAlreadyAssigned,	"Dispatcher for %s already assigned"
-	uRORes_err_InvalidLibrary,	"Invalid library"
+	uRORes_err_CannotFindMessageDispatcher,	"Cannot find message dispatcher. Maybe there is no message component configured for the requested path?"
-	uRORes_err_InvalidStream,	"Invalid stream"
+	uRORes_err_ServerOnlySupportsOneDispatcher,	"%s servers only support one dispatcher"
-	uRORes_err_InvalidTargetEntity,	"Invalid TargetEntity \"%s\""
+	uRORes_err_UnhandledException,	"Unhandled exception"
-	uRORes_err_InvalidParamFlag,	"Invalid Parameter Flag \"%s\""
+	uRORes_err_ChannelBusy,	"Channel is busy. Try again later."
-	uRORes_err_InvalidStringLength,	"Stream read error: Invalid string length \"%d\""
+	uRORes_err_ArrayIndexOutOfBounds,	"Array index out of bounds (%d)."
 	uRORes_str_InvalidClassTypeInStream,	"Stream read error: Invalid class type encountered: \"%s\""
 	uRORes_err_UnexpectedEndOfStream,	"Unexpected end of stream."
 	uRORes_err_RodlDuplicateName,	"Duplicate name."
@@ -1812,6 +1788,30 @@ BEGIN
 	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"
+	uRODECConst_sInvalidFormatString,	"Input cannot be converted to %s Format."
+	uRODECConst_sFMT_COPY,	"copy Input to Output"
+	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"
+	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\""
 	Consts_SSeparator,	"Separator"
 	Consts_SErrorSettingCount,	"Error setting %s.Count"
 	Consts_SListBoxMustBeVirtual,	"Listbox (%s) style must be virtual in order to set Count"
@@ -1825,9 +1825,9 @@ BEGIN
 	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"
+	uRODECConst_sProtectionCircular,	"Circular Protection detected, Protection Object is invalid."
-	ComConst_SNoMethod,	"Method '%s' not supported by automation object"
+	uRODECConst_sStringFormatExists,	"String Format \"%d\" does not exist."
-	ComConst_SVarNotObject,	"Variant does not reference an automation object"
+	uRODECConst_sInvalidStringFormat,	"Input is not a valid %s Format."
 	Consts_srNone,	"(None)"
 	Consts_SOutOfRange,	"Value must be between %d and %d"
 	Consts_SInsertLineError,	"Unable to insert a line"
@@ -2086,33 +2086,34 @@ BEGIN
 	SysConst_SAccessDenied,	"File access denied"
 END
 
-/* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\controls.res */
+/* C:\Archivos de programa\EurekaLog 6\Delphi11\DIALOG.RES */
-/* C:\Codigo Tecsitel\Lib\RemObjects\RemObjects_SDK\uROPoweredByRemObjectsButton.res */
+/* c:\archivos de programa\codegear\rad studio\5.0\lib\Controls.res */
-/* C:\Codigo Tecsitel\Lib\RemObjects\RemObjects_SDK\uROHtmlServerInfo.res */
+/* C:\Archivos de programa\RemObjects Software\RemObjects SDK for Delphi\Source\uROPoweredByRemObjectsButton.res */
-/* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\buttons.res */
+/* C:\Archivos de programa\RemObjects Software\RemObjects SDK for Delphi\Source\uROHtmlServerInfo.res */
-/* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\extdlgs.res */
+/* c:\archivos de programa\codegear\rad studio\5.0\lib\Buttons.res */
-/* C:\Codigo Tecsitel\Lib\FastReport3\frxProgress.dfm */
+/* c:\archivos de programa\codegear\rad studio\5.0\lib\ExtDlgs.res */
-/* C:\Codigo Tecsitel\Lib\FastReport3\frxCtrls.res */
+/* C:\Codigo Tecsitel\Lib\FastReport3\frxProgress.DFM */
-/* C:\Codigo Tecsitel\Lib\FastReport3\frxPrintDialog.dfm */
+/* C:\Codigo Tecsitel\Lib\FastReport3\frxCtrls.RES */
-/* C:\Codigo Tecsitel\Lib\FastReport3\frxDock.dfm */
+/* C:\Codigo Tecsitel\Lib\FastReport3\frxPrintDialog.DFM */
-/* C:\Codigo Tecsitel\Lib\FastReport3\frxPreviewPageSettings.dfm */
+/* C:\Codigo Tecsitel\Lib\FastReport3\frxDock.DFM */
-/* C:\Codigo Tecsitel\Lib\FastReport3\frxSearchDialog.dfm */
+/* C:\Codigo Tecsitel\Lib\FastReport3\frxPreviewPageSettings.DFM */
-/* C:\Codigo Tecsitel\Lib\FastReport3\frxPreview.dfm */
+/* C:\Codigo Tecsitel\Lib\FastReport3\frxSearchDialog.DFM */
-/* C:\Codigo Tecsitel\Lib\FastReport3\frxPreview.res */
+/* C:\Codigo Tecsitel\Lib\FastReport3\frxPreview.DFM */
-/* C:\Codigo Tecsitel\Lib\FastReport3\frxDialogForm.dfm */
+/* C:\Codigo Tecsitel\Lib\FastReport3\frxPreview.RES */
+/* C:\Codigo Tecsitel\Lib\FastReport3\frxDialogForm.DFM */
 /* C:\Codigo Tecsitel\Lib\FastReport3\frxPassw.dfm */
-/* C:\Codigo Tecsitel\Lib\FastReport3\frxClass.res */
+/* C:\Codigo Tecsitel\Lib\FastReport3\frxClass.RES */
-/* C:\Codigo Tecsitel\Lib\JVCL\JvConsts.res */
+/* C:\Codigo Tecsitel\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\WindowsXP.res */
-/* C:\Codigo Tecsitel\Lib\JVCL\JvLogForm.dfm */
+/* C:\Codigo Tecsitel\Lib\jvcl\JvLogForm.dfm */
-/* C:\Codigo Tecsitel\Lib\RemObjects\Data_Abstract\DataAbstract_IBXDriver_Glyphs.res */
+/* C:\Archivos de programa\RemObjects Software\Data Abstract for Delphi\Source\Drivers\DataAbstract_IBXDriver_Glyphs.res */
-/* C:\Codigo Tecsitel\Lib\RemObjects\Data_Abstract\DataAbstract_ADODriver_Glyphs.res */
+/* C:\Archivos de programa\RemObjects Software\Data Abstract for Delphi\Source\Drivers\DataAbstract_ADODriver_Glyphs.res */
 /* C:\Codigo Tecsitel\Source\Servidor\uDataModuleServer.dfm */
 /* C:\Codigo Tecsitel\Source\Servidor\Configuracion\uFrameConfiguracion.dfm */
 /* C:\Codigo Tecsitel\Lib\DevExpressVCL\dxOffice11.res */
 /* C:\Codigo Tecsitel\Lib\DevExpressVCL\cxControls.res */
 /* C:\Codigo Tecsitel\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:\Codigo Tecsitel\Lib\DevExpressVCL\cxEdit.res */
 /* C:\Codigo Tecsitel\Lib\DevExpressVCL\cxShellBrowser.dfm */
 /* C:\Codigo Tecsitel\Source\Servidor\Configuracion\uConexionBD.dfm */
@@ -2128,6 +2129,6 @@ END
 /* C:\Codigo Tecsitel\Source\Modulos\Formas de pago\Servidor\srvFormasPago_Impl.dfm */
 /* C:\Codigo Tecsitel\Source\Modulos\Tipos de IVA\Servidor\srvTiposIVA_Impl.dfm */
 /* C:\Codigo Tecsitel\Source\ApplicationBase\Usuarios\Servidor\srvUsuarios_Impl.dfm */
-/* C:\Codigo Tecsitel\Source\Servidor\FactuGES_Server.RES */
+/* C:\Codigo Tecsitel\Source\Servidor\FactuGES_Server.res */
-/* C:\Codigo Tecsitel\Source\Servidor\..\Servicios\RODLFILE.res */
+/* C:\Codigo Tecsitel\Source\Servidor\..\Servicios\RODLFile.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf28.tmp */
+/* C:\Codigo Tecsitel\Source\Servidor\FactuGES_Server.drf */

Source/Servidor/FactuGES_Server.rc

@@ -14,7 +14,7 @@ BEGIN
          BEGIN
               VALUE "FileVersion", "3.0.0.0\0"
               VALUE "ProductVersion", "3.0.0.0\0"
-              VALUE "CompileDate", "domingo, 07 de octubre de 2007 20:30\0"
+              VALUE "CompileDate", "lunes, 08 de octubre de 2007 22:04\0"
          END
     END
     BLOCK "VarFileInfo"

Source/Servidor/uDataModuleServer.pas

@@ -251,6 +251,7 @@ end;
 procedure TdmServer.DataModuleDestroy(Sender: TObject);
 begin
   SessionManager.ClearSessions(False);
+  ConnectionManager.ClearPool;
   HTTPServer.Active := False;
   DetenerLog;
 end;