- Ticket #32. Añadir la columna contrato al vendedor.

- En proveedores, la descripción (tipo de material que sirve) se ha cambiado a un combobox para que sea más fácil.

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@240 0c75b7a4-871f-7646-8a2f-f78d34cc349f

Database/scripts/factuges.sql

@@ -526,7 +526,8 @@ CREATE TABLE EMPLEADOS_DATOS (
     FORMACION_BASE      TIPO_NOTAS,
     FORMACION_COMPLE    TIPO_NOTAS,
     FORMACION_RECIBIDA  TIPO_NOTAS,
-    EXPERIENCIA         TIPO_NOTAS
+    EXPERIENCIA         TIPO_NOTAS,
+	CONTRATO			VARCHAR(255)
 );
 
 
@@ -1580,7 +1581,8 @@ CREATE VIEW V_EMPLEADOS(
     FORMACION_BASE,
     FORMACION_COMPLE,
     FORMACION_RECIBIDA,
-    EXPERIENCIA)
+    EXPERIENCIA,
+	CONTRATO)
 AS
 SELECT V_CONTACTOS.ID,
   V_CONTACTOS.ID_CATEGORIA,
@@ -1612,7 +1614,8 @@ SELECT V_CONTACTOS.ID,
   EMPLEADOS_DATOS.FORMACION_BASE,
   EMPLEADOS_DATOS.FORMACION_COMPLE,
   EMPLEADOS_DATOS.FORMACION_RECIBIDA,
-  EMPLEADOS_DATOS.EXPERIENCIA
+  EMPLEADOS_DATOS.EXPERIENCIA,
+  EMPLEADOS_DATOS.CONTRATO
   
 FROM V_CONTACTOS
 INNER JOIN EMPLEADOS_DATOS ON (EMPLEADOS_DATOS.ID_EMPLEADO = V_CONTACTOS.ID)

Source/Modulos/Contactos/Controller/uEmpleadosController.pas

@@ -3,7 +3,7 @@ unit uEmpleadosController;
 interface
 
 uses
-  uCustomEditor,
+  uCustomEditor, Classes,
   uContactosController, uBizContactos,
   uIEditorEmpleados, uIEditorEmpleado, uIDataModuleContactos, uIDataModuleEmpleados;
 
@@ -14,6 +14,7 @@ type
     function Eliminar(AEmpleado: IBizContacto; AllItems: Boolean = false): Boolean; overload;
     procedure Preview(AEmpleado : IBizEmpleado; AllItems: Boolean = false);
     procedure Print(AEmpleado : IBizEmpleado; AllItems: Boolean = false);
+    function DarListaContratosEmpleado: TStringList;    
   end;
 
   TEmpleadosController = class(TContactosController, IEmpleadosController)
@@ -31,6 +32,8 @@ type
     function Eliminar(AEmpleado: IBizContacto; AllItems: Boolean = false): Boolean; overload;
     function EsEliminable(AEmpleado: IBizContacto): Boolean;
 
+    function DarListaContratosEmpleado: TStringList;
+    
     procedure Preview(AEmpleado : IBizEmpleado; AllItems: Boolean = false);
     procedure Print(AEmpleado : IBizEmpleado; AllItems: Boolean = false);
   end;
@@ -38,7 +41,7 @@ type
 implementation
 
 uses
-  Classes, Windows, SysUtils, cxControls, Dialogs, uDataModuleEmpleados, uEditorRegistryUtils,
+  Windows, SysUtils, cxControls, Dialogs, uDataModuleEmpleados, uEditorRegistryUtils,
   uDataTableUtils, uDADataTable, DB, schContactosClient_Intf, uFichasEmpleadoReportController,
   uEditorGridBase;
 
@@ -62,6 +65,11 @@ begin
   FDataModule := TDataModuleEmpleados.Create(Nil);
 end;
 
+function TEmpleadosController.DarListaContratosEmpleado: TStringList;
+begin
+  Result := (FDataModule as IDataModuleEmpleados).DarListaContratosEmpleado;
+end;
+
 function TEmpleadosController.Duplicar(AContacto: IBizContacto): IBizContacto;
 begin
   Result := inherited Duplicar(AContacto);

Source/Modulos/Contactos/Controller/uProveedoresController.pas

@@ -3,8 +3,7 @@ unit uProveedoresController;
 interface
 
 uses
-  uCustomEditor,
+  Classes, uCustomEditor, uContactosController, uBizContactos, uBizDireccionesContacto, uDireccionesContactoController,
-  uContactosController, uBizContactos, uBizDireccionesContacto, uDireccionesContactoController,
   uIEditorProveedores, uIEditorProveedor, uIDataModuleContactos, uIDataModuleProveedores;
 
 type
@@ -16,6 +15,7 @@ type
     function Eliminar(AProveedor: IBizContacto; AllItems: Boolean = false): Boolean; overload;
     procedure Preview(AProveedor : IBizProveedor; AllItems: Boolean = false);
     procedure Print(AProveedor : IBizProveedor; AllItems: Boolean = false);
+    function DarListaDescripcionesProveedores: TStringList;    
   end;
 
   TProveedoresController = class(TContactosController, IProveedoresController)
@@ -40,12 +40,13 @@ type
     function Eliminar(AProveedor: IBizContacto; AllItems: Boolean = false): Boolean; overload;
     procedure Preview(AProveedor : IBizProveedor; AllItems: Boolean = false);
     procedure Print(AProveedor : IBizProveedor; AllItems: Boolean = false);
+    function DarListaDescripcionesProveedores: TStringList;    
   end;
 
 implementation
 
 uses
-  Classes, SysUtils, cxControls, Dialogs, uDataModuleProveedores, uEditorRegistryUtils,
+  SysUtils, cxControls, Dialogs, uDataModuleProveedores, uEditorRegistryUtils,
   uDataTableUtils, uDADataTable, DB, schContactosClient_Intf, uEtiquetasContactosReportController,
   uIEditorElegirProveedores, Controls, uIEditorElegirDireccionEntrega,
   uEditorGridBase;
@@ -77,6 +78,11 @@ begin
   FDireccionesController := TDireccionesContactoController.Create;
 end;
 
+function TProveedoresController.DarListaDescripcionesProveedores: TStringList;
+begin
+  Result := (FDataModule as IDataModuleProveedores).DarListaDescripcionesProveedores;
+end;
+
 destructor TProveedoresController.Destroy;
 begin
   FDireccionesController := NIL;

Source/Modulos/Contactos/Data/uDataModuleEmpleados.dfm

@@ -298,10 +298,14 @@ inherited DataModuleEmpleados: TDataModuleEmpleados
       item
         Name = 'FECHA_ALTA'
         DataType = datDateTime
+        DisplayLabel = 'Empleados_FECHA_ALTA'
+        DictionaryEntry = 'Empleados_FECHA_ALTA'
       end
       item
         Name = 'FECHA_MODIFICACION'
         DataType = datDateTime
+        DisplayLabel = 'Empleados_FECHA_MODIFICACION'
+        DictionaryEntry = 'Empleados_FECHA_MODIFICACION'
       end
       item
         Name = 'USUARIO'
@@ -321,7 +325,7 @@ inherited DataModuleEmpleados: TDataModuleEmpleados
         Size = 255
         DisplayLabel = 'Referencia'
         ServerAutoRefresh = True
-        DictionaryEntry = 'Agentes_REFERENCIA'
+        DictionaryEntry = 'Empleados_REFERENCIA'
       end
       item
         Name = 'FECHA_NACIMIENTO'
@@ -365,6 +369,13 @@ inherited DataModuleEmpleados: TDataModuleEmpleados
         DataType = datMemo
         DisplayLabel = 'Experiencia'
         DictionaryEntry = 'Empleados_EXPERIENCIA'
+      end
+      item
+        Name = 'CONTRATO'
+        DataType = datString
+        Size = 255
+        DisplayLabel = 'Contrato'
+        DictionaryEntry = 'Empleados_CONTRATO'
       end>
     Params = <>
     StreamingOptions = [soDisableEventsWhileStreaming]

Source/Modulos/Contactos/Data/uDataModuleEmpleados.pas

@@ -24,6 +24,8 @@ type
     function GetItems : IBizEmpleado;
     function GetGruposEmpleado : IBizGrupoEmpleado;
 
+    function DarListaContratosEmpleado : TStringList;
+
     // Report
     function GetReport(const AFichaID: String): Binary;
   end;
@@ -34,10 +36,17 @@ implementation
 {$R *.dfm}
 
 uses
-  FactuGES_Intf, cxControls, schContactosClient_Intf, uDataTableUtils;
+  FactuGES_Intf, cxControls, schContactosClient_Intf, uDataTableUtils,
+  uStringsUtils;
 
 { TDataModuleVendedores }
 
+function TDataModuleEmpleados.DarListaContratosEmpleado: TStringList;
+begin
+  Result := TStringList.Create;
+  StringToStrings((RORemoteService as IsrvContactos).DarListaContratosEmpleados, '|', Result);
+end;
+
 function TDataModuleEmpleados.GetGruposEmpleado: IBizGrupoEmpleado;
 var
   AGrupoEmpleado : TDAMemDataTable;

Source/Modulos/Contactos/Data/uDataModuleProveedores.pas

@@ -24,6 +24,7 @@ type
     function GetItems : IBizProveedor;
     function GetItemsTiendaWeb : IBizProveedor;
     function GetGruposProveedor : IBizGrupoProveedor;
+    function DarListaDescripcionesProveedores : TStringList;    
   end;
 
 implementation
@@ -31,10 +32,16 @@ implementation
 {$R *.dfm}
 
 uses
-  cxControls, schContactosClient_Intf, uDataTableUtils;
+  FactuGES_Intf, cxControls, schContactosClient_Intf, uDataTableUtils, uStringsUtils;
 
 { TDataModuleProveedores }
 
+function TDataModuleProveedores.DarListaDescripcionesProveedores: TStringList;
+begin
+  Result := TStringList.Create;
+  StringToStrings((RORemoteService as IsrvContactos).DarListaDescripcionesProveedores, '|', Result);
+end;
+
 function TDataModuleProveedores.GetGruposProveedor: IBizGrupoProveedor;
 var
   AGrupoProveedor : TDAMemDataTable;

Source/Modulos/Contactos/Model/Data/uIDataModuleEmpleados.pas

@@ -3,15 +3,16 @@ unit uIDataModuleEmpleados;
 interface
 
 uses
-  uBizContactos, uIDataModuleContactos, uBizGruposEmpleado;
+  Classes, uBizContactos, uIDataModuleContactos, uBizGruposEmpleado;
 
 type
   IDataModuleEmpleados = interface(IDataModuleContactos)
-  ['{42FF228B-C69F-4D45-9E86-A8135D0DB981}']
+  ['{AB1F39BC-CC64-42E6-890C-F10A7AABAA4D}']
     function GetItem(const ID : Integer) : IBizEmpleado;
     function NewItem : IBizEmpleado;
     function GetItems : IBizEmpleado;
     function GetGruposEmpleado : IBizGrupoEmpleado;
+    function DarListaContratosEmpleado : TStringList;
   end;
 
 

Source/Modulos/Contactos/Model/Data/uIDataModuleProveedores.pas

@@ -3,7 +3,7 @@ unit uIDataModuleProveedores;
 interface
 
 uses
-  uBizContactos, uIDataModuleContactos, uBizGruposProveedor;
+  Classes, uBizContactos, uIDataModuleContactos, uBizGruposProveedor;
 
 type
   IDataModuleProveedores = interface(IDataModuleContactos)
@@ -13,6 +13,7 @@ type
     function GetItems : IBizProveedor;
     function GetItemsTiendaWeb : IBizProveedor;
     function GetGruposProveedor : IBizGrupoProveedor;
+    function DarListaDescripcionesProveedores : TStringList;
   end;
 
 

Source/Modulos/Contactos/Model/schContactosClient_Intf.pas

@@ -3,23 +3,25 @@ unit schContactosClient_Intf;
 interface
 
 uses
-  Classes, DB, schBase_Intf, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf;
+  Classes, DB, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf;
 
 const
   { Data table rules ids
        Feel free to change them to something more human readable
        but make sure they are unique in the context of your application }
