diff --git a/Source/ApplicationBase/Configuracion/Views/uViewConfiguracionGeneral.dfm b/Source/ApplicationBase/Configuracion/Views/uViewConfiguracionGeneral.dfm
index d6b850fd..e332c2b1 100644
--- a/Source/ApplicationBase/Configuracion/Views/uViewConfiguracionGeneral.dfm
+++ b/Source/ApplicationBase/Configuracion/Views/uViewConfiguracionGeneral.dfm
@@ -70,9 +70,9 @@ inherited frViewConfiguracionGeneral: TfrViewConfiguracionGeneral
       Top = 11
       Width = 168
       Height = 21
+      Style = csDropDownList
       ItemHeight = 13
       TabOrder = 0
-      Text = 'cbEsquemaColor'
     end
   end
   object Panel4: TPanel
@@ -175,7 +175,6 @@ inherited frViewConfiguracionGeneral: TfrViewConfiguracionGeneral
     BevelOuter = bvNone
     ParentColor = True
     TabOrder = 6
-    ExplicitTop = 224
     object lblLongMinPass: TLabel
       Left = 17
       Top = 43
diff --git a/Source/ApplicationBase/Configuracion/Views/uViewConfiguracionGeneral.pas b/Source/ApplicationBase/Configuracion/Views/uViewConfiguracionGeneral.pas
index a591196e..03b2c868 100644
--- a/Source/ApplicationBase/Configuracion/Views/uViewConfiguracionGeneral.pas
+++ b/Source/ApplicationBase/Configuracion/Views/uViewConfiguracionGeneral.pas
@@ -42,7 +42,8 @@ type
 
 implementation
 
-uses uFactuGES_App;
+uses
+  uFactuGES_App;
 
 {$R *.dfm}
 
diff --git a/Source/Modulos/Contactos/Controller/Contactos_controller.dproj b/Source/Modulos/Contactos/Controller/Contactos_controller.dproj
index 790f04f3..f28352ba 100644
--- a/Source/Modulos/Contactos/Controller/Contactos_controller.dproj
+++ b/Source/Modulos/Contactos/Controller/Contactos_controller.dproj
@@ -46,6 +46,24 @@
       
       
       
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
       
       
       
@@ -59,6 +77,30 @@
     <DelphiCompile Include="Contactos_controller.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
+    <DCCReference Include="..\..\..\Cliente\adortl.dcp" />
+    <DCCReference Include="..\..\..\Cliente\ApplicationBase.dcp" />
+    <DCCReference Include="..\..\..\Cliente\Base.dcp" />
+    <DCCReference Include="..\..\..\Cliente\ccpackD11.dcp" />
+    <DCCReference Include="..\..\..\Cliente\cfpack_d11.dcp" />
+    <DCCReference Include="..\..\..\Cliente\Contabilidad_controller.dcp" />
+    <DCCReference Include="..\..\..\Cliente\Contactos_data.dcp" />
+    <DCCReference Include="..\..\..\Cliente\Contactos_model.dcp" />
+    <DCCReference Include="..\..\..\Cliente\cxLibraryD11.dcp" />
+    <DCCReference Include="..\..\..\Cliente\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="..\..\..\Cliente\dbrtl.dcp" />
+    <DCCReference Include="..\..\..\Cliente\designide.dcp" />
+    <DCCReference Include="..\..\..\Cliente\dsnap.dcp" />
+    <DCCReference Include="..\..\..\Cliente\dxGDIPlusD11.dcp" />
+    <DCCReference Include="..\..\..\Cliente\dxThemeD11.dcp" />
+    <DCCReference Include="..\..\..\Cliente\GUIBase.dcp" />
+    <DCCReference Include="..\..\..\Cliente\GUISDK_D11.dcp" />
+    <DCCReference Include="..\..\..\Cliente\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="..\..\..\Cliente\rtl.dcp" />
+    <DCCReference Include="..\..\..\Cliente\vcl.dcp" />
+    <DCCReference Include="..\..\..\Cliente\vclactnband.dcp" />
+    <DCCReference Include="..\..\..\Cliente\vcldb.dcp" />
+    <DCCReference Include="..\..\..\Cliente\vclx.dcp" />
+    <DCCReference Include="..\..\..\Cliente\xmlrtl.dcp" />
     <DCCReference Include="uClientesController.pas" />
     <DCCReference Include="uContactosController.pas" />
     <DCCReference Include="uDireccionesContactoController.pas" />
@@ -68,25 +110,6 @@
     <DCCReference Include="uProcedenciasClienteController.pas" />
     <DCCReference Include="uProveedoresController.pas" />
     <DCCReference Include="uVendedoresController.pas" />
-    <DCCReference Include="View\adortl.dcp" />
-    <DCCReference Include="View\ApplicationBase.dcp" />
-    <DCCReference Include="View\Base.dcp" />
-    <DCCReference Include="View\ccpackD11.dcp" />
-    <DCCReference Include="View\cfpack_d11.dcp" />
-    <DCCReference Include="View\Contabilidad_controller.dcp" />
-    <DCCReference Include="View\Contactos_data.dcp" />
-    <DCCReference Include="View\Contactos_model.dcp" />
-    <DCCReference Include="View\cxLibraryD11.dcp" />
-    <DCCReference Include="View\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="View\dbrtl.dcp" />
-    <DCCReference Include="View\designide.dcp" />
-    <DCCReference Include="View\dsnap.dcp" />
-    <DCCReference Include="View\dxGDIPlusD11.dcp" />
-    <DCCReference Include="View\dxThemeD11.dcp" />
-    <DCCReference Include="View\GUIBase.dcp" />
-    <DCCReference Include="View\GUISDK_D11.dcp" />
-    <DCCReference Include="View\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="View\rtl.dcp" />
     <DCCReference Include="View\uIEditorCliente.pas" />
     <DCCReference Include="View\uIEditorClientes.pas" />
     <DCCReference Include="View\uIEditorContacto.pas" />
@@ -104,11 +127,6 @@
     <DCCReference Include="View\uIEditorProveedores.pas" />
     <DCCReference Include="View\uIEditorVendedor.pas" />
     <DCCReference Include="View\uIEditorVendedores.pas" />
-    <DCCReference Include="View\vcl.dcp" />
-    <DCCReference Include="View\vclactnband.dcp" />
-    <DCCReference Include="View\vcldb.dcp" />
-    <DCCReference Include="View\vclx.dcp" />
-    <DCCReference Include="View\xmlrtl.dcp" />
     <None Include="ModelSupport_Contactos_controller\default.txaPackage" />
   </ItemGroup>
 </Project>
diff --git a/Source/Modulos/Contactos/Controller/Contactos_controller.res b/Source/Modulos/Contactos/Controller/Contactos_controller.res
index 8b251f31..1641339f 100644
Binary files a/Source/Modulos/Contactos/Controller/Contactos_controller.res and b/Source/Modulos/Contactos/Controller/Contactos_controller.res differ
diff --git a/Source/Modulos/Contactos/Controller/uClientesController.pas b/Source/Modulos/Contactos/Controller/uClientesController.pas
index c566674f..e565b8db 100644
--- a/Source/Modulos/Contactos/Controller/uClientesController.pas
+++ b/Source/Modulos/Contactos/Controller/uClientesController.pas
@@ -126,10 +126,9 @@ function TClientesController.Eliminar(ACliente: IBizContacto; AllItems: Boolean)
 //En el caso de eliminar almenos un elemento del conjunto se devuelve true
 var
   bEliminado: Boolean;
-
 begin
-  Result := False;
-
+  bEliminado := False;
+  
   if not Assigned(ACliente) then
     raise Exception.Create ('Contacto no asignado');
 
@@ -208,34 +207,33 @@ procedure TClientesController.Preview(ACliente: IBizCliente; AllItems: Boolean);
 var
   AReportController : IEtiquetasContactosReportController;
   ListaID: TStringList;
-
 begin
   AReportController := TEtiquetasContactosReportController.Create;
   try
-   ListaID := TStringList.Create;
-
-   //Si deseamos previsualizar todos los items del objeto albaran
-   if AllItems then
-   begin
-     with ACliente.DataTable do
-     begin
-       First;
-       while not EOF do
+    ListaID := TStringList.Create;
+    try
+       //Si deseamos previsualizar todos los items del objeto albaran
+       if AllItems then
        begin
+         with ACliente.DataTable do
+         begin
+           First;
+           while not EOF do
+           begin
+             ListaID.Add(IntToStr(ACliente.ID));
+             Next;
+           end;
+         end;
+       end
+       else //Solo previsualizamos el item seleccionado
          ListaID.Add(IntToStr(ACliente.ID));
-         Next;
-       end;
-     end;
-   end
-   //Solo previsualizamos el item seleccionado
-   else
-     ListaID.Add(IntToStr(ACliente.ID));
-
-    AReportController.Preview(ListaID.CommaText);
 
+       AReportController.Preview(ListaID.CommaText);
+    finally
+      FreeANDNil(ListaID);
+    end;
   finally
     AReportController := NIL;
-    ListaID.Free;
   end;
 end;
 
@@ -247,30 +245,31 @@ var
 begin
   AReportController := TEtiquetasContactosReportController.Create;
   try
-   ListaID := TStringList.Create;
-
-   //Si deseamos previsualizar todos los items del objeto albaran
-   if AllItems then
-   begin
-     with ACliente.DataTable do
-     begin
-       First;
-       while not EOF do
+    ListaID := TStringList.Create;
+    try
+       //Si deseamos previsualizar todos los items del objeto albaran
+       if AllItems then
        begin
+         with ACliente.DataTable do
+         begin
+           First;
+           while not EOF do
+           begin
+             ListaID.Add(IntToStr(ACliente.ID));
+             Next;
+           end;
+         end;
+       end
+       //Solo previsualizamos el item seleccionado
+       else
          ListaID.Add(IntToStr(ACliente.ID));
-         Next;
-       end;
-     end;
-   end
-   //Solo previsualizamos el item seleccionado
-   else
-     ListaID.Add(IntToStr(ACliente.ID));
-
-    AReportController.Print(ListaID.CommaText);
 
