From d07c52d7a40d53a708832f6ed62a9ec39694a981 Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Sun, 16 Dec 2007 21:37:26 +0000
Subject: [PATCH] =?UTF-8?q?Repaso=20al=20m=C3=B3dulo=20de=20contactos:=20-?=
 =?UTF-8?q?=20Duplicar=20habilitado=20y=20funcionando=20-=20Se=20ha=20ocul?=
 =?UTF-8?q?tado=20la=20impresi=C3=B3n=20del=20listado=20de=20contactos.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@173 0c75b7a4-871f-7646-8a2f-f78d34cc349f
---
 Database/FACTUGES.FDB                         | Bin 2482176 -> 2482176 bytes
 .../Controller/uClientesController.pas        |   4 +-
 .../Controller/uContactosController.pas       |   1 +
 .../Contactos/Data/Contactos_data.dproj       |  16 +-
 .../Contactos/Data/uDataModuleClientes.dfm    | 159 ++++++++++++++++++
 .../Contactos/Data/uDataModuleEmpleados.dfm   | 159 ++++++++++++++++++
 .../Contactos/Data/uDataModuleProveedores.dfm |  18 +-
 .../Contactos/Views/uEditorCliente.dfm        | 103 ++++--------
 .../Contactos/Views/uEditorContacto.dfm       |   1 -
 .../Contactos/Views/uEditorContactos.dfm      |  16 --
 .../Contactos/Views/uEditorContactos.pas      |   3 -
 .../Modulos/Contactos/Views/uViewCliente.dfm  | 124 +++++++-------
 .../Modulos/Contactos/Views/uViewClientes.dfm |  32 ++--
 .../Modulos/Contactos/Views/uViewClientes.pas |  25 ---
 .../Modulos/Contactos/Views/uViewContacto.dfm |  37 ++--
 .../Views/uViewDireccionesEntrega.dfm         |  28 +++
 .../Views/uViewDireccionesEntrega.pas         |   9 +-
 .../Modulos/Contactos/Views/uViewEmpleado.dfm | 117 +++++++------
 .../Modulos/Contactos/Views/uViewEmpleado.pas |   3 +-
 .../Contactos/Views/uViewProveedor.dfm        |  85 +++++-----
 .../Contactos/Views/uViewProveedores.dfm      |   4 +-
 21 files changed, 625 insertions(+), 319 deletions(-)

diff --git a/Database/FACTUGES.FDB b/Database/FACTUGES.FDB
index f431786215b0cdc15035c9db76a97388813abc4e..8a1a4d4aa0e8133362fbdd03df49aff7beb2ecef 100644
GIT binary patch
delta 10714
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

delta 10494
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

diff --git a/Source/Modulos/Contactos/Controller/uClientesController.pas b/Source/Modulos/Contactos/Controller/uClientesController.pas
index db91e2c9..ff54e160 100644
--- a/Source/Modulos/Contactos/Controller/uClientesController.pas
+++ b/Source/Modulos/Contactos/Controller/uClientesController.pas
@@ -338,6 +338,8 @@ begin
       end;
     end;
 