-  RID_Contactos = '{7524FEA7-AF23-402A-9D0A-C8F52F2F1691}';
+  RID_Contactos = '{01CE9CDB-E726-469B-A566-3FD8E74E2C36}';
-  RID_GruposCliente = '{10355BC9-5839-4157-8F51-00D07038D882}';
+  RID_GruposCliente = '{EFD8258F-5EA4-4877-9C27-CAB5C72DA74B}';
-  RID_DatosBancarios = '{C1985CC5-5CD0-41F9-819F-4AC322A2F77C}';
+  RID_DatosBancarios = '{8506D0C1-D84B-4FAC-984E-6D954F2719FB}';
-  RID_Clientes = '{7E12D27F-34D5-4D41-913A-AEA7FA728520}';
+  RID_Clientes = '{887D55BC-0EBB-48C5-8E93-398F7465D379}';
-  RID_Proveedores = '{361673C9-4F57-45B7-A5B5-5A0F43AF4838}';
+  RID_Proveedores = '{628FC67C-08CB-42E6-B92D-93A8C6ACCD3C}';
-  RID_Empleados = '{E297A33A-3992-4967-8553-0D6ECE9ACFFB}';
+  RID_Empleados = '{EB5B27DC-6A00-4BCD-A079-E046CC23C6F6}';
-  RID_DireccionesContacto = '{AC2ACC8D-6088-4FF5-9D48-B2905CAB07A4}';
+  RID_DireccionesContacto = '{226A0A42-99A1-4FF0-ADC6-FF2E281C4E6E}';
-  RID_ClientesDescuentos = '{CEF21127-4B3B-4ED3-A93D-C465AA1D76C1}';
+  RID_ClientesDescuentos = '{7D2A9F93-92EC-4E24-AA27-1AAC02B56687}';
-  RID_GruposProveedor = '{65C4B656-1AD2-47AF-8C74-5116816CE478}';
+  RID_GruposProveedor = '{0AC9FC90-A9C3-4107-8ECF-0FEB163A5146}';
-  RID_GruposEmpleado = '{095BF882-6940-4735-BC33-4EFDEA0C1C32}';
+  RID_GruposEmpleado = '{99E32C39-1135-4B8F-9611-D0034FACD8D9}';
-  RID_Contactos_Refresh = '{E99C788D-3782-40C5-B417-30DA01830B78}';
+  RID_Contactos_Refresh = '{09A2CA71-0994-44EE-A10A-28C86E54F64D}';
+  RID_ContratosEmpleados = '{40F36840-7E89-4DFD-BA85-8E34E36A81AD}';
+  RID_DescripcionesProveedores = '{3BAF62F7-6D80-4F31-A321-E2268F0219A4}';
 
   { Data table names }
   nme_Contactos = 'Contactos';
@@ -33,6 +35,8 @@ const
   nme_GruposProveedor = 'GruposProveedor';
   nme_GruposEmpleado = 'GruposEmpleado';
   nme_Contactos_Refresh = 'Contactos_Refresh';
+  nme_ContratosEmpleados = 'ContratosEmpleados';
+  nme_DescripcionesProveedores = 'DescripcionesProveedores';
 
   { Contactos fields }
   fld_ContactosID = 'ID';
@@ -287,6 +291,7 @@ const
   fld_EmpleadosFORMACION_COMPLE = 'FORMACION_COMPLE';
   fld_EmpleadosFORMACION_RECIBIDA = 'FORMACION_RECIBIDA';
   fld_EmpleadosEXPERIENCIA = 'EXPERIENCIA';
+  fld_EmpleadosCONTRATO = 'CONTRATO';
 
   { Empleados field indexes }
   idx_EmpleadosID = 0;
@@ -319,6 +324,7 @@ const
   idx_EmpleadosFORMACION_COMPLE = 27;
   idx_EmpleadosFORMACION_RECIBIDA = 28;
   idx_EmpleadosEXPERIENCIA = 29;
+  idx_EmpleadosCONTRATO = 30;
 
   { DireccionesContacto fields }
   fld_DireccionesContactoID = 'ID';
@@ -432,10 +438,22 @@ const
   idx_Contactos_RefreshREFERENCIA = 19;
   idx_Contactos_RefreshPERSONA_CONTACTO = 20;
 
+  { ContratosEmpleados fields }
+  fld_ContratosEmpleadosCONTRATO = 'CONTRATO';
+
+  { ContratosEmpleados field indexes }
+  idx_ContratosEmpleadosCONTRATO = 0;
+
+  { DescripcionesProveedores fields }
+  fld_DescripcionesProveedoresDESCRIPCION_PROVEEDOR = 'DESCRIPCION_PROVEEDOR';
+
+  { DescripcionesProveedores field indexes }
+  idx_DescripcionesProveedoresDESCRIPCION_PROVEEDOR = 0;
+
 type
   { IContactos }
   IContactos = interface(IDAStronglyTypedDataTable)
-  ['{FFBE8E82-6FA0-4AB4-B1EE-831FB40CF062}']
+  ['{7B181D3B-747F-43F4-BBF3-9785D0D4D67B}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -580,7 +598,7 @@ type
   end;
 
   { TContactosDataTableRules }
-  TContactosDataTableRules = class(TIntfObjectDADataTableRules, IContactos)
+  TContactosDataTableRules = class(TDADataTableRules, IContactos)
   private
     f_NOTAS: IROStrings;
     procedure NOTAS_OnChange(Sender: TObject);
@@ -734,7 +752,7 @@ type
 
   { IGruposCliente }
   IGruposCliente = interface(IDAStronglyTypedDataTable)
-  ['{B5728E65-DE70-4759-8867-C4E262DEDBAF}']
+  ['{2382AA28-EE2C-4691-A770-CB1BA5D70897}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -754,7 +772,7 @@ type
   end;
 
   { TGruposClienteDataTableRules }
-  TGruposClienteDataTableRules = class(TIntfObjectDADataTableRules, IGruposCliente)
+  TGruposClienteDataTableRules = class(TDADataTableRules, IGruposCliente)
   private
   protected
     { Property getters and setters }
@@ -781,7 +799,7 @@ type
 
   { IDatosBancarios }
   IDatosBancarios = interface(IDAStronglyTypedDataTable)
-  ['{9319C424-5D7A-4BD1-91D2-9422AFA7AAAE}']
+  ['{F72B1F33-9B14-42D6-9A25-EAC2E0238671}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -843,7 +861,7 @@ type
   end;
 
   { TDatosBancariosDataTableRules }
-  TDatosBancariosDataTableRules = class(TIntfObjectDADataTableRules, IDatosBancarios)
+  TDatosBancariosDataTableRules = class(TDADataTableRules, IDatosBancarios)
   private
   protected
     { Property getters and setters }
@@ -912,7 +930,7 @@ type
 
   { IClientes }
   IClientes = interface(IDAStronglyTypedDataTable)
-  ['{08955625-F550-4894-AF03-D4D193A50412}']
+  ['{9355C5A0-5E01-4F9D-86CC-BDB1274A2A7B}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1123,7 +1141,7 @@ type
   end;
 
   { TClientesDataTableRules }
-  TClientesDataTableRules = class(TIntfObjectDADataTableRules, IClientes)
+  TClientesDataTableRules = class(TDADataTableRules, IClientes)
   private
     f_NOTAS: IROStrings;
     procedure NOTAS_OnChange(Sender: TObject);
@@ -1343,7 +1361,7 @@ type
 
   { IProveedores }
   IProveedores = interface(IDAStronglyTypedDataTable)
-  ['{0EF80197-36C1-48E5-997D-BA1D4D5C16EF}']
+  ['{D3C0A4E7-F3FD-43DC-B2B8-BAE7ACD8A8F1}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1548,7 +1566,7 @@ type
   end;
 
   { TProveedoresDataTableRules }
-  TProveedoresDataTableRules = class(TIntfObjectDADataTableRules, IProveedores)
+  TProveedoresDataTableRules = class(TDADataTableRules, IProveedores)
   private
     f_NOTAS: IROStrings;
     procedure NOTAS_OnChange(Sender: TObject);
@@ -1762,7 +1780,7 @@ type
 
   { IEmpleados }
   IEmpleados = interface(IDAStronglyTypedDataTable)
-  ['{AC8E7491-3335-46A9-9805-AA0FD4F96E7D}']
+  ['{82522988-9A9D-43E4-9B44-B1A6A8F60D85}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1879,6 +1897,10 @@ type
     function GetEXPERIENCIAValue: IROStrings;
     function GetEXPERIENCIAIsNull: Boolean;
     procedure SetEXPERIENCIAIsNull(const aValue: Boolean);
+    function GetCONTRATOValue: String;
+    procedure SetCONTRATOValue(const aValue: String);
+    function GetCONTRATOIsNull: Boolean;
+    procedure SetCONTRATOIsNull(const aValue: Boolean);
 
 
     { Properties }
@@ -1942,10 +1964,12 @@ type
     property FORMACION_RECIBIDAIsNull: Boolean read GetFORMACION_RECIBIDAIsNull write SetFORMACION_RECIBIDAIsNull;
     property EXPERIENCIA: IROStrings read GetEXPERIENCIAValue;
     property EXPERIENCIAIsNull: Boolean read GetEXPERIENCIAIsNull write SetEXPERIENCIAIsNull;
+    property CONTRATO: String read GetCONTRATOValue write SetCONTRATOValue;
+    property CONTRATOIsNull: Boolean read GetCONTRATOIsNull write SetCONTRATOIsNull;
   end;
 
   { TEmpleadosDataTableRules }
-  TEmpleadosDataTableRules = class(TIntfObjectDADataTableRules, IEmpleados)
+  TEmpleadosDataTableRules = class(TDADataTableRules, IEmpleados)
   private
     f_NOTAS: IROStrings;
     f_FORMACION_BASE: IROStrings;
@@ -2074,6 +2098,10 @@ type
     function GetEXPERIENCIAValue: IROStrings; virtual;
     function GetEXPERIENCIAIsNull: Boolean; virtual;
     procedure SetEXPERIENCIAIsNull(const aValue: Boolean); virtual;
+    function GetCONTRATOValue: String; virtual;
+    procedure SetCONTRATOValue(const aValue: String); virtual;
+    function GetCONTRATOIsNull: Boolean; virtual;
+    procedure SetCONTRATOIsNull(const aValue: Boolean); virtual;
 
     { Properties }
     property ID: Integer read GetIDValue write SetIDValue;
@@ -2136,6 +2164,8 @@ type
     property FORMACION_RECIBIDAIsNull: Boolean read GetFORMACION_RECIBIDAIsNull write SetFORMACION_RECIBIDAIsNull;
     property EXPERIENCIA: IROStrings read GetEXPERIENCIAValue;
     property EXPERIENCIAIsNull: Boolean read GetEXPERIENCIAIsNull write SetEXPERIENCIAIsNull;
+    property CONTRATO: String read GetCONTRATOValue write SetCONTRATOValue;
+    property CONTRATOIsNull: Boolean read GetCONTRATOIsNull write SetCONTRATOIsNull;
 
   public
     constructor Create(aDataTable: TDADataTable); override;
@@ -2145,7 +2175,7 @@ type
 
   { IDireccionesContacto }
   IDireccionesContacto = interface(IDAStronglyTypedDataTable)
-  ['{609D235F-9C3A-4FFE-99B1-C0F93382B1EA}']
+  ['{79BE8405-A1EE-42C2-AB10-5574D6C0E89B}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -2248,7 +2278,7 @@ type
   end;
 
   { TDireccionesContactoDataTableRules }
-  TDireccionesContactoDataTableRules = class(TIntfObjectDADataTableRules, IDireccionesContacto)
+  TDireccionesContactoDataTableRules = class(TDADataTableRules, IDireccionesContacto)
   private
     f_NOTAS: IROStrings;
     procedure NOTAS_OnChange(Sender: TObject);
@@ -2360,7 +2390,7 @@ type
 
   { IClientesDescuentos }
   IClientesDescuentos = interface(IDAStronglyTypedDataTable)
-  ['{A8A45324-25C9-452D-AAF5-CA874C78432A}']
+  ['{F09E5068-595E-4249-813D-5E910D208E3D}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -2398,7 +2428,7 @@ type
   end;
 
   { TClientesDescuentosDataTableRules }
-  TClientesDescuentosDataTableRules = class(TIntfObjectDADataTableRules, IClientesDescuentos)
+  TClientesDescuentosDataTableRules = class(TDADataTableRules, IClientesDescuentos)
   private
   protected
     { Property getters and setters }
@@ -2443,7 +2473,7 @@ type
 
   { IGruposProveedor }
   IGruposProveedor = interface(IDAStronglyTypedDataTable)
-  ['{A2CBFCE6-7B26-4628-8D60-469C83943691}']
+  ['{3E7AE0C8-CB2A-4BFC-8ABC-870455595C62}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -2463,7 +2493,7 @@ type
   end;
 
   { TGruposProveedorDataTableRules }
-  TGruposProveedorDataTableRules = class(TIntfObjectDADataTableRules, IGruposProveedor)
+  TGruposProveedorDataTableRules = class(TDADataTableRules, IGruposProveedor)
   private
   protected
     { Property getters and setters }
@@ -2490,7 +2520,7 @@ type
 
   { IGruposEmpleado }
   IGruposEmpleado = interface(IDAStronglyTypedDataTable)
-  ['{783248AC-A697-4225-942B-69C71017C8DB}']
+  ['{10BBAC28-3D57-455D-AFD3-FE86A98648FD}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -2510,7 +2540,7 @@ type
   end;
 
   { TGruposEmpleadoDataTableRules }
-  TGruposEmpleadoDataTableRules = class(TIntfObjectDADataTableRules, IGruposEmpleado)
+  TGruposEmpleadoDataTableRules = class(TDADataTableRules, IGruposEmpleado)
   private
   protected
     { Property getters and setters }
@@ -2537,7 +2567,7 @@ type
 
   { IContactos_Refresh }
   IContactos_Refresh = interface(IDAStronglyTypedDataTable)
-  ['{3EE4EBBE-A457-4693-9045-62A567A27318}']
+  ['{8CE36C56-56F3-40F5-9E18-06647B1D50AB}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -2670,7 +2700,7 @@ type
   end;
 
   { TContactos_RefreshDataTableRules }
-  TContactos_RefreshDataTableRules = class(TIntfObjectDADataTableRules, IContactos_Refresh)
+  TContactos_RefreshDataTableRules = class(TDADataTableRules, IContactos_Refresh)
   private
     f_NOTAS: IROStrings;
     procedure NOTAS_OnChange(Sender: TObject);
@@ -2810,6 +2840,76 @@ type
 
   end;
 
+  { IContratosEmpleados }
+  IContratosEmpleados = interface(IDAStronglyTypedDataTable)
+  ['{9DCC16EF-A79F-42AF-A083-01A09B70F1C0}']
+    { Property getters and setters }
+    function GetCONTRATOValue: String;
+    procedure SetCONTRATOValue(const aValue: String);
+    function GetCONTRATOIsNull: Boolean;
+    procedure SetCONTRATOIsNull(const aValue: Boolean);
+
+
+    { Properties }
+    property CONTRATO: String read GetCONTRATOValue write SetCONTRATOValue;
+    property CONTRATOIsNull: Boolean read GetCONTRATOIsNull write SetCONTRATOIsNull;
+  end;
+
+  { TContratosEmpleadosDataTableRules }
+  TContratosEmpleadosDataTableRules = class(TDADataTableRules, IContratosEmpleados)
+  private
+  protected
+    { Property getters and setters }
+    function GetCONTRATOValue: String; virtual;
+    procedure SetCONTRATOValue(const aValue: String); virtual;
+    function GetCONTRATOIsNull: Boolean; virtual;
+    procedure SetCONTRATOIsNull(const aValue: Boolean); virtual;
+
+    { Properties }
+    property CONTRATO: String read GetCONTRATOValue write SetCONTRATOValue;
+    property CONTRATOIsNull: Boolean read GetCONTRATOIsNull write SetCONTRATOIsNull;
+
+  public
+    constructor Create(aDataTable: TDADataTable); override;
+    destructor Destroy; override;
+
+  end;
+
+  { IDescripcionesProveedores }
+  IDescripcionesProveedores = interface(IDAStronglyTypedDataTable)
+  ['{A405B7BB-0753-4B81-BE6D-0BE49B548F77}']
+    { Property getters and setters }
+    function GetDESCRIPCION_PROVEEDORValue: String;
+    procedure SetDESCRIPCION_PROVEEDORValue(const aValue: String);
+    function GetDESCRIPCION_PROVEEDORIsNull: Boolean;
+    procedure SetDESCRIPCION_PROVEEDORIsNull(const aValue: Boolean);
+
+
+    { Properties }
+    property DESCRIPCION_PROVEEDOR: String read GetDESCRIPCION_PROVEEDORValue write SetDESCRIPCION_PROVEEDORValue;
+    property DESCRIPCION_PROVEEDORIsNull: Boolean read GetDESCRIPCION_PROVEEDORIsNull write SetDESCRIPCION_PROVEEDORIsNull;
+  end;
+
+  { TDescripcionesProveedoresDataTableRules }
+  TDescripcionesProveedoresDataTableRules = class(TDADataTableRules, IDescripcionesProveedores)
+  private
+  protected
+    { Property getters and setters }
+    function GetDESCRIPCION_PROVEEDORValue: String; virtual;
+    procedure SetDESCRIPCION_PROVEEDORValue(const aValue: String); virtual;
+    function GetDESCRIPCION_PROVEEDORIsNull: Boolean; virtual;
+    procedure SetDESCRIPCION_PROVEEDORIsNull(const aValue: Boolean); virtual;
+
+    { Properties }
+    property DESCRIPCION_PROVEEDOR: String read GetDESCRIPCION_PROVEEDORValue write SetDESCRIPCION_PROVEEDORValue;
+    property DESCRIPCION_PROVEEDORIsNull: Boolean read GetDESCRIPCION_PROVEEDORIsNull write SetDESCRIPCION_PROVEEDORIsNull;
+
+  public
+    constructor Create(aDataTable: TDADataTable); override;
+    destructor Destroy; override;
+
+  end;
+
 implementation
 
 uses Variants, uROBinaryHelpers;
@@ -5684,6 +5784,27 @@ begin
     DataTable.Fields[idx_EmpleadosEXPERIENCIA].AsVariant := Null;
 end;
 
+function TEmpleadosDataTableRules.GetCONTRATOValue: String;
+begin
+  result := DataTable.Fields[idx_EmpleadosCONTRATO].AsString;
+end;
+
+procedure TEmpleadosDataTableRules.SetCONTRATOValue(const aValue: String);
+begin
+  DataTable.Fields[idx_EmpleadosCONTRATO].AsString := aValue;
+end;
+
+function TEmpleadosDataTableRules.GetCONTRATOIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_EmpleadosCONTRATO].IsNull;
+end;
+
+procedure TEmpleadosDataTableRules.SetCONTRATOIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_EmpleadosCONTRATO].AsVariant := Null;
+end;
+
 
 { TDireccionesContactoDataTableRules }
 constructor TDireccionesContactoDataTableRules.Create(aDataTable: TDADataTable);
@@ -6725,6 +6846,72 @@ begin
 end;
 
 
+{ TContratosEmpleadosDataTableRules }
+constructor TContratosEmpleadosDataTableRules.Create(aDataTable: TDADataTable);
+begin
+  inherited;
+end;
+
+destructor TContratosEmpleadosDataTableRules.Destroy;
+begin
+  inherited;
+end;
+
+function TContratosEmpleadosDataTableRules.GetCONTRATOValue: String;
+begin
+  result := DataTable.Fields[idx_ContratosEmpleadosCONTRATO].AsString;
+end;
+
+procedure TContratosEmpleadosDataTableRules.SetCONTRATOValue(const aValue: String);
+begin
+  DataTable.Fields[idx_ContratosEmpleadosCONTRATO].AsString := aValue;
+end;
+
+function TContratosEmpleadosDataTableRules.GetCONTRATOIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_ContratosEmpleadosCONTRATO].IsNull;
+end;
+
+procedure TContratosEmpleadosDataTableRules.SetCONTRATOIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_ContratosEmpleadosCONTRATO].AsVariant := Null;
+end;
+
+
+{ TDescripcionesProveedoresDataTableRules }
+constructor TDescripcionesProveedoresDataTableRules.Create(aDataTable: TDADataTable);
+begin
+  inherited;
+end;
+
+destructor TDescripcionesProveedoresDataTableRules.Destroy;
+begin
+  inherited;
+end;
+
+function TDescripcionesProveedoresDataTableRules.GetDESCRIPCION_PROVEEDORValue: String;
+begin
+  result := DataTable.Fields[idx_DescripcionesProveedoresDESCRIPCION_PROVEEDOR].AsString;
+end;
+
+procedure TDescripcionesProveedoresDataTableRules.SetDESCRIPCION_PROVEEDORValue(const aValue: String);
+begin
+  DataTable.Fields[idx_DescripcionesProveedoresDESCRIPCION_PROVEEDOR].AsString := aValue;
+end;
+
+function TDescripcionesProveedoresDataTableRules.GetDESCRIPCION_PROVEEDORIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_DescripcionesProveedoresDESCRIPCION_PROVEEDOR].IsNull;
+end;
+
+procedure TDescripcionesProveedoresDataTableRules.SetDESCRIPCION_PROVEEDORIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_DescripcionesProveedoresDESCRIPCION_PROVEEDOR].AsVariant := Null;
+end;
+
+
 initialization
   RegisterDataTableRules(RID_Contactos, TContactosDataTableRules);
   RegisterDataTableRules(RID_GruposCliente, TGruposClienteDataTableRules);
@@ -6737,5 +6924,7 @@ initialization
   RegisterDataTableRules(RID_GruposProveedor, TGruposProveedorDataTableRules);
   RegisterDataTableRules(RID_GruposEmpleado, TGruposEmpleadoDataTableRules);
   RegisterDataTableRules(RID_Contactos_Refresh, TContactos_RefreshDataTableRules);
+  RegisterDataTableRules(RID_ContratosEmpleados, TContratosEmpleadosDataTableRules);
+  RegisterDataTableRules(RID_DescripcionesProveedores, TDescripcionesProveedoresDataTableRules);
 
 end.

Source/Modulos/Contactos/Model/schContactosServer_Intf.pas

@@ -9,22 +9,24 @@ const
   { Delta rules ids 
        Feel free to change them to something more human readable
        but make sure they are unique in the context of your application }
-  RID_ContactosDelta = '{E61E8DAA-56D6-4EAE-87EA-49D277119D7C}';
+  RID_ContactosDelta = '{25188B95-F041-4781-A357-50DAC38D4CE2}';
-  RID_GruposClienteDelta = '{0AE5F9C7-48C6-4925-8691-A17CC4505DBE}';
+  RID_GruposClienteDelta = '{AECDD262-DF71-427E-B7E9-73E8D23ECC47}';
-  RID_DatosBancariosDelta = '{F64C6E33-2972-4179-9B5D-DC3254359D9C}';
+  RID_DatosBancariosDelta = '{2803B9AB-C984-4BFB-9FB5-179343CC74BB}';
-  RID_ClientesDelta = '{A162BB3F-80E6-4200-99AD-45692DC0A5F0}';
+  RID_ClientesDelta = '{1AB55D90-E9A6-42D1-9708-458EAA358CD7}';
-  RID_ProveedoresDelta = '{AF4315C9-BD9B-49E1-99CF-EFEB66CBC78B}';
+  RID_ProveedoresDelta = '{91961AA7-2E89-4833-89E2-633B80BE3383}';
-  RID_EmpleadosDelta = '{2592ABD9-DC9D-4CD5-8850-BD4AE48BB5CE}';
+  RID_EmpleadosDelta = '{38129037-CCCD-4E3D-83A1-8F9B31FF3D05}';
-  RID_DireccionesContactoDelta = '{31DBDD24-7EC4-40BE-955C-574291D8C0AB}';
+  RID_DireccionesContactoDelta = '{E2A1E6A4-09FD-4E0A-B26A-B7827984C26D}';
-  RID_ClientesDescuentosDelta = '{667FD725-9E84-4E90-8FF2-F5B332BDC83B}';
+  RID_ClientesDescuentosDelta = '{9418EBB5-5197-4AB9-8526-BDAE38276700}';
-  RID_GruposProveedorDelta = '{4FDC02ED-4392-4BA6-9B79-4F478026AE0A}';
+  RID_GruposProveedorDelta = '{BDB82401-1178-492A-ABDF-240FA1B8D99A}';
-  RID_GruposEmpleadoDelta = '{8E4B32D4-1504-4A57-B33F-52BAD72056F2}';
+  RID_GruposEmpleadoDelta = '{C5CBE45F-F25F-46E4-94B2-05526873408D}';
-  RID_Contactos_RefreshDelta = '{91609D22-D09E-4BE3-9852-569E468C2A21}';
+  RID_Contactos_RefreshDelta = '{62A01664-1F25-49FC-B054-48FE8F8DF7DC}';
+  RID_ContratosEmpleadosDelta = '{1980411A-046A-4D73-BDC3-3F0496E25C2E}';
+  RID_DescripcionesProveedoresDelta = '{BC903E83-347B-4721-82CC-2DED553889C5}';
 
 type
   { IContactosDelta }
   IContactosDelta = interface(IContactos)
-  ['{E61E8DAA-56D6-4EAE-87EA-49D277119D7C}']
+  ['{25188B95-F041-4781-A357-50DAC38D4CE2}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CATEGORIAValue : Integer;
@@ -323,7 +325,7 @@ type
 
   { IGruposClienteDelta }
   IGruposClienteDelta = interface(IGruposCliente)
-  ['{0AE5F9C7-48C6-4925-8691-A17CC4505DBE}']
+  ['{AECDD262-DF71-427E-B7E9-73E8D23ECC47}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldDESCRIPCIONValue : String;
@@ -369,7 +371,7 @@ type
 
   { IDatosBancariosDelta }
   IDatosBancariosDelta = interface(IDatosBancarios)
-  ['{F64C6E33-2972-4179-9B5D-DC3254359D9C}']
+  ['{2803B9AB-C984-4BFB-9FB5-179343CC74BB}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CONTACTOValue : Integer;
@@ -499,7 +501,7 @@ type
 
   { IClientesDelta }
   IClientesDelta = interface(IClientes)
-  ['{A162BB3F-80E6-4200-99AD-45692DC0A5F0}']
+  ['{1AB55D90-E9A6-42D1-9708-458EAA358CD7}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CATEGORIAValue : Integer;
@@ -930,7 +932,7 @@ type
 
   { IProveedoresDelta }
   IProveedoresDelta = interface(IProveedores)
-  ['{AF4315C9-BD9B-49E1-99CF-EFEB66CBC78B}']
+  ['{91961AA7-2E89-4833-89E2-633B80BE3383}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CATEGORIAValue : Integer;
@@ -1349,7 +1351,7 @@ type
 
   { IEmpleadosDelta }
   IEmpleadosDelta = interface(IEmpleados)
-  ['{2592ABD9-DC9D-4CD5-8850-BD4AE48BB5CE}']
+  ['{38129037-CCCD-4E3D-83A1-8F9B31FF3D05}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CATEGORIAValue : Integer;
@@ -1381,6 +1383,7 @@ type
     function GetOldFORMACION_COMPLEValue : IROStrings;
     function GetOldFORMACION_RECIBIDAValue : IROStrings;
     function GetOldEXPERIENCIAValue : IROStrings;
+    function GetOldCONTRATOValue : String;
 
     { Properties }
     property OldID : Integer read GetOldIDValue;
@@ -1413,6 +1416,7 @@ type
     property OldFORMACION_COMPLE : IROStrings read GetOldFORMACION_COMPLEValue;
     property OldFORMACION_RECIBIDA : IROStrings read GetOldFORMACION_RECIBIDAValue;
     property OldEXPERIENCIA : IROStrings read GetOldEXPERIENCIAValue;
+    property OldCONTRATO : String read GetOldCONTRATOValue;
   end;
 
   { TEmpleadosBusinessProcessorRules }
@@ -1605,6 +1609,12 @@ type
     function GetOldEXPERIENCIAValue: IROStrings; virtual;
     function GetOldEXPERIENCIAIsNull: Boolean; virtual;
     procedure SetEXPERIENCIAIsNull(const aValue: Boolean); virtual;
+    function GetCONTRATOValue: String; virtual;
+    function GetCONTRATOIsNull: Boolean; virtual;
+    function GetOldCONTRATOValue: String; virtual;
+    function GetOldCONTRATOIsNull: Boolean; virtual;
+    procedure SetCONTRATOValue(const aValue: String); virtual;
+    procedure SetCONTRATOIsNull(const aValue: Boolean); virtual;
 
     { Properties }
     property ID : Integer read GetIDValue write SetIDValue;
@@ -1727,6 +1737,10 @@ type
     property EXPERIENCIAIsNull : Boolean read GetEXPERIENCIAIsNull write SetEXPERIENCIAIsNull;
     property OldEXPERIENCIA : IROStrings read GetOldEXPERIENCIAValue;
     property OldEXPERIENCIAIsNull : Boolean read GetOldEXPERIENCIAIsNull;
+    property CONTRATO : String read GetCONTRATOValue write SetCONTRATOValue;
+    property CONTRATOIsNull : Boolean read GetCONTRATOIsNull write SetCONTRATOIsNull;
+    property OldCONTRATO : String read GetOldCONTRATOValue;
+    property OldCONTRATOIsNull : Boolean read GetOldCONTRATOIsNull;
 
   public
     constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@@ -1736,7 +1750,7 @@ type
 
   { IDireccionesContactoDelta }
   IDireccionesContactoDelta = interface(IDireccionesContacto)
-  ['{31DBDD24-7EC4-40BE-955C-574291D8C0AB}']
+  ['{E2A1E6A4-09FD-4E0A-B26A-B7827984C26D}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CONTACTOValue : Integer;
@@ -1951,7 +1965,7 @@ type
 
   { IClientesDescuentosDelta }
   IClientesDescuentosDelta = interface(IClientesDescuentos)
-  ['{667FD725-9E84-4E90-8FF2-F5B332BDC83B}']
+  ['{9418EBB5-5197-4AB9-8526-BDAE38276700}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CLIENTEValue : Integer;
@@ -2033,7 +2047,7 @@ type
 
   { IGruposProveedorDelta }
   IGruposProveedorDelta = interface(IGruposProveedor)
-  ['{4FDC02ED-4392-4BA6-9B79-4F478026AE0A}']
+  ['{BDB82401-1178-492A-ABDF-240FA1B8D99A}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldDESCRIPCIONValue : String;
@@ -2079,7 +2093,7 @@ type
 
   { IGruposEmpleadoDelta }
   IGruposEmpleadoDelta = interface(IGruposEmpleado)
-  ['{8E4B32D4-1504-4A57-B33F-52BAD72056F2}']
+  ['{C5CBE45F-F25F-46E4-94B2-05526873408D}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldDESCRIPCIONValue : String;
@@ -2125,7 +2139,7 @@ type
 
   { IContactos_RefreshDelta }
   IContactos_RefreshDelta = interface(IContactos_Refresh)
-  ['{91609D22-D09E-4BE3-9852-569E468C2A21}']
+  ['{62A01664-1F25-49FC-B054-48FE8F8DF7DC}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldNIF_CIFValue : String;
@@ -2398,6 +2412,74 @@ type
 
   end;
 
+  { IContratosEmpleadosDelta }
+  IContratosEmpleadosDelta = interface(IContratosEmpleados)
+  ['{1980411A-046A-4D73-BDC3-3F0496E25C2E}']
+    { Property getters and setters }
+    function GetOldCONTRATOValue : String;
+
+    { Properties }
+    property OldCONTRATO : String read GetOldCONTRATOValue;
+  end;
+
+  { TContratosEmpleadosBusinessProcessorRules }
+  TContratosEmpleadosBusinessProcessorRules = class(TDABusinessProcessorRules, IContratosEmpleados, IContratosEmpleadosDelta)
+  private
+  protected
+    { Property getters and setters }
+    function GetCONTRATOValue: String; virtual;
+    function GetCONTRATOIsNull: Boolean; virtual;
+    function GetOldCONTRATOValue: String; virtual;
+    function GetOldCONTRATOIsNull: Boolean; virtual;
+    procedure SetCONTRATOValue(const aValue: String); virtual;
+    procedure SetCONTRATOIsNull(const aValue: Boolean); virtual;
+
+    { Properties }
+    property CONTRATO : String read GetCONTRATOValue write SetCONTRATOValue;
+    property CONTRATOIsNull : Boolean read GetCONTRATOIsNull write SetCONTRATOIsNull;
+    property OldCONTRATO : String read GetOldCONTRATOValue;
+    property OldCONTRATOIsNull : Boolean read GetOldCONTRATOIsNull;
+
+  public
+    constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
+    destructor Destroy; override;
+
+  end;
+
+  { IDescripcionesProveedoresDelta }
+  IDescripcionesProveedoresDelta = interface(IDescripcionesProveedores)
+  ['{BC903E83-347B-4721-82CC-2DED553889C5}']
+    { Property getters and setters }
+    function GetOldDESCRIPCION_PROVEEDORValue : String;
+
+    { Properties }
+    property OldDESCRIPCION_PROVEEDOR : String read GetOldDESCRIPCION_PROVEEDORValue;
+  end;
+
+  { TDescripcionesProveedoresBusinessProcessorRules }
+  TDescripcionesProveedoresBusinessProcessorRules = class(TDABusinessProcessorRules, IDescripcionesProveedores, IDescripcionesProveedoresDelta)
+  private
+  protected
+    { Property getters and setters }
+    function GetDESCRIPCION_PROVEEDORValue: String; virtual;
+    function GetDESCRIPCION_PROVEEDORIsNull: Boolean; virtual;
+    function GetOldDESCRIPCION_PROVEEDORValue: String; virtual;
+    function GetOldDESCRIPCION_PROVEEDORIsNull: Boolean; virtual;
+    procedure SetDESCRIPCION_PROVEEDORValue(const aValue: String); virtual;
+    procedure SetDESCRIPCION_PROVEEDORIsNull(const aValue: Boolean); virtual;
+
+    { Properties }
+    property DESCRIPCION_PROVEEDOR : String read GetDESCRIPCION_PROVEEDORValue write SetDESCRIPCION_PROVEEDORValue;
+    property DESCRIPCION_PROVEEDORIsNull : Boolean read GetDESCRIPCION_PROVEEDORIsNull write SetDESCRIPCION_PROVEEDORIsNull;
+    property OldDESCRIPCION_PROVEEDOR : String read GetOldDESCRIPCION_PROVEEDORValue;
+    property OldDESCRIPCION_PROVEEDORIsNull : Boolean read GetOldDESCRIPCION_PROVEEDORIsNull;
+
+  public
+    constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
+    destructor Destroy; override;
+
+  end;
+
 implementation
 
 uses
@@ -6591,6 +6673,37 @@ begin
     BusinessProcessor.CurrentChange.NewValueByName[fld_EmpleadosEXPERIENCIA] := Null;
 end;
 
+function TEmpleadosBusinessProcessorRules.GetCONTRATOValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_EmpleadosCONTRATO];
+end;
+
+function TEmpleadosBusinessProcessorRules.GetCONTRATOIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_EmpleadosCONTRATO]);
+end;
+
+function TEmpleadosBusinessProcessorRules.GetOldCONTRATOValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_EmpleadosCONTRATO];
+end;
+
+function TEmpleadosBusinessProcessorRules.GetOldCONTRATOIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_EmpleadosCONTRATO]);
+end;
+
+procedure TEmpleadosBusinessProcessorRules.SetCONTRATOValue(const aValue: String);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_EmpleadosCONTRATO] := aValue;
+end;
+
+procedure TEmpleadosBusinessProcessorRules.SetCONTRATOIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_EmpleadosCONTRATO] := Null;
+end;
+
 
 { TDireccionesContactoBusinessProcessorRules }
 constructor TDireccionesContactoBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);
@@ -8094,6 +8207,92 @@ begin
 end;
 
 
+{ TContratosEmpleadosBusinessProcessorRules }
+constructor TContratosEmpleadosBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);
+begin
+  inherited;
+end;
+
+destructor TContratosEmpleadosBusinessProcessorRules.Destroy;
+begin
+  inherited;
+end;
+
+function TContratosEmpleadosBusinessProcessorRules.GetCONTRATOValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosEmpleadosCONTRATO];
+end;
+
+function TContratosEmpleadosBusinessProcessorRules.GetCONTRATOIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosEmpleadosCONTRATO]);
+end;
+
+function TContratosEmpleadosBusinessProcessorRules.GetOldCONTRATOValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_ContratosEmpleadosCONTRATO];
+end;
+
+function TContratosEmpleadosBusinessProcessorRules.GetOldCONTRATOIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ContratosEmpleadosCONTRATO]);
+end;
+
+procedure TContratosEmpleadosBusinessProcessorRules.SetCONTRATOValue(const aValue: String);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosEmpleadosCONTRATO] := aValue;
+end;
+
+procedure TContratosEmpleadosBusinessProcessorRules.SetCONTRATOIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosEmpleadosCONTRATO] := Null;
+end;
+
+
+{ TDescripcionesProveedoresBusinessProcessorRules }
+constructor TDescripcionesProveedoresBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);
+begin
+  inherited;
+end;
+
+destructor TDescripcionesProveedoresBusinessProcessorRules.Destroy;
+begin
+  inherited;
+end;
+
+function TDescripcionesProveedoresBusinessProcessorRules.GetDESCRIPCION_PROVEEDORValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_DescripcionesProveedoresDESCRIPCION_PROVEEDOR];
+end;
+
+function TDescripcionesProveedoresBusinessProcessorRules.GetDESCRIPCION_PROVEEDORIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_DescripcionesProveedoresDESCRIPCION_PROVEEDOR]);
+end;
+
+function TDescripcionesProveedoresBusinessProcessorRules.GetOldDESCRIPCION_PROVEEDORValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_DescripcionesProveedoresDESCRIPCION_PROVEEDOR];
+end;
+
+function TDescripcionesProveedoresBusinessProcessorRules.GetOldDESCRIPCION_PROVEEDORIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_DescripcionesProveedoresDESCRIPCION_PROVEEDOR]);
+end;
+
+procedure TDescripcionesProveedoresBusinessProcessorRules.SetDESCRIPCION_PROVEEDORValue(const aValue: String);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_DescripcionesProveedoresDESCRIPCION_PROVEEDOR] := aValue;
+end;
+
+procedure TDescripcionesProveedoresBusinessProcessorRules.SetDESCRIPCION_PROVEEDORIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_DescripcionesProveedoresDESCRIPCION_PROVEEDOR] := Null;
+end;
+
+
 initialization
   RegisterBusinessProcessorRules(RID_ContactosDelta, TContactosBusinessProcessorRules);
   RegisterBusinessProcessorRules(RID_GruposClienteDelta, TGruposClienteBusinessProcessorRules);
@@ -8106,5 +8305,7 @@ initialization
   RegisterBusinessProcessorRules(RID_GruposProveedorDelta, TGruposProveedorBusinessProcessorRules);
   RegisterBusinessProcessorRules(RID_GruposEmpleadoDelta, TGruposEmpleadoBusinessProcessorRules);
   RegisterBusinessProcessorRules(RID_Contactos_RefreshDelta, TContactos_RefreshBusinessProcessorRules);
+  RegisterBusinessProcessorRules(RID_ContratosEmpleadosDelta, TContratosEmpleadosBusinessProcessorRules);
+  RegisterBusinessProcessorRules(RID_DescripcionesProveedoresDelta, TDescripcionesProveedoresBusinessProcessorRules);
 
 end.

Source/Modulos/Contactos/Model/uBizEmpleadosServer.pas

@@ -97,6 +97,7 @@ begin
       ParamByName('FORMACION_COMPLE').Value := aChange.NewValueByName[fld_EmpleadosFORMACION_COMPLE];
       ParamByName('FORMACION_RECIBIDA').Value := aChange.NewValueByName[fld_EmpleadosFORMACION_RECIBIDA];
       ParamByName('EXPERIENCIA').Value := aChange.NewValueByName[fld_EmpleadosEXPERIENCIA];
+      ParamByName('CONTRATO').Value := aChange.NewValueByName[fld_EmpleadosCONTRATO];
       Execute;
     end;
   finally
@@ -127,6 +128,7 @@ begin
       ParamByName('FORMACION_COMPLE').Value := aChange.NewValueByName[fld_EmpleadosFORMACION_COMPLE];
       ParamByName('FORMACION_RECIBIDA').Value := aChange.NewValueByName[fld_EmpleadosFORMACION_RECIBIDA];
       ParamByName('EXPERIENCIA').Value := aChange.NewValueByName[fld_EmpleadosEXPERIENCIA];
+      ParamByName('CONTRATO').Value := aChange.NewValueByName[fld_EmpleadosCONTRATO];      
       Execute;
     end;
   finally

Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm

@@ -1187,6 +1187,10 @@ object srvContactos: TsrvContactos
               item
                 DatasetField = 'FECHA_MODIFICACION'
                 TableField = 'FECHA_MODIFICACION'
+              end
+              item
+                DatasetField = 'CONTRATO'
+                TableField = 'CONTRATO'
               end>
           end>
         Name = 'Empleados'
@@ -1303,10 +1307,12 @@ object srvContactos: TsrvContactos
           item
             Name = 'FECHA_ALTA'
             DataType = datDateTime
+            DictionaryEntry = 'Empleados_FECHA_ALTA'
           end
           item
             Name = 'FECHA_MODIFICACION'
             DataType = datDateTime
+            DictionaryEntry = 'Empleados_FECHA_MODIFICACION'
           end
           item
             Name = 'USUARIO'
@@ -1323,8 +1329,8 @@ object srvContactos: TsrvContactos
             Name = 'REFERENCIA'
             DataType = datString
             Size = 255
-            DisplayLabel = 'Referencia'
             ServerAutoRefresh = True
+            DictionaryEntry = 'Empleados_REFERENCIA'
           end
           item
             Name = 'FECHA_NACIMIENTO'
@@ -1361,6 +1367,12 @@ object srvContactos: TsrvContactos
             Name = 'EXPERIENCIA'
             DataType = datMemo
             DictionaryEntry = 'Empleados_EXPERIENCIA'
+          end
+          item
+            Name = 'CONTRATO'
+            DataType = datString
+            Size = 255
+            DictionaryEntry = 'Empleados_CONTRATO'
           end>
       end
       item
@@ -1878,6 +1890,59 @@ object srvContactos: TsrvContactos
             DataType = datString
             Size = 255
           end>
+      end
+      item
+        IsPublic = False
+        Params = <>
+        Statements = <
+          item
+            Connection = 'IBX'
+            TargetTable = 'EMPLEADOS_DATOS'
+            SQL = 
+              'SELECT '#10'  DISTINCT CONTRATO'#10'  FROM'#10'    EMPLEADOS_DATOS'#10'  WHERE {' +
+              'Where}'#10'  ORDER BY CONTRATO'#10
+            StatementType = stSQL
+            ColumnMappings = <
+              item
+                DatasetField = 'CONTRATO'
+                TableField = 'CONTRATO'
+              end>
+          end>
+        Name = 'ContratosEmpleados'
+        Fields = <
+          item
+            Name = 'CONTRATO'
+            DataType = datString
+            Size = 255
+            DictionaryEntry = 'Empleados_CONTRATO'
+          end>
+      end
+      item
+        IsPublic = False
+        Params = <>
+        Statements = <
+          item
+            ConnectionType = 'Interbase'
+            Default = True
+            TargetTable = 'PROVEEDORES_DATOS'
+            SQL = 
+              'SELECT '#10'    DISTINCT DESCRIPCION_PROVEEDOR'#10'  FROM'#10'    PROVEEDORE' +
+              'S_DATOS'#10'  WHERE {Where}'#10'  ORDER BY DESCRIPCION_PROVEEDOR'#10
+            StatementType = stSQL
+            ColumnMappings = <
+              item
+                DatasetField = 'DESCRIPCION_PROVEEDOR'
+                TableField = 'DESCRIPCION_PROVEEDOR'
+              end>
+          end>
+        Name = 'DescripcionesProveedores'
+        Fields = <
+          item
+            Name = 'DESCRIPCION_PROVEEDOR'
+            DataType = datString
+            Size = 255
+            DictionaryEntry = 'Proveedores_DESCRIPCION_PROVEEDOR'
+          end>
       end>
     JoinDataTables = <>
     UnionDataTables = <>
@@ -3262,52 +3327,39 @@ object srvContactos: TsrvContactos
         Params = <
           item
             Name = 'ID_EMPLEADO'
-            DataType = datInteger
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'FECHA_NACIMIENTO'
-            DataType = datDateTime
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'CATEGORIA'
-            DataType = datString
-            Size = 255
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'FECHA_ALTA_EMPRESA'
-            DataType = datDateTime
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'FORMACION_BASE'
-            DataType = datMemo
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'FORMACION_COMPLE'
-            DataType = datMemo
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'FORMACION_RECIBIDA'
-            DataType = datMemo
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'EXPERIENCIA'
-            DataType = datMemo
             Value = ''
-            ParamType = daptInput
+          end
+          item
+            Name = 'CONTRATO'
+            Value = ''
           end>
         Statements = <
           item
@@ -3316,10 +3368,10 @@ object srvContactos: TsrvContactos
             SQL = 
               'INSERT'#10'  INTO EMPLEADOS_DATOS'#10'    (ID_EMPLEADO, FECHA_NACIMIENTO' +
               ', CATEGORIA, FECHA_ALTA_EMPRESA, FORMACION_BASE,'#10'    FORMACION_C' +
-              'OMPLE, FORMACION_RECIBIDA, EXPERIENCIA)'#10'  VALUES'#10'    (:ID_EMPLEA' +
+              'OMPLE, FORMACION_RECIBIDA, EXPERIENCIA, CONTRATO)'#10'  VALUES'#10'    (' +
-              'DO, :FECHA_NACIMIENTO, :CATEGORIA, :FECHA_ALTA_EMPRESA, :FORMACI' +
+              ':ID_EMPLEADO, :FECHA_NACIMIENTO, :CATEGORIA, :FECHA_ALTA_EMPRESA' +
-              'ON_BASE,'#10'    :FORMACION_COMPLE, :FORMACION_RECIBIDA, :EXPERIENCI' +
+              ', :FORMACION_BASE,'#10'    :FORMACION_COMPLE, :FORMACION_RECIBIDA, :' +
-              'A)'
+              'EXPERIENCIA, :CONTRATO)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -3355,6 +3407,10 @@ object srvContactos: TsrvContactos
             Name = 'EXPERIENCIA'
             Value = ''
           end
+          item
+            Name = 'CONTRATO'
+            Value = ''
+          end
           item
             Name = 'OLD_ID_EMPLEADO'
             Value = ''
@@ -3368,8 +3424,8 @@ object srvContactos: TsrvContactos
               'MIENTO,'#10'    CATEGORIA = :CATEGORIA,'#10'    FECHA_ALTA_EMPRESA = :FE' +
               'CHA_ALTA_EMPRESA,'#10'    FORMACION_BASE = :FORMACION_BASE,'#10'    FORM' +
               'ACION_COMPLE = :FORMACION_COMPLE,'#10'    FORMACION_RECIBIDA = :FORM' +
-              'ACION_RECIBIDA,'#10'    EXPERIENCIA = :EXPERIENCIA'#10'  WHERE'#10'    (ID_E' +
+              'ACION_RECIBIDA,'#10'    EXPERIENCIA = :EXPERIENCIA,'#10'    CONTRATO = :' +
-              'MPLEADO = :OLD_ID_EMPLEADO)'
+              'CONTRATO'#10'  WHERE'#10'    (ID_EMPLEADO = :OLD_ID_EMPLEADO)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -3472,7 +3528,7 @@ object srvContactos: TsrvContactos
       end
       item
         Name = 'FK_DireccionesContacto_Empleados'
-        MasterDatasetName = 'Empleados'
+        MasterDatasetName = 'ContratosEmpleados'
         MasterFields = 'ID'
         DetailDatasetName = 'DireccionesContacto'
         DetailFields = 'ID_CONTACTO'
@@ -3480,7 +3536,7 @@ object srvContactos: TsrvContactos
       end
       item
         Name = 'FK_DatosBancarios_Empleados'
-        MasterDatasetName = 'Empleados'
+        MasterDatasetName = 'ContratosEmpleados'
         MasterFields = 'ID'
         DetailDatasetName = 'DatosBancarios'
         DetailFields = 'ID_CONTACTO'
@@ -4155,6 +4211,27 @@ object srvContactos: TsrvContactos
         DataType = datString
         Size = 255
         DisplayLabel = 'Descripci'#243'n'
+      end
+      item
+        Name = 'Empleados_FECHA_ALTA'
+        DataType = datDateTime
+      end
+      item
+        Name = 'Empleados_FECHA_MODIFICACION'
+        DataType = datDateTime
+      end
+      item
+        Name = 'Empleados_REFERENCIA'
+        DataType = datString
+        Size = 255
+        DisplayLabel = 'Referencia'
+        ServerAutoRefresh = True
+      end
+      item
+        Name = 'Empleados_CONTRATO'
+        DataType = datString
+        Size = 255
+        DisplayLabel = 'Contrato'
       end>
     Left = 126
     Top = 14

Source/Modulos/Contactos/Servidor/srvContactos_Impl.pas

@@ -41,6 +41,8 @@ type
   public
     function GenerateFichaEmpleadoReport(const EmpleadoID: String): Binary;
     function GenerateEtiquetasReport(const ContactosID: String): Binary;
+    function DarListaContratosEmpleados: String;
+    function DarListaDescripcionesProveedores: String;
   end;
 
 implementation
@@ -50,7 +52,8 @@ uses
   {Generated:} FactuGES_Invk, Dialogs, uBizContactosServer,
   uDataModuleServer, uDatabaseUtils, uUsersManager,
   schContactosClient_Intf, uBizEmpleadosServer,
-  uBizClientesServer, uBizProveedoresServer, uRestriccionesUsuarioUtils;
+  uBizClientesServer, uBizProveedoresServer, uRestriccionesUsuarioUtils,
+  uStringsUtils;
 //  uRptFichasEmpleado_Server, uRptEtiquetasContacto_Server;
 
 procedure Create_srvContactos(out anInstance : IUnknown);
@@ -88,6 +91,48 @@ begin
   bpProveedores.BusinessRulesID := BIZ_SERVER_PROVEEDOR;
 end;
 
+function TsrvContactos.DarListaContratosEmpleados: String;
+var
+  dsContratos : IDADataset;
+  Aux : TStringList;
+begin
+  Aux := TStringList.Create;
+
+  dsContratos := schContactos.NewDataset(Connection, 'ContratosEmpleados', '', True);
+  try
+    while not dsContratos.EOF do
+    begin
+      Aux.Add(dsContratos.FieldValues[0]);
+      dsContratos.Next;
+    end;
+    Result := StringsToString(Aux, '|');
+  finally
+    dsContratos.Close;
+    dsContratos := NIL;
+  end;
+end;
+
+function TsrvContactos.DarListaDescripcionesProveedores: String;
+var
+  dsDescripciones : IDADataset;
+  Aux : TStringList;
+begin
+  Aux := TStringList.Create;
+
+  dsDescripciones := schContactos.NewDataset(Connection, 'DescripcionesProveedores', '', True);
+  try
+    while not dsDescripciones.EOF do
+    begin
+      Aux.Add(dsDescripciones.FieldValues[0]);
+      dsDescripciones.Next;
+    end;
+    Result := StringsToString(Aux, '|');
+  finally
+    dsDescripciones.Close;
+    dsDescripciones := NIL;
+  end;
+end;
+
 procedure TsrvContactos.DataAbstractServiceBeforeAcquireConnection(
   aSender: TObject; var aConnectionName: string);
 begin

Source/Modulos/Contactos/Views/uEditorContacto.dfm

@@ -7,6 +7,7 @@ inherited fEditorContacto: TfEditorContacto
   ClientWidth = 632
   Scaled = False
   ExplicitWidth = 640
+  ExplicitHeight = 240
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
@@ -73,7 +74,7 @@ inherited fEditorContacto: TfEditorContacto
     end
   end
   inherited pgPaginas: TPageControl
-    Width = 632
+    Width = 626
     ExplicitWidth = 632
     inherited pagGeneral: TTabSheet
       ExplicitLeft = 4
@@ -87,8 +88,8 @@ inherited fEditorContacto: TfEditorContacto
       inline frViewClienteDatosBancarios: TfrViewClienteDatosBancarios
         Left = 0
         Top = 0
-        Width = 624
+        Width = 618
-        Height = 338
+        Height = 332
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -98,12 +99,12 @@ inherited fEditorContacto: TfEditorContacto
         ParentFont = False
         TabOrder = 0
         ReadOnly = False
-        ExplicitWidth = 624
+        ExplicitWidth = 618
-        ExplicitHeight = 338
+        ExplicitHeight = 332
         inherited dxLayoutControl1: TdxLayoutControl
-          Width = 624
+          Width = 618
           LookAndFeel = dxLayoutOfficeLookAndFeel
-          ExplicitWidth = 624
+          ExplicitWidth = 618
           inherited eEntidad: TcxDBTextEdit
             Top = 57
             ExplicitTop = 57
@@ -111,9 +112,9 @@ inherited fEditorContacto: TfEditorContacto
             Width = 114
           end
           inherited eSucursal: TcxDBTextEdit
-            Left = 406
+            Left = 403
             Top = 57
-            ExplicitLeft = 406
+            ExplicitLeft = 403
             ExplicitTop = 57
             ExplicitWidth = 112
             Width = 112

Source/Modulos/Contactos/Views/uEditorContacto.pas

@@ -123,6 +123,9 @@ end;
 procedure TfEditorContacto.SetController(const Value: IContactosController);
 begin
   FController := Value;
+
+  if Assigned(FViewContacto) then
+    FViewContacto.Controller := FController;
 end;
 
 procedure TfEditorContacto.SetViewContacto(const Value: IViewContacto);

Source/Modulos/Contactos/Views/uEditorEmpleado.dfm

@@ -3,7 +3,7 @@ inherited fEditorEmpleado: TfEditorEmpleado
   ClientHeight = 576
   ClientWidth = 676
   ExplicitWidth = 684
-  ExplicitHeight = 610
+  ExplicitHeight = 603
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
@@ -58,20 +58,18 @@ inherited fEditorEmpleado: TfEditorEmpleado
     end
   end
   inherited pgPaginas: TPageControl
-    Width = 676
+    Width = 670
-    Height = 481
+    Height = 475
-    ExplicitWidth = 676
+    ExplicitWidth = 670
-    ExplicitHeight = 481
+    ExplicitHeight = 475
     inherited pagGeneral: TTabSheet
-      ExplicitLeft = 0
+      ExplicitWidth = 662
-      ExplicitTop = 0
+      ExplicitHeight = 447
-      ExplicitWidth = 668
-      ExplicitHeight = 453
       inline frViewEmpleado1: TfrViewEmpleado
         Left = 0
         Top = 0
-        Width = 668
+        Width = 662
-        Height = 453
+        Height = 447
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -81,59 +79,59 @@ inherited fEditorEmpleado: TfEditorEmpleado
         ParentFont = False
         TabOrder = 0
         ReadOnly = False
-        ExplicitWidth = 668
+        ExplicitWidth = 662
-        ExplicitHeight = 453
+        ExplicitHeight = 447
         inherited dxLayoutControlContacto: TdxLayoutControl
-          Width = 668
+          Width = 662
-          Height = 453
+          Height = 447
           LookAndFeel = dxLayoutOfficeLookAndFeel
-          ExplicitWidth = 668
+          ExplicitWidth = 662
-          ExplicitHeight = 453
+          ExplicitHeight = 447
           inherited PngSpeedButton1: TPngSpeedButton
-            Left = 623
+            Left = 617
             Top = 218
-            ExplicitLeft = 623
+            ExplicitLeft = 617
             ExplicitTop = 218
           end
           inherited PngSpeedButton2: TPngSpeedButton
-            Left = 623
+            Left = 617
             Top = 190
-            ExplicitLeft = 623
+            ExplicitLeft = 617
             ExplicitTop = 190
           end
           inherited PngSpeedButton3: TPngSpeedButton
-            Left = 623
+            Left = 617
             Top = 162
-            ExplicitLeft = 623
+            ExplicitLeft = 617
             ExplicitTop = 162
           end
           inherited eCalle: TcxDBTextEdit
-            Top = 162
+            Top = 189
-            ExplicitTop = 162
+            ExplicitTop = 189
             ExplicitWidth = 174
             Width = 174
           end
           inherited eProvincia: TcxDBTextEdit
-            Top = 216
+            Top = 243
-            ExplicitTop = 216
+            ExplicitTop = 243
             ExplicitWidth = 174
             Width = 174
           end
           inherited ePoblacion: TcxDBTextEdit
-            Top = 189
+            Top = 216
-            ExplicitTop = 189
+            ExplicitTop = 216
             ExplicitWidth = 108
             Width = 108
           end
           inherited eCodigoPostal: TcxDBTextEdit
-            Left = 312
+            Left = 308
-            Top = 189
+            Top = 216
-            ExplicitLeft = 312
+            ExplicitLeft = 308
-            ExplicitTop = 189
+            ExplicitTop = 216
           end
           inherited eObservaciones: TcxDBMemo
-            Top = 294
+            Top = 321
-            ExplicitTop = 294
+            ExplicitTop = 321
             ExplicitWidth = 185
             ExplicitHeight = 148
             Height = 148
@@ -146,25 +144,25 @@ inherited fEditorEmpleado: TfEditorEmpleado
             Width = 80
           end
           inherited eFechaAltaEmpresa: TcxDBDateEdit
-            Left = 290
+            Left = 287
             Top = 84
-            ExplicitLeft = 290
+            ExplicitLeft = 287
             ExplicitTop = 84
             ExplicitWidth = 80
             Width = 80
           end
           inherited eTlfParticular: TcxDBTextEdit
-            Left = 500
+            Left = 496
             Top = 57
-            ExplicitLeft = 500
+            ExplicitLeft = 496
             ExplicitTop = 57
             ExplicitWidth = 172
             Width = 172
           end
           inherited eTlfTrabajo: TcxDBTextEdit
-            Left = 500
+            Left = 496
             Top = 30
-            ExplicitLeft = 500
+            ExplicitLeft = 496
             ExplicitTop = 30
             ExplicitWidth = 172
             Width = 172
@@ -176,17 +174,17 @@ inherited fEditorEmpleado: TfEditorEmpleado
             Width = 225
           end
           inherited eTlfMovil: TcxDBTextEdit
-            Left = 500
+            Left = 496
             Top = 84
-            ExplicitLeft = 500
+            ExplicitLeft = 496
             ExplicitTop = 84
             ExplicitWidth = 172
             Width = 172
           end
           inherited eFax: TcxDBTextEdit
-            Left = 500
+            Left = 496
             Top = 111
-            ExplicitLeft = 500
+            ExplicitLeft = 496
             ExplicitTop = 111
             ExplicitWidth = 172
             Width = 172
@@ -198,35 +196,35 @@ inherited fEditorEmpleado: TfEditorEmpleado
             Width = 263
           end
           inherited eNIFCIF: TcxDBTextEdit
-            Left = 219
+            Left = 217
             Top = 30
-            ExplicitLeft = 219
+            ExplicitLeft = 217
             ExplicitTop = 30
             ExplicitWidth = 194
             Width = 194
           end
           inherited eMailTrabajo: TcxDBHyperLinkEdit
-            Left = 500
+            Left = 496
             Top = 162
             Properties.Prefix = 'mailto:'
-            ExplicitLeft = 500
+            ExplicitLeft = 496
             ExplicitTop = 162
             ExplicitWidth = 129
             Width = 129
           end
           inherited eMailParticular: TcxDBHyperLinkEdit
-            Left = 500
+            Left = 496
             Top = 190
             Properties.Prefix = 'mailto:'
-            ExplicitLeft = 500
+            ExplicitLeft = 496
             ExplicitTop = 190
             ExplicitWidth = 165
             Width = 165
           end
           inherited ePaginaWeb: TcxDBHyperLinkEdit
-            Left = 500
+            Left = 496
             Top = 217
-            ExplicitLeft = 500
+            ExplicitLeft = 496
             ExplicitTop = 217
             ExplicitWidth = 165
             Width = 165
@@ -238,11 +236,15 @@ inherited fEditorEmpleado: TfEditorEmpleado
             Width = 97
           end
           inherited ePersonaContacto: TcxDBTextEdit
-            Top = 243
+            Top = 270
-            ExplicitTop = 243
+            ExplicitTop = 270
             ExplicitWidth = 256
             Width = 256
           end
+          inherited cbContrato: TcxDBComboBox
+            Top = 138
+            ExplicitTop = 138
+          end
         end
         inherited dsContacto: TDADataSource
           Left = 8
@@ -251,20 +253,34 @@ inherited fEditorEmpleado: TfEditorEmpleado
       end
     end
     inherited pagDatosBancarios: TTabSheet
-      ExplicitWidth = 668
+      ExplicitWidth = 662
-      ExplicitHeight = 453
+      ExplicitHeight = 447
       inherited frViewClienteDatosBancarios: TfrViewClienteDatosBancarios
-        Width = 668
+        Width = 662
-        Height = 453
+        Height = 447
-        ExplicitWidth = 668
+        ExplicitWidth = 662
-        ExplicitHeight = 453
+        ExplicitHeight = 447
         inherited dxLayoutControl1: TdxLayoutControl
-          Width = 668
+          Width = 662
           LookAndFeel = dxLayoutOfficeLookAndFeel
-          ExplicitWidth = 668
+          ExplicitWidth = 662
+          inherited eEntidad: TcxDBTextEdit
+            ExplicitWidth = 114
+            Width = 114
+          end
           inherited eSucursal: TcxDBTextEdit
-            Left = 429
+            Left = 426
-            ExplicitLeft = 429
+            ExplicitLeft = 426
+            ExplicitWidth = 112
+            Width = 112
+          end
+          inherited eCuenta: TcxDBTextEdit
+            ExplicitWidth = 194
+            Width = 194
+          end
+          inherited eTitular: TcxDBTextEdit
+            ExplicitWidth = 194
+            Width = 194
           end
         end
       end
@@ -272,15 +288,11 @@ inherited fEditorEmpleado: TfEditorEmpleado
     object pagFormacion: TTabSheet
       Caption = 'Formaci'#243'n'
       ImageIndex = 2
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       object dxLayoutControl1: TdxLayoutControl
         Left = 0
         Top = 0
-        Width = 668
+        Width = 662
-        Height = 453
+        Height = 447
         Align = alClient
         ParentBackground = True
         TabOrder = 0
@@ -309,7 +321,7 @@ inherited fEditorEmpleado: TfEditorEmpleado
         end
         object eFormacionComplementaria: TcxDBMemo
           Left = 22
-          Top = 176
+          Top = 174
           DataBinding.DataField = 'FORMACION_COMPLE'
           DataBinding.DataSource = frViewEmpleado1.dsContacto
           Properties.ScrollBars = ssVertical
@@ -330,7 +342,7 @@ inherited fEditorEmpleado: TfEditorEmpleado
         end
         object eFormacionRecibida: TcxDBMemo
           Left = 22
-          Top = 322
+          Top = 318
           DataBinding.DataField = 'FORMACION_RECIBIDA'
           DataBinding.DataSource = frViewEmpleado1.dsContacto
           Properties.ScrollBars = ssVertical
@@ -393,15 +405,11 @@ inherited fEditorEmpleado: TfEditorEmpleado
     object pagExperiencia: TTabSheet
       Caption = 'Experiencia'
       ImageIndex = 3
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       object dxLayoutControl2: TdxLayoutControl
         Left = 0
         Top = 0
-        Width = 668
+        Width = 662
-        Height = 453
+        Height = 447
         Align = alClient
         ParentBackground = True
         TabOrder = 0

Source/Modulos/Contactos/Views/uEditorProveedor.dfm

@@ -53,19 +53,18 @@ inherited fEditorProveedor: TfEditorProveedor
     end
   end
   inherited pgPaginas: TPageControl
-    Width = 648
+    Width = 642
-    Height = 495
+    Height = 489
-    ActivePage = pagDatosComerciales
+    ExplicitWidth = 642
-    ExplicitWidth = 648
+    ExplicitHeight = 489
-    ExplicitHeight = 495
     inherited pagGeneral: TTabSheet
-      ExplicitWidth = 640
+      ExplicitWidth = 634
-      ExplicitHeight = 467
+      ExplicitHeight = 461
       inline frViewProveedor1: TfrViewProveedor
         Left = 0
         Top = 0
-        Width = 640
+        Width = 634
-        Height = 467
+        Height = 461
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -75,63 +74,63 @@ inherited fEditorProveedor: TfEditorProveedor
         ParentFont = False
         TabOrder = 0
         ReadOnly = False
-        ExplicitWidth = 640
+        ExplicitWidth = 634
-        ExplicitHeight = 467
+        ExplicitHeight = 461
         inherited dxLayoutControlContacto: TdxLayoutControl
-          Width = 640
+          Width = 634
-          Height = 467
+          Height = 461
           LookAndFeel = dxLayoutOfficeLookAndFeel
-          ExplicitWidth = 640
+          ExplicitWidth = 634
-          ExplicitHeight = 467
+          ExplicitHeight = 461
           inherited PngSpeedButton1: TPngSpeedButton
-            Left = 595
+            Left = 589
             Top = 218
-            ExplicitLeft = 595
+            ExplicitLeft = 589
             ExplicitTop = 218
           end
           inherited PngSpeedButton2: TPngSpeedButton
-            Left = 595
+            Left = 589
             Top = 190
-            ExplicitLeft = 595
+            ExplicitLeft = 589
             ExplicitTop = 190
           end
           inherited PngSpeedButton3: TPngSpeedButton
-            Left = 595
+            Left = 589
             Top = 162
-            ExplicitLeft = 595
+            ExplicitLeft = 589
             ExplicitTop = 162
           end
           inherited Label1: TLabel
-            Left = 391
+            Left = 390
             Top = 297
             Width = 342
-            ExplicitLeft = 391
+            ExplicitLeft = 390
             ExplicitTop = 297
             ExplicitWidth = 342
           end
           inherited eCalle: TcxDBTextEdit
-            Top = 294
+            Top = 267
-            ExplicitTop = 294
+            ExplicitTop = 267
             ExplicitWidth = 174
             Width = 174
           end
           inherited eProvincia: TcxDBTextEdit
-            Top = 348
+            Top = 321
-            ExplicitTop = 348
+            ExplicitTop = 321
             ExplicitWidth = 174
             Width = 174
           end
           inherited ePoblacion: TcxDBTextEdit
-            Top = 321
+            Top = 294
-            ExplicitTop = 321
+            ExplicitTop = 294
             ExplicitWidth = 108
             Width = 108
           end
           inherited eCodigoPostal: TcxDBTextEdit
-            Left = 298
+            Left = 297
-            Top = 321
+            Top = 294
-            ExplicitLeft = 298
+            ExplicitLeft = 297
-            ExplicitTop = 321
+            ExplicitTop = 294
           end
           inherited eObservaciones: TcxDBMemo
             Top = 399
@@ -142,9 +141,9 @@ inherited fEditorProveedor: TfEditorProveedor
             Width = 580
           end
           inherited cxDBCheckBox1: TcxDBCheckBox
-            Left = 391
+            Left = 390
             Top = 270
-            ExplicitLeft = 391
+            ExplicitLeft = 390
             ExplicitTop = 270
             ExplicitWidth = 310
             Width = 310
@@ -167,7 +166,7 @@ inherited fEditorProveedor: TfEditorProveedor
             ExplicitWidth = 227
             Width = 227
           end
-          inherited eDescripcionProveedor: TcxDBTextEdit
+          inherited cbDescripcionProveedor: TcxDBComboBox
             Top = 84
             ExplicitTop = 84
             ExplicitWidth = 221
@@ -180,33 +179,33 @@ inherited fEditorProveedor: TfEditorProveedor
             Width = 221
           end
           inherited eTlfParticular: TcxDBTextEdit
-            Left = 486
+            Left = 485
             Top = 57
-            ExplicitLeft = 486
+            ExplicitLeft = 485
             ExplicitTop = 57
             ExplicitWidth = 172
             Width = 172
           end
           inherited eTlfTrabajo: TcxDBTextEdit
-            Left = 486
+            Left = 485
             Top = 30
-            ExplicitLeft = 486
+            ExplicitLeft = 485
             ExplicitTop = 30
             ExplicitWidth = 172
             Width = 172
           end
           inherited eTlfMovil: TcxDBTextEdit
-            Left = 486
+            Left = 485
             Top = 84
-            ExplicitLeft = 486
+            ExplicitLeft = 485
             ExplicitTop = 84
             ExplicitWidth = 172
             Width = 172
           end
           inherited eFax: TcxDBTextEdit
-            Left = 486
+            Left = 485
             Top = 111
-            ExplicitLeft = 486
+            ExplicitLeft = 485
             ExplicitTop = 111
             ExplicitWidth = 172
             Width = 172
@@ -218,35 +217,35 @@ inherited fEditorProveedor: TfEditorProveedor
             Width = 263
           end
           inherited eNIFCIF: TcxDBTextEdit
-            Left = 210
+            Left = 213
             Top = 30
-            ExplicitLeft = 210
+            ExplicitLeft = 213
             ExplicitTop = 30
             ExplicitWidth = 254
             Width = 254
           end
           inherited eMailTrabajo: TcxDBHyperLinkEdit
-            Left = 486
+            Left = 485
             Top = 162
             Properties.Prefix = 'mailto:'
-            ExplicitLeft = 486
+            ExplicitLeft = 485
             ExplicitTop = 162
             ExplicitWidth = 129
             Width = 129
           end
           inherited eMailParticular: TcxDBHyperLinkEdit
-            Left = 486
+            Left = 485
             Top = 190
             Properties.Prefix = 'mailto:'
-            ExplicitLeft = 486
+            ExplicitLeft = 485
             ExplicitTop = 190
             ExplicitWidth = 165
             Width = 165
           end
           inherited ePaginaWeb: TcxDBHyperLinkEdit
-            Left = 486
+            Left = 485
             Top = 217
-            ExplicitLeft = 486
+            ExplicitLeft = 485
             ExplicitTop = 217
             ExplicitWidth = 165
             Width = 165
@@ -258,8 +257,8 @@ inherited fEditorProveedor: TfEditorProveedor
             Width = 100
           end
           inherited ePersonaContacto: TcxDBTextEdit
-            Top = 267
+            Top = 348
-            ExplicitTop = 267
+            ExplicitTop = 348
             ExplicitWidth = 253
             Width = 253
           end
@@ -267,24 +266,24 @@ inherited fEditorProveedor: TfEditorProveedor
       end
     end
     inherited pagDatosBancarios: TTabSheet
-      ExplicitWidth = 640
+      ExplicitWidth = 634
-      ExplicitHeight = 467
+      ExplicitHeight = 461
       inherited frViewClienteDatosBancarios: TfrViewClienteDatosBancarios
-        Width = 640
+        Width = 634
-        Height = 467
+        Height = 461
-        ExplicitWidth = 640
+        ExplicitWidth = 634
-        ExplicitHeight = 467
+        ExplicitHeight = 461
         inherited dxLayoutControl1: TdxLayoutControl
-          Width = 640
+          Width = 634
           LookAndFeel = dxLayoutOfficeLookAndFeel
-          ExplicitWidth = 640
+          ExplicitWidth = 634
           inherited eEntidad: TcxDBTextEdit
             ExplicitWidth = 114
             Width = 114
           end
           inherited eSucursal: TcxDBTextEdit
-            Left = 325
+            Left = 323
-            ExplicitLeft = 325
+            ExplicitLeft = 323
             ExplicitWidth = 270
             Width = 270
           end
@@ -305,7 +304,7 @@ inherited fEditorProveedor: TfEditorProveedor
       inline frViewProveedorDatosComerciales1: TfrViewProveedorDatosComerciales
         Left = 0
         Top = 0
-        Width = 640
+        Width = 634
         Height = 121
         Align = alTop
         Font.Charset = DEFAULT_CHARSET
@@ -316,47 +315,57 @@ inherited fEditorProveedor: TfEditorProveedor
         ParentFont = False
         TabOrder = 0
         ReadOnly = False
-        ExplicitWidth = 640
+        ExplicitWidth = 634
         ExplicitHeight = 121
         inherited dxLayoutControl1: TdxLayoutControl
-          Width = 640
+          Width = 634
           LookAndFeel = dxLayoutOfficeLookAndFeel
-          ExplicitWidth = 640
+          ExplicitWidth = 634
           inherited Label1: TLabel
-            Left = 416
+            Left = 412
             Top = 30
-            ExplicitLeft = 416
+            Width = 190
+            ExplicitLeft = 412
             ExplicitTop = 30
+            ExplicitWidth = 190
           end
           inherited cbRegimenIVA: TcxDBComboBox
             Top = 30
             ExplicitTop = 30
+            ExplicitWidth = 121
+            Width = 121
           end
           inherited cbFormaPago: TcxDBLookupComboBox
             Top = 57
             ExplicitTop = 57
+            ExplicitWidth = 121
+            Width = 121
           end
           inherited bFormasPago: TButton
-            Left = 256
+            Left = 252
             Top = 57
-            ExplicitLeft = 256
+            ExplicitLeft = 252
             ExplicitTop = 57
           end
           inherited eIVA: TcxDBLookupComboBox
             Top = 84
             ExplicitTop = 84
+            ExplicitWidth = 121
+            Width = 121
           end
           inherited bTiposIVA: TButton
-            Left = 256
+            Left = 252
             Top = 84
-            ExplicitLeft = 256
+            ExplicitLeft = 252
             ExplicitTop = 84
           end
           inherited eDescuento: TcxDBSpinEdit
-            Left = 460
+            Left = 456
             Top = 62
-            ExplicitLeft = 460
+            ExplicitLeft = 456
             ExplicitTop = 62
+            ExplicitWidth = 73
+            Width = 73
           end
         end
       end
@@ -367,8 +376,8 @@ inherited fEditorProveedor: TfEditorProveedor
       inline frViewDireccionesEntrega1: TfrViewDireccionesEntrega
         Left = 0
         Top = 0
-        Width = 640
+        Width = 634
-        Height = 467
+        Height = 461
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -378,45 +387,17 @@ inherited fEditorProveedor: TfEditorProveedor
         ParentFont = False
         TabOrder = 0
         ReadOnly = False
-        ExplicitWidth = 640
+        ExplicitWidth = 634
-        ExplicitHeight = 467
+        ExplicitHeight = 461
         inherited cxGrid: TcxGrid
-          Width = 640
+          Width = 634
-          Height = 442
+          Height = 436
-          ExplicitWidth = 640
+          ExplicitWidth = 634
-          ExplicitHeight = 442
+          ExplicitHeight = 436
         end
         inherited ToolBar1: TToolBar
-          Width = 640
+          Width = 634
-          ExplicitWidth = 640
+          ExplicitWidth = 634
-          inherited ToolButton1: TToolButton
-            Top = 0
-            ExplicitTop = 0
-            ExplicitWidth = 62
-          end
-          inherited ToolButton4: TToolButton
-            Top = 0
-            ExplicitTop = 0
-            ExplicitWidth = 74
-          end
-          inherited ToolButton5: TToolButton
-            Top = 0
-            ExplicitTop = 0
-          end
-          inherited ToolButton2: TToolButton
-            Top = 0
-            ExplicitTop = 0
-            ExplicitWidth = 67
-          end
-          inherited ToolButton6: TToolButton
-            Top = 0
-            ExplicitTop = 0
-          end
-          inherited ToolButton7: TToolButton
-            Top = 0
-            ExplicitTop = 0
-            ExplicitWidth = 117
-          end
         end
       end
     end

Source/Modulos/Contactos/Views/uViewContacto.pas

@@ -8,11 +8,16 @@ uses
   DBCtrls, Grids, DBGrids, uBizContactos, Mask, ComCtrls, uCustomView,
   JvComponent, JvFormAutoSize, cxControls, cxContainer, cxEdit, cxTextEdit,
   cxDBEdit, dxLayoutControl, dxLayoutLookAndFeels, cxMemo, cxHyperLinkEdit,
-  ImgList, ActnList, PngImageList, PngSpeedButton, uDAInterfaces;
+  ImgList, ActnList, PngImageList, PngSpeedButton, uDAInterfaces, uContactosController;
 
 type
   IViewContacto = interface(IViewBase)
     ['{5FCFD172-5F8A-4639-B479-1CF0061526B5}']
+    function GetController : IContactosController;
+    procedure SetController (const Value : IContactosController);
+    property Controller : IContactosController read GetController
+      write SetController;
+
     function GetContacto: IBizContacto;
     procedure SetContacto(const Value: IBizContacto);
     property Contacto: IBizContacto read GetContacto write SetContacto;
@@ -90,10 +95,15 @@ type
       var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
   protected
     FContacto: IBizContacto;
+    FController : IContactosController;
     function GetContacto: IBizContacto; virtual;
     procedure SetContacto(const Value: IBizContacto); virtual;
+    function GetController : IContactosController; virtual;
+    procedure SetController (const Value : IContactosController); virtual;
   public
     constructor Create(AOwner : TComponent); override;
+    property Controller : IContactosController read GetController
+      write SetController;
     property Contacto: IBizContacto read GetContacto write SetContacto;
   end;
   
@@ -169,6 +179,11 @@ begin
   Result := FContacto;
 end;
 
+function TfrViewContacto.GetController: IContactosController;
+begin
+  Result := FController;
+end;
+
 procedure TfrViewContacto.SetContacto(const Value: IBizContacto);
 begin
   FContacto := Value;
@@ -181,6 +196,11 @@ begin
   end;
 end;
 
+procedure TfrViewContacto.SetController(const Value: IContactosController);
+begin
+  FController := Value;
+end;
+
 initialization
   RegisterClass(TfrViewContacto);
 

Source/Modulos/Contactos/Views/uViewEmpleado.dfm

@@ -8,60 +8,46 @@ inherited frViewEmpleado: TfrViewEmpleado
     ExplicitHeight = 391
     inherited eCalle: TcxDBTextEdit
       Left = 121
-      Top = 166
+      Top = 193
-      TabOrder = 6
+      TabOrder = 7
       ExplicitLeft = 121
-      ExplicitTop = 166
+      ExplicitTop = 193
       ExplicitWidth = 260
       Width = 260
     end
     inherited eProvincia: TcxDBTextEdit
       Left = 121
-      Top = 220
+      Top = 247
-      TabOrder = 9
+      TabOrder = 10
       ExplicitLeft = 121
-      ExplicitTop = 220
+      ExplicitTop = 247
       ExplicitWidth = 260
       Width = 260
     end
     inherited ePoblacion: TcxDBTextEdit
       Left = 121
-      Top = 193
+      Top = 220
-      TabOrder = 7
+      TabOrder = 8
       ExplicitLeft = 121
-      ExplicitTop = 193
+      ExplicitTop = 220
       ExplicitWidth = 159
       Width = 159
     end
     inherited eCodigoPostal: TcxDBTextEdit
       Left = 348
-      Top = 193
+      Top = 220
-      TabOrder = 8
+      TabOrder = 9
       ExplicitLeft = 348
-      ExplicitTop = 193
+      ExplicitTop = 220
     end
     inherited eObservaciones: TcxDBMemo
-      Top = 304
+      Top = 331
-      TabOrder = 18
+      TabOrder = 19
-      ExplicitTop = 304
+      ExplicitTop = 331
       ExplicitHeight = 148
       Height = 148
     end
-    inherited eTlfParticular: TcxDBTextEdit
+    object eFechaNacimiento: TcxDBDateEdit [8]
-      Left = 538
-      TabOrder = 12
-      ExplicitLeft = 538
-      ExplicitWidth = 91
-      Width = 91
-    end
-    inherited eTlfTrabajo: TcxDBTextEdit
-      Left = 538
-      TabOrder = 11
-      ExplicitLeft = 538
-      ExplicitWidth = 127
-      Width = 127
-    end
-    object eFechaNacimiento: TcxDBDateEdit [10]
       Left = 121
       Top = 82
       DataBinding.DataField = 'FECHA_NACIMIENTO'
@@ -78,7 +64,7 @@ inherited frViewEmpleado: TfrViewEmpleado
       TabOrder = 3
       Width = 121
     end
-    object eFechaAltaEmpresa: TcxDBDateEdit [11]
+    object eFechaAltaEmpresa: TcxDBDateEdit [9]
       Left = 262
       Top = 82
       DataBinding.DataField = 'FECHA_ALTA_EMPRESA'
@@ -95,27 +81,7 @@ inherited frViewEmpleado: TfrViewEmpleado
       TabOrder = 4
       Width = 235
     end
-    inherited eTlfMovil: TcxDBTextEdit
+    object cbCategoria: TcxDBComboBox [10]
-      Left = 538
-      TabOrder = 13
-      ExplicitLeft = 538
-      ExplicitWidth = 155
-      Width = 155
-    end
-    inherited eFax: TcxDBTextEdit
-      Left = 538
-      TabOrder = 14
-      ExplicitLeft = 538
-      ExplicitWidth = 121
-      Width = 121
-    end
-    inherited eNombre: TcxDBTextEdit
-      Left = 121
-      ExplicitLeft = 121
-      ExplicitWidth = 263
-      Width = 263
-    end
-    object cbCategoria: TcxDBComboBox [15]
       Left = 121
       Top = 109
       DataBinding.DataField = 'CATEGORIA'
@@ -139,6 +105,40 @@ inherited frViewEmpleado: TfrViewEmpleado
       TabOrder = 5
       Width = 225
     end
+    inherited eTlfParticular: TcxDBTextEdit
+      Left = 538
+      TabOrder = 13
+      ExplicitLeft = 538
+      ExplicitWidth = 91
+      Width = 91
+    end
+    inherited eTlfTrabajo: TcxDBTextEdit
+      Left = 538
+      TabOrder = 12
+      ExplicitLeft = 538
+      ExplicitWidth = 127
+      Width = 127
+    end
+    inherited eTlfMovil: TcxDBTextEdit
+      Left = 538
+      TabOrder = 14
+      ExplicitLeft = 538
+      ExplicitWidth = 155
+      Width = 155
+    end
+    inherited eFax: TcxDBTextEdit
+      Left = 538
+      TabOrder = 15
+      ExplicitLeft = 538
+      ExplicitWidth = 121
+      Width = 121
+    end
+    inherited eNombre: TcxDBTextEdit
+      Left = 121
+      ExplicitLeft = 121
+      ExplicitWidth = 263
+      Width = 263
+    end
     inherited eNIFCIF: TcxDBTextEdit
       Left = 255
       ExplicitLeft = 255
@@ -148,7 +148,7 @@ inherited frViewEmpleado: TfrViewEmpleado
     inherited eMailTrabajo: TcxDBHyperLinkEdit
       Left = 538
       Properties.Prefix = 'mailto:'
-      TabOrder = 15
+      TabOrder = 16
       ExplicitLeft = 538
       ExplicitWidth = 129
       Width = 129
@@ -156,14 +156,38 @@ inherited frViewEmpleado: TfrViewEmpleado
     inherited eMailParticular: TcxDBHyperLinkEdit
       Left = 538
       Properties.Prefix = 'mailto:'
-      TabOrder = 16
+      TabOrder = 17
       ExplicitLeft = 538
       ExplicitWidth = 165
       Width = 165
     end
+    object cbContrato: TcxDBComboBox [19]
+      Left = 121
+      Top = 136
+      DataBinding.DataField = 'CONTRATO'
+      DataBinding.DataSource = dsContacto
+      Properties.ImmediatePost = True
+      Properties.ImmediateUpdateText = True
+      Properties.OnInitPopup = cbContratoPropertiesInitPopup
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      Style.ButtonStyle = bts3D
+      Style.PopupBorderStyle = epbsFrame3D
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 6
+      Width = 292
+    end
     inherited ePaginaWeb: TcxDBHyperLinkEdit
       Left = 538
-      TabOrder = 17
+      TabOrder = 18
       ExplicitLeft = 538
       ExplicitWidth = 165
       Width = 165
@@ -176,10 +200,10 @@ inherited frViewEmpleado: TfrViewEmpleado
     end
     inherited ePersonaContacto: TcxDBTextEdit
       Left = 121
-      Top = 247
+      Top = 274
-      TabOrder = 10
+      TabOrder = 11
       ExplicitLeft = 121
-      ExplicitTop = 247
+      ExplicitTop = 274
       ExplicitWidth = 256
       Width = 256
     end
@@ -220,6 +244,11 @@ inherited frViewEmpleado: TfrViewEmpleado
               Control = cbCategoria
               ControlOptions.ShowBorder = False
             end
+            object dxLayoutControlContactoItem21: TdxLayoutItem
+              Caption = 'Tipo de contrato:'
+              Control = cbContrato
+              ControlOptions.ShowBorder = False
+            end
           end
           inherited dxLayoutControlContactoGroup3: TdxLayoutGroup
             inherited dxLayoutControlContactoItem167: TdxLayoutItem

Source/Modulos/Contactos/Views/uViewEmpleado.pas

@@ -23,11 +23,14 @@ type
     dxLayoutControlContactoGroup10: TdxLayoutGroup;
     dxLayoutControlContactoItem20: TdxLayoutItem;
     cbCategoria: TcxDBComboBox;
+    dxLayoutControlContactoItem21: TdxLayoutItem;
+    cbContrato: TcxDBComboBox;
     procedure CustomViewCreate(Sender: TObject);
     procedure CustomViewDestroy(Sender: TObject);
     procedure cbCategoriaPropertiesInitPopup(Sender: TObject);
     procedure cbCategoriaPropertiesValidate(Sender: TObject;
       var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
+    procedure cbContratoPropertiesInitPopup(Sender: TObject);
   protected
     FGrupoController: IGruposEmpleadoController;
   public
@@ -38,19 +41,21 @@ implementation
 {$R *.dfm}
 
 uses
-  uBizGruposEmpleado, uBizContactos;
+  uBizGruposEmpleado, uBizContactos, uEmpleadosController;
 
 procedure TfrViewEmpleado.cbCategoriaPropertiesInitPopup(Sender: TObject);
 begin
   inherited;
   with cbCategoria.Properties.Items do
   begin
+    ShowHourglassCursor;
     BeginUpdate;
     try
       Clear;
       AddStrings(FGrupoController.DarListaGruposEmpleado);
     finally
       EndUpdate;
+      HideHourglassCursor;
     end;
   end;
 end;
@@ -66,6 +71,7 @@ begin
     if (Length(DisplayValue) > 0) and (DisplayValue <> (Contacto as IBizEmpleado).CATEGORIA) then
       if Properties.LookupItems.IndexOf(DisplayValue) < 0 then
       begin
+        ShowHourglassCursor;
         Properties.LookupItems.BeginUpdate;
         AGrupo := FGrupoController.BuscarTodos;
         AGrupo.DataTable.Active := True;
@@ -77,11 +83,29 @@ begin
         finally
           Properties.LookupItems.EndUpdate;
           AGrupo := NIL;
+          HideHourglassCursor;
         end;
       end;
   end;
 end;
 
+procedure TfrViewEmpleado.cbContratoPropertiesInitPopup(Sender: TObject);
+begin
+  inherited;
+  with cbContrato.Properties.Items do
+  begin
+    ShowHourglassCursor;
+    BeginUpdate;
+    try
+      Clear;
+      AddStrings((FController as IEmpleadosController).DarListaContratosEmpleado);
+    finally
+      EndUpdate;
+      HideHourglassCursor;
+    end;
+  end;
+end;
+
 procedure TfrViewEmpleado.CustomViewCreate(Sender: TObject);
 begin
   inherited;

Source/Modulos/Contactos/Views/uViewProveedor.dfm

@@ -8,6 +8,7 @@ inherited frViewProveedor: TfrViewProveedor
   inherited dxLayoutControlContacto: TdxLayoutControl
     Width = 799
     Height = 454
+    ExplicitWidth = 799
     ExplicitHeight = 454
     inherited PngSpeedButton1: TPngSpeedButton
       Left = 738
@@ -164,11 +165,14 @@ inherited frViewProveedor: TfrViewProveedor
       TabOrder = 5
       Width = 227
     end
-    object eDescripcionProveedor: TcxDBTextEdit [13]
+    object cbDescripcionProveedor: TcxDBComboBox [13]
       Left = 134
       Top = 82
       DataBinding.DataField = 'DESCRIPCION_PROVEEDOR'
       DataBinding.DataSource = dsContacto
+      Properties.ImmediatePost = True
+      Properties.ImmediateUpdateText = True
+      Properties.OnInitPopup = cbDescripcionProveedorPropertiesInitPopup
       Style.BorderColor = clWindowFrame
       Style.BorderStyle = ebs3D
       Style.HotTrack = False
@@ -286,7 +290,7 @@ inherited frViewProveedor: TfrViewProveedor
           inherited dxLayoutControlContactoGroup1: TdxLayoutGroup
             object dxLayoutControlContactoItem21: TdxLayoutItem
               Caption = 'Proveedor de...:'
-              Control = eDescripcionProveedor
+              Control = cbDescripcionProveedor
               ControlOptions.ShowBorder = False
             end
             object dxLayoutControlContactoItem24: TdxLayoutItem

Source/Modulos/Contactos/Views/uViewProveedor.pas

@@ -29,7 +29,7 @@ type
     dxLayoutControlContactoItem20: TdxLayoutItem;
     cbGrupoProveedor: TcxDBComboBox;
     dxLayoutControlContactoItem21: TdxLayoutItem;
-    eDescripcionProveedor: TcxDBTextEdit;
+    cbDescripcionProveedor: TcxDBComboBox;
     dxLayoutControlContactoItem24: TdxLayoutItem;
     eCodigoAsignado: TcxDBTextEdit;
     procedure CustomViewCreate(Sender: TObject);
@@ -37,6 +37,7 @@ type
     procedure cbGrupoProveedorPropertiesInitPopup(Sender: TObject);
     procedure cbGrupoProveedorPropertiesValidate(Sender: TObject;
       var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
+    procedure cbDescripcionProveedorPropertiesInitPopup(Sender: TObject);
   protected
     FGrupoController: IGruposProveedorController;
   public
@@ -47,9 +48,27 @@ implementation
 {$R *.dfm}
 
 uses
-  uBizGruposProveedor, uBizContactos;
+  uBizGruposProveedor, uBizContactos, uProveedoresController;
 
 
+procedure TfrViewProveedor.cbDescripcionProveedorPropertiesInitPopup(
+  Sender: TObject);
+begin
+  inherited;
+  with cbDescripcionProveedor.Properties.Items do
+  begin
+    ShowHourglassCursor;
+    BeginUpdate;
+    try
+      Clear;
+      AddStrings((FController as IProveedoresController).DarListaDescripcionesProveedores);
+    finally
+      EndUpdate;
+      HideHourglassCursor;
+    end;
+  end;
+end;
+
 procedure TfrViewProveedor.cbGrupoProveedorPropertiesInitPopup(Sender: TObject);
 begin
   inherited;