+        AReportController.Print(ListaID.CommaText);
+    finally
+      FreeANDNIL(ListaID);
+    end;
   finally
     AReportController := NIL;
-    ListaID.Free;
   end;
 end;
 
@@ -320,8 +319,6 @@ end;
 
 function TClientesController.TieneDatosBancarios(ACliente: IBizCliente): Boolean;
 begin
-  Result := False;
-
   if not Assigned(ACliente) then
     raise Exception.Create ('Cliente no asignado (TieneDatosBancarios)');
 
diff --git a/Source/Modulos/Contactos/Controller/uContactosController.pas b/Source/Modulos/Contactos/Controller/uContactosController.pas
index 82d44e78..06b3561f 100644
--- a/Source/Modulos/Contactos/Controller/uContactosController.pas
+++ b/Source/Modulos/Contactos/Controller/uContactosController.pas
@@ -132,8 +132,6 @@ end;
 function TContactosController.ElegirDireccion(AContacto: IBizContacto; AMensaje: String): IBizDireccionesContacto;
 var
   JsDialog: TJSDialog;
-  Respuesta: Integer;
-
 begin
   Result := NIL;
   JsDialog := TJSDialog.Create(nil);
@@ -175,7 +173,7 @@ begin
              Result := AContacto.Direcciones;
 
   finally
-    JsDialog := NIL;
+    FreeAndNIL(JsDialog);
   end;
 end;
 
@@ -317,8 +315,6 @@ end;
 
 function TContactosController.ValidarContacto(AContacto: IBizContacto): Boolean;
 begin
-  Result := False;
-
   if not Assigned(AContacto) then
     raise Exception.Create ('Contacto no asignado');
 
diff --git a/Source/Modulos/Contactos/Controller/uGruposClienteController.pas b/Source/Modulos/Contactos/Controller/uGruposClienteController.pas
index e9ee7d15..9e51fc9e 100644
--- a/Source/Modulos/Contactos/Controller/uGruposClienteController.pas
+++ b/Source/Modulos/Contactos/Controller/uGruposClienteController.pas
@@ -123,8 +123,6 @@ end;
 
 function TGruposClienteController.ValidarGrupoCliente(AGrupoCliente: IBizGrupoCliente): Boolean;
 begin
-  Result := False;
-
   if not Assigned(AGrupoCliente) then
     raise Exception.Create ('GrupoCliente no asignada');
 
@@ -161,8 +159,6 @@ end;
 
 function TGruposClienteController.Eliminar(AGrupoCliente: IBizGrupoCliente): Boolean;
 begin
-  Result := False;
-
   if not Assigned(AGrupoCliente) then
     raise Exception.Create ('GrupoCliente no asignada');
 
diff --git a/Source/Modulos/Contactos/Controller/uGruposProveedorController.pas b/Source/Modulos/Contactos/Controller/uGruposProveedorController.pas
index e201436a..c99eb8fa 100644
--- a/Source/Modulos/Contactos/Controller/uGruposProveedorController.pas
+++ b/Source/Modulos/Contactos/Controller/uGruposProveedorController.pas
@@ -123,8 +123,6 @@ end;
 
 function TGruposProveedorController.ValidarGrupoProveedor(AGrupoProveedor: IBizGrupoProveedor): Boolean;
 begin
-  Result := False;
-
   if not Assigned(AGrupoProveedor) then
     raise Exception.Create ('GrupoProveedor no asignada');
 
@@ -161,8 +159,6 @@ end;
 
 function TGruposProveedorController.Eliminar(AGrupoProveedor: IBizGrupoProveedor): Boolean;
 begin
-  Result := False;
-
   if not Assigned(AGrupoProveedor) then
     raise Exception.Create ('GrupoProveedor no asignada');
 
diff --git a/Source/Modulos/Contactos/Controller/uProcedenciasClienteController.pas b/Source/Modulos/Contactos/Controller/uProcedenciasClienteController.pas
index 6abd7b55..d9ef2755 100644
--- a/Source/Modulos/Contactos/Controller/uProcedenciasClienteController.pas
+++ b/Source/Modulos/Contactos/Controller/uProcedenciasClienteController.pas
@@ -123,8 +123,6 @@ end;
 
 function TProcedenciasClienteController.ValidarProcedenciaCliente(AProcedenciaCliente: IBizProcedenciaCliente): Boolean;
 begin
-  Result := False;
-
   if not Assigned(AProcedenciaCliente) then
     raise Exception.Create ('ProcedenciaCliente no asignada');
 
@@ -161,8 +159,6 @@ end;
 
 function TProcedenciasClienteController.Eliminar(AProcedenciaCliente: IBizProcedenciaCliente): Boolean;
 begin
-  Result := False;
-
   if not Assigned(AProcedenciaCliente) then
     raise Exception.Create ('ProcedenciaCliente no asignada');
 
diff --git a/Source/Modulos/Contactos/Controller/uProveedoresController.pas b/Source/Modulos/Contactos/Controller/uProveedoresController.pas
index 3783640b..e3f4facf 100644
--- a/Source/Modulos/Contactos/Controller/uProveedoresController.pas
+++ b/Source/Modulos/Contactos/Controller/uProveedoresController.pas
@@ -116,8 +116,7 @@ var
   bEliminado: Boolean;
 
 begin
-  Result := False;
-
+  bEliminado := False;
   if not Assigned(AProveedor) then
     raise Exception.Create ('Contacto no asignado');
 
@@ -200,30 +199,31 @@ var
 begin
   AReportController := TEtiquetasContactosReportController.Create;
   try
-   ListaID := TStringList.Create;
-
-   //Si deseamos previsualizar todos los items del objeto albaran
-   if AllItems then
-   begin
-     with AProveedor.DataTable do
-     begin
-       First;
-       while not EOF do
+    ListaID := TStringList.Create;
+    try
+       //Si deseamos previsualizar todos los items del objeto albaran
+       if AllItems then
        begin
+         with AProveedor.DataTable do
+         begin
+           First;
+           while not EOF do
+           begin
+             ListaID.Add(IntToStr(AProveedor.ID));
+             Next;
+           end;
+         end;
+       end
+       //Solo previsualizamos el item seleccionado
+       else
          ListaID.Add(IntToStr(AProveedor.ID));
-         Next;
-       end;
-     end;
-   end
-   //Solo previsualizamos el item seleccionado
-   else
-     ListaID.Add(IntToStr(AProveedor.ID));
-
-    AReportController.Preview(ListaID.CommaText);
 
+        AReportController.Preview(ListaID.CommaText);
+    finally
+      FreeANDNIL(ListaID);
+    end;
   finally
     AReportController := NIL;
-    ListaID.Free;
   end;
 end;
 
@@ -235,30 +235,31 @@ var
 begin
   AReportController := TEtiquetasContactosReportController.Create;
   try
-   ListaID := TStringList.Create;
-
-   //Si deseamos previsualizar todos los items del objeto albaran
-   if AllItems then
-   begin
-     with AProveedor.DataTable do
-     begin
-       First;
-       while not EOF do
+    ListaID := TStringList.Create;
+    try
+       //Si deseamos previsualizar todos los items del objeto albaran
+       if AllItems then
        begin
+         with AProveedor.DataTable do
+         begin
+           First;
+           while not EOF do
+           begin
+             ListaID.Add(IntToStr(AProveedor.ID));
+             Next;
+           end;
+         end;
+       end
+       //Solo previsualizamos el item seleccionado
+       else
          ListaID.Add(IntToStr(AProveedor.ID));
-         Next;
-       end;
-     end;
-   end
-   //Solo previsualizamos el item seleccionado
-   else
-     ListaID.Add(IntToStr(AProveedor.ID));
-
-    AReportController.Print(ListaID.CommaText);
 
+        AReportController.Print(ListaID.CommaText);
+    finally
+      FreeANDNIL(ListaID);
+    end;
   finally
     AReportController := NIL;
-    ListaID.Free;
   end;
 end;
 
diff --git a/Source/Modulos/Contactos/Controller/uVendedoresController.pas b/Source/Modulos/Contactos/Controller/uVendedoresController.pas
index d9861481..1b246e6f 100644
--- a/Source/Modulos/Contactos/Controller/uVendedoresController.pas
+++ b/Source/Modulos/Contactos/Controller/uVendedoresController.pas
@@ -26,7 +26,7 @@ type
     function Duplicar(AContacto: IBizContacto): IBizContacto; override;
     function Buscar(const ID: Integer): IBizContacto; override;
     function BuscarTodos: IBizContacto; overload; override;
-    function BuscarTodos(const CadenaIDs: String): IBizContacto; overload;
+    function BuscarTodos(const CadenaIDs: String): IBizContacto; overload;  
     function Nuevo : IBizContacto; override;
     procedure Ver(AContacto : IBizContacto); override;
     procedure VerTodos(AContactos: IBizContacto); override;
@@ -106,7 +106,6 @@ end;
 function TVendedoresController.DarListaVendedores: TStringList;
 var
   AVendedores: IBizContacto;
-  i : integer;
 begin
   AVendedores := BuscarTodos;
   AVendedores.DataTable.Active := True;