+    {
+    // Por ahora no existe el concepto de direcciones de entrega asi que esto está desactivado
     if Result and (AContacto.Direcciones.RecordCount = 0) then
       if (ShowConfirmMessage('El cliente no tiene direcciones asociadas',
         AContacto.NOMBRE + ' no tiene ninguna dirección de envío dada de alta, ' + #10#13 +
@@ -345,7 +347,7 @@ begin
       begin
         FDireccionesController.CopiarDireccionFiscal(AContacto, AContacto.Direcciones);
         FDireccionesController.Ver(AContacto.Direcciones);
-      end;
+      end;}
   end;
 end;
 
diff --git a/Source/Modulos/Contactos/Controller/uContactosController.pas b/Source/Modulos/Contactos/Controller/uContactosController.pas
index e01530df..46ca370d 100644
--- a/Source/Modulos/Contactos/Controller/uContactosController.pas
+++ b/Source/Modulos/Contactos/Controller/uContactosController.pas
@@ -88,6 +88,7 @@ begin
     begin
       ID_EMPRESA := AppFactuGES.EmpresaActiva.ID;
       USUARIO := AppFactuGES.UsuarioActivo.UserName;
+      REFERENCIA := '';
     end;
 
     Result.Post;
diff --git a/Source/Modulos/Contactos/Data/Contactos_data.dproj b/Source/Modulos/Contactos/Data/Contactos_data.dproj
index f9d3f422..b456abaa 100644
--- a/Source/Modulos/Contactos/Data/Contactos_data.dproj
+++ b/Source/Modulos/Contactos/Data/Contactos_data.dproj
@@ -49,23 +49,27 @@
     <DelphiCompile Include="Contactos_data.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\..\..\Base\ApplicationBase.dcp" />
-    <DCCReference Include="..\..\..\Base\Base.dcp" />
-    <DCCReference Include="..\..\..\Base\Contactos_model.dcp" />
-    <DCCReference Include="..\..\..\Base\GUIBase.dcp" />
-    <DCCReference Include="..\..\..\Base\rtl.dcp" />
-    <DCCReference Include="..\..\..\Base\vcl.dcp" />
+    <DCCReference Include="..\ApplicationBase.dcp" />
+    <DCCReference Include="..\Base.dcp" />
+    <DCCReference Include="..\Contactos_model.dcp" />
+    <DCCReference Include="..\GUIBase.dcp" />
+    <DCCReference Include="..\rtl.dcp" />
+    <DCCReference Include="..\vcl.dcp" />
     <DCCReference Include="uDataModuleClientes.pas">
       <Form>DataModuleClientes</Form>
+      <DesignClass>TDAClientDataModule</DesignClass>
     </DCCReference>
     <DCCReference Include="uDataModuleContactos.pas">
       <Form>DataModuleContactos</Form>
+      <DesignClass>TDAClientDataModule</DesignClass>
     </DCCReference>
     <DCCReference Include="uDataModuleEmpleados.pas">
       <Form>DataModuleEmpleados</Form>
+      <DesignClass>TDAClientDataModule</DesignClass>
     </DCCReference>
     <DCCReference Include="uDataModuleProveedores.pas">
       <Form>DataModuleProveedores</Form>
+      <DesignClass>TDAClientDataModule</DesignClass>
     </DCCReference>
     <None Include="ModelSupport_Contactos_data\default.txaPackage" />
   </ItemGroup>
diff --git a/Source/Modulos/Contactos/Data/uDataModuleClientes.dfm b/Source/Modulos/Contactos/Data/uDataModuleClientes.dfm
index a752c916..f53d5462 100644
--- a/Source/Modulos/Contactos/Data/uDataModuleClientes.dfm
+++ b/Source/Modulos/Contactos/Data/uDataModuleClientes.dfm
@@ -7,6 +7,164 @@ inherited DataModuleClientes: TDataModuleClientes
   inherited Bin2DataStreamer: TDABin2DataStreamer
     Top = 136
   end
+  inherited tbl_Contactos: TDAMemDataTable
+    Fields = <
+      item
+        Name = 'ID'
+        DataType = datAutoInc
+        GeneratorName = 'GEN_CONTACTOS_ID'
+        ServerAutoRefresh = True
+        DictionaryEntry = 'Contactos_ID'
+        InPrimaryKey = True
+      end
+      item
+        Name = 'ID_CATEGORIA'
+        DataType = datInteger
+      end
+      item
+        Name = 'NIF_CIF'
+        DataType = datString
+        Size = 15
+        DisplayLabel = 'NIF/CIF'
+        DictionaryEntry = 'Contactos_NIF_CIF'
+      end
+      item
+        Name = 'NOMBRE'
+        DataType = datString
+        Size = 255
+        Required = True
+        DisplayLabel = 'Nombre'
+        DictionaryEntry = 'Contactos_NOMBRE'
+      end
+      item
+        Name = 'PERSONA_CONTACTO'
+        DataType = datString
+        Size = 255
+        DisplayLabel = 'Persona de contacto'
+        DictionaryEntry = 'Contactos_PERSONA_CONTACTO'
+      end
+      item
+        Name = 'CALLE'
+        DataType = datString
+        Size = 255
+        DisplayLabel = 'Direcci'#243'n'
+        DictionaryEntry = 'Contactos_CALLE'
+      end
+      item
+        Name = 'POBLACION'
+        DataType = datString
+        Size = 255
+        DisplayLabel = 'Poblaci'#243'n'
+        DictionaryEntry = 'Contactos_POBLACION'
+      end
+      item
+        Name = 'PROVINCIA'
+        DataType = datString
+        Size = 255
+        DisplayLabel = 'Provincia'
+        DictionaryEntry = 'Contactos_PROVINCIA'
+      end
+      item
+        Name = 'CODIGO_POSTAL'
+        DataType = datString
+        Size = 10
+        DisplayLabel = 'C'#243'digo postal'
+        DictionaryEntry = 'Contactos_CODIGO_POSTAL'
+      end
+      item
+        Name = 'TELEFONO_1'
+        DataType = datString
+        Size = 25
+        DisplayLabel = 'Tlf. trabajo'
+        DictionaryEntry = 'Contactos_TELEFONO_1'
+      end
+      item
+        Name = 'TELEFONO_2'
+        DataType = datString
+        Size = 25
+        DisplayLabel = 'Tlf. particular'
+        DictionaryEntry = 'Contactos_TELEFONO_2'
+      end
+      item
+        Name = 'MOVIL_1'
+        DataType = datString
+        Size = 25
+        DisplayLabel = 'M'#243'vil'
+        DictionaryEntry = 'Contactos_MOVIL_1'
+      end
+      item
+        Name = 'MOVIL_2'
+        DataType = datString
+        Size = 25
+        DictionaryEntry = 'Contactos_MOVIL_2'
+      end
+      item
+        Name = 'FAX'
+        DataType = datString
+        Size = 25
+        DisplayLabel = 'Fax'
+        DictionaryEntry = 'Contactos_FAX'
+      end
+      item
+        Name = 'EMAIL_1'
+        DataType = datString
+        Size = 255
+        DisplayLabel = 'E-mail trabajo'
+        DictionaryEntry = 'Contactos_EMAIL_1'
+      end
+      item
+        Name = 'EMAIL_2'
+        DataType = datString
+        Size = 255
+        DisplayLabel = 'E-mail particular'
+        DictionaryEntry = 'Contactos_EMAIL_2'
+      end
+      item
+        Name = 'PAGINA_WEB'
+        DataType = datString
+        Size = 255
+        DisplayLabel = 'Web'
+        DictionaryEntry = 'Contactos_PAGINA_WEB'
+      end
+      item
+        Name = 'NOTAS'
+        DataType = datMemo
+        BlobType = dabtMemo
+        DisplayLabel = 'Observaciones'
+        DictionaryEntry = 'Contactos_NOTAS'
+      end
+      item
+        Name = 'FECHA_ALTA'
+        DataType = datDateTime
+        DisplayLabel = 'Fecha de alta'
+        DictionaryEntry = 'Contactos_FECHA_ALTA'
+      end
+      item
+        Name = 'FECHA_MODIFICACION'
+        DataType = datDateTime
+        DisplayLabel = 'Fecha de modificaci'#243'n'
+        DictionaryEntry = 'Contactos_FECHA_MODIFICACION'
+      end
+      item
+        Name = 'USUARIO'
+        DataType = datString
+        Size = 20
+        DisplayLabel = 'Usuario'
+        DictionaryEntry = 'Contactos_USUARIO'
+      end
+      item
+        Name = 'ID_EMPRESA'
+        DataType = datInteger
+      end
+      item
+        Name = 'REFERENCIA'
+        DataType = datString
+        Size = 255
+        DisplayLabel = 'Referencia'
+        ServerAutoRefresh = True
+        DictionaryEntry = 'Contactos_REFERENCIA'
+      end>
+  end
   inherited ds_Contactos: TDADataSource
     DataSet = tbl_Contactos.Dataset
   end
@@ -169,6 +327,7 @@ inherited DataModuleClientes: TDataModuleClientes
         Name = 'REFERENCIA'
         DataType = datString
         Size = 255
+        ServerAutoRefresh = True
         DictionaryEntry = 'Clientes_REFERENCIA'
       end
       item
diff --git a/Source/Modulos/Contactos/Data/uDataModuleEmpleados.dfm b/Source/Modulos/Contactos/Data/uDataModuleEmpleados.dfm
index 2586822a..d80d16ea 100644
--- a/Source/Modulos/Contactos/Data/uDataModuleEmpleados.dfm
+++ b/Source/Modulos/Contactos/Data/uDataModuleEmpleados.dfm
@@ -1,4 +1,162 @@
 inherited DataModuleEmpleados: TDataModuleEmpleados
+  inherited tbl_Contactos: TDAMemDataTable
+    Fields = <
+      item
+        Name = 'ID'
+        DataType = datAutoInc
+        GeneratorName = 'GEN_CONTACTOS_ID'
+        ServerAutoRefresh = True
+        DictionaryEntry = 'Contactos_ID'
+        InPrimaryKey = True
+      end
+      item
+        Name = 'ID_CATEGORIA'
+        DataType = datInteger
+      end
+      item
+        Name = 'NIF_CIF'
+        DataType = datString
+        Size = 15
+        DisplayLabel = 'NIF/CIF'
+        DictionaryEntry = 'Contactos_NIF_CIF'
+      end
+      item
+        Name = 'NOMBRE'
+        DataType = datString
+        Size = 255
+        Required = True
+        DisplayLabel = 'Nombre'
+        DictionaryEntry = 'Contactos_NOMBRE'
+      end
+      item
+        Name = 'PERSONA_CONTACTO'
+        DataType = datString
+        Size = 255
+        DisplayLabel = 'Persona de contacto'
+        DictionaryEntry = 'Contactos_PERSONA_CONTACTO'
+      end
+      item
+        Name = 'CALLE'
+        DataType = datString
+        Size = 255
+        DisplayLabel = 'Direcci'#243'n'
+        DictionaryEntry = 'Contactos_CALLE'
+      end
+      item
+        Name = 'POBLACION'
+        DataType = datString
+        Size = 255
+        DisplayLabel = 'Poblaci'#243'n'
+        DictionaryEntry = 'Contactos_POBLACION'
+      end
+      item
+        Name = 'PROVINCIA'
+        DataType = datString
+        Size = 255
+        DisplayLabel = 'Provincia'
+        DictionaryEntry = 'Contactos_PROVINCIA'
+      end
+      item
+        Name = 'CODIGO_POSTAL'
+        DataType = datString
+        Size = 10
+        DisplayLabel = 'C'#243'digo postal'
+        DictionaryEntry = 'Contactos_CODIGO_POSTAL'
+      end
+      item
+        Name = 'TELEFONO_1'
+        DataType = datString
+        Size = 25
+        DisplayLabel = 'Tlf. trabajo'
+        DictionaryEntry = 'Contactos_TELEFONO_1'
+      end
+      item
+        Name = 'TELEFONO_2'
+        DataType = datString
+        Size = 25
+        DisplayLabel = 'Tlf. particular'
+        DictionaryEntry = 'Contactos_TELEFONO_2'
+      end
+      item
+        Name = 'MOVIL_1'
+        DataType = datString
+        Size = 25
+        DisplayLabel = 'M'#243'vil'
+        DictionaryEntry = 'Contactos_MOVIL_1'
+      end
+      item
+        Name = 'MOVIL_2'
+        DataType = datString
+        Size = 25
+        DictionaryEntry = 'Contactos_MOVIL_2'
+      end
+      item
+        Name = 'FAX'
+        DataType = datString
+        Size = 25
+        DisplayLabel = 'Fax'
+        DictionaryEntry = 'Contactos_FAX'
+      end
+      item
+        Name = 'EMAIL_1'
+        DataType = datString
+        Size = 255
+        DisplayLabel = 'E-mail trabajo'
+        DictionaryEntry = 'Contactos_EMAIL_1'
+      end
+      item
+        Name = 'EMAIL_2'
+        DataType = datString
+        Size = 255
+        DisplayLabel = 'E-mail particular'
+        DictionaryEntry = 'Contactos_EMAIL_2'
+      end
+      item
+        Name = 'PAGINA_WEB'
+        DataType = datString
+        Size = 255
+        DisplayLabel = 'Web'
+        DictionaryEntry = 'Contactos_PAGINA_WEB'
+      end
+      item
+        Name = 'NOTAS'
+        DataType = datMemo
+        BlobType = dabtMemo
+        DisplayLabel = 'Observaciones'
+        DictionaryEntry = 'Contactos_NOTAS'
+      end
+      item
+        Name = 'FECHA_ALTA'
+        DataType = datDateTime
+        DisplayLabel = 'Fecha de alta'
+        DictionaryEntry = 'Contactos_FECHA_ALTA'
+      end
+      item
+        Name = 'FECHA_MODIFICACION'
+        DataType = datDateTime
+        DisplayLabel = 'Fecha de modificaci'#243'n'
+        DictionaryEntry = 'Contactos_FECHA_MODIFICACION'
+      end
+      item
+        Name = 'USUARIO'
+        DataType = datString
+        Size = 20
+        DisplayLabel = 'Usuario'
+        DictionaryEntry = 'Contactos_USUARIO'
+      end
+      item
+        Name = 'ID_EMPRESA'
+        DataType = datInteger
+      end
+      item
+        Name = 'REFERENCIA'
+        DataType = datString
+        Size = 255
+        DisplayLabel = 'Referencia'
+        ServerAutoRefresh = True
+        DictionaryEntry = 'Contactos_REFERENCIA'
+      end>
+  end
   inherited ds_Contactos: TDADataSource
     DataSet = tbl_Contactos.Dataset
   end
@@ -162,6 +320,7 @@ inherited DataModuleEmpleados: TDataModuleEmpleados
         DataType = datString
         Size = 255
         DisplayLabel = 'Referencia'
+        ServerAutoRefresh = True
         DictionaryEntry = 'Agentes_REFERENCIA'
       end
       item
diff --git a/Source/Modulos/Contactos/Data/uDataModuleProveedores.dfm b/Source/Modulos/Contactos/Data/uDataModuleProveedores.dfm
index 90782bd9..acc78d38 100644
--- a/Source/Modulos/Contactos/Data/uDataModuleProveedores.dfm
+++ b/Source/Modulos/Contactos/Data/uDataModuleProveedores.dfm
@@ -1,6 +1,6 @@
 inherited DataModuleProveedores: TDataModuleProveedores
-  Height = 442
-  Width = 763
+  Height = 311
+  Width = 550
   inherited ds_Contactos: TDADataSource
     DataSet = tbl_Contactos.Dataset
   end
@@ -43,6 +43,7 @@ inherited DataModuleProveedores: TDataModuleProveedores
         Name = 'ID'
         DataType = datAutoInc
         GeneratorName = 'GEN_CONTACTOS_ID'
+        ServerAutoRefresh = True
         DictionaryEntry = 'Contactos_ID'
         InPrimaryKey = True
       end
@@ -78,14 +79,14 @@ inherited DataModuleProveedores: TDataModuleProveedores
         Name = 'CALLE'
         DataType = datString
         Size = 255
-        DisplayLabel = 'Direcci'#195#179'n'
+        DisplayLabel = 'Direcci'#243'n'
         DictionaryEntry = 'Contactos_CALLE'
       end
       item
         Name = 'POBLACION'
         DataType = datString
         Size = 255
-        DisplayLabel = 'Poblaci'#195#179'n'
+        DisplayLabel = 'Poblaci'#243'n'
         DictionaryEntry = 'Contactos_POBLACION'
       end
       item
@@ -99,7 +100,7 @@ inherited DataModuleProveedores: TDataModuleProveedores
         Name = 'CODIGO_POSTAL'
         DataType = datString
         Size = 10
-        DisplayLabel = 'C'#195#179'digo postal'
+        DisplayLabel = 'C'#243'digo postal'
         DictionaryEntry = 'Contactos_CODIGO_POSTAL'
       end
       item
@@ -120,7 +121,7 @@ inherited DataModuleProveedores: TDataModuleProveedores
         Name = 'MOVIL_1'
         DataType = datString
         Size = 25
-        DisplayLabel = 'M'#195#179'vil'
+        DisplayLabel = 'M'#243'vil'
         DictionaryEntry = 'Contactos_MOVIL_1'
       end
       item
@@ -189,6 +190,7 @@ inherited DataModuleProveedores: TDataModuleProveedores
         DataType = datString
         Size = 255
         DisplayLabel = 'Referencia'
+        ServerAutoRefresh = True
         DictionaryEntry = 'Proveedores_REFERENCIA'
       end
       item
@@ -208,7 +210,7 @@ inherited DataModuleProveedores: TDataModuleProveedores
         Name = 'CODIGO_ASIGNADO'
         DataType = datString
         Size = 255
-        DisplayLabel = 'C'#195#179'digo asignado'
+        DisplayLabel = 'C'#243'digo asignado'
         DictionaryEntry = 'Proveedores_CODIGO_ASIGNADO'
       end
       item
@@ -220,7 +222,7 @@ inherited DataModuleProveedores: TDataModuleProveedores
         Name = 'REGIMEN_IVA'
         DataType = datString
         Size = 255
-        DisplayLabel = 'R'#195#169'gimen de IVA'
+        DisplayLabel = 'R'#233'gimen de IVA'
         DictionaryEntry = 'Proveedores_REGIMEN_IVA'
       end
       item
diff --git a/Source/Modulos/Contactos/Views/uEditorCliente.dfm b/Source/Modulos/Contactos/Views/uEditorCliente.dfm
index b96c9e71..de168eb0 100644
--- a/Source/Modulos/Contactos/Views/uEditorCliente.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorCliente.dfm
@@ -5,7 +5,7 @@ inherited fEditorCliente: TfEditorCliente
   ClientHeight = 585
   ClientWidth = 656
   ExplicitWidth = 664
-  ExplicitHeight = 612
+  ExplicitHeight = 619
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
@@ -65,7 +65,7 @@ inherited fEditorCliente: TfEditorCliente
   inherited pgPaginas: TPageControl
     Width = 656
     Height = 490
-    ActivePage = pagDatosComerciales
+    ActivePage = pagDirecciones
     ExplicitWidth = 656
     ExplicitHeight = 490
     inherited pagGeneral: TTabSheet
@@ -120,28 +120,28 @@ inherited fEditorCliente: TfEditorCliente
             ExplicitWidth = 269
           end
           inherited eCalle: TcxDBTextEdit
-            Top = 294
-            ExplicitTop = 294
+            Top = 267
+            ExplicitTop = 267
             ExplicitWidth = 268
             Width = 268
           end
           inherited eProvincia: TcxDBTextEdit
-            Top = 348
-            ExplicitTop = 348
+            Top = 321
+            ExplicitTop = 321
             ExplicitWidth = 268
             Width = 268
           end
           inherited ePoblacion: TcxDBTextEdit
-            Top = 321
-            ExplicitTop = 321
+            Top = 294
+            ExplicitTop = 294
             ExplicitWidth = 78
             Width = 78
           end
           inherited eCodigoPostal: TcxDBTextEdit
             Left = 339
-            Top = 321
+            Top = 294
             ExplicitLeft = 339
-            ExplicitTop = 321
+            ExplicitTop = 294
           end
           inherited eObservaciones: TcxDBMemo
             Top = 399
@@ -181,7 +181,6 @@ inherited fEditorCliente: TfEditorCliente
             ExplicitLeft = 432
             ExplicitTop = 315
             ExplicitWidth = 275
-            ExplicitHeight = 21
             Width = 275
           end
           inherited eTlfParticular: TcxDBTextEdit
@@ -205,6 +204,8 @@ inherited fEditorCliente: TfEditorCliente
             Top = 84
             ExplicitLeft = 527
             ExplicitTop = 84
+            ExplicitWidth = 140
+            Width = 140
           end
           inherited eFax: TcxDBTextEdit
             Left = 527
@@ -220,6 +221,12 @@ inherited fEditorCliente: TfEditorCliente
             ExplicitWidth = 158
             Width = 158
           end
+          inherited eCodigoAsignado: TcxDBTextEdit
+            Top = 111
+            ExplicitTop = 111
+            ExplicitWidth = 227
+            Width = 227
+          end
           inherited eNIFCIF: TcxDBTextEdit
             Left = 226
             Top = 30
@@ -246,12 +253,6 @@ inherited fEditorCliente: TfEditorCliente
             ExplicitWidth = 121
             Width = 121
           end
-          inherited eCodigoAsignado: TcxDBTextEdit
-            Top = 111
-            ExplicitTop = 111
-            ExplicitWidth = 227
-            Width = 227
-          end
           inherited ePaginaWeb: TcxDBHyperLinkEdit
             Left = 527
             Top = 217
@@ -267,8 +268,8 @@ inherited fEditorCliente: TfEditorCliente
             Width = 102
           end
           inherited ePersonaContacto: TcxDBTextEdit
-            Top = 267
-            ExplicitTop = 267
+            Top = 348
+            ExplicitTop = 348
             ExplicitWidth = 253
             Width = 253
           end
@@ -336,21 +337,20 @@ inherited fEditorCliente: TfEditorCliente
           LookAndFeel = dxLayoutOfficeLookAndFeel
           ExplicitWidth = 648
           inherited Label1: TLabel
-            Left = 340
+            Left = 397
             Top = 30
-            Width = 229
-            Caption = 
-              'Puede indicar el d'#237'a del mes que el cliente desea realizar el pa' +
-              'go de sus recibos.'
-            ExplicitLeft = 340
+            Width = 206
+            Height = 39
+            ExplicitLeft = 397
             ExplicitTop = 30
-            ExplicitWidth = 229
+            ExplicitWidth = 206
+            ExplicitHeight = 39
           end
           inherited eDiasVencimiento: TcxDBSpinEdit
-            Left = 466
-            Top = 62
-            ExplicitLeft = 466
-            ExplicitTop = 62
+            Left = 464
+            Top = 75
+            ExplicitLeft = 464
+            ExplicitTop = 75
             ExplicitWidth = 160
             Width = 160
           end
@@ -373,9 +373,9 @@ inherited fEditorCliente: TfEditorCliente
             Width = 121
           end
           inherited bFormasPago: TButton
-            Left = 180
+            Left = 237
             Top = 57
-            ExplicitLeft = 180
+            ExplicitLeft = 237
             ExplicitTop = 57
           end
           inherited eIVA: TcxDBLookupComboBox
@@ -385,18 +385,11 @@ inherited fEditorCliente: TfEditorCliente
             Width = 121
           end
           inherited bTiposIVA: TButton
-            Left = 180
+            Left = 237
             Top = 84
-            ExplicitLeft = 180
+            ExplicitLeft = 237
             ExplicitTop = 84
           end
-          inherited dxLayoutGroup1: TdxLayoutGroup
-            inherited dxLayoutControl1Group5: TdxLayoutGroup
-              inherited dxLayoutControl1Item2: TdxLayoutItem
-                Caption = 'D'#237'a del mes para el pago:'
-              end
-            end
-          end
         end
       end
     end
@@ -434,34 +427,6 @@ inherited fEditorCliente: TfEditorCliente
         inherited ToolBar1: TToolBar
           Width = 648
           ExplicitWidth = 648
-          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
diff --git a/Source/Modulos/Contactos/Views/uEditorContacto.dfm b/Source/Modulos/Contactos/Views/uEditorContacto.dfm
index 49fce0d6..65af220d 100644
--- a/Source/Modulos/Contactos/Views/uEditorContacto.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorContacto.dfm
@@ -7,7 +7,6 @@ inherited fEditorContacto: TfEditorContacto
   ClientWidth = 632
   Scaled = False
   ExplicitWidth = 640
-  ExplicitHeight = 488
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
diff --git a/Source/Modulos/Contactos/Views/uEditorContactos.dfm b/Source/Modulos/Contactos/Views/uEditorContactos.dfm
index 55901294..161c413d 100644
--- a/Source/Modulos/Contactos/Views/uEditorContactos.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorContactos.dfm
@@ -9,9 +9,6 @@ inherited fEditorContactos: TfEditorContactos
     Caption = 'Lista de contactos'
   end
   inherited TBXDock: TTBXDock
-    inherited tbxMain: TTBXToolbar
-      ExplicitWidth = 543
-    end
     inherited tbxFiltro: TTBXToolbar
       ExplicitWidth = 269
       inherited tbxEditFiltro: TTBXEditItem
@@ -26,17 +23,4 @@ inherited fEditorContactos: TfEditorContactos
       ExplicitLeft = 334
     end
   end
-  inherited EditorActionList: TActionList
-    inherited actPrevisualizar: TAction
-      Visible = True
-    end
-    inherited actImprimir: TAction
-      Visible = True
-    end
-  end
-  inherited GridPopupMenu: TPopupMenu
-    inherited Duplicar1: TMenuItem
-      Visible = False
-    end
-  end
 end
diff --git a/Source/Modulos/Contactos/Views/uEditorContactos.pas b/Source/Modulos/Contactos/Views/uEditorContactos.pas
index 921ef705..087817ff 100644
--- a/Source/Modulos/Contactos/Views/uEditorContactos.pas
+++ b/Source/Modulos/Contactos/Views/uEditorContactos.pas
@@ -152,8 +152,6 @@ procedure TfEditorContactos.DuplicarInterno;
 var
   AContacto : IBizContacto;
 begin
-AppFactuGES.ShowCapado;
-{
   inherited;
   AContacto := FController.Duplicar(Contactos);
   try
@@ -161,7 +159,6 @@ AppFactuGES.ShowCapado;
   finally
     actRefrescar.Execute;
   end;
-}
 end;
 
 procedure TfEditorContactos.EliminarInterno;
diff --git a/Source/Modulos/Contactos/Views/uViewCliente.dfm b/Source/Modulos/Contactos/Views/uViewCliente.dfm
index 92177670..f66629a0 100644
--- a/Source/Modulos/Contactos/Views/uViewCliente.dfm
+++ b/Source/Modulos/Contactos/Views/uViewCliente.dfm
@@ -1,29 +1,29 @@
 inherited frViewCliente: TfrViewCliente
-  Width = 646
+  Width = 742
   Height = 470
   OnCreate = CustomViewCreate
   OnDestroy = CustomViewDestroy
-  ExplicitWidth = 646
+  ExplicitWidth = 742
   ExplicitHeight = 470
   inherited dxLayoutControlContacto: TdxLayoutControl
-    Width = 646
+    Width = 742
     Height = 470
     ExplicitWidth = 646
     ExplicitHeight = 470
     inherited PngSpeedButton1: TPngSpeedButton
-      Left = 585
-      ExplicitLeft = 585
+      Left = 681
+      ExplicitLeft = 681
     end
     inherited PngSpeedButton2: TPngSpeedButton
-      Left = 585
-      ExplicitLeft = 585
+      Left = 681
+      ExplicitLeft = 681
     end
     inherited PngSpeedButton3: TPngSpeedButton
-      Left = 585
-      ExplicitLeft = 585
+      Left = 681
+      ExplicitLeft = 681
     end
     object Label1: TLabel [3]
-      Left = 373
+      Left = 428
       Top = 280
       Width = 269
       Height = 39
@@ -35,37 +35,37 @@ inherited frViewCliente: TfrViewCliente
     end
     inherited eCalle: TcxDBTextEdit
       Left = 132
-      Top = 304
-      TabOrder = 9
+      Top = 277
+      TabOrder = 8
       ExplicitLeft = 132
-      ExplicitTop = 304
+      ExplicitTop = 277
       ExplicitWidth = 175
       Width = 175
     end
     inherited eProvincia: TcxDBTextEdit
       Left = 132
-      Top = 358
-      TabOrder = 12
+      Top = 331
+      TabOrder = 11
       ExplicitLeft = 132
-      ExplicitTop = 358
+      ExplicitTop = 331
       ExplicitWidth = 167
       Width = 167
     end
     inherited ePoblacion: TcxDBTextEdit
       Left = 132
-      Top = 331
-      TabOrder = 10
+      Top = 304
+      TabOrder = 9
       ExplicitLeft = 132
-      ExplicitTop = 331
+      ExplicitTop = 304
       ExplicitWidth = 71
       Width = 71
     end
     inherited eCodigoPostal: TcxDBTextEdit
-      Left = 278
-      Top = 331
-      TabOrder = 11
-      ExplicitLeft = 278
-      ExplicitTop = 331
+      Left = 333
+      Top = 304
+      TabOrder = 10
+      ExplicitLeft = 333
+      ExplicitTop = 304
     end
     inherited eObservaciones: TcxDBMemo
       Top = 415
@@ -164,7 +164,7 @@ inherited frViewCliente: TfrViewCliente
       Width = 113
     end
     object cxDBCheckBox1: TcxDBCheckBox [13]
-      Left = 373
+      Left = 428
       Top = 325
       Caption = 'Permitir el acceso de este cliente a la tienda web'
       DataBinding.DataField = 'TIENDA_WEB'
@@ -189,30 +189,30 @@ inherited frViewCliente: TfrViewCliente
       Width = 249
     end
     inherited eTlfParticular: TcxDBTextEdit
-      Left = 468
+      Left = 523
       TabOrder = 14
-      ExplicitLeft = 468
+      ExplicitLeft = 523
       ExplicitWidth = 157
       Width = 157
     end
     inherited eTlfTrabajo: TcxDBTextEdit
-      Left = 468
+      Left = 523
       TabOrder = 13
-      ExplicitLeft = 468
+      ExplicitLeft = 523
       ExplicitWidth = 157
       Width = 157
     end
     inherited eTlfMovil: TcxDBTextEdit
-      Left = 468
+      Left = 523
       TabOrder = 15
-      ExplicitLeft = 468
+      ExplicitLeft = 523
       ExplicitWidth = 157
       Width = 157
     end
     inherited eFax: TcxDBTextEdit
-      Left = 468
+      Left = 523
       TabOrder = 16
-      ExplicitLeft = 468
+      ExplicitLeft = 523
       ExplicitWidth = 157
       Width = 157
     end
@@ -223,50 +223,28 @@ inherited frViewCliente: TfrViewCliente
       Width = 135
     end
     inherited eNIFCIF: TcxDBTextEdit
-      Left = 259
-      ExplicitLeft = 259
+      Left = 291
+      ExplicitLeft = 291
       ExplicitWidth = 58
       Width = 58
     end
     inherited eMailTrabajo: TcxDBHyperLinkEdit
-      Left = 468
+      Left = 523
       Properties.Prefix = 'mailto:'
       TabOrder = 17
-      ExplicitLeft = 468
+      ExplicitLeft = 523
       ExplicitWidth = 128
       Width = 128
     end
     inherited eMailParticular: TcxDBHyperLinkEdit
-      Left = 468
+      Left = 523
       Properties.Prefix = 'mailto:'
       TabOrder = 18
-      ExplicitLeft = 468
+      ExplicitLeft = 523
       ExplicitWidth = 128
       Width = 128
     end
-    inherited ePaginaWeb: TcxDBHyperLinkEdit
-      Left = 468
-      TabOrder = 19
-      ExplicitLeft = 468
-      ExplicitWidth = 128
-      Width = 128
-    end
-    inherited eReferencia: TcxDBTextEdit
-      Left = 132
-      ExplicitLeft = 132
-      ExplicitWidth = 38
-      Width = 38
-    end
-    inherited ePersonaContacto: TcxDBTextEdit
-      Left = 132
-      Top = 277
-      TabOrder = 8
-      ExplicitLeft = 132
-      ExplicitTop = 277
-      ExplicitWidth = 256
-      Width = 256
-    end
-    object eCodigoAsignado: TcxDBTextEdit [25]
+    object eCodigoAsignado: TcxDBTextEdit [22]
       Left = 132
       Top = 109
       DataBinding.DataField = 'CODIGO_ASIGNADO'
@@ -286,6 +264,28 @@ inherited frViewCliente: TfrViewCliente
       TabOrder = 4
       Width = 227
     end
+    inherited ePaginaWeb: TcxDBHyperLinkEdit
+      Left = 523
+      TabOrder = 19
+      ExplicitLeft = 523
+      ExplicitWidth = 128
+      Width = 128
+    end
+    inherited eReferencia: TcxDBTextEdit
+      Left = 132
+      ExplicitLeft = 132
+      ExplicitWidth = 38
+      Width = 38
+    end
+    inherited ePersonaContacto: TcxDBTextEdit
+      Left = 132
+      Top = 358
+      TabOrder = 12
+      ExplicitLeft = 132
+      ExplicitTop = 358
+      ExplicitWidth = 256
+      Width = 256
+    end
     inherited dxLayoutControlContactoGroup_Root: TdxLayoutGroup
       AutoAligns = [aaHorizontal]
       AlignVert = avBottom
diff --git a/Source/Modulos/Contactos/Views/uViewClientes.dfm b/Source/Modulos/Contactos/Views/uViewClientes.dfm
index 2bd03d8e..20e53a66 100644
--- a/Source/Modulos/Contactos/Views/uViewClientes.dfm
+++ b/Source/Modulos/Contactos/Views/uViewClientes.dfm
@@ -56,19 +56,30 @@ inherited frViewClientes: TfrViewClientes
         DataBinding.FieldName = 'NOMBRE_COMERCIAL'
         Width = 164
       end
-      object cxGridViewAGENTE: TcxGridDBColumn
-        DataBinding.FieldName = 'AGENTE'
-        Visible = False
+    end
+  end
+  inherited frViewFiltroBase1: TfrViewFiltroBase
+    inherited TBXDockablePanel1: TTBXDockablePanel
+      inherited dxLayoutControl1: TdxLayoutControl
+        inherited txtFiltroTodo: TcxTextEdit
+          ExplicitWidth = 273
+          Width = 273
+        end
+        inherited edtFechaIniFiltro: TcxDateEdit
+          ExplicitWidth = 121
+          Width = 121
+        end
+        inherited edtFechaFinFiltro: TcxDateEdit
+          ExplicitWidth = 284
+          Width = 284
+        end
       end
     end
   end
   inherited pnlAgrupaciones: TTBXDockablePanel
-    ExplicitWidth = 128
     inherited TBXAlignmentPanel1: TTBXAlignmentPanel
       inherited TBXToolbar1: TTBXToolbar
-        object TBXItem2: TTBXItem
-          Action = actAgente
-        end
+        Visible = False
       end
     end
   end
@@ -89,13 +100,6 @@ inherited frViewClientes: TfrViewClientes
   inherited cxViewGridPopupMenu: TcxGridPopupMenu
     Left = 32
   end
-  inherited ActionList1: TActionList
-    object actAgente: TAction
-      Caption = 'Agente'
-      OnExecute = actAgenteExecute
-      OnUpdate = actAgenteUpdate
-    end
-  end
   inherited dxPrintStyleManager1: TdxPrintStyleManager
     inherited dxPrintStyleManager1Style1: TdxPSPrintStyle
       BuiltInStyle = True
diff --git a/Source/Modulos/Contactos/Views/uViewClientes.pas b/Source/Modulos/Contactos/Views/uViewClientes.pas
index 5fd03fc6..9cc273d2 100644
--- a/Source/Modulos/Contactos/Views/uViewClientes.pas
+++ b/Source/Modulos/Contactos/Views/uViewClientes.pas
@@ -25,11 +25,6 @@ type
     cxGridViewNOMBRE_COMERCIAL: TcxGridDBColumn;
     cxGridViewBLOQUEADO: TcxGridDBColumn;
     cxGridViewTiendaWeb: TcxGridDBColumn;
-    actAgente: TAction;
-    cxGridViewAGENTE: TcxGridDBColumn;
-    TBXItem2: TTBXItem;
-    procedure actAgenteExecute(Sender: TObject);
-    procedure actAgenteUpdate(Sender: TObject);
   end;
   
 
@@ -41,24 +36,4 @@ uses uViewGridBase;
 {$R *.dfm}
 
 
-procedure TfrViewClientes.actAgenteExecute(Sender: TObject);
-begin
-  if (cxGridViewAGENTE.GroupIndex < 0) then
-  begin
-    cxGridViewAGENTE.GroupIndex := cxGridView.GroupedColumnCount;
-    cxGridViewAGENTE.Visible := False;
-  end
-  else
-  begin
-    cxGridViewAGENTE.GroupIndex := -1;
-    cxGridViewAGENTE.Visible := True;
-  end;
-end;
-
-procedure TfrViewClientes.actAgenteUpdate(Sender: TObject);
-begin
-  inherited;
-  (Sender as TAction).Checked := not (cxGridViewAGENTE.GroupIndex < 0);
-end;
-
 end.
diff --git a/Source/Modulos/Contactos/Views/uViewContacto.dfm b/Source/Modulos/Contactos/Views/uViewContacto.dfm
index 62c87a14..cd573b59 100644
--- a/Source/Modulos/Contactos/Views/uViewContacto.dfm
+++ b/Source/Modulos/Contactos/Views/uViewContacto.dfm
@@ -104,7 +104,7 @@ inherited frViewContacto: TfrViewContacto
     end
     object eCalle: TcxDBTextEdit
       Left = 115
-      Top = 169
+      Top = 142
       DataBinding.DataField = 'CALLE'
       DataBinding.DataSource = dsContacto
       Style.BorderColor = clWindowFrame
@@ -117,12 +117,12 @@ inherited frViewContacto: TfrViewContacto
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 4
+      TabOrder = 3
       Width = 181
     end
     object eProvincia: TcxDBTextEdit
       Left = 115
-      Top = 223
+      Top = 196
       DataBinding.DataField = 'PROVINCIA'
       DataBinding.DataSource = dsContacto
       Style.BorderColor = clWindowFrame
@@ -135,12 +135,12 @@ inherited frViewContacto: TfrViewContacto
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 7
+      TabOrder = 6
       Width = 133
     end
     object ePoblacion: TcxDBTextEdit
       Left = 115
-      Top = 196
+      Top = 169
       DataBinding.DataField = 'POBLACION'
       DataBinding.DataSource = dsContacto
       Style.BorderColor = clWindowFrame
@@ -153,12 +153,12 @@ inherited frViewContacto: TfrViewContacto
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 5
+      TabOrder = 4
       Width = 111
     end
     object eCodigoPostal: TcxDBTextEdit
       Left = 303
-      Top = 196
+      Top = 169
       DataBinding.DataField = 'CODIGO_POSTAL'
       DataBinding.DataSource = dsContacto
       Style.BorderColor = clWindowFrame
@@ -171,7 +171,7 @@ inherited frViewContacto: TfrViewContacto
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 6
+      TabOrder = 5
       Width = 65
     end
     object eObservaciones: TcxDBMemo
@@ -376,6 +376,7 @@ inherited frViewContacto: TfrViewContacto
       Top = 28
       DataBinding.DataField = 'REFERENCIA'
       DataBinding.DataSource = dsContacto
+      Enabled = False
       Style.BorderColor = clWindowFrame
       Style.BorderStyle = ebs3D
       Style.Color = clWindow
@@ -384,6 +385,7 @@ inherited frViewContacto: TfrViewContacto
       Style.LookAndFeel.NativeStyle = True
       StyleDisabled.LookAndFeel.Kind = lfStandard
       StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.TextColor = clWindowText
       StyleFocused.LookAndFeel.Kind = lfStandard
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
@@ -393,7 +395,7 @@ inherited frViewContacto: TfrViewContacto
     end
     object ePersonaContacto: TcxDBTextEdit
       Left = 115
-      Top = 142
+      Top = 223
       DataBinding.DataField = 'PERSONA_CONTACTO'
       DataBinding.DataSource = dsContacto
       Style.BorderColor = clWindowFrame
@@ -407,7 +409,7 @@ inherited frViewContacto: TfrViewContacto
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 3
+      TabOrder = 7
       Width = 256
     end
     object dxLayoutControlContactoGroup_Root: TdxLayoutGroup
@@ -458,11 +460,6 @@ inherited frViewContacto: TfrViewContacto
           object dxLayoutControlContactoGroup3: TdxLayoutGroup
             AutoAligns = [aaHorizontal]
             Caption = 'Direcci'#243'n'
-            object dxLayoutControlContactoItem167: TdxLayoutItem
-              Caption = 'Persona contacto:'
-              Control = ePersonaContacto
-              ControlOptions.ShowBorder = False
-            end
             object dxLayoutControlContactoItem1: TdxLayoutItem
               Caption = 'Calle:'
               Control = eCalle
@@ -491,6 +488,11 @@ inherited frViewContacto: TfrViewContacto
               Control = eProvincia
               ControlOptions.ShowBorder = False
             end
+            object dxLayoutControlContactoItem167: TdxLayoutItem
+              Caption = 'Persona contacto:'
+              Control = ePersonaContacto
+              ControlOptions.ShowBorder = False
+            end
           end
         end
         object dxLayoutControlContactoGroup6: TdxLayoutGroup
@@ -502,13 +504,12 @@ inherited frViewContacto: TfrViewContacto
           object dxLayoutControlContactoGroup2: TdxLayoutGroup
             Caption = 'Tel'#233'fonos'
             object dxLayoutControlContactoItem10: TdxLayoutItem
-              Caption = 'Tlf. trabajo:'
+              Caption = 'Tel'#233'fono 1:'
               Control = eTlfTrabajo
               ControlOptions.ShowBorder = False
             end
             object dxLayoutControlContactoItem9: TdxLayoutItem
-              Caption = 'Tlf. particular:'
-              Visible = False
+              Caption = 'Tel'#233'fono 2:'
               Control = eTlfParticular
               ControlOptions.ShowBorder = False
             end
diff --git a/Source/Modulos/Contactos/Views/uViewDireccionesEntrega.dfm b/Source/Modulos/Contactos/Views/uViewDireccionesEntrega.dfm
index 862fd540..b3d07cf0 100644
--- a/Source/Modulos/Contactos/Views/uViewDireccionesEntrega.dfm
+++ b/Source/Modulos/Contactos/Views/uViewDireccionesEntrega.dfm
@@ -75,5 +75,33 @@ inherited frViewDireccionesEntrega: TfrViewDireccionesEntrega
   inherited ToolBar1: TToolBar
     Width = 583
     ExplicitWidth = 583
+    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
diff --git a/Source/Modulos/Contactos/Views/uViewDireccionesEntrega.pas b/Source/Modulos/Contactos/Views/uViewDireccionesEntrega.pas
index 5bd6e451..9e6b0567 100644
--- a/Source/Modulos/Contactos/Views/uViewDireccionesEntrega.pas
+++ b/Source/Modulos/Contactos/Views/uViewDireccionesEntrega.pas
@@ -24,6 +24,7 @@ type
     cxGridViewEMAIL: TcxGridDBColumn;
     cxGridViewPORTE: TcxGridDBColumn;
     procedure cxGridViewDblClick(Sender: TObject);
+    procedure actEliminarExecute(Sender: TObject);
   protected
     procedure AnadirInterno; override;
     procedure ModificarInterno; override;
@@ -36,7 +37,13 @@ implementation
 {$R *.dfm}
 
 uses
-  uDireccionesContactoController, uBizDireccionesContacto;
+  uDialogUtils, uDireccionesContactoController, uBizDireccionesContacto;
+
+procedure TfrViewDireccionesEntrega.actEliminarExecute(Sender: TObject);
+begin
+  if (ShowConfirmMessage('Eliminar una dirección', '¿Desea eliminar esta dirección?') = IDYES) then
+    inherited;
+end;
 
 procedure TfrViewDireccionesEntrega.AnadirInterno;
 begin
diff --git a/Source/Modulos/Contactos/Views/uViewEmpleado.dfm b/Source/Modulos/Contactos/Views/uViewEmpleado.dfm
index fad2e9eb..20dcc102 100644
--- a/Source/Modulos/Contactos/Views/uViewEmpleado.dfm
+++ b/Source/Modulos/Contactos/Views/uViewEmpleado.dfm
@@ -8,37 +8,37 @@ inherited frViewEmpleado: TfrViewEmpleado
     ExplicitHeight = 391
     inherited eCalle: TcxDBTextEdit
       Left = 121
-      Top = 193
-      TabOrder = 7
+      Top = 166
+      TabOrder = 6
       ExplicitLeft = 121
-      ExplicitTop = 193
+      ExplicitTop = 166
       ExplicitWidth = 260
       Width = 260
     end
     inherited eProvincia: TcxDBTextEdit
       Left = 121
-      Top = 247
-      TabOrder = 10
+      Top = 220
+      TabOrder = 9
       ExplicitLeft = 121
-      ExplicitTop = 247
+      ExplicitTop = 220
       ExplicitWidth = 260
       Width = 260
     end
     inherited ePoblacion: TcxDBTextEdit
       Left = 121
-      Top = 220
-      TabOrder = 8
+      Top = 193
+      TabOrder = 7
       ExplicitLeft = 121
-      ExplicitTop = 220
+      ExplicitTop = 193
       ExplicitWidth = 159
       Width = 159
     end
     inherited eCodigoPostal: TcxDBTextEdit
       Left = 348
-      Top = 220
-      TabOrder = 9
+      Top = 193
+      TabOrder = 8
       ExplicitLeft = 348
-      ExplicitTop = 220
+      ExplicitTop = 193
     end
     inherited eObservaciones: TcxDBMemo
       Top = 304
@@ -51,29 +51,17 @@ inherited frViewEmpleado: TfrViewEmpleado
       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
-    inherited eTlfMovil: TcxDBTextEdit
-      Left = 538
-      TabOrder = 13
-      ExplicitLeft = 538
-    end
-    inherited eFax: TcxDBTextEdit
-      Left = 538
-      TabOrder = 14
-      ExplicitLeft = 538
-    end
-    inherited eNombre: TcxDBTextEdit
-      Left = 121
-      ExplicitLeft = 121
-      ExplicitWidth = 263
-      Width = 263
-    end
-    object eFechaNacimiento: TcxDBDateEdit [13]
+    object eFechaNacimiento: TcxDBDateEdit [10]
       Left = 121
       Top = 82
       DataBinding.DataField = 'FECHA_NACIMIENTO'
@@ -90,7 +78,7 @@ inherited frViewEmpleado: TfrViewEmpleado
       TabOrder = 3
       Width = 121
     end
-    object eFechaAltaEmpresa: TcxDBDateEdit [14]
+    object eFechaAltaEmpresa: TcxDBDateEdit [11]
       Left = 262
       Top = 82
       DataBinding.DataField = 'FECHA_ALTA_EMPRESA'
@@ -107,29 +95,27 @@ inherited frViewEmpleado: TfrViewEmpleado
       TabOrder = 4
       Width = 235
     end
-    inherited eNIFCIF: TcxDBTextEdit
-      Left = 289
-      ExplicitLeft = 289
-      ExplicitWidth = 100
-      Width = 100
-    end
-    inherited eMailTrabajo: TcxDBHyperLinkEdit
+    inherited eTlfMovil: TcxDBTextEdit
       Left = 538
-      Properties.Prefix = 'mailto:'
-      TabOrder = 15
+      TabOrder = 13
       ExplicitLeft = 538
-      ExplicitWidth = 129
-      Width = 129
+      ExplicitWidth = 155
+      Width = 155
     end
-    inherited eMailParticular: TcxDBHyperLinkEdit
+    inherited eFax: TcxDBTextEdit
       Left = 538
-      Properties.Prefix = 'mailto:'
-      TabOrder = 16
+      TabOrder = 14
       ExplicitLeft = 538
-      ExplicitWidth = 165
-      Width = 165
+      ExplicitWidth = 121
+      Width = 121
     end
-    object cbCategoria: TcxDBComboBox [18]
+    inherited eNombre: TcxDBTextEdit
+      Left = 121
+      ExplicitLeft = 121
+      ExplicitWidth = 263
+      Width = 263
+    end
+    object cbCategoria: TcxDBComboBox [15]
       Left = 121
       Top = 109
       DataBinding.DataField = 'CATEGORIA'
@@ -153,6 +139,28 @@ inherited frViewEmpleado: TfrViewEmpleado
       TabOrder = 5
       Width = 225
     end
+    inherited eNIFCIF: TcxDBTextEdit
+      Left = 255
+      ExplicitLeft = 255
+      ExplicitWidth = 100
+      Width = 100
+    end
+    inherited eMailTrabajo: TcxDBHyperLinkEdit
+      Left = 538
+      Properties.Prefix = 'mailto:'
+      TabOrder = 15
+      ExplicitLeft = 538
+      ExplicitWidth = 129
+      Width = 129
+    end
+    inherited eMailParticular: TcxDBHyperLinkEdit
+      Left = 538
+      Properties.Prefix = 'mailto:'
+      TabOrder = 16
+      ExplicitLeft = 538
+      ExplicitWidth = 165
+      Width = 165
+    end
     inherited ePaginaWeb: TcxDBHyperLinkEdit
       Left = 538
       TabOrder = 17
@@ -163,13 +171,17 @@ inherited frViewEmpleado: TfrViewEmpleado
     inherited eReferencia: TcxDBTextEdit
       Left = 121
       ExplicitLeft = 121
+      ExplicitWidth = 38
+      Width = 38
     end
     inherited ePersonaContacto: TcxDBTextEdit
       Left = 121
-      Top = 166
-      TabOrder = 6
+      Top = 247
+      TabOrder = 10
       ExplicitLeft = 121
-      ExplicitTop = 166
+      ExplicitTop = 247
+      ExplicitWidth = 256
+      Width = 256
     end
     inherited dxLayoutControlContactoGroup_Root: TdxLayoutGroup
       inherited dxLayoutControlContactoGroup9: TdxLayoutGroup
@@ -217,8 +229,11 @@ inherited frViewEmpleado: TfrViewEmpleado
         end
         inherited dxLayoutControlContactoGroup6: TdxLayoutGroup
           inherited dxLayoutControlContactoGroup2: TdxLayoutGroup
+            inherited dxLayoutControlContactoItem10: TdxLayoutItem
+              Caption = 'Tlf. trabajo:'
+            end
             inherited dxLayoutControlContactoItem9: TdxLayoutItem
-              Visible = True
+              Caption = 'Tlf. particular:'
             end
             inherited dxLayoutControlContactoItem12: TdxLayoutItem
               Visible = False
diff --git a/Source/Modulos/Contactos/Views/uViewEmpleado.pas b/Source/Modulos/Contactos/Views/uViewEmpleado.pas
index af7814bf..7677e0b9 100644
--- a/Source/Modulos/Contactos/Views/uViewEmpleado.pas
+++ b/Source/Modulos/Contactos/Views/uViewEmpleado.pas
@@ -7,7 +7,8 @@ uses
   Dialogs, uViewContacto, dxLayoutLookAndFeels, DB, uDADataTable,
   dxLayoutControl, cxMemo, cxDBEdit, cxContainer, cxEdit, cxTextEdit, cxControls,
   cxMaskEdit, cxSpinEdit, ImgList, PngImageList, ActnList, cxHyperLinkEdit,
-  Buttons, PngSpeedButton, cxDropDownEdit, cxCalendar, cxGraphics, uGruposEmpleadoController;
+  Buttons, PngSpeedButton, cxDropDownEdit, cxCalendar, cxGraphics, uGruposEmpleadoController,
+  uDAInterfaces;
 
 type
   IViewEmpleado = interface(IViewContacto)
diff --git a/Source/Modulos/Contactos/Views/uViewProveedor.dfm b/Source/Modulos/Contactos/Views/uViewProveedor.dfm
index 8617c312..c013eed6 100644
--- a/Source/Modulos/Contactos/Views/uViewProveedor.dfm
+++ b/Source/Modulos/Contactos/Views/uViewProveedor.dfm
@@ -1,25 +1,28 @@
 inherited frViewProveedor: TfrViewProveedor
+  Width = 799
   Height = 454
   OnCreate = CustomViewCreate
   OnDestroy = CustomViewDestroy
+  ExplicitWidth = 799
   ExplicitHeight = 454
   inherited dxLayoutControlContacto: TdxLayoutControl
+    Width = 799
     Height = 454
     ExplicitHeight = 454
     inherited PngSpeedButton1: TPngSpeedButton
-      Left = 613
-      ExplicitLeft = 613
+      Left = 738
+      ExplicitLeft = 738
     end
     inherited PngSpeedButton2: TPngSpeedButton
-      Left = 613
-      ExplicitLeft = 613
+      Left = 738
+      ExplicitLeft = 738
     end
     inherited PngSpeedButton3: TPngSpeedButton
-      Left = 613
-      ExplicitLeft = 613
+      Left = 738
+      ExplicitLeft = 738
     end
     object Label1: TLabel [3]
-      Left = 370
+      Left = 438
       Top = 307
       Width = 342
       Height = 26
@@ -30,37 +33,37 @@ inherited frViewProveedor: TfrViewProveedor
     end
     inherited eCalle: TcxDBTextEdit
       Left = 134
-      Top = 304
-      TabOrder = 9
+      Top = 277
+      TabOrder = 8
       ExplicitLeft = 134
-      ExplicitTop = 304
+      ExplicitTop = 277
       ExplicitWidth = 264
       Width = 264
     end
     inherited eProvincia: TcxDBTextEdit
       Left = 134
-      Top = 358
-      TabOrder = 12
+      Top = 331
+      TabOrder = 11
       ExplicitLeft = 134
-      ExplicitTop = 358
+      ExplicitTop = 331
       ExplicitWidth = 264
       Width = 264
     end
     inherited ePoblacion: TcxDBTextEdit
       Left = 134
-      Top = 331
-      TabOrder = 10
+      Top = 304
+      TabOrder = 9
       ExplicitLeft = 134
-      ExplicitTop = 331
+      ExplicitTop = 304
       ExplicitWidth = 163
       Width = 163
     end
     inherited eCodigoPostal: TcxDBTextEdit
-      Left = 275
-      Top = 331
-      TabOrder = 11
-      ExplicitLeft = 275
-      ExplicitTop = 331
+      Left = 343
+      Top = 304
+      TabOrder = 10
+      ExplicitLeft = 343
+      ExplicitTop = 304
     end
     inherited eObservaciones: TcxDBMemo
       Top = 415
@@ -70,7 +73,7 @@ inherited frViewProveedor: TfrViewProveedor
       Height = 20
     end
     object cxDBCheckBox1: TcxDBCheckBox [9]
-      Left = 370
+      Left = 438
       Top = 280
       Caption = 'Incluir este proveedor en la tienda web'
       DataBinding.DataField = 'TIENDA_WEB'
@@ -200,30 +203,30 @@ inherited frViewProveedor: TfrViewProveedor
       Width = 221
     end
     inherited eTlfParticular: TcxDBTextEdit
-      Left = 465
+      Left = 533
       TabOrder = 14
-      ExplicitLeft = 465
+      ExplicitLeft = 533
       ExplicitWidth = 91
       Width = 91
     end
     inherited eTlfTrabajo: TcxDBTextEdit
-      Left = 465
+      Left = 533
       TabOrder = 13
-      ExplicitLeft = 465
+      ExplicitLeft = 533
       ExplicitWidth = 127
       Width = 127
     end
     inherited eTlfMovil: TcxDBTextEdit
-      Left = 465
+      Left = 533
       TabOrder = 15
-      ExplicitLeft = 465
+      ExplicitLeft = 533
       ExplicitWidth = 155
       Width = 155
     end
     inherited eFax: TcxDBTextEdit
-      Left = 465
+      Left = 533
       TabOrder = 16
-      ExplicitLeft = 465
+      ExplicitLeft = 533
       ExplicitWidth = 121
       Width = 121
     end
@@ -234,31 +237,31 @@ inherited frViewProveedor: TfrViewProveedor
       Width = 221
     end
     inherited eNIFCIF: TcxDBTextEdit
-      Left = 207
-      ExplicitLeft = 207
+      Left = 217
+      ExplicitLeft = 217
       ExplicitWidth = 205
       Width = 205
     end
     inherited eMailTrabajo: TcxDBHyperLinkEdit
-      Left = 465
+      Left = 533
       Properties.Prefix = 'mailto:'
       TabOrder = 17
-      ExplicitLeft = 465
+      ExplicitLeft = 533
       ExplicitWidth = 133
       Width = 133
     end
     inherited eMailParticular: TcxDBHyperLinkEdit
-      Left = 465
+      Left = 533
       Properties.Prefix = 'mailto:'
       TabOrder = 18
-      ExplicitLeft = 465
+      ExplicitLeft = 533
       ExplicitWidth = 133
       Width = 133
     end
     inherited ePaginaWeb: TcxDBHyperLinkEdit
-      Left = 465
+      Left = 533
       TabOrder = 19
-      ExplicitLeft = 465
+      ExplicitLeft = 533
       ExplicitWidth = 133
       Width = 133
     end
@@ -270,10 +273,10 @@ inherited frViewProveedor: TfrViewProveedor
     end
     inherited ePersonaContacto: TcxDBTextEdit
       Left = 134
-      Top = 277
-      TabOrder = 8
+      Top = 358
+      TabOrder = 12
       ExplicitLeft = 134
-      ExplicitTop = 277
+      ExplicitTop = 358
       ExplicitWidth = 256
       Width = 256
     end
diff --git a/Source/Modulos/Contactos/Views/uViewProveedores.dfm b/Source/Modulos/Contactos/Views/uViewProveedores.dfm
index 37730c25..d95a3fce 100644
--- a/Source/Modulos/Contactos/Views/uViewProveedores.dfm
+++ b/Source/Modulos/Contactos/Views/uViewProveedores.dfm
@@ -51,8 +51,8 @@ inherited frViewProveedores: TfrViewProveedores
         Width = 483
         ExplicitWidth = 483
         inherited edtFechaFinFiltro: TcxDateEdit
-          ExplicitWidth = 206
-          Width = 206
+          ExplicitWidth = 228
+          Width = 228
         end
       end
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel