diff --git a/Source/ApplicationBase/ApplicationBase.dproj b/Source/ApplicationBase/ApplicationBase.dproj
index 462eab2b..f81fd44d 100644
--- a/Source/ApplicationBase/ApplicationBase.dproj
+++ b/Source/ApplicationBase/ApplicationBase.dproj
@@ -46,13 +46,6 @@
     <Borland.ProjectType>Package</Borland.ProjectType>
     <BorlandProject>
 <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">True</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
-      
-      
-      
-      
-      
-      
-      
       <Excluded_Packages Name="$(BDS)\Bin\dclintraweb_90_100.bpl">VCL for the Web Design Package for CodeGear RAD Studio</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages>
@@ -67,12 +60,12 @@
     <DelphiCompile Include="ApplicationBase.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\Base.dcp" />
-    <DCCReference Include="..\dbrtl.dcp" />
-    <DCCReference Include="..\GUIBase.dcp" />
-    <DCCReference Include="..\JvJansD11R.dcp" />
-    <DCCReference Include="..\rtl.dcp" />
-    <DCCReference Include="..\vcl.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Base.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\dbrtl.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\GUIBase.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\JvJansD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\rtl.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\vcl.dcp" />
     <DCCReference Include="Ejercicios\Controller\uEjerciciosController.pas" />
     <DCCReference Include="Ejercicios\Controller\View\uIEditorEjercicio.pas" />
     <DCCReference Include="Ejercicios\Controller\View\uIEditorEjercicios.pas" />
diff --git a/Source/ApplicationBase/ApplicationBase.res b/Source/ApplicationBase/ApplicationBase.res
index 8b251f31..1641339f 100644
Binary files a/Source/ApplicationBase/ApplicationBase.res and b/Source/ApplicationBase/ApplicationBase.res differ
diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj
index cd75ef1b..50c04110 100644
--- a/Source/Base/Base.dproj
+++ b/Source/Base/Base.dproj
@@ -44,13 +44,6 @@
     <Borland.ProjectType>Package</Borland.ProjectType>
     <BorlandProject>
 <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="PackageDescription">Libreria base de FactuGES</Package_Options><Package_Options Name="ImplicitBuild">True</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
-      
-      
-      
-      
-      
-      
-      
       <Excluded_Packages Name="$(BDS)\Bin\dclintraweb_90_100.bpl">VCL for the Web Design Package for CodeGear RAD Studio</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages>
@@ -65,6 +58,47 @@
     <DelphiCompile Include="Base.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
+    <DCCReference Include="..\Modulos\Contactos\adortl.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\cxIntl6D11.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\cxIntlPrintSys3D11.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\dbrtl.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\dclIndyCore.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\designide.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\dsnap.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\GUISDK_D11.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\IndyCore.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\IndyProtocols.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\IndySystem.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Jcl.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\JclVcl.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\JSDialog100.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\JvCmpD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\JvCoreD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\JvCtrlsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\JvDlgsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\JvMMD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\JvNetD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\JvPageCompsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\JvSystemD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\pckMD5.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\pckUCDataConnector.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\pckUserControl_RT.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\PluginSDK_D10R.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\PngComponentsD10.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\PNG_D10.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\rtl.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\TB2k_D10.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\tbx_d10.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\vcl.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\vclactnband.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\vcldb.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\vcljpg.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\VclSmp.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\vclx.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\xmlrtl.dcp" />
     <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
     <DCCReference Include="Conexion\uConfigurarConexion.pas">
       <Form>fConfigurarConexion</Form>
@@ -89,44 +123,10 @@
       <Form>dmBase</Form>
       <DesignClass>TDataModule</DesignClass>
     </DCCReference>
-    <DCCReference Include="Utiles\adortl.dcp" />
     <DCCReference Include="Utiles\ClassRegistry\uClassRegistryUtils.pas" />
     <DCCReference Include="Utiles\ClassRegistry\uEditorRegistryUtils.pas" />
     <DCCReference Include="Utiles\ClassRegistry\uInformeRegistryUtils.pas" />
     <DCCReference Include="Utiles\ClassRegistry\uViewRegistryUtils.pas" />
-    <DCCReference Include="Utiles\cxIntl6D11.dcp" />
-    <DCCReference Include="Utiles\cxIntlPrintSys3D11.dcp" />
-    <DCCReference Include="Utiles\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="Utiles\dbrtl.dcp" />
-    <DCCReference Include="Utiles\dclIndyCore.dcp" />
-    <DCCReference Include="Utiles\designide.dcp" />
-    <DCCReference Include="Utiles\dsnap.dcp" />
-    <DCCReference Include="Utiles\GUISDK_D11.dcp" />
-    <DCCReference Include="Utiles\IndyCore.dcp" />
-    <DCCReference Include="Utiles\IndyProtocols.dcp" />
-    <DCCReference Include="Utiles\IndySystem.dcp" />
-    <DCCReference Include="Utiles\Jcl.dcp" />
-    <DCCReference Include="Utiles\JclVcl.dcp" />
-    <DCCReference Include="Utiles\JSDialog100.dcp" />
-    <DCCReference Include="Utiles\JvCmpD11R.dcp" />
-    <DCCReference Include="Utiles\JvCoreD11R.dcp" />
-    <DCCReference Include="Utiles\JvCtrlsD11R.dcp" />
-    <DCCReference Include="Utiles\JvDlgsD11R.dcp" />
-    <DCCReference Include="Utiles\JvMMD11R.dcp" />
-    <DCCReference Include="Utiles\JvNetD11R.dcp" />
-    <DCCReference Include="Utiles\JvPageCompsD11R.dcp" />
-    <DCCReference Include="Utiles\JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="Utiles\JvSystemD11R.dcp" />
-    <DCCReference Include="Utiles\pckMD5.dcp" />
-    <DCCReference Include="Utiles\pckUCDataConnector.dcp" />
-    <DCCReference Include="Utiles\pckUserControl_RT.dcp" />
-    <DCCReference Include="Utiles\PluginSDK_D10R.dcp" />
-    <DCCReference Include="Utiles\PngComponentsD10.dcp" />
-    <DCCReference Include="Utiles\PNG_D10.dcp" />
-    <DCCReference Include="Utiles\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="Utiles\rtl.dcp" />
-    <DCCReference Include="Utiles\TB2k_D10.dcp" />
-    <DCCReference Include="Utiles\tbx_d10.dcp" />
     <DCCReference Include="Utiles\uCalculosUtils.pas" />
     <DCCReference Include="Utiles\uDataTableUtils.pas" />
     <DCCReference Include="Utiles\uDateUtils.pas" />
@@ -140,13 +140,6 @@
     <DCCReference Include="Utiles\uPasswordUtils.pas" />
     <DCCReference Include="Utiles\uSistemaFunc.pas" />
     <DCCReference Include="Utiles\uStringsUtils.pas" />
-    <DCCReference Include="Utiles\vcl.dcp" />
-    <DCCReference Include="Utiles\vclactnband.dcp" />
-    <DCCReference Include="Utiles\vcldb.dcp" />
-    <DCCReference Include="Utiles\vcljpg.dcp" />
-    <DCCReference Include="Utiles\VclSmp.dcp" />
-    <DCCReference Include="Utiles\vclx.dcp" />
-    <DCCReference Include="Utiles\xmlrtl.dcp" />
   </ItemGroup>
 </Project>
 <!-- EurekaLog First Line
diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj
index fdb45e7a..cc0edfd5 100644
--- a/Source/GUIBase/GUIBase.dproj
+++ b/Source/GUIBase/GUIBase.dproj
@@ -57,21 +57,23 @@
     <DelphiCompile Include="GUIBase.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="Base.dcp" />
-    <DCCReference Include="dbrtl.dcp" />
-    <DCCReference Include="dxBarD11.dcp" />
-    <DCCReference Include="dxBarExtItemsD11.dcp" />
-    <DCCReference Include="dxLayoutControlD11.dcp" />
-    <DCCReference Include="dxPScxCommonD11.dcp" />
-    <DCCReference Include="dxPScxGrid6LnkD11.dcp" />
-    <DCCReference Include="dxPsPrVwAdvD11.dcp" />
-    <DCCReference Include="frx11.dcp" />
-    <DCCReference Include="frxe11.dcp" />
-    <DCCReference Include="fs11.dcp" />
-    <DCCReference Include="JvAppFrmD11R.dcp" />
-    <DCCReference Include="JvCtrlsD11R.dcp" />
-    <DCCReference Include="JvGlobusD11R.dcp" />
-    <DCCReference Include="rtl.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Base.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\dbrtl.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\dxBarD11.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\dxBarExtItemsD11.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\dxLayoutControlD11.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\dxPScxCommonD11.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\dxPScxGrid6LnkD11.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\dxPsPrVwAdvD11.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\frx11.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\frxe11.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\fs11.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\JvAppFrmD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\JvCtrlsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\JvGlobusD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\rtl.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\vcl.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\vcldb.dcp" />
     <DCCReference Include="uDialogBase.pas">
       <Form>fDialogBase</Form>
     </DCCReference>
@@ -158,8 +160,6 @@
       <Form>frViewTotales</Form>
       <DesignClass>TFrame</DesignClass>
     </DCCReference>
-    <DCCReference Include="vcl.dcp" />
-    <DCCReference Include="vcldb.dcp" />
   </ItemGroup>
 </Project>
 <!-- EurekaLog First Line
diff --git a/Source/GUIBase/GUIBase.res b/Source/GUIBase/GUIBase.res
index 8b251f31..1641339f 100644
Binary files a/Source/GUIBase/GUIBase.res and b/Source/GUIBase/GUIBase.res differ
diff --git a/Source/Modulos/Contactos/Plugin/uPluginContactos.dfm b/Source/Modulos/Contactos/Plugin/uPluginContactos.dfm
index de76d419..2309c757 100644
--- a/Source/Modulos/Contactos/Plugin/uPluginContactos.dfm
+++ b/Source/Modulos/Contactos/Plugin/uPluginContactos.dfm
@@ -278,8 +278,8 @@ object PluginContactos: TPluginContactos
       OnExecute = actProveedoresExecute
     end
     object actEmpleados: TAction
-      Category = 'Ventas'
-      Caption = 'Empleados'
+      Category = 'Empresa'
+      Caption = 'Vendedores'
       ImageIndex = 2
       OnExecute = actEmpleadosExecute
     end
@@ -308,8 +308,17 @@ object PluginContactos: TPluginContactos
     Images = SmallImages
     Left = 40
     Top = 16