@@ -160,10 +159,9 @@ function TVendedoresController.Eliminar(AVendedor: IBizContacto; AllItems: Boole
 //En el caso de eliminar almenos un elemento del conjunto se devuelve true
 var
   bEliminado: Boolean;
-
 begin
-  Result := False;
-
+  bEliminado := False;
+  
   if not Assigned(AVendedor) then
     raise Exception.Create ('Contacto no asignado');
 
diff --git a/Source/Modulos/Contactos/Model/Contactos_model.dpk b/Source/Modulos/Contactos/Model/Contactos_model.dpk
index 54d94731..9693fa7d 100644
Binary files a/Source/Modulos/Contactos/Model/Contactos_model.dpk and b/Source/Modulos/Contactos/Model/Contactos_model.dpk differ
diff --git a/Source/Modulos/Contactos/Model/Contactos_model.dproj b/Source/Modulos/Contactos/Model/Contactos_model.dproj
index 26fb6dd7..86f28038 100644
--- a/Source/Modulos/Contactos/Model/Contactos_model.dproj
+++ b/Source/Modulos/Contactos/Model/Contactos_model.dproj
@@ -49,23 +49,21 @@
     <DelphiCompile Include="Contactos_model.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
+    <DCCReference Include="..\..\..\Cliente\ApplicationBase.dcp" />
+    <DCCReference Include="..\..\..\Cliente\Base.dcp" />
+    <DCCReference Include="..\..\..\Cliente\FormasPago_controller.dcp" />
+    <DCCReference Include="..\..\..\Cliente\FormasPago_model.dcp" />
+    <DCCReference Include="..\..\..\Cliente\GUIBase.dcp" />
+    <DCCReference Include="..\..\..\Cliente\rtl.dcp" />
+    <DCCReference Include="..\..\..\Cliente\TiposIVA_controller.dcp" />
+    <DCCReference Include="..\..\..\Cliente\TiposIVA_model.dcp" />
+    <DCCReference Include="..\..\..\Cliente\vcl.dcp" />
     <DCCReference Include="..\Utiles\uRegimenIVAUtils.pas" />
-    <DCCReference Include="Data\adortl.dcp" />
-    <DCCReference Include="Data\ApplicationBase.dcp" />
-    <DCCReference Include="Data\Base.dcp" />
-    <DCCReference Include="Data\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="Data\dbrtl.dcp" />
-    <DCCReference Include="Data\dsnap.dcp" />
-    <DCCReference Include="Data\GUIBase.dcp" />
-    <DCCReference Include="Data\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="Data\rtl.dcp" />
     <DCCReference Include="Data\uIDataModuleClientes.pas" />
     <DCCReference Include="Data\uIDataModuleContactos.pas" />
     <DCCReference Include="Data\uIDataModuleEtiquetasContactosReport.pas" />
     <DCCReference Include="Data\uIDataModuleProveedores.pas" />
     <DCCReference Include="Data\uIDataModuleVendedores.pas" />
-    <DCCReference Include="Data\vcl.dcp" />
-    <DCCReference Include="Data\vcldb.dcp" />
     <DCCReference Include="schContactosClient_Intf.pas" />
     <DCCReference Include="schContactosServer_Intf.pas" />
     <DCCReference Include="uBizClientesDescuentos.pas" />
diff --git a/Source/Modulos/Contactos/Model/Contactos_model.res b/Source/Modulos/Contactos/Model/Contactos_model.res
index 8b251f31..1641339f 100644
Binary files a/Source/Modulos/Contactos/Model/Contactos_model.res and b/Source/Modulos/Contactos/Model/Contactos_model.res differ
diff --git a/Source/Modulos/Contactos/Model/uBizContactos.pas b/Source/Modulos/Contactos/Model/uBizContactos.pas
index 21e4a991..70bca986 100644
--- a/Source/Modulos/Contactos/Model/uBizContactos.pas
+++ b/Source/Modulos/Contactos/Model/uBizContactos.pas
@@ -18,11 +18,6 @@ const
   CATEGORIA_VENDEDOR = 3;
   CATEGORIA_INSTALADOR = 4;  
 
-  PROVEEDOR_REGIMEN_IVA = 'General';
-  CLIENTE_REGIMEN_IVA = 'General';
-  CLIENTE_DIAS_VENCIMIENTO = 15;
-  CLIENTE_RECARGO_EQUIVALENCIA = 0;
-
 type
   IBizContacto = interface (IContactos)
     ['{CD585680-26B6-47A4-B684-89C468670F4A}']
@@ -382,11 +377,21 @@ type
 
 
 implementation
+
 {$INCLUDE ..\..\..\FactuGES.inc}
 
 
 uses
-  uDataTableUtils, Classes, DateUtils, SysUtils, uFactuGES_App, uBizEmpresasTiendas;
+  uDataTableUtils, Classes, DateUtils, SysUtils, uFactuGES_App,
+  uBizEmpresasTiendas, uTiposIVAController, uBizTiposIVA,
+  uFormasPagoController, uBizFormasPago;
+
+const
+  PROVEEDOR_REGIMEN_IVA = 'General';
+  CLIENTE_REGIMEN_IVA = 'General';
+  CLIENTE_DIAS_VENCIMIENTO = 15;
+  CLIENTE_RECARGO_EQUIVALENCIA = 0;
+
 
 { TBizContacto }
 
@@ -643,13 +648,16 @@ begin
 end;
 
 procedure TBizCliente.IniciarValoresContactoNuevo;
+var
+  AFormaPagoController: IFormasPagoController;
+  ATiposIVAController: ITiposIVAController;
 begin
   inherited;
   ID_CATEGORIA := CATEGORIA_CLIENTE;
   VENCIMIENTO_FACTURAS := CLIENTE_DIAS_VENCIMIENTO;
   BLOQUEADO := 0;
   RECARGO_EQUIVALENCIA := CLIENTE_RECARGO_EQUIVALENCIA;
-  REGIMEN_IVA := CLIENTE_REGIMEN_IVA;
+  REGIMEN_IVA := AppFactuGES.Configuracion.GetSettingAsString('Clientes.RegimenIVA', CLIENTE_REGIMEN_IVA);
 
   {$IFDEF CONTABILIDAD}
     IGNORAR_CONTABILIDAD := 0;
@@ -658,8 +666,23 @@ begin
     IGNORAR_CONTABILIDAD := 1;
     TIENE_SUBCUENTA := 0;
   {$ENDIF}
+
+  AFormaPagoController := TFormasPagoController.Create;
+  try
+    ID_FORMA_PAGO := AFormaPagoController.BuscarID(AppFactuGES.Configuracion.GetSettingAsString('Clientes.FormaPago'))
+  finally
+    AFormaPagoController := NIL;
+  end;
+
+  ATiposIVAController := TTiposIVAController.Create;
+  try
+    ID_TIPO_IVA := ATiposIVAController.BuscarID(AppFactuGES.Configuracion.GetSettingAsString('Clientes.TipoIVA'))
+  finally
+    ATiposIVAController := NIL;
+  end;
 end;
 
+
 { TBizProveedor }
 
 function TBizProveedor.GetGRUPO_PROVEEDORValue: String;
diff --git a/Source/Modulos/Contactos/Views/Contactos_view.dproj b/Source/Modulos/Contactos/Views/Contactos_view.dproj
index eeea6c35..af493e2e 100644
--- a/Source/Modulos/Contactos/Views/Contactos_view.dproj
+++ b/Source/Modulos/Contactos/Views/Contactos_view.dproj
@@ -49,53 +49,47 @@
     <DelphiCompile Include="Contactos_view.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\Plugin\adortl.dcp" />
-    <DCCReference Include="..\Plugin\ApplicationBase.dcp" />
-    <DCCReference Include="..\Plugin\Base.dcp" />
-    <DCCReference Include="..\Plugin\bdertl.dcp" />
-    <DCCReference Include="..\Plugin\ccpackD11.dcp" />
-    <DCCReference Include="..\Plugin\cfpack_d11.dcp" />
-    <DCCReference Include="..\Plugin\Contactos_controller.dcp" />
-    <DCCReference Include="..\Plugin\Contactos_model.dcp" />
-    <DCCReference Include="..\Plugin\cxDataD11.dcp" />
-    <DCCReference Include="..\Plugin\cxEditorsD11.dcp" />
-    <DCCReference Include="..\Plugin\cxLibraryD11.dcp" />
-    <DCCReference Include="..\Plugin\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="..\Plugin\dbrtl.dcp" />
-    <DCCReference Include="..\Plugin\designide.dcp" />
-    <DCCReference Include="..\Plugin\dsnap.dcp" />
-    <DCCReference Include="..\Plugin\dxComnD11.dcp" />
-    <DCCReference Include="..\Plugin\dxGDIPlusD11.dcp" />
-    <DCCReference Include="..\Plugin\dxLayoutControlD11.dcp" />
-    <DCCReference Include="..\Plugin\dxThemeD11.dcp" />
-    <DCCReference Include="..\Plugin\FormasPago_controller.dcp" />
-    <DCCReference Include="..\Plugin\FormasPago_model.dcp" />
-    <DCCReference Include="..\Plugin\GUIBase.dcp" />
-    <DCCReference Include="..\Plugin\GUISDK_D11.dcp" />
-    <DCCReference Include="..\Plugin\Jcl.dcp" />
-    <DCCReference Include="..\Plugin\JclVcl.dcp" />
-    <DCCReference Include="..\Plugin\JSDialog100.dcp" />
-    <DCCReference Include="..\Plugin\JvCoreD11R.dcp" />
-    <DCCReference Include="..\Plugin\JvCtrlsD11R.dcp" />
-    <DCCReference Include="..\Plugin\JvGlobusD11R.dcp" />
-    <DCCReference Include="..\Plugin\JvMMD11R.dcp" />
-    <DCCReference Include="..\Plugin\JvPageCompsD11R.dcp" />
-    <DCCReference Include="..\Plugin\JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="..\Plugin\JvSystemD11R.dcp" />
-    <DCCReference Include="..\Plugin\PngComponentsD10.dcp" />
-    <DCCReference Include="..\Plugin\PNG_D10.dcp" />
-    <DCCReference Include="..\Plugin\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="..\Plugin\rtl.dcp" />
-    <DCCReference Include="..\Plugin\tb2k_d10.dcp" />
-    <DCCReference Include="..\Plugin\tbx_d10.dcp" />
-    <DCCReference Include="..\Plugin\TiposIVA_controller.dcp" />
-    <DCCReference Include="..\Plugin\TiposIVA_model.dcp" />
-    <DCCReference Include="..\Plugin\vcl.dcp" />
-    <DCCReference Include="..\Plugin\vclactnband.dcp" />
-    <DCCReference Include="..\Plugin\vcldb.dcp" />
-    <DCCReference Include="..\Plugin\vcljpg.dcp" />
-    <DCCReference Include="..\Plugin\vclx.dcp" />
-    <DCCReference Include="..\Plugin\xmlrtl.dcp" />
+    <DCCReference Include="adortl.dcp" />
+    <DCCReference Include="ApplicationBase.dcp" />
+    <DCCReference Include="Base.dcp" />
+    <DCCReference Include="bdertl.dcp" />
+    <DCCReference Include="ccpackD11.dcp" />
+    <DCCReference Include="cfpack_d11.dcp" />
+    <DCCReference Include="Contactos_controller.dcp" />
+    <DCCReference Include="Contactos_model.dcp" />
+    <DCCReference Include="cxDataD11.dcp" />
+    <DCCReference Include="cxEditorsD11.dcp" />
+    <DCCReference Include="cxLibraryD11.dcp" />
+    <DCCReference Include="DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="dbrtl.dcp" />
+    <DCCReference Include="designide.dcp" />
+    <DCCReference Include="dsnap.dcp" />
+    <DCCReference Include="dxComnD11.dcp" />
+    <DCCReference Include="dxGDIPlusD11.dcp" />
+    <DCCReference Include="dxLayoutControlD11.dcp" />
+    <DCCReference Include="dxThemeD11.dcp" />
+    <DCCReference Include="FormasPago_controller.dcp" />
+    <DCCReference Include="FormasPago_model.dcp" />
+    <DCCReference Include="GUIBase.dcp" />
+    <DCCReference Include="GUISDK_D11.dcp" />
+    <DCCReference Include="Jcl.dcp" />
+    <DCCReference Include="JclVcl.dcp" />
+    <DCCReference Include="JSDialog100.dcp" />
+    <DCCReference Include="JvCoreD11R.dcp" />
+    <DCCReference Include="JvCtrlsD11R.dcp" />
+    <DCCReference Include="JvGlobusD11R.dcp" />
+    <DCCReference Include="JvMMD11R.dcp" />
+    <DCCReference Include="JvPageCompsD11R.dcp" />
+    <DCCReference Include="JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="JvSystemD11R.dcp" />
+    <DCCReference Include="PngComponentsD10.dcp" />
+    <DCCReference Include="PNG_D10.dcp" />
+    <DCCReference Include="RemObjects_Core_D11.dcp" />
+    <DCCReference Include="rtl.dcp" />
+    <DCCReference Include="tb2k_d10.dcp" />
+    <DCCReference Include="tbx_d10.dcp" />
+    <DCCReference Include="TiposIVA_controller.dcp" />
+    <DCCReference Include="TiposIVA_model.dcp" />
     <DCCReference Include="uContactosViewRegister.pas" />
     <DCCReference Include="uEditorCliente.pas">
       <Form>fEditorCliente</Form>
@@ -227,6 +221,12 @@
       <Form>frViewVendedores</Form>
       <DesignClass>TCustomView</DesignClass>
     </DCCReference>
+    <DCCReference Include="vcl.dcp" />
+    <DCCReference Include="vclactnband.dcp" />
+    <DCCReference Include="vcldb.dcp" />
+    <DCCReference Include="vcljpg.dcp" />
+    <DCCReference Include="vclx.dcp" />
+    <DCCReference Include="xmlrtl.dcp" />
   </ItemGroup>
 </Project>
 <!-- EurekaLog First Line
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 e98c767c..c4c89767 100644
--- a/Source/Modulos/Contactos/Views/uEditorCliente.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorCliente.dfm
@@ -65,6 +65,7 @@ inherited fEditorCliente: TfEditorCliente
   inherited pgPaginas: TPageControl
     Width = 890
     Height = 544
+    ActivePage = pagDatosComerciales
     ExplicitWidth = 890
     ExplicitHeight = 544
     inherited pagGeneral: TTabSheet
@@ -113,20 +114,20 @@ inherited fEditorCliente: TfEditorCliente
           inherited eCalle: TcxDBTextEdit
             Top = 243
             ExplicitTop = 243
-            ExplicitWidth = 268
-            Width = 268
+            ExplicitWidth = 428
+            Width = 428
           end
           inherited cbProvincia: TcxDBComboBox
             Top = 270
             ExplicitTop = 270
-            ExplicitWidth = 121
-            Width = 121
+            ExplicitWidth = 336
+            Width = 336
           end
           inherited cbPoblacion: TcxDBComboBox
             Top = 297
             ExplicitTop = 297
-            ExplicitWidth = 213
-            Width = 213
+            ExplicitWidth = 428
+            Width = 428
           end
           inherited eCodigoPostal: TcxDBTextEdit
             Left = 504
@@ -137,92 +138,92 @@ inherited fEditorCliente: TfEditorCliente
           inherited eObservaciones: TcxDBMemo
             Top = 426
             ExplicitTop = 426
-            ExplicitWidth = 587
-            ExplicitHeight = 33
-            Height = 33
-            Width = 587
+            ExplicitWidth = 838
+            ExplicitHeight = 74
+            Height = 74
+            Width = 838
           end
           inherited eNombreComercial: TcxDBTextEdit
             Top = 84
             ExplicitTop = 84
-            ExplicitWidth = 265
-            Width = 265
+            ExplicitWidth = 428
+            Width = 428
           end
           inherited cbClienteBloqueado: TcxDBCheckBox
             Top = 348
             ExplicitTop = 348
-            ExplicitWidth = 163
-            Width = 163
+            ExplicitWidth = 538
+            Width = 538
           end
           inherited cbGrupoCliente: TcxDBComboBox
             Top = 138
             ExplicitTop = 138
-            ExplicitWidth = 40
-            Width = 40
+            ExplicitWidth = 428
+            Width = 428
           end
           inherited eBloqueo: TcxDBTextEdit
             Top = 375
             ExplicitTop = 375
-            ExplicitWidth = 205
-            Width = 205
+            ExplicitWidth = 428
+            Width = 428
           end
           inherited eCodigoAsignado: TcxDBTextEdit
             Top = 111
             ExplicitTop = 111
-            ExplicitWidth = 227
-            Width = 227
+            ExplicitWidth = 428
+            Width = 428
           end
           inherited cbProcedenciaCliente: TcxDBComboBox
             Top = 165
             ExplicitTop = 165
-            ExplicitWidth = 211
-            Width = 211
+            ExplicitWidth = 428
+            Width = 428
           end
           inherited eTlfParticular: TcxDBTextEdit
             Left = 683
             Top = 57
             ExplicitLeft = 683
             ExplicitTop = 57
-            ExplicitWidth = 91
-            Width = 91
+            ExplicitWidth = 177
+            Width = 177
           end
           inherited eTlfTrabajo: TcxDBTextEdit
             Left = 683
             Top = 30
             ExplicitLeft = 683
             ExplicitTop = 30
-            ExplicitWidth = 127
-            Width = 127
+            ExplicitWidth = 177
+            Width = 177
           end
           inherited eTlfMovil: TcxDBTextEdit
             Left = 683
             Top = 84
             ExplicitLeft = 683
             ExplicitTop = 84
-            ExplicitWidth = 157
-            Width = 157
+            ExplicitWidth = 177
+            Width = 177
           end
           inherited eFax: TcxDBTextEdit
             Left = 683
             Top = 111
             ExplicitLeft = 683
             ExplicitTop = 111
-            ExplicitWidth = 121
-            Width = 121
+            ExplicitWidth = 177
+            Width = 177
           end
           inherited eNombre: TcxDBTextEdit
             Top = 57
             ExplicitTop = 57
-            ExplicitWidth = 158
-            Width = 158
+            ExplicitWidth = 428
+            Width = 428
           end
           inherited eNIFCIF: TcxDBTextEdit
             Left = 289
             Top = 30
             ExplicitLeft = 289
             ExplicitTop = 30
-            ExplicitWidth = 268
-            Width = 268
+            ExplicitWidth = 271
+            Width = 271
           end
           inherited eMailTrabajo: TcxDBHyperLinkEdit
             Left = 683
@@ -230,8 +231,8 @@ inherited fEditorCliente: TfEditorCliente
             Properties.Prefix = 'mailto:'
             ExplicitLeft = 683
             ExplicitTop = 162
-            ExplicitWidth = 121
-            Width = 121
+            ExplicitWidth = 148
+            Width = 148
           end
           inherited eMailParticular: TcxDBHyperLinkEdit
             Left = 683
@@ -239,28 +240,28 @@ inherited fEditorCliente: TfEditorCliente
             Properties.Prefix = 'mailto:'
             ExplicitLeft = 683
             ExplicitTop = 190
-            ExplicitWidth = 121
-            Width = 121
+            ExplicitWidth = 148
+            Width = 148
           end
           inherited ePaginaWeb: TcxDBHyperLinkEdit
             Left = 683
             Top = 217
             ExplicitLeft = 683
             ExplicitTop = 217
-            ExplicitWidth = 121
-            Width = 121
+            ExplicitWidth = 148
+            Width = 148
           end
           inherited eReferencia: TcxDBTextEdit
             Top = 30
             ExplicitTop = 30
-            ExplicitWidth = 102
-            Width = 102
+            ExplicitWidth = 104
+            Width = 104
           end
           inherited ePersonaContacto: TcxDBTextEdit
             Top = 216
             ExplicitTop = 216
-            ExplicitWidth = 253
-            Width = 253
+            ExplicitWidth = 428
+            Width = 428
           end
           inherited frViewTienda1: TfrViewTienda
             Left = 588
@@ -269,8 +270,8 @@ inherited fEditorCliente: TfEditorCliente
             ExplicitTop = 270
             inherited dxLayoutControl1: TdxLayoutControl
               inherited cbTienda: TcxComboBox
-                ExplicitWidth = 250
-                Width = 250
+                ExplicitWidth = 229
+                Width = 229
               end
             end
           end
@@ -294,22 +295,22 @@ inherited fEditorCliente: TfEditorCliente
           LookAndFeel = dxLayoutOfficeLookAndFeel
           ExplicitWidth = 882
           inherited eEntidad: TcxDBTextEdit
-            ExplicitWidth = 114
-            Width = 114
+            ExplicitWidth = 345
+            Width = 345
           end
           inherited eSucursal: TcxDBTextEdit
             Left = 542
             ExplicitLeft = 542
-            ExplicitWidth = 112
-            Width = 112
+            ExplicitWidth = 318
+            Width = 318
           end
           inherited eCuenta: TcxDBTextEdit
-            ExplicitWidth = 194
-            Width = 194
+            ExplicitWidth = 622
+            Width = 622
           end
           inherited eTitular: TcxDBTextEdit
-            ExplicitWidth = 194
-            Width = 194
+            ExplicitWidth = 743
+            Width = 743
           end
         end
       end
@@ -335,23 +336,25 @@ inherited fEditorCliente: TfEditorCliente
         ExplicitHeight = 193
         inherited dxLayoutControl1: TdxLayoutControl
           Width = 882
+          Height = 193
           LookAndFeel = dxLayoutOfficeLookAndFeel
           ExplicitWidth = 882
+          ExplicitHeight = 193
           inherited Label1: TLabel
-            Left = 492
+            Left = 570
             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 = 492
+            ExplicitLeft = 570
             ExplicitTop = 30
             ExplicitWidth = 281
           end
           inherited eDiasVencimiento: TcxDBSpinEdit
-            Left = 618
+            Left = 696
             Top = 62
-            ExplicitLeft = 618
+            ExplicitLeft = 696
             ExplicitTop = 62
             ExplicitWidth = 160
             Width = 160
@@ -359,37 +362,37 @@ inherited fEditorCliente: TfEditorCliente
           inherited cbRegimenIVA: TcxDBComboBox
             Top = 30
             ExplicitTop = 30
-            ExplicitWidth = 121
-            Width = 121
+            ExplicitWidth = 427
+            Width = 427
           end
           inherited cbRecargoEquivalencia: TcxDBCheckBox
             Top = 111
             ExplicitTop = 111
-            ExplicitWidth = 121
-            Width = 121
+            ExplicitWidth = 427
+            Width = 427
           end
           inherited cbFormaPago: TcxDBLookupComboBox
             Top = 57
             ExplicitTop = 57
-            ExplicitWidth = 121
-            Width = 121
+            ExplicitWidth = 289
+            Width = 289
           end
           inherited bFormasPago: TButton
-            Left = 332
+            Left = 410
             Top = 57
-            ExplicitLeft = 332
+            ExplicitLeft = 410
             ExplicitTop = 57
           end
           inherited eIVA: TcxDBLookupComboBox
             Top = 84
             ExplicitTop = 84
-            ExplicitWidth = 121
-            Width = 121
+            ExplicitWidth = 289
+            Width = 289
           end
           inherited bTiposIVA: TButton
-            Left = 332
+            Left = 410
             Top = 84
-            ExplicitLeft = 332
+            ExplicitLeft = 410
             ExplicitTop = 84
           end
           inherited dxLayoutGroup1: TdxLayoutGroup
@@ -436,6 +439,18 @@ inherited fEditorCliente: TfEditorCliente
         inherited ToolBar1: TToolBar
           Width = 882
           ExplicitWidth = 882
+          inherited ToolButton1: TToolButton
+            ExplicitWidth = 113
+          end
+          inherited ToolButton4: TToolButton
+            ExplicitWidth = 113
+          end
+          inherited ToolButton2: TToolButton
+            ExplicitWidth = 113
+          end
+          inherited ToolButton7: TToolButton
+            ExplicitWidth = 113
+          end
         end
       end
     end
@@ -512,16 +527,16 @@ inherited fEditorCliente: TfEditorCliente
             882
             516)
           inherited eRefSubCuenta: TcxDBTextEdit
-            ExplicitWidth = 346
-            Width = 346
+            ExplicitWidth = 441
+            Width = 441
           end
           inherited BitBtn3: TBitBtn
             Left = 540
             ExplicitLeft = 540
           end
           inherited eSubCuenta: TcxDBTextEdit
-            ExplicitWidth = 265
-            Width = 265
+            ExplicitWidth = 779
+            Width = 779
           end
           inherited BitBtn1: TBitBtn
             Left = 656
@@ -533,8 +548,8 @@ inherited fEditorCliente: TfEditorCliente
           end
           inherited cbIgnorarContabilidad: TcxDBCheckBox
             DataBinding.DataSource = frViewCliente1.dsContacto
-            ExplicitWidth = 300
-            Width = 300
+            ExplicitWidth = 862
+            Width = 862
           end
         end
       end
diff --git a/Source/Modulos/Contactos/Views/uEditorContacto.dfm b/Source/Modulos/Contactos/Views/uEditorContacto.dfm
index 318a0e8c..4181946a 100644
--- a/Source/Modulos/Contactos/Views/uEditorContacto.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorContacto.dfm
@@ -7,6 +7,7 @@ inherited fEditorContacto: TfEditorContacto
   ClientWidth = 632
   Scaled = False
   ExplicitWidth = 640
+  ExplicitHeight = 240
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
diff --git a/Source/Modulos/Contactos/Views/uViewCliente.dfm b/Source/Modulos/Contactos/Views/uViewCliente.dfm
index 65113a3a..5ff62e0e 100644
--- a/Source/Modulos/Contactos/Views/uViewCliente.dfm
+++ b/Source/Modulos/Contactos/Views/uViewCliente.dfm
@@ -28,8 +28,6 @@ inherited frViewCliente: TfrViewCliente
       TabOrder = 8
       ExplicitLeft = 132
       ExplicitTop = 247
-      ExplicitWidth = 181
-      Width = 181
     end
     inherited cbProvincia: TcxDBComboBox
       Left = 132
@@ -262,8 +260,6 @@ inherited frViewCliente: TfrViewCliente
     inherited eReferencia: TcxDBTextEdit
       Left = 132
       ExplicitLeft = 132
-      ExplicitWidth = 38
-      Width = 38
     end
     inherited ePersonaContacto: TcxDBTextEdit
       Left = 132
@@ -271,8 +267,6 @@ inherited frViewCliente: TfrViewCliente
       TabOrder = 7
       ExplicitLeft = 132
       ExplicitTop = 220
-      ExplicitWidth = 256
-      Width = 256
     end
     inherited frViewTienda1: TfrViewTienda
       Left = 354
@@ -284,10 +278,6 @@ inherited frViewCliente: TfrViewCliente
       inherited dxLayoutControl1: TdxLayoutControl
         Width = 270
         ExplicitWidth = 270
-        inherited cbTienda: TcxComboBox
-          ExplicitWidth = 376
-          Width = 376
-        end
       end
     end
     inherited dxLayoutControlContactoGroup_Root: TdxLayoutGroup
diff --git a/Source/Modulos/Contactos/Views/uViewCliente.pas b/Source/Modulos/Contactos/Views/uViewCliente.pas
index 245c5c67..0271656e 100644
--- a/Source/Modulos/Contactos/Views/uViewCliente.pas
+++ b/Source/Modulos/Contactos/Views/uViewCliente.pas
@@ -12,7 +12,13 @@ uses
   PngSpeedButton, PngImageList, cxGraphics, cxMaskEdit, cxDropDownEdit,
   cxLookupEdit, cxDBLookupEdit, cxDBLookupComboBox, uGruposClienteController,
   uProcedenciasClienteController, cxCheckBox, cxSpinEdit, Grids, DBGrids, uDAInterfaces,
-  uViewTienda;
+  uViewTienda, dxSkinsCore, dxSkinBlack, dxSkinBlue, dxSkinCaramel,
+  dxSkinCoffee, dxSkinGlassOceans, dxSkiniMaginary, dxSkinLilian,
+  dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMoneyTwins,
+  dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green,
+  dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinSilver, dxSkinStardust,
+  dxSkinsDefaultPainters, dxSkinValentine, dxSkinXmas2008Blue,
+  dxSkinsdxLCPainter;
 
 type
   IViewCliente = interface(IViewContacto)
diff --git a/Source/Modulos/Contactos/Views/uViewClienteDatosComerciales.dfm b/Source/Modulos/Contactos/Views/uViewClienteDatosComerciales.dfm
index cd5d5e50..2f2bbdc9 100644
--- a/Source/Modulos/Contactos/Views/uViewClienteDatosComerciales.dfm
+++ b/Source/Modulos/Contactos/Views/uViewClienteDatosComerciales.dfm
@@ -13,9 +13,10 @@ inherited frViewClienteDatosComerciales: TfrViewClienteDatosComerciales
     Align = alTop
     ParentBackground = True
     TabOrder = 0
+    TabStop = False
     AutoContentSizes = [acsWidth]
     object Label1: TLabel
-      Left = 353
+      Left = 317
       Top = 28
       Width = 299
       Height = 26
@@ -26,7 +27,7 @@ inherited frViewClienteDatosComerciales: TfrViewClienteDatosComerciales
       WordWrap = True
     end
     object eDiasVencimiento: TcxDBSpinEdit
-      Left = 420
+      Left = 384
       Top = 60
       DataBinding.DataField = 'VENCIMIENTO_FACTURAS'
       DataBinding.DataSource = dsDatosComerciales
@@ -70,7 +71,7 @@ inherited frViewClienteDatosComerciales: TfrViewClienteDatosComerciales
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 0
-      Width = 121
+      Width = 181
     end
     object cbRecargoEquivalencia: TcxDBCheckBox
       Left = 107
@@ -94,7 +95,7 @@ inherited frViewClienteDatosComerciales: TfrViewClienteDatosComerciales
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 5
-      Width = 121
+      Width = 181
     end
     object cbFormaPago: TcxDBLookupComboBox
       Left = 107
@@ -111,6 +112,7 @@ inherited frViewClienteDatosComerciales: TfrViewClienteDatosComerciales
       Properties.ListOptions.ShowHeader = False
       Properties.ListOptions.SyncMode = True
       Properties.ListSource = dsFormaPago
+      Properties.PostPopupValueOnTab = True
       Style.BorderColor = clWindowFrame
       Style.BorderStyle = ebs3D
       Style.HotTrack = False
@@ -125,10 +127,10 @@ inherited frViewClienteDatosComerciales: TfrViewClienteDatosComerciales
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 1
-      Width = 121
+      Width = 43
     end
     object bFormasPago: TButton
-      Left = 191
+      Left = 155
       Top = 55
       Width = 132
       Height = 21