+    object Empresas1: TMenuItem
+      Caption = 'Empresa'
+      object Vendedores1: TMenuItem
+        Tag = 102
+        Action = actEmpleados
+        SubMenuImages = SmallImages
+      end
+    end
     object Da1: TMenuItem
       Caption = 'Datos'
+      GroupIndex = 1
       object Gruposdeproveedor1: TMenuItem
         Tag = 101
         Action = actGruposProveedor
@@ -348,11 +357,6 @@ object PluginContactos: TPluginContactos
         Action = actClientes
         SubMenuImages = SmallImages
       end
-      object Vendedores1: TMenuItem
-        Tag = 102
-        Action = actEmpleados
-        SubMenuImages = SmallImages
-      end
     end
   end
   object SmallImages: TPngImageList
diff --git a/Source/Modulos/Contactos/Plugin/uPluginContactos.pas b/Source/Modulos/Contactos/Plugin/uPluginContactos.pas
index 2205e2a2..0b42f9a4 100644
--- a/Source/Modulos/Contactos/Plugin/uPluginContactos.pas
+++ b/Source/Modulos/Contactos/Plugin/uPluginContactos.pas
@@ -34,6 +34,7 @@ type
     Da1: TMenuItem;
     actProcedenciasCliente: TAction;
     Procedenciasdecliente1: TMenuItem;
+    Empresas1: TMenuItem;
     procedure actClientesExecute(Sender: TObject);
     procedure actProveedoresExecute(Sender: TObject);
     procedure actEmpleadosExecute(Sender: TObject);
diff --git a/Source/Modulos/Contactos/Views/Contactos_view.dproj b/Source/Modulos/Contactos/Views/Contactos_view.dproj
index 02bc6fa5..98fdad74 100644
--- a/Source/Modulos/Contactos/Views/Contactos_view.dproj
+++ b/Source/Modulos/Contactos/Views/Contactos_view.dproj
@@ -49,31 +49,31 @@
     <DelphiCompile Include="Contactos_view.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\..\Contabilidad\adortl.dcp" />
-    <DCCReference Include="..\..\Contabilidad\ApplicationBase.dcp" />
-    <DCCReference Include="..\..\Contabilidad\Base.dcp" />
-    <DCCReference Include="..\..\Contabilidad\ccpackD11.dcp" />
-    <DCCReference Include="..\..\Contabilidad\cfpack_d11.dcp" />
-    <DCCReference Include="..\..\Contabilidad\Contactos_controller.dcp" />
-    <DCCReference Include="..\..\Contabilidad\Contactos_model.dcp" />
-    <DCCReference Include="..\..\Contabilidad\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="..\..\Contabilidad\dbrtl.dcp" />
-    <DCCReference Include="..\..\Contabilidad\designide.dcp" />
-    <DCCReference Include="..\..\Contabilidad\dsnap.dcp" />
-    <DCCReference Include="..\..\Contabilidad\FormasPago_controller.dcp" />
-    <DCCReference Include="..\..\Contabilidad\FormasPago_model.dcp" />
-    <DCCReference Include="..\..\Contabilidad\GUIBase.dcp" />
-    <DCCReference Include="..\..\Contabilidad\GUISDK_D11.dcp" />
-    <DCCReference Include="..\..\Contabilidad\JvGlobusD11R.dcp" />
-    <DCCReference Include="..\..\Contabilidad\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="..\..\Contabilidad\rtl.dcp" />
-    <DCCReference Include="..\..\Contabilidad\TiposIVA_controller.dcp" />
-    <DCCReference Include="..\..\Contabilidad\TiposIVA_model.dcp" />
-    <DCCReference Include="..\..\Contabilidad\vcl.dcp" />
-    <DCCReference Include="..\..\Contabilidad\vclactnband.dcp" />
-    <DCCReference Include="..\..\Contabilidad\vcldb.dcp" />
-    <DCCReference Include="..\..\Contabilidad\vclx.dcp" />
-    <DCCReference Include="..\..\Contabilidad\xmlrtl.dcp" />
+    <DCCReference Include="..\adortl.dcp" />
+    <DCCReference Include="..\ApplicationBase.dcp" />
+    <DCCReference Include="..\Base.dcp" />
+    <DCCReference Include="..\ccpackD11.dcp" />
+    <DCCReference Include="..\cfpack_d11.dcp" />
+    <DCCReference Include="..\Contactos_controller.dcp" />
+    <DCCReference Include="..\Contactos_model.dcp" />
+    <DCCReference Include="..\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="..\dbrtl.dcp" />
+    <DCCReference Include="..\designide.dcp" />
+    <DCCReference Include="..\dsnap.dcp" />
+    <DCCReference Include="..\FormasPago_controller.dcp" />
+    <DCCReference Include="..\FormasPago_model.dcp" />
+    <DCCReference Include="..\GUIBase.dcp" />
+    <DCCReference Include="..\GUISDK_D11.dcp" />
+    <DCCReference Include="..\JvGlobusD11R.dcp" />
+    <DCCReference Include="..\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="..\rtl.dcp" />
+    <DCCReference Include="..\TiposIVA_controller.dcp" />
+    <DCCReference Include="..\TiposIVA_model.dcp" />
+    <DCCReference Include="..\vcl.dcp" />
+    <DCCReference Include="..\vclactnband.dcp" />
+    <DCCReference Include="..\vcldb.dcp" />
+    <DCCReference Include="..\vclx.dcp" />
+    <DCCReference Include="..\xmlrtl.dcp" />
     <DCCReference Include="uContactosViewRegister.pas" />
     <DCCReference Include="uEditorCliente.pas">
       <Form>fEditorCliente</Form>
diff --git a/Source/Modulos/Contactos/Views/Contactos_view.res b/Source/Modulos/Contactos/Views/Contactos_view.res
index 8b251f31..1641339f 100644
Binary files a/Source/Modulos/Contactos/Views/Contactos_view.res and b/Source/Modulos/Contactos/Views/Contactos_view.res differ
diff --git a/Source/Modulos/Contactos/Views/uEditorCliente.dfm b/Source/Modulos/Contactos/Views/uEditorCliente.dfm
index 62fde08a..08dab8af 100644
--- a/Source/Modulos/Contactos/Views/uEditorCliente.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorCliente.dfm
@@ -2,18 +2,18 @@ inherited fEditorCliente: TfEditorCliente
   Left = 387
   Top = 297
   Caption = 'Ficha de cliente'
-  ClientHeight = 585
-  ClientWidth = 656
-  ExplicitWidth = 664
-  ExplicitHeight = 612
+  ClientHeight = 645
+  ClientWidth = 896
+  ExplicitWidth = 904
+  ExplicitHeight = 679
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
-    Width = 656
+    Width = 896
     Caption = 'Ficha de cliente'
     ExplicitWidth = 656
     inherited Image1: TImage