@@ -151,6 +153,7 @@ inherited frViewClienteDatosComerciales: TfrViewClienteDatosComerciales
       Properties.ListOptions.ShowHeader = False
       Properties.ListOptions.SyncMode = True
       Properties.ListSource = dsTiposIVA
+      Properties.PostPopupValueOnTab = True
       Style.BorderColor = clWindowFrame
       Style.BorderStyle = ebs3D
       Style.HotTrack = False
@@ -165,10 +168,10 @@ inherited frViewClienteDatosComerciales: TfrViewClienteDatosComerciales
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 3
-      Width = 121
+      Width = 43
     end
     object bTiposIVA: TButton
-      Left = 191
+      Left = 155
       Top = 82
       Width = 132
       Height = 21
diff --git a/Source/Modulos/Contactos/Views/uViewClienteDatosComerciales.pas b/Source/Modulos/Contactos/Views/uViewClienteDatosComerciales.pas
index c5d10398..0a905a5e 100644
--- a/Source/Modulos/Contactos/Views/uViewClienteDatosComerciales.pas
+++ b/Source/Modulos/Contactos/Views/uViewClienteDatosComerciales.pas
@@ -8,7 +8,13 @@ uses
   cxContainer, cxEdit, cxTextEdit, cxMaskEdit, cxDropDownEdit, cxLookupEdit,
   cxDBLookupEdit, cxDBLookupComboBox, cxControls, cxSpinEdit, cxDBEdit,
   uBizContactos, cxCheckBox, StdCtrls, uFormasPagoController, uTiposIVAController,
-  uDAInterfaces, uBizFormasPago, uBizTiposIVA;
+  uDAInterfaces, uBizFormasPago, uBizTiposIVA, dxSkinsCore, dxSkinBlack,
+  dxSkinBlue, dxSkinCaramel, dxSkinCoffee, dxSkinGlassOceans, dxSkiniMaginary,
+  dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin,
+  dxSkinMoneyTwins, dxSkinOffice2007Black, dxSkinOffice2007Blue,
+  dxSkinOffice2007Green, dxSkinOffice2007Pink, dxSkinOffice2007Silver,
+  dxSkinSilver, dxSkinStardust, dxSkinsDefaultPainters, dxSkinValentine,
+  dxSkinXmas2008Blue, dxSkinsdxLCPainter;
 
 type
   IViewClienteDatosComerciales = interface(IViewBase)
@@ -68,7 +74,7 @@ implementation
 {$R *.dfm}
 
 uses
-  uRegimenIVAUtils;
+  uRegimenIVAUtils, uFactuGES_App;
 
 { TfrViewClienteDatosComerciales }
 
@@ -138,11 +144,6 @@ begin
     FTiposIVA := FTiposIVAController.BuscarTodos;
     dsTiposIVA.DataTable := FTiposIVA.DataTable;
     dsTiposIVA.DataTable.Active := True;
-
-    //Por defecto se establece la primera forma de pago (CONTADO) y la primera forma de IVA (16%)
-    cbFormaPago.ItemIndex := 0;
-    eIVA.ItemIndex := 0;
-  
   end
   else begin
     dsDatosComerciales.DataTable := NIL;
diff --git a/Source/Modulos/Contactos/Views/uViewClienteDescuentos.dfm b/Source/Modulos/Contactos/Views/uViewClienteDescuentos.dfm
index 3415f3a1..55f8ac26 100644
--- a/Source/Modulos/Contactos/Views/uViewClienteDescuentos.dfm
+++ b/Source/Modulos/Contactos/Views/uViewClienteDescuentos.dfm
@@ -22,7 +22,7 @@ inherited frViewClienteDescuentos: TfrViewClienteDescuentos
           end>
         Properties.ListOptions.GridLines = glNone
         Properties.ListOptions.ShowHeader = False
-        Properties.ListOptions.SyncMode = True        
+        Properties.ListOptions.SyncMode = True
         Properties.ListSource = dsProveedores
       end
       object cxGridViewDESCUENTO: TcxGridDBColumn
diff --git a/Source/Modulos/Contactos/Views/uViewClienteDescuentos.pas b/Source/Modulos/Contactos/Views/uViewClienteDescuentos.pas
index 0bed2d29..37b90318 100644
--- a/Source/Modulos/Contactos/Views/uViewClienteDescuentos.pas
+++ b/Source/Modulos/Contactos/Views/uViewClienteDescuentos.pas
@@ -9,7 +9,13 @@ uses
   PngImageList, uDADataTable, ComCtrls, ToolWin, cxGridLevel,
   cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses,
   cxControls, cxGridCustomView, cxGrid, cxDBLookupComboBox, cxSpinEdit,
-  uBizContactos, uProveedoresController, uDAInterfaces;
+  uBizContactos, uProveedoresController, uDAInterfaces, dxSkinsCore,
+  dxSkinBlack, dxSkinBlue, dxSkinCaramel, dxSkinCoffee, dxSkinGlassOceans,
+  dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky,
+  dxSkinMcSkin, dxSkinMoneyTwins, dxSkinOffice2007Black, dxSkinOffice2007Blue,
+  dxSkinOffice2007Green, dxSkinOffice2007Pink, dxSkinOffice2007Silver,
+  dxSkinSilver, dxSkinStardust, dxSkinsDefaultPainters, dxSkinValentine,
+  dxSkinXmas2008Blue, dxSkinscxPCPainter;
 
 type
   TfrViewClienteDescuentos = class(TfrViewDetallesGenerico)
diff --git a/Source/Modulos/Contactos/Views/uViewConfiguracionContactos.dfm b/Source/Modulos/Contactos/Views/uViewConfiguracionContactos.dfm
index 6daa61f8..b89f0fda 100644
--- a/Source/Modulos/Contactos/Views/uViewConfiguracionContactos.dfm
+++ b/Source/Modulos/Contactos/Views/uViewConfiguracionContactos.dfm
@@ -1,10 +1,7 @@
 inherited frViewConfiguracionContactos: TfrViewConfiguracionContactos
-  Height = 325
-  ExplicitHeight = 325
   inherited Panel1: TPanel
-    Visible = False
     inherited Label3: TLabel
-      Width = 429
+      Width = 166
       Caption = 'Configuraci'#243'n para clientes'
       ExplicitWidth = 166
     end
@@ -12,4 +9,92 @@ inherited frViewConfiguracionContactos: TfrViewConfiguracionContactos
   inherited JvGradientHeaderPanel1: TJvGradientHeaderPanel
     LabelCaption = 'Configuraci'#243'n para contactos'
   end
+  object Panel3: TPanel
+    AlignWithMargins = True
+    Left = 5
+    Top = 68
+    Width = 441
+    Height = 149
+    Margins.Left = 5
+    Margins.Top = 0
+    Margins.Right = 5
+    Margins.Bottom = 0
+    Align = alTop
+    BevelOuter = bvNone
+    ParentColor = True
+    TabOrder = 2
+    object Label1: TLabel
+      Left = 17
+      Top = 54
+      Width = 76
+      Height = 13
+      Caption = 'Forma de pago:'
+    end
+    object Label2: TLabel
+      Left = 6
+      Top = 16
+      Width = 31
+      Height = 13
+      Caption = 'Label2'
+    end
+    object Label4: TLabel
+      Left = 17
+      Top = 81
+      Width = 80
+      Height = 13
+      Caption = 'R'#233'gimen de IVA:'
+    end
+    object Label5: TLabel
+      Left = 17
+      Top = 108
+      Width = 50
+      Height = 13
+      Caption = '% de IVA:'
+    end
+    object cbFormaPago: TComboBox
+      Left = 111
+      Top = 51
+      Width = 168
+      Height = 21
+      Style = csDropDownList
+      ItemHeight = 0
+      TabOrder = 0
+    end
+    object cbRegimenIVA: TComboBox
+      Left = 111
+      Top = 78
+      Width = 168
+      Height = 21
+      Style = csDropDownList
+      ItemHeight = 0
+      TabOrder = 1
+    end
+    object bFormasPago: TButton
+      Left = 285
+      Top = 51
+      Width = 132
+      Height = 21
+      Caption = 'Ver las formas de pago...'
+      TabOrder = 2
+      OnClick = bFormasPagoClick
+    end
+    object bTiposIVA: TButton
+      Left = 285
+      Top = 105
+      Width = 132
+      Height = 21
+      Caption = 'Ver los tipos de IVA...'
+      TabOrder = 3
+      OnClick = bTiposIVAClick
+    end
+    object cbIVA: TComboBox
+      Left = 111
+      Top = 105
+      Width = 168
+      Height = 21
+      Style = csDropDownList
+      ItemHeight = 0
+      TabOrder = 4
+    end
+  end
 end
diff --git a/Source/Modulos/Contactos/Views/uViewConfiguracionContactos.pas b/Source/Modulos/Contactos/Views/uViewConfiguracionContactos.pas
index fda78506..a93055e9 100644
--- a/Source/Modulos/Contactos/Views/uViewConfiguracionContactos.pas
+++ b/Source/Modulos/Contactos/Views/uViewConfiguracionContactos.pas
@@ -5,23 +5,33 @@ interface
 uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Dialogs, uViewConfiguracionBase, JvExControls, JvGradientHeaderPanel,
-  StdCtrls, ExtCtrls, dxSkinsCore, dxSkinBlack, dxSkinBlue, dxSkinCaramel,
-  dxSkinCoffee, dxSkinGlassOceans, dxSkiniMaginary, dxSkinLilian,
-  dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMoneyTwins,
-  dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green,
-  dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinSilver, dxSkinStardust,
-  dxSkinsDefaultPainters, dxSkinValentine, dxSkinXmas2008Blue, cxControls,
-  cxContainer, cxEdit, cxTextEdit, cxMaskEdit, cxSpinEdit;
+  StdCtrls, ExtCtrls, uFormasPagoController, uTiposIVAController,
+  uBizFormasPago, uBizTiposIVA;
 
 type
   TfrViewConfiguracionContactos = class(TfrViewConfiguracionBase)
+    Panel3: TPanel;
+    Label1: TLabel;
+    cbFormaPago: TComboBox;
+    Label2: TLabel;
+    Label4: TLabel;
+    cbRegimenIVA: TComboBox;
+    Label5: TLabel;
+    bFormasPago: TButton;
+    bTiposIVA: TButton;
+    cbIVA: TComboBox;
+    procedure bFormasPagoClick(Sender: TObject);
+    procedure bTiposIVAClick(Sender: TObject);
   private
-    { Private declarations }
+    FFormasPagoController : IFormasPagoController;
+    FTiposIVAController : ITiposIVAController;
   public
     class function GetViewClass : TClass; override;
     class function DarEtiqueta : String; override;
+    constructor Create(AOwner: TComponent); override;
     procedure CargarValores; override;
     procedure GuardarValores; override;
+    destructor Destroy; override;
   end;
 
 
@@ -29,12 +39,49 @@ implementation
 
 {$R *.dfm}
 
+uses
+  uRegimenIVAUtils, uFactuGES_App;
+
 { TfrViewConfiguracionBase1 }
 
+procedure TfrViewConfiguracionContactos.bFormasPagoClick(Sender: TObject);
+begin
+  inherited;
+  with FFormasPagoController do
+  begin
+    VerTodos(BuscarTodos);
+    cbFormaPago.Items := DarListaFormasPago;
+  end;
+end;
+
+procedure TfrViewConfiguracionContactos.bTiposIVAClick(Sender: TObject);
+begin
+  inherited;
+  with FTiposIVAController do
+  begin
+    VerTodos(BuscarTodos);
+    cbIVA.Items := DarListaTiposIVA;
+  end;
+end;
+
 procedure TfrViewConfiguracionContactos.CargarValores;
 begin
   inherited;
-  //
+
+  cbRegimenIVA.Items := DarRegimenesIVA;
+  cbFormaPago.Items := FFormasPagoController.DarListaFormasPago;
+  cbIVA.Items := FTiposIVAController.DarListaTiposIVA;
+
+  cbRegimenIVA.ItemIndex := cbRegimenIVA.Items.IndexOf (AppFactuGES.Configuracion.GetSettingAsString('Clientes.RegimenIVA', cbRegimenIVA.Items[0]));
+  cbFormaPago.ItemIndex := cbFormaPago.Items.IndexOf (AppFactuGES.Configuracion.GetSettingAsString('Clientes.FormaPago', cbFormaPago.Items[0]));
+  cbIVA.ItemIndex := cbIVA.Items.IndexOf (AppFactuGES.Configuracion.GetSettingAsString('Clientes.TipoIVA'));
+end;
+
+constructor TfrViewConfiguracionContactos.Create(AOwner: TComponent);
+begin
+  inherited;
+  FFormasPagoController := TFormasPagoController.Create;
+  FTiposIVAController := TTiposIVAController.Create;
 end;
 
 class function TfrViewConfiguracionContactos.DarEtiqueta: String;
@@ -42,6 +89,13 @@ begin
   Result := 'Contactos';
 end;
 
+destructor TfrViewConfiguracionContactos.Destroy;
+begin
+  FFormasPagoController := NIL;
+  FTiposIVAController := NIL;
+  inherited;
+end;
+
 class function TfrViewConfiguracionContactos.GetViewClass: TClass;
 begin
   Result := TfrViewConfiguracionContactos;
@@ -50,7 +104,9 @@ end;
 procedure TfrViewConfiguracionContactos.GuardarValores;
 begin
   inherited;
-  //
+  AppFactuGES.Configuracion.SetSettingAsString('Clientes.RegimenIVA', cbRegimenIVA.Text);
+  AppFactuGES.Configuracion.SetSettingAsString('Clientes.FormaPago', cbFormaPago.Text);
+  AppFactuGES.Configuracion.SetSettingAsString('Clientes.TipoIVA', cbIVA.Text);
 end;
 
 end.
diff --git a/Source/Modulos/Contactos/Views/uViewContacto.dfm b/Source/Modulos/Contactos/Views/uViewContacto.dfm
index 3b2ad9bd..daa45314 100644
--- a/Source/Modulos/Contactos/Views/uViewContacto.dfm
+++ b/Source/Modulos/Contactos/Views/uViewContacto.dfm
@@ -11,6 +11,7 @@ inherited frViewContacto: TfrViewContacto
     Align = alClient
     ParentBackground = True
     TabOrder = 0
+    TabStop = False
     AutoContentSizes = [acsWidth, acsHeight]
     object PngSpeedButton1: TPngSpeedButton
       Left = 579
@@ -130,6 +131,8 @@ inherited frViewContacto: TfrViewContacto
       Style.BorderStyle = ebs3D
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
+      Style.ButtonStyle = bts3D
+      Style.PopupBorderStyle = epbsFrame3D
       StyleDisabled.LookAndFeel.Kind = lfStandard
       StyleDisabled.LookAndFeel.NativeStyle = True
       StyleFocused.LookAndFeel.Kind = lfStandard
@@ -149,6 +152,8 @@ inherited frViewContacto: TfrViewContacto
       Style.BorderStyle = ebs3D
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
+      Style.ButtonStyle = bts3D
+      Style.PopupBorderStyle = epbsFrame3D
       StyleDisabled.LookAndFeel.Kind = lfStandard
       StyleDisabled.LookAndFeel.NativeStyle = True
       StyleFocused.LookAndFeel.Kind = lfStandard
diff --git a/Source/Modulos/Contactos/Views/uViewContacto.pas b/Source/Modulos/Contactos/Views/uViewContacto.pas
index db82616a..d299d3de 100644
--- a/Source/Modulos/Contactos/Views/uViewContacto.pas
+++ b/Source/Modulos/Contactos/Views/uViewContacto.pas
@@ -10,7 +10,13 @@ uses
   cxDBEdit, dxLayoutControl, dxLayoutLookAndFeels, cxMemo, cxHyperLinkEdit,
   ImgList, ActnList, PngImageList, PngSpeedButton, uDAInterfaces, uBizEmpresasTiendas,
   cxGraphics, cxMaskEdit, cxDropDownEdit, uContactosController,
-  cxLookupEdit, cxDBLookupEdit, cxDBLookupComboBox, uViewTienda;
+  cxLookupEdit, cxDBLookupEdit, cxDBLookupComboBox, uViewTienda, dxSkinsCore,
+  dxSkinBlack, dxSkinBlue, dxSkinCaramel, dxSkinCoffee, dxSkinGlassOceans,
+  dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky,
+  dxSkinMcSkin, dxSkinMoneyTwins, dxSkinOffice2007Black, dxSkinOffice2007Blue,
+  dxSkinOffice2007Green, dxSkinOffice2007Pink, dxSkinOffice2007Silver,
+  dxSkinSilver, dxSkinStardust, dxSkinsDefaultPainters, dxSkinValentine,
+  dxSkinXmas2008Blue, dxSkinsdxLCPainter;
 
 type
   IViewContacto = interface(IViewBase)
@@ -291,8 +297,6 @@ begin
 end;
 
 procedure TfrViewContacto.SetContacto(const Value: IBizContacto);
-var
-  i : integer;
 begin
   FContacto := Value;
   if Assigned(FContacto) then
diff --git a/Source/Modulos/Contactos/Views/uViewContactoDatosBancarios.dfm b/Source/Modulos/Contactos/Views/uViewContactoDatosBancarios.dfm
index db311d51..405d3d2e 100644
--- a/Source/Modulos/Contactos/Views/uViewContactoDatosBancarios.dfm
+++ b/Source/Modulos/Contactos/Views/uViewContactoDatosBancarios.dfm
@@ -11,6 +11,7 @@ inherited frViewClienteDatosBancarios: TfrViewClienteDatosBancarios
     Align = alTop
     ParentBackground = True
     TabOrder = 0
+    TabStop = False
     AutoContentSizes = [acsWidth]
     object eEntidad: TcxDBTextEdit
       Left = 117
diff --git a/Source/Modulos/Contactos/Views/uViewContactoDatosBancarios.pas b/Source/Modulos/Contactos/Views/uViewContactoDatosBancarios.pas
index ef75386e..536067bf 100644
--- a/Source/Modulos/Contactos/Views/uViewContactoDatosBancarios.pas
+++ b/Source/Modulos/Contactos/Views/uViewContactoDatosBancarios.pas
@@ -5,7 +5,13 @@ interface
 uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Dialogs, uViewBase, dxLayoutControl, cxControls, cxContainer, cxEdit,
-  cxTextEdit, cxDBEdit, DB, uDADataTable, uDAInterfaces;
+  cxTextEdit, cxDBEdit, DB, uDADataTable, uDAInterfaces, dxSkinsCore,
+  dxSkinBlack, dxSkinBlue, dxSkinCaramel, dxSkinCoffee, dxSkinGlassOceans,
+  dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky,
+  dxSkinMcSkin, dxSkinMoneyTwins, dxSkinOffice2007Black, dxSkinOffice2007Blue,
+  dxSkinOffice2007Green, dxSkinOffice2007Pink, dxSkinOffice2007Silver,
+  dxSkinSilver, dxSkinStardust, dxSkinsDefaultPainters, dxSkinValentine,
+  dxSkinXmas2008Blue, dxSkinsdxLCPainter;
 
 type
   IViewDatosBancarios = interface(IViewBase)
diff --git a/Source/Modulos/Contactos/Views/uViewDatosYSeleccionCliente.dfm b/Source/Modulos/Contactos/Views/uViewDatosYSeleccionCliente.dfm
index b158aeb6..176de137 100644
--- a/Source/Modulos/Contactos/Views/uViewDatosYSeleccionCliente.dfm
+++ b/Source/Modulos/Contactos/Views/uViewDatosYSeleccionCliente.dfm
@@ -15,6 +15,7 @@ inherited frViewDatosYSeleccionCliente: TfrViewDatosYSeleccionCliente
     Align = alClient
     ParentBackground = True
     TabOrder = 0