-      Left = 629
+      Left = 869
       Picture.Data = {
         0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800
         0000180806000000E0773DF80000000970485973000017120000171201679FD2
@@ -49,7 +49,7 @@ inherited fEditorCliente: TfEditorCliente
     end
   end
   inherited TBXDock: TTBXDock
-    Width = 656
+    Width = 896
     ExplicitWidth = 656
     inherited tbxMain: TTBXToolbar
       ExplicitWidth = 446
@@ -59,14 +59,12 @@ inherited fEditorCliente: TfEditorCliente
       end
     end
     inherited tbxMenu: TTBXToolbar
-      ExplicitWidth = 656
+      ExplicitWidth = 896
     end
   end
   inherited pgPaginas: TPageControl
-    Width = 650
-    Height = 484
-    ExplicitLeft = 3
-    ExplicitTop = 79
+    Width = 890
+    Height = 544
     ExplicitWidth = 650
     ExplicitHeight = 484
     inherited pagGeneral: TTabSheet
@@ -75,8 +73,8 @@ inherited fEditorCliente: TfEditorCliente
       inline frViewCliente1: TfrViewCliente
         Left = 0
         Top = 0
-        Width = 642
-        Height = 456
+        Width = 882
+        Height = 516
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -89,64 +87,64 @@ inherited fEditorCliente: TfEditorCliente
         ExplicitWidth = 642
         ExplicitHeight = 456
         inherited dxLayoutControlContacto: TdxLayoutControl
-          Width = 642
-          Height = 456
+          Width = 882
+          Height = 516
           LookAndFeel = dxLayoutOfficeLookAndFeel
           ExplicitWidth = 642
           ExplicitHeight = 456
           inherited PngSpeedButton1: TPngSpeedButton
-            Left = 581
+            Left = 837
             Top = 218
-            ExplicitLeft = 581
+            ExplicitLeft = 837
             ExplicitTop = 218
           end
           inherited PngSpeedButton2: TPngSpeedButton
-            Left = 581
+            Left = 837
             Top = 190
-            ExplicitLeft = 581
+            ExplicitLeft = 837
             ExplicitTop = 190
           end
           inherited PngSpeedButton3: TPngSpeedButton
-            Left = 581
+            Left = 837
             Top = 162
-            ExplicitLeft = 581
+            ExplicitLeft = 837
             ExplicitTop = 162
           end
           inherited Label1: TLabel
-            Left = 390
-            Top = 342
+            Left = 586
+            Top = 352
             Width = 269
-            ExplicitLeft = 390
-            ExplicitTop = 342
+            ExplicitLeft = 586
+            ExplicitTop = 352
             ExplicitWidth = 269
           end
           inherited eCalle: TcxDBTextEdit
-            Top = 295
-            ExplicitTop = 295
+            Top = 280
+            ExplicitTop = 280
             ExplicitWidth = 268
             Width = 268
           end
           inherited eProvincia: TcxDBTextEdit
-            Top = 349
-            ExplicitTop = 349
+            Top = 334
+            ExplicitTop = 334
             ExplicitWidth = 268
             Width = 268
           end
           inherited ePoblacion: TcxDBTextEdit
-            Top = 322
-            ExplicitTop = 322
+            Top = 307
+            ExplicitTop = 307
             ExplicitWidth = 78
             Width = 78
           end
           inherited eCodigoPostal: TcxDBTextEdit
-            Left = 297
-            Top = 322
-            ExplicitLeft = 297
-            ExplicitTop = 322
+            Left = 493
+            Top = 307
+            ExplicitLeft = 493
+            ExplicitTop = 307
           end
           inherited eObservaciones: TcxDBMemo
-            Top = 451
-            ExplicitTop = 451
+            Top = 463
+            ExplicitTop = 463
             ExplicitWidth = 587
             ExplicitHeight = 33
             Height = 33
@@ -159,8 +157,8 @@ inherited fEditorCliente: TfEditorCliente
             Width = 265
           end
           inherited cbClienteBloqueado: TcxDBCheckBox
-            Top = 400
-            ExplicitTop = 400
+            Top = 385
+            ExplicitTop = 385
             ExplicitWidth = 163
             Width = 163
           end
@@ -171,19 +169,18 @@ inherited fEditorCliente: TfEditorCliente
             Width = 40
           end
           inherited eBloqueo: TcxDBTextEdit
-            Top = 348
-            ExplicitTop = 348
+            Top = 412
+            ExplicitTop = 412
             ExplicitWidth = 205
             Width = 205
           end
           inherited cxDBCheckBox1: TcxDBCheckBox
-            Left = 390
-            Top = 387
-            ExplicitLeft = 390
-            ExplicitTop = 387
-            ExplicitWidth = 214
-            ExplicitHeight = 34
-            Width = 214
+            Left = 586
+            Top = 397
+            ExplicitLeft = 586
+            ExplicitTop = 397
+            ExplicitWidth = 272
+            Width = 272
           end
           inherited eCodigoAsignado: TcxDBTextEdit
             Top = 111
@@ -191,34 +188,40 @@ inherited fEditorCliente: TfEditorCliente
             ExplicitWidth = 227
             Width = 227
           end
+          inherited cbProcedenciaCliente: TcxDBComboBox
+            Top = 165
+            ExplicitTop = 165
+            ExplicitWidth = 211
+            Width = 211
+          end
           inherited eTlfParticular: TcxDBTextEdit
-            Left = 485
+            Left = 681
             Top = 57
-            ExplicitLeft = 485
+            ExplicitLeft = 681
             ExplicitTop = 57
             ExplicitWidth = 91
             Width = 91
           end
           inherited eTlfTrabajo: TcxDBTextEdit
-            Left = 485
+            Left = 681
             Top = 30
-            ExplicitLeft = 485
+            ExplicitLeft = 681
             ExplicitTop = 30
             ExplicitWidth = 127
             Width = 127
           end
           inherited eTlfMovil: TcxDBTextEdit
-            Left = 485
+            Left = 681
             Top = 84
-            ExplicitLeft = 485
+            ExplicitLeft = 681
             ExplicitTop = 84
             ExplicitWidth = 157
             Width = 157
           end
           inherited eFax: TcxDBTextEdit
-            Left = 485
+            Left = 681
             Top = 111
-            ExplicitLeft = 485
+            ExplicitLeft = 681
             ExplicitTop = 111
             ExplicitWidth = 121
             Width = 121
@@ -229,42 +232,36 @@ inherited fEditorCliente: TfEditorCliente
             ExplicitWidth = 158
             Width = 158
           end
-          inherited cbProcedenciaCliente: TcxDBComboBox
-            Top = 165
-            ExplicitTop = 165
-            ExplicitWidth = 211
-            Width = 211
-          end
           inherited eNIFCIF: TcxDBTextEdit
-            Left = 209
+            Left = 288
             Top = 30
-            ExplicitLeft = 209
+            ExplicitLeft = 288
             ExplicitTop = 30
             ExplicitWidth = 268
             Width = 268
           end
           inherited eMailTrabajo: TcxDBHyperLinkEdit
-            Left = 485
+            Left = 681
             Top = 162
             Properties.Prefix = 'mailto:'
-            ExplicitLeft = 485
+            ExplicitLeft = 681
             ExplicitTop = 162
             ExplicitWidth = 121
             Width = 121
           end
           inherited eMailParticular: TcxDBHyperLinkEdit
-            Left = 485
+            Left = 681
             Top = 190
             Properties.Prefix = 'mailto:'
-            ExplicitLeft = 485
+            ExplicitLeft = 681
             ExplicitTop = 190
             ExplicitWidth = 121
             Width = 121
           end
           inherited ePaginaWeb: TcxDBHyperLinkEdit
-            Left = 485
+            Left = 681
             Top = 217
-            ExplicitLeft = 485
+            ExplicitLeft = 681
             ExplicitTop = 217
             ExplicitWidth = 121
             Width = 121
@@ -276,13 +273,24 @@ inherited fEditorCliente: TfEditorCliente
             Width = 102
           end
           inherited ePersonaContacto: TcxDBTextEdit
-            Top = 268
-            ExplicitTop = 268
+            Top = 253
+            ExplicitTop = 253
             ExplicitWidth = 253
             Width = 253
           end
           inherited frViewTienda1: TfrViewTienda
-
+            Left = 586
+            Top = 270
+            ExplicitLeft = 586
+            ExplicitTop = 270
+            inherited dxLayoutControl1: TdxLayoutControl
+              ExplicitWidth = 270
+              inherited cbTienda: TcxDBComboBox
+                DataBinding.DataSource = frViewCliente1.dsContacto
+                ExplicitWidth = 412
+                Width = 412
+              end
+            end
           end
         end
         inherited dsContacto: TDADataSource
@@ -295,12 +303,12 @@ inherited fEditorCliente: TfEditorCliente
       ExplicitWidth = 642
       ExplicitHeight = 456
       inherited frViewClienteDatosBancarios: TfrViewClienteDatosBancarios
-        Width = 642
-        Height = 456
+        Width = 882
+        Height = 516
         ExplicitWidth = 642
         ExplicitHeight = 456
         inherited dxLayoutControl1: TdxLayoutControl
-          Width = 642
+          Width = 882
           LookAndFeel = dxLayoutOfficeLookAndFeel
           ExplicitWidth = 642
           inherited eEntidad: TcxDBTextEdit
@@ -308,8 +316,8 @@ inherited fEditorCliente: TfEditorCliente
             Width = 114
           end
           inherited eSucursal: TcxDBTextEdit
-            Left = 415
-            ExplicitLeft = 415
+            Left = 542
+            ExplicitLeft = 542
             ExplicitWidth = 112
             Width = 112
           end
@@ -327,10 +335,12 @@ inherited fEditorCliente: TfEditorCliente
     object pagDatosComerciales: TTabSheet
       Caption = 'Datos comerciales'
       ImageIndex = 4
+      ExplicitWidth = 642
+      ExplicitHeight = 456
       inline frViewClienteDatosComerciales1: TfrViewClienteDatosComerciales
         Left = 0
         Top = 0
-        Width = 642
+        Width = 882
         Height = 193
         Align = alTop
         Font.Charset = DEFAULT_CHARSET
@@ -344,24 +354,24 @@ inherited fEditorCliente: TfEditorCliente
         ExplicitWidth = 642
         ExplicitHeight = 193
         inherited dxLayoutControl1: TdxLayoutControl
-          Width = 642
+          Width = 882
           LookAndFeel = dxLayoutOfficeLookAndFeel
           ExplicitWidth = 642
           inherited Label1: TLabel
-            Left = 334
+            Left = 492
             Top = 30
             Width = 281
             Caption = 
               'Puede indicar el d'#237'a del mes que el cliente desea realizar el pa' +
               'go de sus recibos.'
-            ExplicitLeft = 334
+            ExplicitLeft = 492
             ExplicitTop = 30
             ExplicitWidth = 281
           end
           inherited eDiasVencimiento: TcxDBSpinEdit
-            Left = 460
+            Left = 618
             Top = 62
-            ExplicitLeft = 460
+            ExplicitLeft = 618
             ExplicitTop = 62
             ExplicitWidth = 160
             Width = 160
@@ -385,9 +395,9 @@ inherited fEditorCliente: TfEditorCliente
             Width = 121
           end
           inherited bFormasPago: TButton
-            Left = 174
+            Left = 332
             Top = 57
-            ExplicitLeft = 174
+            ExplicitLeft = 332
             ExplicitTop = 57
           end
           inherited eIVA: TcxDBLookupComboBox
@@ -397,9 +407,9 @@ inherited fEditorCliente: TfEditorCliente
             Width = 121
           end
           inherited bTiposIVA: TButton
-            Left = 174
+            Left = 332
             Top = 84
-            ExplicitLeft = 174
+            ExplicitLeft = 332
             ExplicitTop = 84
           end
           inherited dxLayoutGroup1: TdxLayoutGroup
@@ -415,11 +425,13 @@ inherited fEditorCliente: TfEditorCliente
     object pagDirecciones: TTabSheet
       Caption = 'Direcciones'
       ImageIndex = 1
+      ExplicitWidth = 642
+      ExplicitHeight = 456
       inline frViewDireccionesEntrega1: TfrViewDireccionesEntrega
         Left = 0
         Top = 0
-        Width = 642
-        Height = 456
+        Width = 882
+        Height = 516
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -432,8 +444,8 @@ inherited fEditorCliente: TfEditorCliente
         ExplicitWidth = 642
         ExplicitHeight = 456
         inherited cxGrid: TcxGrid
-          Width = 642
-          Height = 431
+          Width = 882
+          Height = 491
           ExplicitWidth = 642
           ExplicitHeight = 431
           inherited cxGridView: TcxGridDBTableView
@@ -444,7 +456,7 @@ inherited fEditorCliente: TfEditorCliente
           end
         end
         inherited ToolBar1: TToolBar
-          Width = 642
+          Width = 882
           ExplicitWidth = 642
         end
       end
@@ -453,11 +465,13 @@ inherited fEditorCliente: TfEditorCliente
       Caption = 'Descuentos'
       ImageIndex = 2
       TabVisible = False
+      ExplicitWidth = 642
+      ExplicitHeight = 456
       inline frViewClienteDescuentos1: TfrViewClienteDescuentos
         Left = 0
         Top = 0
-        Width = 642
-        Height = 456
+        Width = 882
+        Height = 516
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -470,13 +484,13 @@ inherited fEditorCliente: TfEditorCliente
         ExplicitWidth = 642
         ExplicitHeight = 456
         inherited cxGrid: TcxGrid
-          Width = 642
-          Height = 431
+          Width = 882
+          Height = 491
           ExplicitWidth = 642
           ExplicitHeight = 431
         end
         inherited ToolBar1: TToolBar
-          Width = 642
+          Width = 882
           ExplicitWidth = 642
           inherited ToolButton1: TToolButton
             Top = 0
@@ -512,11 +526,13 @@ inherited fEditorCliente: TfEditorCliente
     object pagContabilidad: TTabSheet
       Caption = 'Contabilidad'
       ImageIndex = 5
+      ExplicitWidth = 642
+      ExplicitHeight = 456
       inline frViewSubCuentaContacto1: TfrViewSubCuentaContacto
         Left = 0
         Top = 0
-        Width = 642
-        Height = 456
+        Width = 882
+        Height = 516
         Align = alClient
         AutoSize = True
         Font.Charset = DEFAULT_CHARSET
@@ -530,8 +546,8 @@ inherited fEditorCliente: TfEditorCliente
         ExplicitWidth = 642
         ExplicitHeight = 456
         inherited layoutApunte: TdxLayoutControl
-          Width = 642
-          Height = 456
+          Width = 882
+          Height = 516
           ExplicitWidth = 642
           ExplicitHeight = 456
           inherited eRefSubCuenta: TcxDBTextEdit
@@ -539,20 +555,20 @@ inherited fEditorCliente: TfEditorCliente
             Width = 346
           end
           inherited BitBtn3: TBitBtn
-            Left = 300
-            ExplicitLeft = 300
+            Left = 540
+            ExplicitLeft = 540
           end
           inherited eSubCuenta: TcxDBTextEdit
             ExplicitWidth = 265
             Width = 265
           end
           inherited BitBtn1: TBitBtn
-            Left = 416
-            ExplicitLeft = 416
+            Left = 656
+            ExplicitLeft = 656
           end
           inherited BitBtn2: TBitBtn
-            Left = 542
-            ExplicitLeft = 542
+            Left = 782
+            ExplicitLeft = 782
           end
           inherited cbIgnorarContabilidad: TcxDBCheckBox
             DataBinding.DataSource = frViewCliente1.dsContacto
@@ -564,8 +580,8 @@ inherited fEditorCliente: TfEditorCliente
     end
   end
   inherited StatusBar: TJvStatusBar
-    Top = 566
-    Width = 656
+    Top = 626
+    Width = 896
     ExplicitTop = 566
     ExplicitWidth = 656
   end
diff --git a/Source/Modulos/Contactos/Views/uEditorContacto.dfm b/Source/Modulos/Contactos/Views/uEditorContacto.dfm
index 892c66d9..b6dd475e 100644
--- a/Source/Modulos/Contactos/Views/uEditorContacto.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorContacto.dfm
@@ -7,7 +7,7 @@ inherited fEditorContacto: TfEditorContacto
   ClientWidth = 632
   Scaled = False
   ExplicitWidth = 640
-  ExplicitHeight = 488
+  ExplicitHeight = 240
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
@@ -75,11 +75,15 @@ inherited fEditorContacto: TfEditorContacto
   end
   inherited pgPaginas: TPageControl
     Width = 626
-    ExplicitWidth = 632
+    ExplicitLeft = 3
+    ExplicitTop = 79
+    ExplicitWidth = 626
+    ExplicitHeight = 360
     inherited pagGeneral: TTabSheet
       ExplicitLeft = 4
       ExplicitTop = 24
-      ExplicitWidth = 624
+      ExplicitWidth = 618
+      ExplicitHeight = 332
     end
     object pagDatosBancarios: TTabSheet
       Caption = 'Datos bancarios'
diff --git a/Source/Modulos/Contactos/Views/uEditorContactos.dfm b/Source/Modulos/Contactos/Views/uEditorContactos.dfm
index c722fad7..895252bb 100644
--- a/Source/Modulos/Contactos/Views/uEditorContactos.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorContactos.dfm
@@ -2,8 +2,6 @@ inherited fEditorContactos: TfEditorContactos
   Left = 285
   Top = 448
   Caption = 'Lista de contactos'
-  ExplicitWidth = 320
-  ExplicitHeight = 471
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
diff --git a/Source/Modulos/Contactos/Views/uEditorEmpleado.dfm b/Source/Modulos/Contactos/Views/uEditorEmpleado.dfm
index 7cf338e6..91136fca 100644
--- a/Source/Modulos/Contactos/Views/uEditorEmpleado.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorEmpleado.dfm
@@ -58,18 +58,19 @@ inherited fEditorEmpleado: TfEditorEmpleado
     end
   end
   inherited pgPaginas: TPageControl
-    Width = 676
-    Height = 481
-    ExplicitWidth = 676
-    ExplicitHeight = 481
+    Width = 670
+    Height = 475
+    ActivePage = pagFormacion
+    ExplicitWidth = 670
+    ExplicitHeight = 475
     inherited pagGeneral: TTabSheet
-      ExplicitWidth = 668
-      ExplicitHeight = 453
+      ExplicitWidth = 662
+      ExplicitHeight = 447
       inline frViewEmpleado1: TfrViewEmpleado
         Left = 0
         Top = 0
-        Width = 668
-        Height = 453
+        Width = 662
+        Height = 447
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -79,92 +80,110 @@ inherited fEditorEmpleado: TfEditorEmpleado
         ParentFont = False
         TabOrder = 0
         ReadOnly = False
-        ExplicitWidth = 668
-        ExplicitHeight = 453
+        ExplicitWidth = 662
+        ExplicitHeight = 447
         inherited dxLayoutControlContacto: TdxLayoutControl
-          Width = 668
-          Height = 453
+          Width = 662
+          Height = 447
           LookAndFeel = dxLayoutOfficeLookAndFeel
-          ExplicitWidth = 668
-          ExplicitHeight = 453
+          ExplicitWidth = 662
+          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 = 189
-            ExplicitTop = 189
+            Top = 233
+            ExplicitTop = 233
             ExplicitWidth = 174
             Width = 174
           end
           inherited eProvincia: TcxDBTextEdit
-            Top = 243
-            ExplicitTop = 243
+            Top = 287
+            ExplicitTop = 287
             ExplicitWidth = 174
             Width = 174
           end
           inherited ePoblacion: TcxDBTextEdit
-            Top = 216
-            ExplicitTop = 216
+            Top = 260
+            ExplicitTop = 260
             ExplicitWidth = 108
             Width = 108
           end
           inherited eCodigoPostal: TcxDBTextEdit
-            Left = 312
-            Top = 216
-            ExplicitLeft = 312
-            ExplicitTop = 216
+            Left = 295
+            Top = 260
+            ExplicitLeft = 295
+            ExplicitTop = 260
           end
           inherited eObservaciones: TcxDBMemo
-            Top = 294
-            ExplicitTop = 294
-            ExplicitWidth = 185
-            ExplicitHeight = 148
-            Height = 148
-            Width = 185
+            Top = 338
+            ExplicitTop = 338
+            ExplicitWidth = 618
+            ExplicitHeight = 94
+            Height = 94
+            Width = 618
+          end
+          inherited eFechaNacimiento: TcxDBDateEdit
+            Top = 84
+            ExplicitTop = 84
+            ExplicitWidth = 80
+            Width = 80
+          end
+          inherited eFechaAltaEmpresa: TcxDBDateEdit
+            Top = 84
+            ExplicitTop = 84
+            ExplicitWidth = 80
+            Width = 80
+          end
+          inherited cbCategoria: TcxDBComboBox
+            Top = 111
+            ExplicitTop = 111
+            ExplicitWidth = 225
+            Width = 225
           end
           inherited eTlfParticular: TcxDBTextEdit
-            Left = 500
+            Left = 483
             Top = 57
-            ExplicitLeft = 500
+            ExplicitLeft = 483
             ExplicitTop = 57
             ExplicitWidth = 172
             Width = 172
           end
           inherited eTlfTrabajo: TcxDBTextEdit
-            Left = 500
+            Left = 483
             Top = 30
-            ExplicitLeft = 500
+            ExplicitLeft = 483
             ExplicitTop = 30
             ExplicitWidth = 172
             Width = 172
           end
           inherited eTlfMovil: TcxDBTextEdit
-            Left = 500
+            Left = 483
             Top = 84
-            ExplicitLeft = 500
+            ExplicitLeft = 483
             ExplicitTop = 84
             ExplicitWidth = 172
             Width = 172
           end
           inherited eFax: TcxDBTextEdit
-            Left = 500
+            Left = 483
             Top = 111
-            ExplicitLeft = 500
+            ExplicitLeft = 483
             ExplicitTop = 111
             ExplicitWidth = 172
             Width = 172
@@ -175,56 +194,36 @@ inherited fEditorEmpleado: TfEditorEmpleado
             ExplicitWidth = 263
             Width = 263
           end
-          inherited eFechaNacimiento: TcxDBDateEdit
-            Top = 84
-            ExplicitTop = 84
-            ExplicitWidth = 80
-            Width = 80
-          end
-          inherited eFechaAltaEmpresa: TcxDBDateEdit
-            Left = 290
-            Top = 84
-            ExplicitLeft = 290
-            ExplicitTop = 84
-            ExplicitWidth = 80
-            Width = 80
-          end
           inherited eNIFCIF: TcxDBTextEdit
-            Left = 219
+            Left = 211
             Top = 30
-            ExplicitLeft = 219
+            ExplicitLeft = 211
             ExplicitTop = 30
             ExplicitWidth = 194
             Width = 194
           end
           inherited eMailTrabajo: TcxDBHyperLinkEdit
-            Left = 500
+            Left = 483
             Top = 162
             Properties.Prefix = 'mailto:'
-            ExplicitLeft = 500
+            ExplicitLeft = 483
             ExplicitTop = 162
             ExplicitWidth = 129
             Width = 129
           end
           inherited eMailParticular: TcxDBHyperLinkEdit
-            Left = 500
+            Left = 483
             Top = 190
             Properties.Prefix = 'mailto:'
-            ExplicitLeft = 500
+            ExplicitLeft = 483
             ExplicitTop = 190
             ExplicitWidth = 165
             Width = 165
           end
-          inherited cbCategoria: TcxDBComboBox
-            Top = 111
-            ExplicitTop = 111
-            ExplicitWidth = 225
-            Width = 225
-          end
           inherited ePaginaWeb: TcxDBHyperLinkEdit
-            Left = 500
+            Left = 483
             Top = 217
-            ExplicitLeft = 500
+            ExplicitLeft = 483
             ExplicitTop = 217
             ExplicitWidth = 165
             Width = 165
@@ -236,11 +235,29 @@ inherited fEditorEmpleado: TfEditorEmpleado
             Width = 97
           end
           inherited ePersonaContacto: TcxDBTextEdit
-            Top = 162
-            ExplicitTop = 162
+            Top = 206
+            ExplicitTop = 206
             ExplicitWidth = 256
             Width = 256
           end
+          inherited frViewTienda1: TfrViewTienda
+            Left = 388
+            Top = 270
+            Width = 316
+            Height = 42
+            ExplicitLeft = 388
+            ExplicitTop = 270
+            ExplicitWidth = 316
+            ExplicitHeight = 42
+            inherited dxLayoutControl1: TdxLayoutControl
+              Width = 316
+              inherited cbTienda: TcxDBComboBox
+                DataBinding.DataSource = frViewEmpleado1.dsContacto
+                ExplicitWidth = 412
+                Width = 412
+              end
+            end
+          end
         end
         inherited dsContacto: TDADataSource
           Left = 8
@@ -249,24 +266,24 @@ inherited fEditorEmpleado: TfEditorEmpleado
       end
     end
     inherited pagDatosBancarios: TTabSheet
-      ExplicitWidth = 668
-      ExplicitHeight = 453
+      ExplicitWidth = 662
+      ExplicitHeight = 447
       inherited frViewClienteDatosBancarios: TfrViewClienteDatosBancarios
-        Width = 668
-        Height = 453
-        ExplicitWidth = 668
-        ExplicitHeight = 453
+        Width = 662
+        Height = 447
+        ExplicitWidth = 662
+        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
-            ExplicitLeft = 429
+            Left = 426
+            ExplicitLeft = 426
             ExplicitWidth = 112
             Width = 112
           end
@@ -287,8 +304,8 @@ inherited fEditorEmpleado: TfEditorEmpleado
       object dxLayoutControl1: TdxLayoutControl
         Left = 0
         Top = 0
-        Width = 668
-        Height = 453
+        Width = 662
+        Height = 447
         Align = alClient
         ParentBackground = True
         TabOrder = 0
@@ -317,7 +334,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
@@ -338,7 +355,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
@@ -404,8 +421,8 @@ inherited fEditorEmpleado: TfEditorEmpleado
       object dxLayoutControl2: TdxLayoutControl
         Left = 0
         Top = 0
-        Width = 668
-        Height = 453
+        Width = 662
+        Height = 447
         Align = alClient
         ParentBackground = True
         TabOrder = 0
diff --git a/Source/Modulos/Contactos/Views/uEditorEmpleado.pas b/Source/Modulos/Contactos/Views/uEditorEmpleado.pas
index b9fae393..28914646 100644
--- a/Source/Modulos/Contactos/Views/uEditorEmpleado.pas
+++ b/Source/Modulos/Contactos/Views/uEditorEmpleado.pas
@@ -1,4 +1,4 @@
-unit uEditorEmpleado;
+unit uEditorEmpleado;
 
 interface
 
@@ -11,7 +11,8 @@ uses
   uViewEmpleado, uBizContactos,
   uIEditorEmpleado, pngimage, TBXStatusBars, JvExComCtrls, JvStatusBar,
   uViewDetallesGenerico, uViewContactoDatosBancarios, dxLayoutLookAndFeels,
-  dxLayoutControl, cxContainer, cxEdit, cxTextEdit, cxMemo, cxDBEdit, cxControls;
+  dxLayoutControl, cxContainer, cxEdit, cxTextEdit, cxMemo, cxDBEdit, cxControls,
+  uDAInterfaces;
 
 type
   TfEditorEmpleado = class(TfEditorContacto, IEditorEmpleado)
@@ -72,11 +73,13 @@ constructor TfEditorEmpleado.Create(AOwner: TComponent);
 begin
   inherited;
   ViewContacto := frViewEmpleado1;
+  pagFormacion.TabVisible := False;
+  pagExperiencia.TabVisible := False;
 end;
 
 procedure TfEditorEmpleado.EliminarInterno;
 begin
-  if (ShowConfirmMessage('¿Desea borrar este empleado?', '') = IDYES) then
+  if (ShowConfirmMessage('¿Desea borrar este vendedor?', '') = IDYES) then
     inherited;
 end;
 
@@ -87,9 +90,9 @@ begin
   if Assigned(Contacto) then
   begin
     if Contacto.EsNuevo then
-      FTitulo := 'Nuevo empleado'
+      FTitulo := 'Nuevo vendedor'
     else
-      FTitulo := 'Empleado';
+      FTitulo := 'Vendedor';
   end;
 
   inherited PonerTitulos(FTitulo);
diff --git a/Source/Modulos/Contactos/Views/uEditorEmpleados.dfm b/Source/Modulos/Contactos/Views/uEditorEmpleados.dfm
index 6ce3831a..d412997d 100644
--- a/Source/Modulos/Contactos/Views/uEditorEmpleados.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorEmpleados.dfm
@@ -6,44 +6,47 @@ inherited fEditorEmpleados: TfEditorEmpleados
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
     Width = 786
-    Caption = 'Lista de empleados'
+    Caption = 'Lista de vendedores'
+    ExplicitWidth = 786
     inherited Image1: TImage
       Left = 759
       Picture.Data = {
         0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800
         0000180806000000E0773DF80000000970485973000017120000171201679FD2
-        520000000467414D410000AA11B57D14DC0000034D4944415478DADD957D6855
-        651CC73FF7E56CF7DEE962EA340397D96C0B97291B8AD95227EA086706460E47
-        6AA60B06C3B7966FC3AD482457D01441A13F842141232128288656B4ECC58992
-        F8C760E2CB9DB9DBBABBD773CFDD793F3DF7EA86977B74FDE1FEE9811FCF73CE
-        F39CEFE7FB3C3F7ECFF1388EC37836CFFF0370E6EC9571A1BC5E55E619058887
-        D10953FB87FE9E4F8986AF61990E534A5633B3BC2E4BC0B26C114EBA376C3136
-        EDF4D8B42D56ADDFCDE5AE93EE80F06FCDE8FDBDC4E2AA880449CB4771E5664A
-        17D4FE27F154FFEA862677C08DEE26D4F00D2C3B075956482492C88A829C8CB2
-        74E33166942E1B156FEA305C8F666775929AB7F6640394C805FA7E6C23191B16
-        C9F18BA50E92CF836EE8440623E43F534EE5FA638F749E0EDB61EDA6BDD980C1
-        BE4E6E9DEFC0D67D8482218239121E8490AAA12493F446C2BCF6DEEF6911DDB0
-        38D8E99EDC862A9975EFEC7707C4FEEC244008C92F097726866188D0D1348DDE
-        98CDCAFA2F31CD94E3945BEBBEFB7BCEEDD4CE847B438C6BEB9BB301F1F0AF44
-        2F9DC63B1CC3EB15DEC587E67D88ACA8DC9DFC0A15D58D638AA78EADAEE1A07B
-        926F751F47BBD92D8EDF2235770FA0138EFB99B5620F85452F8C299E7AB7B1B1
-        D51D702EDC43E287369E5455249164C334E8570C060BCAA858D0C053D3A78E29
-        9E9ADBB2FDC36C40D7A53B1C387599EBB13BAC29FB8275D38AB97D37CA277205
-        7FFD022BE7CCA069CB8B4CCE9B9216DADBF6B56B92B76FAA62DBAE8F3201739F
-        2FA2F5F38B745D88A048010AF306D85053C2CDDB71BE3D9FC0D182F8127FB364
-        DE04EAEBCA78FA89E919CE0D33F3D81ADE3F9C09D0FD797C70F467E2092FDAC4
-        49E83E93C2608C612B80AC4E2464EAF8E2830CE903AC7969162DDB96D17AF41B
-        D71DBC5B5B49E3BE8F33017D4370A8FD27F27373D14205E8B9134421A9A20EFC
-        E488AB30479591E428036A94E78AF339DDF206E648613DE07CA4D0761C389209
-        187682347FF63D9AA8626FA00033370F4792402CF6EA1A929E40518650BC1A35
-        8B4BD9F7F6620E9FF8CE75075BDF7C391B50BDA8848B57FB69FFAA873FAE5C4B
-        5F038EED495F171EC716209B40C124F66F9EC3FCA2E2873A1F695980E50B673F
-        F45E49BFB3467A7B4C7157C0D2F2671F9BB82BA0E550FB63FFA38D02C6B38D3B
-        E05FAF5B45FEC8107D9F0000000049454E44AE426082}
+        520000000467414D410000AA11B57D14DC0000034C4944415478DADD957D6855
+        651CC73FF76DF765BA983ACBC0596BB685CB940DA36CA50B75883303238723B7
+        4C170C86A62DDF865B9148ADC02982427F0863040D05C1A0185AD1B217274AD2
+        1F8349EA9DB9EBBCDEBB73CFDD793F3DF7EA46977B6CFDE1FEE9811FCF73CEF3
+        9CEFE7FB3C3F7ECF71D9B6CD5436D7FF0370EAEC9529A1BC5E55E69A00888789
+        0943BDC350FFE744C357310D9B59256B78A2BC2E4BC0342D1176BAD72D3136AC
+        F4D8B04C566DD8C9E5DEE3CE80F02FAD684303C4E28A880449D343716503A54B
+        6AFF9378AA5FBDB1C51970ADAF05257C0DD3CA419264128924922C2325A32CDB
+        7484B9A5CB27C45BBA74C7A379AF3A49CD5BBBB20172E40283DF77908C8D89E4
+        78C5521B9FC785A66B444622E43D594EE58623FFEA3C1D96CDBAFADDD98091C1
+        1E6E9CEFC2D23C84822182393E5C082145454E2619888479EDFD5FD3229A6EB2
+        BFC739B94D5512EBDFD9EB0C88FDDE4380103EAF4FB833D0755D8486AAAA0CC4
+        2C56367E8561A41CA7DC9AF7DDDF736EA57626DCEB625CDBD89A0D88877F267A
+        A91BF7580CB75B78171F1AF72192AC303AF3652AAA9B27154F1D5B5DD37EE724
+        DFE83B8A7ABD4F1CBF496AEE1E40231CF752B462170585CF4E2A9E7AB7A9B9DD
+        19702EDC4FE2BB0E1E53147C22C9BAA13324EB8CE49751B1A489C7E7CC9E543C
+        35B779DB47D980DE4BB7D877E2327FC66EB1B6EC4BD63F5ACCCDD1289F4915FC
+        F513AC5C309796CDCF313377565A6877C769C7246FABAF62EB8E8F33010B9F29
+        A4FD8B8BF45E8820FB0214E40EB3B1A684EB37E37C7D3E81AD06F1246EF3CAA2
+        6934D69531EF913919CE7523F3D89A3E389809D0BCB97C78F847E20937EAF419
+        681E8382600CC50C30AA4C27646878E32344B561D6BE5844DBD6E5B41F3EE3B8
+        83776B2B69DEF3492660F02E1CE8FC813CBF1F35948FE69F260A491175E02547
+        5C857E45C22B451956A23C5D9C4777DB1B18E385F50FE7E385B67DDFA7998031
+        3B48EBA16F514515BB03F918FE5C6C9F0FC4628FA6E2D512C8F25D64B74ACDD2
+        52F6BCBD9483C7BE71DCC196375FCA0654BF50C2C53F86E83CD9CF6F57AEA6AF
+        01DB72A5AF0B976D099045207F067B1B16B0B8B0F881CEC75B16E0D5E7E73FF0
+        5E49BF33C77B6B527147C0B2F2A71E9AB823A0ED40E743FFA34D00A6B24D39E0
+        6FAF6B45FE0D6316680000000049454E44AE426082}
+      ExplicitLeft = 759
     end
   end
   inherited TBXDock: TTBXDock
     Width = 786
+    ExplicitWidth = 786
     inherited tbxMain: TTBXToolbar
       ExplicitWidth = 632
       inherited TBXItem2: TTBXItem
@@ -57,6 +60,7 @@ inherited fEditorEmpleados: TfEditorEmpleados
   end
   inherited StatusBar: TJvStatusBar
     Width = 786
+    ExplicitWidth = 786
   end
   inline frViewEmpleados1: TfrViewEmpleados [3]
     Left = 0
@@ -73,17 +77,17 @@ inherited fEditorEmpleados: TfEditorEmpleados
     TabOrder = 3
     ReadOnly = False
     ExplicitTop = 102
-    ExplicitWidth = 543
+    ExplicitWidth = 786
     ExplicitHeight = 323
     inherited cxGrid: TcxGrid
       Width = 786
       Height = 195
-      ExplicitWidth = 543
+      ExplicitWidth = 786
       ExplicitHeight = 195
       inherited cxGridView: TcxGridDBTableView
         DataController.Summary.FooterSummaryItems = <
           item
-            Format = '0 empleados'
+            Format = '0 vendedores'
             Kind = skCount
             FieldName = 'ID'
             Column = frViewEmpleados1.cxGridViewNIF_CIF
@@ -92,12 +96,12 @@ inherited fEditorEmpleados: TfEditorEmpleados
     end
     inherited frViewFiltroBase1: TfrViewFiltroBase
       Width = 786
-      ExplicitWidth = 543
+      ExplicitWidth = 786
       inherited TBXDockablePanel1: TTBXDockablePanel
-        ExplicitWidth = 543
+        ExplicitWidth = 786
         inherited dxLayoutControl1: TdxLayoutControl
           Width = 786
-          ExplicitWidth = 543
+          ExplicitWidth = 786
           inherited txtFiltroTodo: TcxTextEdit
             ExplicitWidth = 273
             Width = 273
@@ -115,10 +119,10 @@ inherited fEditorEmpleados: TfEditorEmpleados
         end
         inherited TBXAlignmentPanel1: TTBXAlignmentPanel
           Width = 786
-          ExplicitWidth = 543
+          ExplicitWidth = 786
           inherited tbxBotones: TTBXToolbar
             Width = 776
-            ExplicitWidth = 533
+            ExplicitWidth = 776
           end
         end
       end
@@ -126,13 +130,13 @@ inherited fEditorEmpleados: TfEditorEmpleados
     inherited pnlAgrupaciones: TTBXDockablePanel
       Top = 297
       ExplicitTop = 297
-      ExplicitWidth = 543
+      ExplicitWidth = 786
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel
         Width = 786
-        ExplicitWidth = 543
+        ExplicitWidth = 786
         inherited TBXToolbar1: TTBXToolbar
           Width = 776
-          ExplicitWidth = 533
+          ExplicitWidth = 776
         end
       end
     end
@@ -264,12 +268,12 @@ inherited fEditorEmpleados: TfEditorEmpleados
     Instruction.Icon = tdiCustom
     CustomButtons = <
       item
-        Caption = 'Previsualizar la ficha/s de emplado seleccionada/s'
+        Caption = 'Previsualizar la ficha/s de vendedor seleccionada/s'
         Value = 100
         Default = True
       end
       item
-        Caption = 'Previsualizar la lista de empleados actual'
+        Caption = 'Previsualizar la lista de vendedores actual'
         Value = 200
       end>
     ButtonBar.Buttons = [cbCancel]
@@ -575,12 +579,12 @@ inherited fEditorEmpleados: TfEditorEmpleados
     Instruction.Icon = tdiCustom
     CustomButtons = <
       item
-        Caption = 'Imprimir la ficha/s de empleado seleccionada/s'
+        Caption = 'Imprimir la ficha/s de vendedor seleccionada/s'
         Value = 100
         Default = True
       end
       item
-        Caption = 'Imprimir la lista de empleados actual'
+        Caption = 'Imprimir la lista de vendedores actual'
         Value = 200
       end>
     ButtonBar.Buttons = [cbCancel]
@@ -851,8 +855,8 @@ inherited fEditorEmpleados: TfEditorEmpleados
       82866906D6993E62F6F1C3F45D160A5305BE68FF8095CF5B4302134CFE1185EA
       1FB8A1B4FF4FE32FF6FADB8B5E0000000049454E44AE426082}
     Instruction.Text = 
-      'Los siguientes empleados no han podido ser eliminados, porque ti' +
-      'enen documentos asociados'
+      'Los siguientes vendedores no han podido ser eliminados, porque t' +
+      'ienen documentos asociados'
     Instruction.Glyph.Data = {
       0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001C00
       00001C0806000000720DDF940000000970485973000017120000171201679FD2
diff --git a/Source/Modulos/Contactos/Views/uEditorEmpleados.pas b/Source/Modulos/Contactos/Views/uEditorEmpleados.pas
index 1d85cc0f..f3f1297b 100644
--- a/Source/Modulos/Contactos/Views/uEditorEmpleados.pas
+++ b/Source/Modulos/Contactos/Views/uEditorEmpleados.pas
@@ -56,14 +56,14 @@ begin
 
   if AllItems then
   begin
-    if (Application.MessageBox('¿Desea borrar los empleados seleccionados?', 'Atención', MB_YESNO) = IDYES) then
+    if (Application.MessageBox('¿Desea borrar los vendedores seleccionados?', 'Atención', MB_YESNO) = IDYES) then
     begin
       SeleccionarFilasDesdeGrid(ViewGrid._FocusedView, (Contactos as ISeleccionable).SelectedRecords);
       AContactos := (Controller as IEmpleadosController).ExtraerSeleccionados(Contactos) as IBizContacto;
     end
   end
   else begin
-    if (Application.MessageBox('¿Desea borrar el empleado seleccionado?', 'Atención', MB_YESNO) = IDYES) then
+    if (Application.MessageBox('¿Desea borrar el vendedor seleccionado?', 'Atención', MB_YESNO) = IDYES) then
         AContactos := Contactos;
   end;
 
@@ -79,7 +79,7 @@ begin
           First;
           while not EOF do
           begin
-            JsListaContactosNoEliminados.Content.Add('Empleado: ' + AContactos.NOMBRE);
+            JsListaContactosNoEliminados.Content.Add('Vendedor: ' + AContactos.NOMBRE);
             Next;
           end;
         end;
@@ -139,7 +139,7 @@ procedure TfEditorEmpleados.PonerTitulos(const ATitulo: string);
 var
   FTitulo : String;
 begin
-  FTitulo := 'Lista de empleados - ' + AppFactuGES.EmpresaActiva.NOMBRE;
+  FTitulo := 'Lista de vendedores - ' + AppFactuGES.EmpresaActiva.NOMBRE;
   inherited PonerTitulos(FTitulo);
 end;
 
diff --git a/Source/Modulos/Contactos/Views/uViewCliente.dfm b/Source/Modulos/Contactos/Views/uViewCliente.dfm
index af6e035c..08923ec4 100644
--- a/Source/Modulos/Contactos/Views/uViewCliente.dfm
+++ b/Source/Modulos/Contactos/Views/uViewCliente.dfm
@@ -11,20 +11,20 @@ inherited frViewCliente: TfrViewCliente
     ExplicitWidth = 646
     ExplicitHeight = 534
     inherited PngSpeedButton1: TPngSpeedButton
-      Left = 584
-      ExplicitLeft = 584
+      Left = 601
+      ExplicitLeft = 601
     end
     inherited PngSpeedButton2: TPngSpeedButton
-      Left = 584
-      ExplicitLeft = 584
+      Left = 601
+      ExplicitLeft = 601
     end
     inherited PngSpeedButton3: TPngSpeedButton
-      Left = 584
-      ExplicitLeft = 584
+      Left = 601
+      ExplicitLeft = 601
     end
     object Label1: TLabel [3]
-      Left = 333
-      Top = 385
+      Left = 354
+      Top = 361
       Width = 269
       Height = 39
       Margins.Bottom = 0
@@ -35,36 +35,42 @@ inherited frViewCliente: TfrViewCliente
     end
     inherited eCalle: TcxDBTextEdit
       Left = 132
-      Top = 292
+      Top = 273
       TabOrder = 8
       ExplicitLeft = 132
-      ExplicitTop = 292
+      ExplicitTop = 273
+      ExplicitWidth = 181
+      Width = 181
     end
     inherited eProvincia: TcxDBTextEdit
       Left = 132
-      Top = 346
+      Top = 327
       TabOrder = 11
       ExplicitLeft = 132
-      ExplicitTop = 346
+      ExplicitTop = 327
+      ExplicitWidth = 133
+      Width = 133
     end
     inherited ePoblacion: TcxDBTextEdit
       Left = 132
-      Top = 319
+      Top = 300
       TabOrder = 9
       ExplicitLeft = 132
-      ExplicitTop = 319
+      ExplicitTop = 300
+      ExplicitWidth = 111
+      Width = 111
     end
     inherited eCodigoPostal: TcxDBTextEdit
-      Left = 238
-      Top = 319
+      Left = 259
+      Top = 300
       TabOrder = 10
-      ExplicitLeft = 238
-      ExplicitTop = 319
+      ExplicitLeft = 259
+      ExplicitTop = 300
     end
     inherited eObservaciones: TcxDBMemo
-      Top = 487
+      Top = 468
       TabOrder = 23
-      ExplicitTop = 487
+      ExplicitTop = 468
       ExplicitWidth = 609
       ExplicitHeight = 42
       Height = 42
@@ -92,7 +98,7 @@ inherited frViewCliente: TfrViewCliente
     end
     object cbClienteBloqueado: TcxDBCheckBox [10]
       Left = 22
-      Top = 403
+      Top = 384
       Action = actBloqueoCliente
       DataBinding.DataField = 'BLOQUEADO'
       DataBinding.DataSource = dsContacto
@@ -140,7 +146,7 @@ inherited frViewCliente: TfrViewCliente
     end
     object eBloqueo: TcxDBTextEdit [12]
       Left = 132
-      Top = 430
+      Top = 411
       DataBinding.DataField = 'MOTIVO_BLOQUEO'
       DataBinding.DataSource = dsContacto
       Style.BorderColor = clWindowFrame
@@ -158,8 +164,8 @@ inherited frViewCliente: TfrViewCliente
       Width = 113
     end
     object cxDBCheckBox1: TcxDBCheckBox [13]
-      Left = 333
-      Top = 430
+      Left = 354
+      Top = 406
       Caption = 'Permitir el acceso de este cliente a la tienda web'
       DataBinding.DataField = 'TIENDA_WEB'
       DataBinding.DataSource = dsContacto
@@ -227,30 +233,30 @@ inherited frViewCliente: TfrViewCliente
       Width = 211
     end
     inherited eTlfParticular: TcxDBTextEdit
-      Left = 428
+      Left = 449
       TabOrder = 15
-      ExplicitLeft = 428
+      ExplicitLeft = 449
       ExplicitWidth = 233
       Width = 233
     end
     inherited eTlfTrabajo: TcxDBTextEdit
-      Left = 428
+      Left = 449
       TabOrder = 14
-      ExplicitLeft = 428
+      ExplicitLeft = 449
       ExplicitWidth = 233
       Width = 233
     end
     inherited eTlfMovil: TcxDBTextEdit
-      Left = 428
+      Left = 449
       TabOrder = 16
-      ExplicitLeft = 428
+      ExplicitLeft = 449
       ExplicitWidth = 233
       Width = 233
     end
     inherited eFax: TcxDBTextEdit
-      Left = 428
+      Left = 449
       TabOrder = 17
-      ExplicitLeft = 428
+      ExplicitLeft = 449
       ExplicitWidth = 233
       Width = 233
     end
@@ -261,63 +267,67 @@ inherited frViewCliente: TfrViewCliente
       Width = 135
     end
     inherited eNIFCIF: TcxDBTextEdit
-      Left = 232
-      ExplicitLeft = 232
+      Left = 247
+      ExplicitLeft = 247
       ExplicitWidth = 59
       Width = 59
     end
     inherited eMailTrabajo: TcxDBHyperLinkEdit
-      Left = 428
+      Left = 449
       Properties.Prefix = 'mailto:'
       TabOrder = 18
-      ExplicitLeft = 428
+      ExplicitLeft = 449
       ExplicitWidth = 204
       Width = 204
     end
     inherited eMailParticular: TcxDBHyperLinkEdit
-      Left = 428
+      Left = 449
       Properties.Prefix = 'mailto:'
       TabOrder = 19
-      ExplicitLeft = 428
+      ExplicitLeft = 449
       ExplicitWidth = 204
       Width = 204
     end
     inherited ePaginaWeb: TcxDBHyperLinkEdit
-      Left = 428
+      Left = 449
       TabOrder = 20
-      ExplicitLeft = 428
+      ExplicitLeft = 449
       ExplicitWidth = 204
       Width = 204
     end
     inherited eReferencia: TcxDBTextEdit
       Left = 132
       ExplicitLeft = 132
+      ExplicitWidth = 38
+      Width = 38
     end
     inherited ePersonaContacto: TcxDBTextEdit
       Left = 132
-      Top = 265
+      Top = 246
       TabOrder = 7
       ExplicitLeft = 132
-      ExplicitTop = 265
+      ExplicitTop = 246
+      ExplicitWidth = 256
+      Width = 256
     end
     inherited frViewTienda1: TfrViewTienda
-      Left = 333
-      Width = 274
-      Height = 69
+      Left = 354
+      Width = 270
+      Height = 41
       AutoSize = True
       TabOrder = 21
-      ExplicitLeft = 333
-      ExplicitWidth = 274
-      ExplicitHeight = 69
+      ExplicitLeft = 354
+      ExplicitWidth = 270
+      ExplicitHeight = 41
       inherited dxLayoutControl1: TdxLayoutControl
-        Width = 274
-        Height = 69
+        Width = 270
+        Height = 41
+        ExplicitWidth = 262
+        ExplicitHeight = 41
         inherited cbTienda: TcxDBComboBox
           DataBinding.DataSource = dsContacto
-        end
-        inherited cbVendedor: TcxDBLookupComboBox
-          ExplicitWidth = 376
-          Width = 376
+          ExplicitWidth = 412
+          Width = 412
         end
       end
     end
diff --git a/Source/Modulos/Contactos/Views/uViewContacto.dfm b/Source/Modulos/Contactos/Views/uViewContacto.dfm
index 891c2b0c..d38ce0ff 100644
--- a/Source/Modulos/Contactos/Views/uViewContacto.dfm
+++ b/Source/Modulos/Contactos/Views/uViewContacto.dfm
@@ -157,7 +157,7 @@ inherited frViewContacto: TfrViewContacto
       Width = 111
     end
     object eCodigoPostal: TcxDBTextEdit
-      Left = 196
+      Left = 248
       Top = 355
       DataBinding.DataField = 'CODIGO_POSTAL'
       DataBinding.DataSource = dsContacto
@@ -195,7 +195,7 @@ inherited frViewContacto: TfrViewContacto
       Width = 630
     end
     object eTlfParticular: TcxDBTextEdit
-      Left = 386
+      Left = 438
       Top = 55
       DataBinding.DataField = 'TELEFONO_2'
       DataBinding.DataSource = dsContacto
@@ -213,7 +213,7 @@ inherited frViewContacto: TfrViewContacto
       Width = 91
     end
     object eTlfTrabajo: TcxDBTextEdit
-      Left = 386
+      Left = 438
       Top = 28
       DataBinding.DataField = 'TELEFONO_1'
       DataBinding.DataSource = dsContacto
@@ -231,7 +231,7 @@ inherited frViewContacto: TfrViewContacto
       Width = 127
     end
     object eTlfMovil: TcxDBTextEdit
-      Left = 386
+      Left = 438
       Top = 82
       DataBinding.DataField = 'MOVIL_1'
       DataBinding.DataSource = dsContacto
@@ -249,7 +249,7 @@ inherited frViewContacto: TfrViewContacto
       Width = 155
     end
     object eFax: TcxDBTextEdit
-      Left = 386
+      Left = 438
       Top = 109
       DataBinding.DataField = 'FAX'
       DataBinding.DataSource = dsContacto
@@ -287,7 +287,7 @@ inherited frViewContacto: TfrViewContacto
       Width = 221
     end
     object eNIFCIF: TcxDBTextEdit
-      Left = 205
+      Left = 234
       Top = 28
       DataBinding.DataField = 'NIF_CIF'
       DataBinding.DataSource = dsContacto
@@ -306,7 +306,7 @@ inherited frViewContacto: TfrViewContacto
       Width = 57
     end
     object eMailTrabajo: TcxDBHyperLinkEdit
-      Left = 386
+      Left = 438
       Top = 166
       DataBinding.DataField = 'EMAIL_1'
       DataBinding.DataSource = dsContacto
@@ -328,7 +328,7 @@ inherited frViewContacto: TfrViewContacto
       Width = 133
     end
     object eMailParticular: TcxDBHyperLinkEdit
-      Left = 386
+      Left = 438
       Top = 194
       DataBinding.DataField = 'EMAIL_2'
       DataBinding.DataSource = dsContacto
@@ -350,7 +350,7 @@ inherited frViewContacto: TfrViewContacto
       Width = 133
     end
     object ePaginaWeb: TcxDBHyperLinkEdit
-      Left = 386
+      Left = 438
       Top = 221
       DataBinding.DataField = 'PAGINA_WEB'
       DataBinding.DataSource = dsContacto
@@ -411,11 +411,11 @@ inherited frViewContacto: TfrViewContacto
       Width = 256
     end
     inline frViewTienda1: TfrViewTienda
-      Left = 291
+      Left = 343
       Top = 280
-      Width = 451
+      Width = 311
       Height = 42
-      Align = alBottom
+      Align = alTop
       Font.Charset = DEFAULT_CHARSET
       Font.Color = clWindowText
       Font.Height = -11
@@ -424,10 +424,12 @@ inherited frViewContacto: TfrViewContacto
       ParentFont = False
       TabOrder = 15
       ReadOnly = False
-      ExplicitLeft = 291
+      ExplicitLeft = 343
       ExplicitTop = 280
+      ExplicitWidth = 311
       ExplicitHeight = 42
       inherited dxLayoutControl1: TdxLayoutControl
+        Width = 311
         Height = 42
         ExplicitHeight = 42
         inherited cbTienda: TcxDBComboBox
@@ -436,11 +438,6 @@ inherited frViewContacto: TfrViewContacto
           ExplicitWidth = 412
           Width = 412
         end
-        inherited dxLayoutControl1Group_Root: TdxLayoutGroup
-          inherited dxLayoutControl1Item2: TdxLayoutItem
-            Visible = False
-          end
-        end
       end
     end
     object dxLayoutControlContactoGroup_Root: TdxLayoutGroup
@@ -634,7 +631,6 @@ inherited frViewContacto: TfrViewContacto
           end
           object dxLayoutControlContactoGroup100: TdxLayoutGroup
             AutoAligns = [aaHorizontal]
-            AlignVert = avClient
             Caption = 'El contacto pertenece a la tienda'
             object dxLayoutControlContactoItem16: TdxLayoutItem
               AutoAligns = [aaHorizontal]
diff --git a/Source/Modulos/Contactos/Views/uViewEmpleado.dfm b/Source/Modulos/Contactos/Views/uViewEmpleado.dfm
index 196e05c8..7479b028 100644
--- a/Source/Modulos/Contactos/Views/uViewEmpleado.dfm
+++ b/Source/Modulos/Contactos/Views/uViewEmpleado.dfm
@@ -50,10 +50,10 @@ inherited frViewEmpleado: TfrViewEmpleado
       Width = 51
     end
     inherited eCodigoPostal: TcxDBTextEdit
-      Left = 209
+      Left = 261
       Top = 304
       TabOrder = 8
-      ExplicitLeft = 209
+      ExplicitLeft = 261
       ExplicitTop = 304
     end
     inherited eObservaciones: TcxDBMemo
@@ -124,32 +124,24 @@ inherited frViewEmpleado: TfrViewEmpleado
       Width = 225
     end
     inherited eTlfParticular: TcxDBTextEdit
-      Left = 399
+      Left = 451
       TabOrder = 11
-      ExplicitLeft = 399
-      ExplicitWidth = 91
-      Width = 91
+      ExplicitLeft = 451
     end
     inherited eTlfTrabajo: TcxDBTextEdit
-      Left = 399
+      Left = 451
       TabOrder = 10
-      ExplicitLeft = 399
-      ExplicitWidth = 127
-      Width = 127
+      ExplicitLeft = 451
     end
     inherited eTlfMovil: TcxDBTextEdit
-      Left = 399
+      Left = 451
       TabOrder = 12
-      ExplicitLeft = 399
-      ExplicitWidth = 155
-      Width = 155
+      ExplicitLeft = 451
     end
     inherited eFax: TcxDBTextEdit
-      Left = 399
+      Left = 451
       TabOrder = 13
-      ExplicitLeft = 399
-      ExplicitWidth = 121
-      Width = 121
+      ExplicitLeft = 451
     end
     inherited eNombre: TcxDBTextEdit
       Left = 121
@@ -158,39 +150,37 @@ inherited frViewEmpleado: TfrViewEmpleado
       Width = 263
     end
     inherited eNIFCIF: TcxDBTextEdit
-      Left = 183
-      ExplicitLeft = 183
+      Left = 210
+      ExplicitLeft = 210
       ExplicitWidth = 100
       Width = 100
     end
     inherited eMailTrabajo: TcxDBHyperLinkEdit
-      Left = 399
+      Left = 451
       Properties.Prefix = 'mailto:'
       TabOrder = 14
-      ExplicitLeft = 399
+      ExplicitLeft = 451
       ExplicitWidth = 129
       Width = 129
     end
     inherited eMailParticular: TcxDBHyperLinkEdit
-      Left = 399
+      Left = 451
       Properties.Prefix = 'mailto:'
       TabOrder = 15
-      ExplicitLeft = 399
+      ExplicitLeft = 451
       ExplicitWidth = 165
       Width = 165
     end
     inherited ePaginaWeb: TcxDBHyperLinkEdit
-      Left = 399
+      Left = 451
       TabOrder = 16
-      ExplicitLeft = 399
+      ExplicitLeft = 451
       ExplicitWidth = 165
       Width = 165
     end
     inherited eReferencia: TcxDBTextEdit
       Left = 121
       ExplicitLeft = 121
-      ExplicitWidth = 38
-      Width = 38
     end
     inherited ePersonaContacto: TcxDBTextEdit
       Left = 121
@@ -202,40 +192,16 @@ inherited frViewEmpleado: TfrViewEmpleado
       Width = 152
     end
     inherited frViewTienda1: TfrViewTienda
-      Left = 304
-      Width = 451
-      Height = 42
+      Left = 356
+      Width = 264
       TabOrder = 17
-      ExplicitLeft = 304
-      ExplicitWidth = 451
-      ExplicitHeight = 42
+      ExplicitLeft = 356
+      ExplicitWidth = 264
       inherited dxLayoutControl1: TdxLayoutControl
-        Width = 451
-        Height = 42
+        Width = 264
+        ExplicitWidth = 316
         inherited cbTienda: TcxDBComboBox
-          Left = 55
           DataBinding.DataSource = dsContacto
-          ExplicitLeft = 55
-          ExplicitWidth = 412
-          Width = 412
-        end
-        inherited cbVendedor: TcxDBLookupComboBox
-          Left = 55
-          DataBinding.DataField = 'ID_USUARIO'
-          DataBinding.DataSource = dsContacto
-          Properties.ListColumns = <
-            item
-              FieldName = 'USERNAME'
-            end>
-          ExplicitLeft = 55
-          ExplicitWidth = 376
-          Width = 376
-        end
-        inherited dxLayoutControl1Group_Root: TdxLayoutGroup
-          inherited dxLayoutControl1Item2: TdxLayoutItem
-            Caption = 'Usuario:'
-            Visible = True
-          end
         end
       end
     end
@@ -289,6 +255,7 @@ inherited frViewEmpleado: TfrViewEmpleado
             Visible = False
           end
           inherited dxLayoutControlContactoGroup100: TdxLayoutGroup
+            AlignVert = avClient
             Caption = 'El empleado pertenece a la tienda'
           end
         end
diff --git a/Source/Modulos/Contactos/Views/uViewProveedor.dfm b/Source/Modulos/Contactos/Views/uViewProveedor.dfm
index 4c06a04b..cd765a98 100644
--- a/Source/Modulos/Contactos/Views/uViewProveedor.dfm
+++ b/Source/Modulos/Contactos/Views/uViewProveedor.dfm
@@ -23,7 +23,7 @@ inherited frViewProveedor: TfrViewProveedor
       ExplicitLeft = 669
     end
     object Label1: TLabel [3]
-      Left = 357
+      Left = 402
       Top = 358
       Width = 342
       Height = 26
@@ -34,49 +34,47 @@ inherited frViewProveedor: TfrViewProveedor
     end
     inherited eCalle: TcxDBTextEdit
       Left = 138
-      Top = 252
+      Top = 380
       TabOrder = 7
       ExplicitLeft = 138
-      ExplicitTop = 252
+      ExplicitTop = 380
       ExplicitWidth = 264
       Width = 264
     end
     inherited eProvincia: TcxDBTextEdit
       Left = 138
-      Top = 306
+      Top = 434
       TabOrder = 10
       ExplicitLeft = 138
-      ExplicitTop = 306
+      ExplicitTop = 434
       ExplicitWidth = 264
       Width = 264
     end
     inherited ePoblacion: TcxDBTextEdit
       Left = 138
-      Top = 279
+      Top = 407
       TabOrder = 8
       ExplicitLeft = 138
-      ExplicitTop = 279
+      ExplicitTop = 407
       ExplicitWidth = 163
       Width = 163
     end
     inherited eCodigoPostal: TcxDBTextEdit
-      Left = 262
-      Top = 279
+      Left = 307
+      Top = 407
       TabOrder = 9
-      ExplicitLeft = 262
-      ExplicitTop = 279
+      ExplicitLeft = 307
+      ExplicitTop = 407
     end
     inherited eObservaciones: TcxDBMemo
-      Top = 447
+      Top = 575
       TabOrder = 22
-      ExplicitTop = 447
-      ExplicitWidth = 630
+      ExplicitTop = 575
       ExplicitHeight = 20
       Height = 20
-      Width = 630
     end
     object cxDBCheckBox1: TcxDBCheckBox [9]
-      Left = 357
+      Left = 402
       Top = 390
       Caption = 'Incluir este proveedor en la tienda web'
       DataBinding.DataField = 'TIENDA_WEB'
@@ -102,7 +100,7 @@ inherited frViewProveedor: TfrViewProveedor
     end
     object cxDBCheckBox2: TcxDBCheckBox [10]
       Left = 22
-      Top = 363
+      Top = 491
       Caption = 'El proveedor est'#225' homologado'
       DataBinding.DataField = 'HOMOLOGADO'
       DataBinding.DataSource = dsContacto
@@ -126,7 +124,7 @@ inherited frViewProveedor: TfrViewProveedor
     end
     object eCertificaciones: TcxDBTextEdit [11]
       Left = 138
-      Top = 390
+      Top = 518
       DataBinding.DataField = 'CERTIFICACION'
       DataBinding.DataSource = dsContacto
       Style.BorderColor = clWindowFrame
@@ -206,38 +204,28 @@ inherited frViewProveedor: TfrViewProveedor
       Width = 221
     end
     inherited eTlfParticular: TcxDBTextEdit
-      Left = 452
+      Left = 497
       TabOrder = 14
-      ExplicitLeft = 452
-      ExplicitWidth = 91
-      Width = 91
+      ExplicitLeft = 497
     end
     inherited eTlfTrabajo: TcxDBTextEdit
-      Left = 452
+      Left = 497
       TabOrder = 13
-      ExplicitLeft = 452
-      ExplicitWidth = 127
-      Width = 127
+      ExplicitLeft = 497
     end
     inherited eTlfMovil: TcxDBTextEdit
-      Left = 452
+      Left = 497
       TabOrder = 15
-      ExplicitLeft = 452
-      ExplicitWidth = 155
-      Width = 155
+      ExplicitLeft = 497
     end
     inherited eFax: TcxDBTextEdit
-      Left = 452
+      Left = 497
       TabOrder = 16
-      ExplicitLeft = 452
-      ExplicitWidth = 121
-      Width = 121
+      ExplicitLeft = 497
     end
     inherited eNombre: TcxDBTextEdit
       Left = 138
       ExplicitLeft = 138
-      ExplicitWidth = 221
-      Width = 221
     end
     inherited eNIFCIF: TcxDBTextEdit
       Left = 211
@@ -246,55 +234,44 @@ inherited frViewProveedor: TfrViewProveedor
       Width = 205
     end
     inherited eMailTrabajo: TcxDBHyperLinkEdit
-      Left = 452
+      Left = 497
       Properties.Prefix = 'mailto:'
       TabOrder = 17
-      ExplicitLeft = 452
-      ExplicitWidth = 133
-      Width = 133
+      ExplicitLeft = 497
     end
     inherited eMailParticular: TcxDBHyperLinkEdit
-      Left = 452
+      Left = 497
       Properties.Prefix = 'mailto:'
       TabOrder = 18
-      ExplicitLeft = 452
-      ExplicitWidth = 133
-      Width = 133
+      ExplicitLeft = 497
     end
     inherited ePaginaWeb: TcxDBHyperLinkEdit
-      Left = 452
+      Left = 497
       TabOrder = 19
-      ExplicitLeft = 452
-      ExplicitWidth = 133
-      Width = 133
+      ExplicitLeft = 497
     end
     inherited eReferencia: TcxDBTextEdit
       Left = 138
       ExplicitLeft = 138
-      ExplicitWidth = 38
-      Width = 38
     end
     inherited ePersonaContacto: TcxDBTextEdit
       Left = 138
-      Top = 225
+      Top = 353
       TabOrder = 6
       ExplicitLeft = 138
-      ExplicitTop = 225
-      ExplicitWidth = 256
-      Width = 256
+      ExplicitTop = 353
     end
     inherited frViewTienda1: TfrViewTienda
-      Left = 357
-      Width = 451
+      Left = 402
+      Width = 290
+      Align = alNone
       TabOrder = 20
-      ExplicitLeft = 357
-      ExplicitWidth = 451
+      ExplicitLeft = 402
+      ExplicitWidth = 290
       inherited dxLayoutControl1: TdxLayoutControl
-        Width = 451
+        Width = 290
         inherited cbTienda: TcxDBComboBox
           DataBinding.DataSource = dsContacto
-          ExplicitWidth = 412
-          Width = 412
         end
       end
     end