+    TabStop = False
     AutoContentSizes = [acsWidth, acsHeight]
     DesignSize = (
       350
diff --git a/Source/Modulos/Contactos/Views/uViewDatosYSeleccionCliente.pas b/Source/Modulos/Contactos/Views/uViewDatosYSeleccionCliente.pas
index 409223f5..756e1aa2 100644
--- a/Source/Modulos/Contactos/Views/uViewDatosYSeleccionCliente.pas
+++ b/Source/Modulos/Contactos/Views/uViewDatosYSeleccionCliente.pas
@@ -9,7 +9,13 @@ uses
   ComCtrls, ToolWin, ActnList, ImgList, PngImageList, cxTextEdit, cxDBEdit,
   pngimage, JvExControls, JvComponent, JvButton, JvTransparentButton, Mask,
   DBCtrls,
-  uClientesController, dxLayoutControl, Buttons, uDAInterfaces;
+  uClientesController, dxLayoutControl, Buttons, uDAInterfaces, dxSkinsCore,
+  dxSkinBlack, dxSkinBlue, dxSkinCaramel, dxSkinCoffee, dxSkinGlassOceans,
+  dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky,
+  dxSkinMcSkin, dxSkinMoneyTwins, dxSkinOffice2007Black, dxSkinOffice2007Blue,
+  dxSkinOffice2007Green, dxSkinOffice2007Pink, dxSkinOffice2007Silver,
+  dxSkinSilver, dxSkinStardust, dxSkinsDefaultPainters, dxSkinValentine,
+  dxSkinXmas2008Blue, dxSkinsdxLCPainter;
 
 type
   IViewDatosYSeleccionCliente = interface(IViewBase)
diff --git a/Source/Modulos/Contactos/Views/uViewDireccionesEntrega.pas b/Source/Modulos/Contactos/Views/uViewDireccionesEntrega.pas
index 827bec40..a9b2e00f 100644
--- a/Source/Modulos/Contactos/Views/uViewDireccionesEntrega.pas
+++ b/Source/Modulos/Contactos/Views/uViewDireccionesEntrega.pas
@@ -10,7 +10,13 @@ uses
   cxGridDBBandedTableView, cxClasses, cxControls, cxGridCustomView, cxGrid,
   uDADataTable, Grids, DBGrids, ActnList, ImgList, PngImageList, ComCtrls,
   ToolWin, cxGridDBTableView, uViewDetallesGenerico, cxCurrencyEdit,
-  uDAInterfaces;
+  uDAInterfaces, dxSkinsCore, dxSkinBlack, dxSkinBlue, dxSkinCaramel,
+  dxSkinCoffee, dxSkinGlassOceans, dxSkiniMaginary, dxSkinLilian,
+  dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMoneyTwins,
+  dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green,
+  dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinSilver, dxSkinStardust,
+  dxSkinsDefaultPainters, dxSkinValentine, dxSkinXmas2008Blue,
+  dxSkinscxPCPainter;
 
 type
   TfrViewDireccionesEntrega = class(TfrViewDetallesGenerico)
diff --git a/Source/Modulos/Contactos/Views/uViewProveedorDatosComerciales.dfm b/Source/Modulos/Contactos/Views/uViewProveedorDatosComerciales.dfm
index c483ebad..042a830c 100644
--- a/Source/Modulos/Contactos/Views/uViewProveedorDatosComerciales.dfm
+++ b/Source/Modulos/Contactos/Views/uViewProveedorDatosComerciales.dfm
@@ -13,6 +13,7 @@ inherited frViewProveedorDatosComerciales: TfrViewProveedorDatosComerciales
     Align = alTop
     ParentBackground = True
     TabOrder = 0
+    TabStop = False
     AutoContentSizes = [acsWidth]
     object Label1: TLabel
       Left = 417
@@ -48,7 +49,7 @@ inherited frViewProveedorDatosComerciales: TfrViewProveedorDatosComerciales
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 0
-      Width = 121
+      Width = 280
     end
     object cbFormaPago: TcxDBLookupComboBox
       Left = 107
@@ -78,7 +79,7 @@ inherited frViewProveedorDatosComerciales: TfrViewProveedorDatosComerciales
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 1
-      Width = 121
+      Width = 142
     end
     object bFormasPago: TButton
       Left = 255
@@ -117,7 +118,7 @@ inherited frViewProveedorDatosComerciales: TfrViewProveedorDatosComerciales
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 3
-      Width = 121
+      Width = 142
     end
     object bTiposIVA: TButton
       Left = 255
@@ -146,7 +147,7 @@ inherited frViewProveedorDatosComerciales: TfrViewProveedorDatosComerciales
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 5
-      Width = 73
+      Width = 159
     end
     object dxLayoutGroup1: TdxLayoutGroup
       ShowCaption = False
diff --git a/Source/Modulos/Contactos/Views/uViewProveedorDatosComerciales.pas b/Source/Modulos/Contactos/Views/uViewProveedorDatosComerciales.pas
index 8c7ec490..6bcb23c6 100644
--- a/Source/Modulos/Contactos/Views/uViewProveedorDatosComerciales.pas
+++ b/Source/Modulos/Contactos/Views/uViewProveedorDatosComerciales.pas
@@ -8,7 +8,13 @@ uses
   cxContainer, cxEdit, cxTextEdit, cxMaskEdit, cxDropDownEdit, cxLookupEdit,
   cxDBLookupEdit, cxDBLookupComboBox, cxControls, cxSpinEdit, cxDBEdit,
   uBizContactos, cxCheckBox, StdCtrls, uFormasPagoController, uTiposIVAController,
-  uDAInterfaces, uBizTiposIVA, uBizFormasPago;
+  uDAInterfaces, uBizTiposIVA, uBizFormasPago, dxSkinsCore, dxSkinBlack,
+  dxSkinBlue, dxSkinCaramel, dxSkinCoffee, dxSkinGlassOceans, dxSkiniMaginary,
+  dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin,
+  dxSkinMoneyTwins, dxSkinOffice2007Black, dxSkinOffice2007Blue,
+  dxSkinOffice2007Green, dxSkinOffice2007Pink, dxSkinOffice2007Silver,
+  dxSkinSilver, dxSkinStardust, dxSkinsDefaultPainters, dxSkinValentine,
+  dxSkinXmas2008Blue, dxSkinsdxLCPainter;
 
 type
   IViewProveedorDatosComerciales = interface(IViewBase)
diff --git a/Source/Modulos/Contactos/Views/uViewSubCuentaContacto.dfm b/Source/Modulos/Contactos/Views/uViewSubCuentaContacto.dfm
index b1e54efc..ffca8a9b 100644
--- a/Source/Modulos/Contactos/Views/uViewSubCuentaContacto.dfm
+++ b/Source/Modulos/Contactos/Views/uViewSubCuentaContacto.dfm
@@ -1,6 +1,6 @@
 inherited frViewSubCuentaContacto: TfrViewSubCuentaContacto
-  Width = 577
-  Height = 143
+  Width = 451
+  Height = 304
   Align = alClient
   AutoSize = True
   OnCreate = CustomViewCreate
@@ -10,17 +10,18 @@ inherited frViewSubCuentaContacto: TfrViewSubCuentaContacto
   object layoutApunte: TdxLayoutControl
     Left = 0
     Top = 0
-    Width = 577
-    Height = 143
+    Width = 451
+    Height = 304
     Align = alClient
     ParentBackground = True
     TabOrder = 0
+    TabStop = False
     AutoContentSizes = [acsWidth, acsHeight]
-    ExplicitWidth = 451
-    ExplicitHeight = 304
+    ExplicitWidth = 577
+    ExplicitHeight = 143
     DesignSize = (
-      577
-      143)
+      451
+      304)
     object eRefSubCuenta: TcxDBTextEdit
       Left = 93
       Top = 37
@@ -42,7 +43,7 @@ inherited frViewSubCuentaContacto: TfrViewSubCuentaContacto
       Width = 346
     end
     object BitBtn3: TBitBtn
-      Left = 235
+      Left = 119
       Top = 37
       Width = 110
       Height = 25
@@ -106,7 +107,7 @@ inherited frViewSubCuentaContacto: TfrViewSubCuentaContacto
       Width = 265
     end
     object BitBtn1: TBitBtn
-      Left = 351
+      Left = 235
       Top = 37
       Width = 120
       Height = 25
@@ -150,7 +151,7 @@ inherited frViewSubCuentaContacto: TfrViewSubCuentaContacto
         E000E248D100E407DB00FF00FF00FF00FF00FF00FF00FF00FF00}
     end
     object BitBtn2: TBitBtn
-      Left = 477
+      Left = 361
       Top = 37
       Width = 90
       Height = 25
diff --git a/Source/Modulos/Contactos/Views/uViewSubCuentaContacto.pas b/Source/Modulos/Contactos/Views/uViewSubCuentaContacto.pas
index 79a1ca14..4012170f 100644
--- a/Source/Modulos/Contactos/Views/uViewSubCuentaContacto.pas
+++ b/Source/Modulos/Contactos/Views/uViewSubCuentaContacto.pas
@@ -9,7 +9,13 @@ uses
   JvComponent, JvFormAutoSize, cxControls, cxContainer, cxEdit, cxTextEdit,
   cxDBEdit, dxLayoutControl, uDAInterfaces, cxGraphics, cxDropDownEdit,
   cxImageComboBox, cxMaskEdit, cxCalendar, ImgList, PngImageList, ActnList,
-  cxCurrencyEdit, uSubCuentasController, cxCheckBox;
+  cxCurrencyEdit, uSubCuentasController, cxCheckBox, dxSkinsCore, dxSkinBlack,
+  dxSkinBlue, dxSkinCaramel, dxSkinCoffee, dxSkinGlassOceans, dxSkiniMaginary,
+  dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin,
+  dxSkinMoneyTwins, dxSkinOffice2007Black, dxSkinOffice2007Blue,
+  dxSkinOffice2007Green, dxSkinOffice2007Pink, dxSkinOffice2007Silver,
+  dxSkinSilver, dxSkinStardust, dxSkinsDefaultPainters, dxSkinValentine,
+  dxSkinXmas2008Blue, dxSkinsdxLCPainter;
 
 type
   IViewSubCuenta = interface(IViewBase)