From ceacc28fe9d7d1f3a943e08d50086fcc5d389fe2 Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Fri, 29 Jan 2010 16:54:47 +0000
Subject: [PATCH] =?UTF-8?q?Se=20a=C3=B1ade=20la=20lista=20de=20direcciones?=
 =?UTF-8?q?=20a=20las=20fichas=20de=20cliente=20y=20la=20validaci=C3=B3n?=
 =?UTF-8?q?=20del=20DC=20de=20las=20cuentas=20bancarias?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://192.168.0.254/svn/Proyectos.Noviseda_FactuGES2/trunk@75 f33bb606-9f5c-448d-9c99-757f00063c96
---
 Source/Base/Base.dpk                          |   2 +-
 Source/Base/Base.dproj                        | 138 +++++---
 ...{uCIFNIFUtils.pas => uValidacionUtils.pas} |  51 ++-
 .../Contactos/Views/uEditorCliente.dfm        |  18 +-
 .../Contactos/Views/uEditorCliente.pas        |   3 +-
 .../Contactos/Views/uEditorContacto.pas       |   3 +-
 .../Contactos/Views/uEditorContactos.dfm      |  10 +-
 .../Contactos/Views/uEditorDatoBancario.dfm   | 302 +++++++++++-------
 .../Contactos/Views/uEditorDatoBancario.pas   |  41 ++-
 .../Modulos/Contactos/Views/uViewCliente.dfm  |  83 +++--
 .../Modulos/Contactos/Views/uViewCliente.pas  |   7 +-
 .../Views/uViewClienteDatosComerciales.dfm    |  71 ++--
 .../Views/uViewClienteDatosComerciales.pas    |   3 +-
 .../Views/uViewClienteDescuentos.pas          |   3 +-
 .../Views/uViewContactoDatosBancarios.dfm     |  41 ++-
 .../Views/uViewContactoDatosBancarios.pas     |  13 +-
 .../uViewContactoListaDatosBancarios.pas      |   3 +-
 .../Views/uViewDireccionesEntrega.pas         |   2 +-
 .../Contactos/Views/uViewPersonalContacto.pas |   2 +-
 .../Views/uEditorElegirRecibosCliente.dfm     |  57 ++--
 .../Views/uEditorElegirRecibosCliente.pas     |   3 +-
 .../Views/uEditorRecibosCliente.dfm           |  24 +-
 .../Views/uEditorRecibosCliente.pas           |   3 +-
 .../Views/uViewRecibosCliente.dfm             |   8 +-
 .../Views/uViewRecibosCliente.pas             |   4 +-
 25 files changed, 547 insertions(+), 348 deletions(-)
 rename Source/Base/Utiles/{uCIFNIFUtils.pas => uValidacionUtils.pas} (67%)

diff --git a/Source/Base/Base.dpk b/Source/Base/Base.dpk
index 915349f..d9c0aa7 100644
--- a/Source/Base/Base.dpk
+++ b/Source/Base/Base.dpk
@@ -115,6 +115,6 @@ contains
   uSaveClipboard in 'Utiles\uSaveClipboard.pas',
   MidasSpeedFix in 'Utiles\MidasSpeedFix.pas',
   uGridUtils in 'Utiles\uGridUtils.pas',
-  uCIFNIFUtils in 'Utiles\uCIFNIFUtils.pas';
+  uValidacionUtils in 'Utiles\uValidacionUtils.pas';
 
 end.
diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj
index b34842b..650bbac 100644
--- a/Source/Base/Base.dproj
+++ b/Source/Base/Base.dproj
@@ -45,6 +45,42 @@
     <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">False</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\dcloffice2k100.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclofficexp100.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
     </Excluded_Packages><Source><Source Name="MainSource">Base.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
@@ -55,56 +91,6 @@
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
     <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
-    <DCCReference Include="..\Servidor\adortl.dcp" />
-    <DCCReference Include="..\Servidor\cxDataD11.dcp" />
-    <DCCReference Include="..\Servidor\cxEditorsD11.dcp" />
-    <DCCReference Include="..\Servidor\cxExportD11.dcp" />
-    <DCCReference Include="..\Servidor\cxExtEditorsD11.dcp" />
-    <DCCReference Include="..\Servidor\cxGridD11.dcp" />
-    <DCCReference Include="..\Servidor\cxLibraryD11.dcp" />
-    <DCCReference Include="..\Servidor\cxPageControlD11.dcp" />
-    <DCCReference Include="..\Servidor\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="..\Servidor\dbrtl.dcp" />
-    <DCCReference Include="..\Servidor\dclIndyCore.dcp" />
-    <DCCReference Include="..\Servidor\designide.dcp" />
-    <DCCReference Include="..\Servidor\dsnap.dcp" />
-    <DCCReference Include="..\Servidor\dxCoreD11.dcp" />
-    <DCCReference Include="..\Servidor\dxGDIPlusD11.dcp" />
-    <DCCReference Include="..\Servidor\dxPSCoreD11.dcp" />
-    <DCCReference Include="..\Servidor\dxThemeD11.dcp" />
-    <DCCReference Include="..\Servidor\GUISDK_D11R.dcp" />
-    <DCCReference Include="..\Servidor\IndyCore.dcp" />
-    <DCCReference Include="..\Servidor\IndyProtocols.dcp" />
-    <DCCReference Include="..\Servidor\IndySystem.dcp" />
-    <DCCReference Include="..\Servidor\Jcl.dcp" />
-    <DCCReference Include="..\Servidor\JclVcl.dcp" />
-    <DCCReference Include="..\Servidor\JSDialog100.dcp" />
-    <DCCReference Include="..\Servidor\JvCmpD11R.dcp" />
-    <DCCReference Include="..\Servidor\JvCoreD11R.dcp" />
-    <DCCReference Include="..\Servidor\JvCtrlsD11R.dcp" />
-    <DCCReference Include="..\Servidor\JvDlgsD11R.dcp" />
-    <DCCReference Include="..\Servidor\JvMMD11R.dcp" />
-    <DCCReference Include="..\Servidor\JvNetD11R.dcp" />
-    <DCCReference Include="..\Servidor\JvPageCompsD11R.dcp" />
-    <DCCReference Include="..\Servidor\JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="..\Servidor\JvSystemD11R.dcp" />
-    <DCCReference Include="..\Servidor\pckMD5.dcp" />
-    <DCCReference Include="..\Servidor\pckUCDataConnector.dcp" />
-    <DCCReference Include="..\Servidor\pckUserControl_RT.dcp" />
-    <DCCReference Include="..\Servidor\PngComponentsD10.dcp" />
-    <DCCReference Include="..\Servidor\PNG_D10.dcp" />
-    <DCCReference Include="..\Servidor\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="..\Servidor\RemObjects_Indy_D11.dcp" />
-    <DCCReference Include="..\Servidor\rtl.dcp" />
-    <DCCReference Include="..\Servidor\SpTBXLib_d11.dcp" />
-    <DCCReference Include="..\Servidor\tb2k_d11.dcp" />
-    <DCCReference Include="..\Servidor\vcl.dcp" />
-    <DCCReference Include="..\Servidor\vclactnband.dcp" />
-    <DCCReference Include="..\Servidor\vcldb.dcp" />
-    <DCCReference Include="..\Servidor\vcljpg.dcp" />
-    <DCCReference Include="..\Servidor\VclSmp.dcp" />
-    <DCCReference Include="..\Servidor\vclx.dcp" />
-    <DCCReference Include="..\Servidor\xmlrtl.dcp" />
     <DCCReference Include="Conexion\uConfigurarConexion.pas">
       <Form>fConfigurarConexion</Form>
       <DesignClass>TForm</DesignClass>
@@ -128,16 +114,58 @@
       <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\ClipboardUtils.pas" />
     <DCCReference Include="Utiles\Ctltortf.pas" />
+    <DCCReference Include="Utiles\cxDataD11.dcp" />
+    <DCCReference Include="Utiles\cxEditorsD11.dcp" />
+    <DCCReference Include="Utiles\cxExportD11.dcp" />
+    <DCCReference Include="Utiles\cxExtEditorsD11.dcp" />
+    <DCCReference Include="Utiles\cxGridD11.dcp" />
+    <DCCReference Include="Utiles\cxLibraryD11.dcp" />
+    <DCCReference Include="Utiles\cxPageControlD11.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\dxCoreD11.dcp" />
+    <DCCReference Include="Utiles\dxGDIPlusD11.dcp" />
+    <DCCReference Include="Utiles\dxPSCoreD11.dcp" />
+    <DCCReference Include="Utiles\dxThemeD11.dcp" />
+    <DCCReference Include="Utiles\GUISDK_D11R.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\MidasSpeedFix.pas" />
+    <DCCReference Include="Utiles\pckMD5.dcp" />
+    <DCCReference Include="Utiles\pckUCDataConnector.dcp" />
+    <DCCReference Include="Utiles\pckUserControl_RT.dcp" />
+    <DCCReference Include="Utiles\PngComponentsD10.dcp" />
+    <DCCReference Include="Utiles\PNG_D10.dcp" />
+    <DCCReference Include="Utiles\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="Utiles\RemObjects_Indy_D11.dcp" />
+    <DCCReference Include="Utiles\rtl.dcp" />
+    <DCCReference Include="Utiles\SpTBXLib_d11.dcp" />
+    <DCCReference Include="Utiles\tb2k_d11.dcp" />
     <DCCReference Include="Utiles\uAppInfoUtils.pas" />
     <DCCReference Include="Utiles\uCalculosUtils.pas" />
-    <DCCReference Include="Utiles\uCIFNIFUtils.pas" />
     <DCCReference Include="Utiles\uDataTableUtils.pas" />
     <DCCReference Include="Utiles\uDateUtils.pas" />
     <DCCReference Include="Utiles\uDBSelectionListUtils.pas" />
@@ -156,6 +184,14 @@
     <DCCReference Include="Utiles\uSaveClipboard.pas" />
     <DCCReference Include="Utiles\uSistemaFunc.pas" />
     <DCCReference Include="Utiles\uStringsUtils.pas" />
+    <DCCReference Include="Utiles\uValidacionUtils.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/Base/Utiles/uCIFNIFUtils.pas b/Source/Base/Utiles/uValidacionUtils.pas
similarity index 67%
rename from Source/Base/Utiles/uCIFNIFUtils.pas
rename to Source/Base/Utiles/uValidacionUtils.pas
index aa15661..11b5622 100644
--- a/Source/Base/Utiles/uCIFNIFUtils.pas
+++ b/Source/Base/Utiles/uValidacionUtils.pas
@@ -1,13 +1,14 @@
-unit uCIFNIFUtils;
+unit uValidacionUtils;
 
 interface
 
-function EsCif(Cif : String) : Boolean;
+function EsNIFCIF(Cif : String) : Boolean;
+function DarDC(const Entidad,Sucursal,Cuenta: Variant): String;
 
 implementation
 
 uses
-  SysUtils;
+  SysUtils, Variants;
 
 function Letra(Numero: Integer): string;
 begin
@@ -50,7 +51,7 @@ end;
 
 
 { Validar si un CIF introducido es correcto}
-function EsCif(Cif : String) : Boolean;
+function EsNIFCIF(Cif : String) : Boolean;
 var
   Suma, Control : Integer;
   n : Byte;
@@ -101,4 +102,46 @@ begin
   end;
 end;
 
+function CCC(cTemp : String) : Integer;
+var
+  K,I,nNum,nSum : Integer;
+  cPesos,cNum  : String;
+begin
+  cPesos := '06030709100508040201';
+  nSum := 0;
+  for I := 1 TO length(cTemp) DO
+  begin
+    cNum := Copy(cTemp, length(cTemp) - I + 1, 1);
+    nNum := StrToInt(cNum);
+    nSum := nSum + (nNum * StrToInt(Copy(cPesos, ((i - 1) * 2) + 1, 2)));
+  end;
+
+  K := 11 -  (nSum MOD 11);
+
+  Case K OF
+    10:Result := 1;
+    11:Result := 0;
+    Else Result := K;
+  end;
+end;
+
+
+function DarDC(const Entidad,Sucursal,Cuenta: Variant): String;
+var
+DC1,DC2: String;
+begin
+  if VarIsNull(Entidad)
+  or VarIsNull(Sucursal)
+  or VarIsNull(Cuenta) then
+    Result := ''
+  else
+  begin
+    DC1 := IntToStr(CCC(VarToStr(Entidad) + VarToStr(Sucursal))) ;
+    DC2 := IntToStr(CCC(VarToStr(Cuenta)));
+    Result := Dc1 + Dc2;
+  end;
+end; 
+
+
+
 end.
diff --git a/Source/Modulos/Contactos/Views/uEditorCliente.dfm b/Source/Modulos/Contactos/Views/uEditorCliente.dfm
index e9f5a8a..26e84fe 100644
--- a/Source/Modulos/Contactos/Views/uEditorCliente.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorCliente.dfm
@@ -69,9 +69,9 @@ inherited fEditorCliente: TfEditorCliente
       object TBXSubmenuItem8: TSpTBXSubmenuItem [8]
         Caption = 'Documentos relacionados'
         DisplayMode = nbdmImageAndText
-        DropdownCombo = True
         ImageIndex = 22
         Visible = False
+        DropdownCombo = True
         object TBXItem36: TSpTBXItem
           Action = actDocumentosPresupuestos
         end
@@ -123,7 +123,7 @@ inherited fEditorCliente: TfEditorCliente
   inherited pgPaginas: TPageControl
     Width = 786
     Height = 530
-    ActivePage = pagDatosComerciales
+    ActivePage = pagGeneral
     ExplicitWidth = 786
     ExplicitHeight = 530
     inherited pagGeneral: TTabSheet
@@ -148,19 +148,25 @@ inherited fEditorCliente: TfEditorCliente
         inherited dxLayoutControlContacto: TdxLayoutControl
           Width = 778
           Height = 502
-          LookAndFeel = dxLayoutOfficeLookAndFeel
+          LayoutLookAndFeel = dxLayoutOfficeLookAndFeel
           ExplicitWidth = 778
           ExplicitHeight = 502
           inherited PngSpeedButton1: TPngSpeedButton
+            Left = 733
             Top = 218
+            ExplicitLeft = 733
             ExplicitTop = 218
           end
           inherited PngSpeedButton2: TPngSpeedButton
+            Left = 733
             Top = 190
+            ExplicitLeft = 733
             ExplicitTop = 190
           end
           inherited PngSpeedButton3: TPngSpeedButton
+            Left = 733
             Top = 162
+            ExplicitLeft = 733
             ExplicitTop = 162
           end
           inherited eCalle: TcxDBTextEdit
@@ -410,7 +416,7 @@ inherited fEditorCliente: TfEditorCliente
               inherited dxLayoutControlContactoGroup4: TdxLayoutGroup
                 inherited dxLayoutControlContactoGroup1: TdxLayoutGroup
                   inherited dxLayoutControlContactoItem19: TdxLayoutItem
-                    Caption = 'Procedencia de cliente:'
+                    CaptionOptions.Text = 'Procedencia de cliente:'
                   end
                 end
                 inherited dxLayoutControlContactoGroup18: TdxLayoutGroup
@@ -484,7 +490,7 @@ inherited fEditorCliente: TfEditorCliente
         ExplicitHeight = 261
         inherited dxLayoutControl1: TdxLayoutControl
           Width = 778
-          LookAndFeel = dxLayoutOfficeLookAndFeel
+          LayoutLookAndFeel = dxLayoutOfficeLookAndFeel
           ExplicitWidth = 778
           inherited Label1: TLabel
             Left = 524
@@ -619,9 +625,7 @@ inherited fEditorCliente: TfEditorCliente
     end
     object pagDirecciones: TTabSheet [3]
       Caption = 'Direcciones'
-      Enabled = False
       ImageIndex = 1
-      TabVisible = False
       inline frViewDireccionesEntrega1: TfrViewDireccionesEntrega
         Left = 0
         Top = 0
diff --git a/Source/Modulos/Contactos/Views/uEditorCliente.pas b/Source/Modulos/Contactos/Views/uEditorCliente.pas
index 11aa0c1..48306df 100644
--- a/Source/Modulos/Contactos/Views/uEditorCliente.pas
+++ b/Source/Modulos/Contactos/Views/uEditorCliente.pas
@@ -15,7 +15,8 @@ uses
   uViewDireccionesEntrega, uViewDetallesGenerico, uViewClienteDescuentos,
   uViewContactoDatosBancarios, dxLayoutLookAndFeels,
   uViewClienteDatosComerciales, uDAInterfaces, uViewContactoListaDatosBancarios,
-  uViewPersonalContacto, cxControls, cxContainer, cxEdit, cxLabel;
+  uViewPersonalContacto, cxControls, cxContainer, cxEdit, cxLabel, cxGraphics,
+  cxLookAndFeels, cxLookAndFeelPainters;
 
 type
   TfEditorCliente = class(TfEditorContacto, IEditorCliente)
diff --git a/Source/Modulos/Contactos/Views/uEditorContacto.pas b/Source/Modulos/Contactos/Views/uEditorContacto.pas
index 7da5dde..ec07953 100644
--- a/Source/Modulos/Contactos/Views/uEditorContacto.pas
+++ b/Source/Modulos/Contactos/Views/uEditorContacto.pas
@@ -15,7 +15,8 @@ uses
   uIEditorContacto, uContactosController,  JvExComCtrls,
   JvStatusBar, uViewContactoDatosBancarios, dxLayoutLookAndFeels, JvLabel,
   uDAInterfaces, uViewDetallesGenerico, uViewContactoListaDatosBancarios,
-  uViewPersonalContacto, cxControls, cxContainer, cxEdit, cxLabel;
+  uViewPersonalContacto, cxControls, cxContainer, cxEdit, cxLabel, cxGraphics,
+  cxLookAndFeels, cxLookAndFeelPainters;
 
 type
   TfEditorContacto = class(TfEditorDBItem, IEditorContacto)
diff --git a/Source/Modulos/Contactos/Views/uEditorContactos.dfm b/Source/Modulos/Contactos/Views/uEditorContactos.dfm
index c034405..6c09299 100644
--- a/Source/Modulos/Contactos/Views/uEditorContactos.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorContactos.dfm
@@ -11,14 +11,10 @@ inherited fEditorContactos: TfEditorContactos
   end
   inherited TBXDock: TSpTBXDock
     inherited tbxFiltro: TSpTBXToolbar
-      ExplicitWidth = 287
+      ExplicitWidth = 328
       inherited TBXItem37: TSpTBXItem
         Visible = False
       end
-      inherited cbxListaAnos: TSpTBXComboBox
-        Left = 129
-        ExplicitLeft = 129
-      end
     end
     inherited tbxMenu: TSpTBXToolbar
       object TBXSubmenuItemAcciones: TSpTBXSubmenuItem [4]
@@ -26,9 +22,9 @@ inherited fEditorContactos: TfEditorContactos
       end
     end
     inherited TBXTMain2: TSpTBXToolbar
-      Left = 287
+      Left = 328
       DockPos = 286
-      ExplicitLeft = 287
+      ExplicitLeft = 328
     end
   end
   inherited EditorActionList: TActionList
diff --git a/Source/Modulos/Contactos/Views/uEditorDatoBancario.dfm b/Source/Modulos/Contactos/Views/uEditorDatoBancario.dfm
index efc3f50..9b0ea5a 100644
--- a/Source/Modulos/Contactos/Views/uEditorDatoBancario.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorDatoBancario.dfm
@@ -1,82 +1,21 @@
 object fEditorDatoBancario: TfEditorDatoBancario
   Left = 227
   Top = 108
-  ActiveControl = eTitular
   BorderStyle = bsDialog
   Caption = 'Cambiar datos bancarios'
-  ClientHeight = 193
-  ClientWidth = 502
+  ClientHeight = 128
+  ClientWidth = 645
   Color = clBtnFace
   ParentFont = True
   OldCreateOrder = True
   Position = poOwnerFormCenter
   DesignSize = (
-    502
-    193)
+    645
+    128)
   PixelsPerInch = 96
   TextHeight = 13
-  object Bevel1: TBevel
-    Left = 8
-    Top = 8
-    Width = 405
-    Height = 177
-    Anchors = [akLeft, akTop, akRight]
-    Shape = bsFrame
-    ExplicitWidth = 329
-  end
-  object Label2: TLabel
-    Left = 20
-    Top = 71
-    Width = 110
-    Height = 13
-    AutoSize = False
-    Caption = 'C'#243'digo de entidad:'
-  end
-  object Label3: TLabel
-    Left = 20
-    Top = 98
-    Width = 110
-    Height = 13
-    AutoSize = False
-    Caption = 'C'#243'digo de sucursal:'
-  end
-  object Label4: TLabel
-    Left = 20
-    Top = 125
-    Width = 110
-    Height = 13
-    AutoSize = False
-    Caption = 'D'#237'gito de control:'
-  end
-  object Label5: TLabel
-    Left = 20
-    Top = 27
-    Width = 110
-    Height = 13
-    AutoSize = False
-    Caption = 'Nombre descriptivo:'
-  end
-  object Label6: TLabel
-    Left = 20
-    Top = 152
-    Width = 109
-    Height = 13
-    AutoSize = False
-    Caption = 'C'#243'digo de cuenta:'
-  end
-  object OKBtn: TButton
-    Left = 419
-    Top = 7
-    Width = 75
-    Height = 25
-    Anchors = [akTop, akRight]
-    Caption = '&Aceptar'
-    ModalResult = 1
-    TabOrder = 0
-    ExplicitLeft = 343
-  end
   object CancelBtn: TButton
-    Left = 419
+    Left = 562
     Top = 38
     Width = 75
     Height = 25
@@ -84,57 +23,192 @@ object fEditorDatoBancario: TfEditorDatoBancario
     Cancel = True
     Caption = '&Cancelar'
     ModalResult = 2
+    TabOrder = 0
+    ExplicitLeft = 419
+  end
+  object dxLayoutControl1: TdxLayoutControl
+    Left = 0
+    Top = 0
+    Width = 553
+    Height = 128
+    Align = alLeft
+    ParentBackground = True
     TabOrder = 1
-    ExplicitLeft = 343
+    TabStop = False
+    object eEntidad: TcxDBTextEdit
+      Left = 117
+      Top = 55
+      DataBinding.DataField = 'ENTIDAD'
+      DataBinding.DataSource = dsDatosBancarios
+      Properties.MaxLength = 4
+      Properties.OnEditValueChanged = CalcularDC
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 1
+      Width = 114
+    end
+    object eSucursal: TcxDBTextEdit
+      Left = 368
+      Top = 55
+      DataBinding.DataField = 'SUCURSAL'
+      DataBinding.DataSource = dsDatosBancarios
+      Properties.MaxLength = 4
+      Properties.OnEditValueChanged = CalcularDC
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 2
+      Width = 112
+    end
+    object eCuenta: TcxDBTextEdit
+      Left = 238
+      Top = 82
+      DataBinding.DataField = 'CUENTA'
+      DataBinding.DataSource = dsDatosBancarios
+      Properties.MaxLength = 10
+      Properties.OnEditValueChanged = CalcularDC
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 4
+      Width = 194
+    end
+    object eDC: TcxDBTextEdit
+      Left = 117
+      Top = 82
+      DataBinding.DataField = 'DC'
+      DataBinding.DataSource = dsDatosBancarios
+      Enabled = False
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 3
+      Width = 47
+    end
+    object eTitular: TcxDBTextEdit
+      Left = 117
+      Top = 28
+      DataBinding.DataField = 'TITULAR'
+      DataBinding.DataSource = dsDatosBancarios
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 0
+      Width = 194
+    end
+    object dxLayoutGroup1: TdxLayoutGroup
+      AlignHorz = ahParentManaged
+      AlignVert = avTop
+      CaptionOptions.Visible = False
+      ButtonOptions.Buttons = <>
+      Hidden = True
+      ShowBorder = False
+      object dxLayoutControl1Group3: TdxLayoutGroup
+        CaptionOptions.Text = 'Datos bancarios'
+        ButtonOptions.Buttons = <>
+        object dxLayoutControl1Item5: TdxLayoutItem
+          CaptionOptions.Text = 'Nombre del banco:'
+          Control = eTitular
+          ControlOptions.ShowBorder = False
+        end
+        object dxLayoutControl1Group2: TdxLayoutGroup
+          CaptionOptions.Visible = False
+          ButtonOptions.Buttons = <>
+          Hidden = True
+          ShowBorder = False
+          object dxLayoutGroup2: TdxLayoutGroup
+            CaptionOptions.Visible = False
+            ButtonOptions.Buttons = <>
+            Hidden = True
+            LayoutDirection = ldHorizontal
+            ShowBorder = False
+            object dxLayoutItem1: TdxLayoutItem
+              AlignHorz = ahClient
+              CaptionOptions.Text = 'C'#243'd. entidad:'
+              Control = eEntidad
+              ControlOptions.ShowBorder = False
+            end
+            object dxLayoutControl1Item2: TdxLayoutItem
+              AlignHorz = ahClient
+              CaptionOptions.Text = 'C'#243'd. sucursal:'
+              Control = eSucursal
+              ControlOptions.ShowBorder = False
+            end
+          end
+          object dxLayoutControl1Group4: TdxLayoutGroup
+            CaptionOptions.Visible = False
+            ButtonOptions.Buttons = <>
+            Hidden = True
+            LayoutDirection = ldHorizontal
+            ShowBorder = False
+            object dxLayoutControl1Item4: TdxLayoutItem
+              CaptionOptions.Text = 'DC:'
+              Enabled = False
+              Control = eDC
+              ControlOptions.ShowBorder = False
+            end
+            object dxLayoutControl1Item3: TdxLayoutItem
+              AlignHorz = ahClient
+              CaptionOptions.Text = 'C'#243'd. cuenta:'
+              Control = eCuenta
+              ControlOptions.ShowBorder = False
+            end
+          end
+        end
+      end
+    end
   end
-  object eEntidad: TDBEdit
-    Left = 136
-    Top = 67
-    Width = 94
-    Height = 21
-    DataField = 'ENTIDAD'
-    DataSource = dsDatosBancarios
-    MaxLength = 4
-    TabOrder = 3
-  end
-  object eSucursal: TDBEdit
-    Left = 136
-    Top = 94
-    Width = 95
-    Height = 21
-    DataField = 'SUCURSAL'
-    DataSource = dsDatosBancarios
-    MaxLength = 4
-    TabOrder = 4
-  end
-  object eDC: TDBEdit
-    Left = 136
-    Top = 121
-    Width = 41
-    Height = 21
-    DataField = 'DC'
-    DataSource = dsDatosBancarios
-    MaxLength = 2
-    TabOrder = 5
-  end
-  object eTitular: TDBEdit
-    Left = 135
-    Top = 24
-    Width = 266
-    Height = 21
-    DataField = 'TITULAR'
-    DataSource = dsDatosBancarios
+  object OKBtn: TButton
+    Left = 562
+    Top = 7
+    Width = 75
+    Height = 25
+    Anchors = [akTop, akRight]
+    Caption = '&Aceptar'
+    ModalResult = 1
     TabOrder = 2
-  end
-  object eCuenta: TDBEdit
-    Left = 136
-    Top = 148
-    Width = 191
-    Height = 21
-    DataField = 'CUENTA'
-    DataSource = dsDatosBancarios
-    MaxLength = 10
-    TabOrder = 6
+    ExplicitLeft = 419
   end
   object dsDatosBancarios: TDADataSource
     Left = 352
diff --git a/Source/Modulos/Contactos/Views/uEditorDatoBancario.pas b/Source/Modulos/Contactos/Views/uEditorDatoBancario.pas
index a41df39..bc09be8 100644
--- a/Source/Modulos/Contactos/Views/uEditorDatoBancario.pas
+++ b/Source/Modulos/Contactos/Views/uEditorDatoBancario.pas
@@ -5,24 +5,32 @@ interface
 uses Windows, SysUtils, Classes, Graphics, Forms, Controls, StdCtrls,
   Buttons, ExtCtrls, Mask, DBCtrls, DB, uDAInterfaces, uDADataTable,
   uBizContactosDatosBancarios, uIEditorDatoBancarioContacto,
-  uDatosBancariosContactoController;
+  uDatosBancariosContactoController, cxGraphics, cxControls, cxLookAndFeels,
+  cxLookAndFeelPainters, cxContainer, cxEdit, dxLayoutcxEditAdapters,
+  dxLayoutControl, cxTextEdit, cxDBEdit;
 
 type
   TfEditorDatoBancario = class(TForm, IEditorDatoBancarioContacto)
-    OKBtn: TButton;
     CancelBtn: TButton;
-    Bevel1: TBevel;
-    eEntidad: TDBEdit;
-    eSucursal: TDBEdit;
-    eDC: TDBEdit;
-    Label2: TLabel;
-    Label3: TLabel;
-    Label4: TLabel;
     dsDatosBancarios: TDADataSource;
-    Label5: TLabel;
-    eTitular: TDBEdit;
-    Label6: TLabel;
-    eCuenta: TDBEdit;
+    dxLayoutControl1: TdxLayoutControl;
+    eEntidad: TcxDBTextEdit;
+    eSucursal: TcxDBTextEdit;
+    eCuenta: TcxDBTextEdit;
+    eDC: TcxDBTextEdit;
+    eTitular: TcxDBTextEdit;
+    dxLayoutGroup1: TdxLayoutGroup;
+    dxLayoutControl1Group3: TdxLayoutGroup;
+    dxLayoutControl1Item5: TdxLayoutItem;
+    dxLayoutControl1Group2: TdxLayoutGroup;
+    dxLayoutGroup2: TdxLayoutGroup;
+    dxLayoutItem1: TdxLayoutItem;
+    dxLayoutControl1Item2: TdxLayoutItem;
+    dxLayoutControl1Group4: TdxLayoutGroup;
+    dxLayoutControl1Item4: TdxLayoutItem;
+    dxLayoutControl1Item3: TdxLayoutItem;
+    OKBtn: TButton;
+    procedure CalcularDC(Sender: TObject);    
   protected
     FController : IDatosBancariosContactoController;
     FDatosBanco : IBizContactosDatosBancarios;
@@ -42,12 +50,17 @@ type
 implementation
 
 uses
-  Variants;
+  Variants, uValidacionUtils;
 
 {$R *.dfm}
 
 { TfEditorDireccion }
 
+procedure TfEditorDatoBancario.CalcularDC(Sender: TObject);
+begin
+  eDC.EditValue := DarDC(eEntidad.EditValue,eSucursal.EditValue,eCuenta.EditValue);
+end;
+
 constructor TfEditorDatoBancario.Create(AOwner: TComponent);
 begin
   inherited;
diff --git a/Source/Modulos/Contactos/Views/uViewCliente.dfm b/Source/Modulos/Contactos/Views/uViewCliente.dfm
index c1a64aa..1a314b4 100644
--- a/Source/Modulos/Contactos/Views/uViewCliente.dfm
+++ b/Source/Modulos/Contactos/Views/uViewCliente.dfm
@@ -11,16 +11,16 @@ inherited frViewCliente: TfrViewCliente
     ExplicitWidth = 777
     ExplicitHeight = 506
     inherited PngSpeedButton1: TPngSpeedButton
-      Left = 733
-      ExplicitLeft = 733
+      Left = 732
+      ExplicitLeft = 732
     end
     inherited PngSpeedButton2: TPngSpeedButton
-      Left = 733
-      ExplicitLeft = 733
+      Left = 732
+      ExplicitLeft = 732
     end
     inherited PngSpeedButton3: TPngSpeedButton
-      Left = 733
-      ExplicitLeft = 733
+      Left = 732
+      ExplicitLeft = 732
     end
     inherited eCalle: TcxDBTextEdit
       Left = 121
@@ -194,6 +194,30 @@ inherited frViewCliente: TfrViewCliente
       ExplicitWidth = 238
       Width = 238
     end
+    object cbFelicitacion: TcxDBCheckBox [14]
+      Left = 404
+      Top = 280
+      Caption = 'Mandar felicitaci'#243'n navide'#241'a a este cliente'
+      DataBinding.DataField = 'FELICITACION'
+      DataBinding.DataSource = dsContacto
+      Properties.ImmediatePost = True
+      Properties.NullStyle = nssUnchecked
+      Properties.ValueChecked = 1
+      Properties.ValueUnchecked = 0
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 20
+      Width = 370
+    end
     inherited eTlfMovil: TcxDBTextEdit
       Left = 499
       Style.LookAndFeel.SkinName = ''
@@ -226,30 +250,6 @@ inherited frViewCliente: TfrViewCliente
       ExplicitWidth = 260
       Width = 260
     end
-    object cbFelicitacion: TcxDBCheckBox [17]
-      Left = 404
-      Top = 280
-      Caption = 'Mandar felicitaci'#243'n navide'#241'a a este cliente'
-      DataBinding.DataField = 'FELICITACION'
-      DataBinding.DataSource = dsContacto
-      Properties.ImmediatePost = True
-      Properties.NullStyle = nssUnchecked
-      Properties.ValueChecked = 1
-      Properties.ValueUnchecked = 0
-      Style.BorderColor = clWindowFrame
-      Style.BorderStyle = ebs3D
-      Style.HotTrack = False
-      Style.LookAndFeel.Kind = lfStandard
-      Style.LookAndFeel.NativeStyle = True
-      StyleDisabled.LookAndFeel.Kind = lfStandard
-      StyleDisabled.LookAndFeel.NativeStyle = True
-      StyleFocused.LookAndFeel.Kind = lfStandard
-      StyleFocused.LookAndFeel.NativeStyle = True
-      StyleHot.LookAndFeel.Kind = lfStandard
-      StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 20
-      Width = 370
-    end
     inherited eNIFCIF: TcxDBTextEdit
       Left = 279
       Properties.OnValidate = eNIFCIFPropertiesValidate
@@ -329,49 +329,48 @@ inherited frViewCliente: TfrViewCliente
       ExplicitTop = 331
     end
     inherited dxLayoutControlContactoGroup_Root: TdxLayoutGroup
-      AutoAligns = [aaHorizontal]
       AlignVert = avBottom
       inherited dxLayoutControlContactoGroup9: TdxLayoutGroup
         inherited dxLayoutControlContactoGroup4: TdxLayoutGroup
           inherited dxLayoutControlContactoGroup1: TdxLayoutGroup
             object dxLayoutControlContactoItem24: TdxLayoutItem
-              Caption = 'Nombre comercial:'
+              CaptionOptions.Text = 'Nombre comercial:'
               Control = eNombreComercial
               ControlOptions.ShowBorder = False
             end
             object dxLayoutControlContactoItem19: TdxLayoutItem
-              AutoAligns = [aaVertical]
               AlignHorz = ahClient
-              Caption = 'Grupo de cliente:'
+              CaptionOptions.Text = 'Grupo de cliente:'
               Control = cbGrupoCliente
               ControlOptions.ShowBorder = False
             end
           end
           object dxLayoutControlContactoGroup18: TdxLayoutGroup [1]
-            Caption = 'Bloqueo'
+            CaptionOptions.Text = 'Bloqueo'
+            ButtonOptions.Buttons = <>
             object dxLayoutControlContactoItem26: TdxLayoutItem
-              AutoAligns = [aaVertical]
               AlignHorz = ahClient
-              Caption = ' '
-              ShowCaption = False
+              CaptionOptions.Text = ' '
+              CaptionOptions.Visible = False
               Control = cbClienteBloqueado
               ControlOptions.ShowBorder = False
             end
             object dxLayoutControlContactoItem16: TdxLayoutItem
-              Caption = 'Motivo del bloqueo:'
+              CaptionOptions.Text = 'Motivo del bloqueo:'
               Control = eBloqueo
               ControlOptions.ShowBorder = False
             end
           end
           inherited dxLayoutControlContactoGroup3: TdxLayoutGroup
-            Caption = 'Domicilio fiscal'
+            CaptionOptions.Text = 'Domicilio fiscal'
           end
         end
         inherited dxLayoutControlContactoGroup6: TdxLayoutGroup
           object dxLayoutControlContactoGroup8: TdxLayoutGroup
-            Caption = 'Otros'
+            CaptionOptions.Text = 'Otros'
+            ButtonOptions.Buttons = <>
             object dxLayoutControlContactoItem20: TdxLayoutItem
-              ShowCaption = False
+              CaptionOptions.Visible = False
               Control = cbFelicitacion
               ControlOptions.ShowBorder = False
             end
diff --git a/Source/Modulos/Contactos/Views/uViewCliente.pas b/Source/Modulos/Contactos/Views/uViewCliente.pas
index 637dcf4..9f27a80 100644
--- a/Source/Modulos/Contactos/Views/uViewCliente.pas
+++ b/Source/Modulos/Contactos/Views/uViewCliente.pas
@@ -11,7 +11,8 @@ uses
   dxLayoutControl, cxMemo, cxHyperLinkEdit, ImgList, ActnList, Buttons,
   PngSpeedButton, PngImageList, cxGraphics, cxMaskEdit, cxDropDownEdit,
   cxLookupEdit, cxDBLookupEdit, cxDBLookupComboBox, uGruposClienteController,
-  cxCheckBox, cxSpinEdit, Grids, DBGrids, uDAInterfaces; 
+  cxCheckBox, cxSpinEdit, Grids, DBGrids, uDAInterfaces, cxLookAndFeels,
+  cxLookAndFeelPainters, dxLayoutcxEditAdapters; 
 
 type
   IViewCliente = interface(IViewContacto)
@@ -50,7 +51,7 @@ implementation
 {$R *.dfm}
 
 uses
-  uCIFNIFUtils, uBizGruposCliente;
+  uValidacionUtils, uBizGruposCliente;
 
 { TfrViewCliente }
 
@@ -118,7 +119,7 @@ procedure TfrViewCliente.eNIFCIFPropertiesValidate(Sender: TObject;
   var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
 begin
   inherited;
-  if not EsCif(DisplayValue) then
+  if not EsNIFCIF(DisplayValue) then
      Application.MessageBox('El NIF/CIF introducido no es correcto', 'Atención', MB_OK);
 end;
 
diff --git a/Source/Modulos/Contactos/Views/uViewClienteDatosComerciales.dfm b/Source/Modulos/Contactos/Views/uViewClienteDatosComerciales.dfm
index 5a011f5..b094f66 100644
--- a/Source/Modulos/Contactos/Views/uViewClienteDatosComerciales.dfm
+++ b/Source/Modulos/Contactos/Views/uViewClienteDatosComerciales.dfm
@@ -21,7 +21,6 @@ inherited frViewClienteDatosComerciales: TfrViewClienteDatosComerciales
     ParentBackground = True
     TabOrder = 0
     TabStop = False
-    AutoContentSizes = [acsWidth]
     object Label1: TLabel
       Left = 466
       Top = 28
@@ -362,84 +361,83 @@ inherited frViewClienteDatosComerciales: TfrViewClienteDatosComerciales
       Width = 165
     end
     object dxLayoutGroup1: TdxLayoutGroup
-      ShowCaption = False
+      AlignHorz = ahParentManaged
+      AlignVert = avTop
+      CaptionOptions.Visible = False
+      ButtonOptions.Buttons = <>
       Hidden = True
       LayoutDirection = ldHorizontal
       ShowBorder = False
       object dxLayoutControl1Group3: TdxLayoutGroup
-        AutoAligns = [aaVertical]
         AlignHorz = ahClient
-        Caption = 'Datos comerciales'
+        CaptionOptions.Text = 'Datos comerciales'
+        ButtonOptions.Buttons = <>
         object dxLayoutControl1Item3: TdxLayoutItem
-          AutoAligns = [aaVertical]
           AlignHorz = ahClient
-          Caption = 'R'#233'gimen de IVA:'
+          CaptionOptions.Text = 'R'#233'gimen de IVA:'
           Control = cbRegimenIVA
           ControlOptions.ShowBorder = False
         end
         object dxLayoutControl1Group2: TdxLayoutGroup
-          ShowCaption = False
+          CaptionOptions.Visible = False
+          ButtonOptions.Buttons = <>
           Hidden = True
           LayoutDirection = ldHorizontal
           ShowBorder = False
           object dxLayoutControl1Item5: TdxLayoutItem
-            AutoAligns = [aaVertical]
             AlignHorz = ahClient
-            Caption = 'Forma de pago:'
+            CaptionOptions.Text = 'Forma de pago:'
             Control = cbFormaPago
             ControlOptions.ShowBorder = False
           end
           object dxLayoutControl1Item7: TdxLayoutItem
-            AutoAligns = [aaVertical]
             AlignHorz = ahRight
-            Caption = 'Button1'
-            ShowCaption = False
+            CaptionOptions.Text = 'Button1'
+            CaptionOptions.Visible = False
             Control = bFormasPago
             ControlOptions.ShowBorder = False
           end
         end
         object dxLayoutControl1Group1: TdxLayoutGroup
-          ShowCaption = False
+          CaptionOptions.Visible = False
+          ButtonOptions.Buttons = <>
           Hidden = True
           LayoutDirection = ldHorizontal
           ShowBorder = False
           object dxLayoutControl1Item8: TdxLayoutItem
-            AutoAligns = [aaVertical]
             AlignHorz = ahClient
-            Caption = 'IVA por defecto'
+            CaptionOptions.Text = 'IVA por defecto'
             Control = eIVA
             ControlOptions.ShowBorder = False
           end
           object dxLayoutControl1Item9: TdxLayoutItem
-            AutoAligns = [aaVertical]
             AlignHorz = ahRight
-            ShowCaption = False
+            CaptionOptions.Visible = False
             Control = bTiposIVA
             ControlOptions.ShowBorder = False
           end
         end
         object dxLayoutControl1Item4: TdxLayoutItem
-          AutoAligns = [aaVertical]
           AlignHorz = ahClient
-          Caption = ' '
+          CaptionOptions.Text = ' '
           Control = cbRecargoEquivalencia
           ControlOptions.ShowBorder = False
         end
         object dxLayoutControl1Item10: TdxLayoutItem
-          Caption = 'Bevel1'
-          ShowCaption = False
+          CaptionOptions.Text = 'Bevel1'
+          CaptionOptions.Visible = False
           Control = Bevel1
           ControlOptions.ShowBorder = False
         end
         object dxLayoutControl1Item1: TdxLayoutItem
-          AutoAligns = [aaVertical]
-          Caption = 'Dto. cliente:'
+          AlignHorz = ahLeft
+          CaptionOptions.Text = 'Dto. cliente:'
           Control = eDescuento
           ControlOptions.ShowBorder = False
         end
         object dxLayoutControl1Item13: TdxLayoutItem
-          AutoAligns = [aaVertical]
-          Caption = 'Dto. pronto pago:'
+          AlignHorz = ahLeft
+          CaptionOptions.Text = 'Dto. pronto pago:'
           Control = eDescuento2
           ControlOptions.ShowBorder = False
         end
@@ -448,39 +446,38 @@ inherited frViewClienteDatosComerciales: TfrViewClienteDatosComerciales
           ControlOptions.ShowBorder = False
         end
         object dxLayoutControl1Item14: TdxLayoutItem
-          Caption = 'Vendedor:'
+          CaptionOptions.Text = 'Vendedor:'
           Control = eVendedor
           ControlOptions.ShowBorder = False
         end
       end
       object dxLayoutControl1Group5: TdxLayoutGroup
-        AutoAligns = [aaVertical]
         AlignHorz = ahClient
-        Caption = 'Datos para facturaci'#243'n'
+        CaptionOptions.Text = 'Datos para facturaci'#243'n'
+        ButtonOptions.Buttons = <>
         object dxLayoutControl1Item6: TdxLayoutItem
-          AutoAligns = [aaVertical]
           AlignHorz = ahClient
-          Caption = 'Label1'
-          ShowCaption = False
+          CaptionOptions.Text = 'Label1'
+          CaptionOptions.Visible = False
           Control = Label1
           ControlOptions.AutoColor = True
           ControlOptions.ShowBorder = False
         end
         object dxLayoutControl1Item2: TdxLayoutItem
-          AutoAligns = [aaVertical]
-          Caption = 'D'#237'a del mes 1:'
+          AlignHorz = ahLeft
+          CaptionOptions.Text = 'D'#237'a del mes 1:'
           Control = eDiasVencimiento1
           ControlOptions.ShowBorder = False
         end
         object dxLayoutControl1Item11: TdxLayoutItem
-          AutoAligns = [aaVertical]
-          Caption = 'D'#237'a del mes 2:'
+          AlignHorz = ahLeft
+          CaptionOptions.Text = 'D'#237'a del mes 2:'
           Control = eDiasVencimiento2
           ControlOptions.ShowBorder = False
         end
         object dxLayoutControl1Item12: TdxLayoutItem
-          AutoAligns = [aaVertical]
-          Caption = 'D'#237'a del mes 3:'
+          AlignHorz = ahLeft
+          CaptionOptions.Text = 'D'#237'a del mes 3:'
           Control = eDiasVencimiento3
           ControlOptions.ShowBorder = False
         end
diff --git a/Source/Modulos/Contactos/Views/uViewClienteDatosComerciales.pas b/Source/Modulos/Contactos/Views/uViewClienteDatosComerciales.pas
index e3ddb80..5827cb7 100644
--- a/Source/Modulos/Contactos/Views/uViewClienteDatosComerciales.pas
+++ b/Source/Modulos/Contactos/Views/uViewClienteDatosComerciales.pas
@@ -8,7 +8,8 @@ uses
   cxContainer, cxEdit, cxTextEdit, cxMaskEdit, cxDropDownEdit, cxLookupEdit,
   cxDBLookupEdit, cxDBLookupComboBox, cxControls, cxSpinEdit, cxDBEdit,
   uBizContactos, cxCheckBox, StdCtrls, uFormasPagoController, uTiposIVAController,
-  uDAInterfaces, uBizFormasPago, uBizTiposIVA, ExtCtrls, uVendedoresController; 
+  uDAInterfaces, uBizFormasPago, uBizTiposIVA, ExtCtrls, uVendedoresController,
+  cxLookAndFeels, cxLookAndFeelPainters, dxLayoutcxEditAdapters; 
 
 type
   IViewClienteDatosComerciales = interface(IViewBase)
diff --git a/Source/Modulos/Contactos/Views/uViewClienteDescuentos.pas b/Source/Modulos/Contactos/Views/uViewClienteDescuentos.pas
index ea8c2aa..36a4867 100644
--- a/Source/Modulos/Contactos/Views/uViewClienteDescuentos.pas
+++ b/Source/Modulos/Contactos/Views/uViewClienteDescuentos.pas
@@ -9,7 +9,8 @@ uses
   PngImageList, uDADataTable, ComCtrls, ToolWin, cxGridLevel,
   cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses,
   cxControls, cxGridCustomView, cxGrid, cxDBLookupComboBox, cxSpinEdit,
-  uBizContactos, uProveedoresController, uDAInterfaces; 
+  uBizContactos, uProveedoresController, uDAInterfaces, cxLookAndFeels,
+  cxLookAndFeelPainters; 
    
 type
   TfrViewClienteDescuentos = class(TfrViewDetallesGenerico)
diff --git a/Source/Modulos/Contactos/Views/uViewContactoDatosBancarios.dfm b/Source/Modulos/Contactos/Views/uViewContactoDatosBancarios.dfm
index db311d5..a0ce9cb 100644
--- a/Source/Modulos/Contactos/Views/uViewContactoDatosBancarios.dfm
+++ b/Source/Modulos/Contactos/Views/uViewContactoDatosBancarios.dfm
@@ -11,12 +11,14 @@ inherited frViewClienteDatosBancarios: TfrViewClienteDatosBancarios
     Align = alTop
     ParentBackground = True
     TabOrder = 0
-    AutoContentSizes = [acsWidth]
+    TabStop = False
     object eEntidad: TcxDBTextEdit
       Left = 117
       Top = 55
       DataBinding.DataField = 'ENTIDAD'
       DataBinding.DataSource = dsDatosBancarios
+      Properties.MaxLength = 4
+      Properties.OnEditValueChanged = CalcularDC
       Style.BorderColor = clWindowFrame
       Style.BorderStyle = ebs3D
       Style.HotTrack = False
@@ -36,6 +38,8 @@ inherited frViewClienteDatosBancarios: TfrViewClienteDatosBancarios
       Top = 55
       DataBinding.DataField = 'SUCURSAL'
       DataBinding.DataSource = dsDatosBancarios
+      Properties.MaxLength = 4
+      Properties.OnEditValueChanged = CalcularDC
       Style.BorderColor = clWindowFrame
       Style.BorderStyle = ebs3D
       Style.HotTrack = False
@@ -55,6 +59,8 @@ inherited frViewClienteDatosBancarios: TfrViewClienteDatosBancarios
       Top = 82
       DataBinding.DataField = 'CUENTA'
       DataBinding.DataSource = dsDatosBancarios
+      Properties.MaxLength = 10
+      Properties.OnEditValueChanged = CalcularDC
       Style.BorderColor = clWindowFrame
       Style.BorderStyle = ebs3D
       Style.HotTrack = False
@@ -74,6 +80,8 @@ inherited frViewClienteDatosBancarios: TfrViewClienteDatosBancarios
       Top = 82
       DataBinding.DataField = 'DC'
       DataBinding.DataSource = dsDatosBancarios
+      Enabled = False
+      Properties.MaxLength = 2
       Style.BorderColor = clWindowFrame
       Style.BorderStyle = ebs3D
       Style.HotTrack = False
@@ -108,54 +116,59 @@ inherited frViewClienteDatosBancarios: TfrViewClienteDatosBancarios
       Width = 194
     end
     object dxLayoutControl1Group_Root: TdxLayoutGroup
-      ShowCaption = False
+      AlignHorz = ahParentManaged
+      AlignVert = avTop
+      CaptionOptions.Visible = False
+      ButtonOptions.Buttons = <>
       Hidden = True
       ShowBorder = False
       object dxLayoutControl1Group3: TdxLayoutGroup
-        Caption = 'Datos bancarios'
+        CaptionOptions.Text = 'Datos bancarios'
+        ButtonOptions.Buttons = <>
         object dxLayoutControl1Item5: TdxLayoutItem
-          Caption = 'Nombre del banco:'
+          CaptionOptions.Text = 'Nombre del banco:'
           Control = eTitular
           ControlOptions.ShowBorder = False
         end
         object dxLayoutControl1Group2: TdxLayoutGroup
-          ShowCaption = False
+          CaptionOptions.Visible = False
+          ButtonOptions.Buttons = <>
           Hidden = True
           ShowBorder = False
           object dxLayoutControl1Group1: TdxLayoutGroup
-            ShowCaption = False
+            CaptionOptions.Visible = False
+            ButtonOptions.Buttons = <>
             Hidden = True
             LayoutDirection = ldHorizontal
             ShowBorder = False
             object dxLayoutControl1Item1: TdxLayoutItem
-              AutoAligns = [aaVertical]
               AlignHorz = ahClient
-              Caption = 'C'#243'd. entidad:'
+              CaptionOptions.Text = 'C'#243'd. entidad:'
               Control = eEntidad
               ControlOptions.ShowBorder = False
             end
             object dxLayoutControl1Item2: TdxLayoutItem
-              AutoAligns = [aaVertical]
               AlignHorz = ahClient
-              Caption = 'C'#243'd. sucursal:'
+              CaptionOptions.Text = 'C'#243'd. sucursal:'
               Control = eSucursal
               ControlOptions.ShowBorder = False
             end
           end
           object dxLayoutControl1Group4: TdxLayoutGroup
-            ShowCaption = False
+            CaptionOptions.Visible = False
+            ButtonOptions.Buttons = <>
             Hidden = True
             LayoutDirection = ldHorizontal
             ShowBorder = False
             object dxLayoutControl1Item4: TdxLayoutItem
-              Caption = 'DC:'
+              CaptionOptions.Text = 'DC:'
+              Enabled = False
               Control = eDC
               ControlOptions.ShowBorder = False
             end
             object dxLayoutControl1Item3: TdxLayoutItem
-              AutoAligns = [aaVertical]
               AlignHorz = ahClient
-              Caption = 'C'#243'd. cuenta:'
+              CaptionOptions.Text = 'C'#243'd. cuenta:'
               Control = eCuenta
               ControlOptions.ShowBorder = False
             end
diff --git a/Source/Modulos/Contactos/Views/uViewContactoDatosBancarios.pas b/Source/Modulos/Contactos/Views/uViewContactoDatosBancarios.pas
index ef75386..1d2d16e 100644
--- a/Source/Modulos/Contactos/Views/uViewContactoDatosBancarios.pas
+++ b/Source/Modulos/Contactos/Views/uViewContactoDatosBancarios.pas
@@ -5,7 +5,8 @@ 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, cxGraphics,
+  cxLookAndFeels, cxLookAndFeelPainters, dxLayoutcxEditAdapters;
 
 type
   IViewDatosBancarios = interface(IViewBase)
@@ -30,10 +31,18 @@ type
     dxLayoutControl1Group4: TdxLayoutGroup;
     dxLayoutControl1Group1: TdxLayoutGroup;
     dsDatosBancarios: TDADataSource;
+    procedure CalcularDC(Sender: TObject);
   end;
 
 implementation
-
 {$R *.dfm}
 
+uses
+  uValidacionUtils;
+
+procedure TfrViewClienteDatosBancarios.CalcularDC(Sender: TObject);
+begin
+  eDC.EditValue := DarDC(eEntidad.EditValue,eSucursal.EditValue,eCuenta.EditValue);
+end;
+
 end.
diff --git a/Source/Modulos/Contactos/Views/uViewContactoListaDatosBancarios.pas b/Source/Modulos/Contactos/Views/uViewContactoListaDatosBancarios.pas
index 2d5e608..06cbb8d 100644
--- a/Source/Modulos/Contactos/Views/uViewContactoListaDatosBancarios.pas
+++ b/Source/Modulos/Contactos/Views/uViewContactoListaDatosBancarios.pas
@@ -8,7 +8,8 @@ uses
   cxData, cxDataStorage, cxEdit, DB, cxDBData, ActnList, ImgList, PngImageList,
   uDAInterfaces, uDADataTable, ComCtrls, ToolWin, cxGridLevel,
   cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses,
-  cxControls, cxGridCustomView, cxGrid, cxTextEdit;
+  cxControls, cxGridCustomView, cxGrid, cxTextEdit, cxLookAndFeels,
+  cxLookAndFeelPainters;
    
 type
   IViewListaDatosBancarios = interface(IViewDetallesGenerico)
diff --git a/Source/Modulos/Contactos/Views/uViewDireccionesEntrega.pas b/Source/Modulos/Contactos/Views/uViewDireccionesEntrega.pas
index 1584ed9..184b52b 100644
--- a/Source/Modulos/Contactos/Views/uViewDireccionesEntrega.pas
+++ b/Source/Modulos/Contactos/Views/uViewDireccionesEntrega.pas
@@ -10,7 +10,7 @@ uses
   cxGridDBBandedTableView, cxClasses, cxControls, cxGridCustomView, cxGrid,
   uDADataTable, Grids, DBGrids, ActnList, ImgList, PngImageList, ComCtrls,
   ToolWin, cxGridDBTableView, uViewDetallesGenerico, cxCurrencyEdit,
-  uDAInterfaces;    
+  uDAInterfaces, cxLookAndFeels, cxLookAndFeelPainters;    
   
 type
   TfrViewDireccionesEntrega = class(TfrViewDetallesGenerico)
diff --git a/Source/Modulos/Contactos/Views/uViewPersonalContacto.pas b/Source/Modulos/Contactos/Views/uViewPersonalContacto.pas
index 63ba235..2760a26 100644
--- a/Source/Modulos/Contactos/Views/uViewPersonalContacto.pas
+++ b/Source/Modulos/Contactos/Views/uViewPersonalContacto.pas
@@ -10,7 +10,7 @@ uses
   cxGridDBBandedTableView, cxClasses, cxControls, cxGridCustomView, cxGrid,
   uDADataTable, Grids, DBGrids, ActnList, ImgList, PngImageList, ComCtrls,
   ToolWin, cxGridDBTableView, uViewDetallesGenerico,
-  uDAInterfaces, StdCtrls;
+  uDAInterfaces, StdCtrls, cxLookAndFeels, cxLookAndFeelPainters;
   
 type
   TfrViewPersonalContacto = class(TfrViewDetallesGenerico)
diff --git a/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.dfm
index f31222b..1d38856 100644
--- a/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.dfm	
+++ b/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.dfm	
@@ -5,10 +5,10 @@ inherited fEditorElegirRecibosCliente: TfEditorElegirRecibosCliente
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
-    Top = 220
+    Top = 264
     Width = 670
     Visible = False
-    ExplicitTop = 214
+    ExplicitTop = 264
     ExplicitWidth = 670
     inherited Image1: TImage
       Left = 643
@@ -16,16 +16,16 @@ inherited fEditorElegirRecibosCliente: TfEditorElegirRecibosCliente
     end
   end
   inherited TBXDock: TSpTBXDock
-    Top = 148
+    Top = 192
     Width = 670
     Height = 72
-    ExplicitTop = 175
+    ExplicitTop = 192
     ExplicitWidth = 670
     ExplicitHeight = 72
     inherited tbxMain: TSpTBXToolbar
-      Left = 97
-      ExplicitLeft = 97
-      ExplicitWidth = 269
+      Left = 146
+      ExplicitLeft = 146
+      ExplicitWidth = 126
       inherited TBXItem5: TSpTBXItem
         Visible = False
       end
@@ -40,7 +40,7 @@ inherited fEditorElegirRecibosCliente: TfEditorElegirRecibosCliente
       Top = 23
       DockRow = 1
       ExplicitTop = 23
-      ExplicitWidth = 97
+      ExplicitWidth = 146
       inherited sepAno: TSpTBXSeparatorItem
         Visible = False
       end
@@ -64,7 +64,6 @@ inherited fEditorElegirRecibosCliente: TfEditorElegirRecibosCliente
     inherited TBXTMain2: TSpTBXToolbar
       Left = 330
       DockPos = 330
-      Visible = False
       ExplicitLeft = 330
       ExplicitHeight = 23
     end
@@ -169,18 +168,18 @@ inherited fEditorElegirRecibosCliente: TfEditorElegirRecibosCliente
     end
   end
   inherited frViewRecibosCliente1: TfrViewRecibosCliente [5]
-    Top = 247
+    Top = 291
     Width = 670
-    Height = 259
-    ExplicitTop = 247
+    Height = 215
+    ExplicitTop = 291
     ExplicitWidth = 670
-    ExplicitHeight = 259
+    ExplicitHeight = 215
     inherited cxGrid: TcxGrid
       Width = 670
-      Height = 131
+      Height = 87
       RootLevelOptions.DetailTabsPosition = dtpNone
       ExplicitWidth = 670
-      ExplicitHeight = 131
+      ExplicitHeight = 87
       inherited cxGridView: TcxGridDBTableView
         DataController.Summary.DefaultGroupSummaryItems = <
           item
@@ -205,6 +204,7 @@ inherited fEditorElegirRecibosCliente: TfEditorElegirRecibosCliente
       Width = 670
       ExplicitWidth = 670
       inherited TBXDockablePanel1: TSpTBXDockablePanel
+        Width = 670
         ExplicitWidth = 670
         inherited dxLayoutControl1: TdxLayoutControl
           Width = 670
@@ -247,8 +247,8 @@ inherited fEditorElegirRecibosCliente: TfEditorElegirRecibosCliente
           end
         end
         inherited TBXAlignmentPanel1: TSpTBXDockablePanel
-          Width = 670
-          ExplicitWidth = 670
+          Width = 660
+          ExplicitWidth = 660
           inherited tbxBotones: TSpTBXToolbar
             Width = 660
             ExplicitWidth = 660
@@ -257,15 +257,16 @@ inherited fEditorElegirRecibosCliente: TfEditorElegirRecibosCliente
       end
     end
     inherited pnlAgrupaciones: TSpTBXDockablePanel
-      Top = 233
-      ExplicitTop = 233
+      Top = 189
+      Width = 670
+      ExplicitTop = 189
       ExplicitWidth = 670
       inherited TBXAlignmentPanel1: TSpTBXDockablePanel
         Width = 670
         ExplicitWidth = 670
         inherited TBXToolbar1: TSpTBXToolbar
-          Width = 660
-          ExplicitWidth = 660
+          Width = 670
+          ExplicitWidth = 670
         end
       end
     end
@@ -274,6 +275,9 @@ inherited fEditorElegirRecibosCliente: TfEditorElegirRecibosCliente
         BuiltInReportLink = True
       end
     end
+    inherited dxPSEngineController1: TdxPSEngineController
+      Active = True
+    end
     inherited cxViewGridPopupMenu: TcxGridPopupMenu
       PopupMenus = <
         item
@@ -286,18 +290,15 @@ inherited fEditorElegirRecibosCliente: TfEditorElegirRecibosCliente
   object pnlFiltrar: TSpTBXDockablePanel [6]
     Left = 0
     Top = 64
-    Align = alTop
+    Width = 670
+    Height = 128
     Caption = 'Filtrar'
-    CaptionRotation = dpcrAlwaysVert
-    DockedHeight = 84
+    Align = alTop
     DockMode = dmCannotFloat
     DockPos = 88
     DockRow = 2
-    FloatingWidth = 128
-    FloatingHeight = 84
-    ShowCaptionWhenDocked = False
-    SupportedDocks = [dkStandardDock, dkMultiDock]
     TabOrder = 5
+    ShowCaptionWhenDocked = False
     object Label1: TLabel
       Left = 330
       Top = 50
diff --git a/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.pas b/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.pas
index 96ca848..3de4a2d 100644
--- a/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.pas	
+++ b/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.pas	
@@ -38,7 +38,8 @@ uses
   uViewRecibosCliente, uEditorRecibosCliente, uBizRecibosCliente, uIEditorElegirRecibosCliente,
   Buttons, cxRadioGroup, cxMaskEdit, cxDropDownEdit, cxCalendar, cxControls,
   cxContainer, cxEdit, cxTextEdit, SpTBXDkPanels, JSDialog, 
-  uDAInterfaces;
+  uDAInterfaces, cxGraphics, cxLookAndFeels, cxLookAndFeelPainters, TntStdCtrls,
+  SpTBXEditors;
   
 
 type
diff --git a/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.dfm
index 7426baf..25d5046 100644
--- a/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.dfm	
+++ b/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.dfm	
@@ -44,23 +44,25 @@ inherited fEditorRecibosCliente: TfEditorRecibosCliente
       ExplicitWidth = 434
     end
     inherited tbxFiltro: TSpTBXToolbar
-      ExplicitWidth = 427
+      ExplicitWidth = 435
       inherited lblAno: TSpTBXLabelItem
         Visible = True
       end
-      inherited cbxListaAnos: TSpTBXComboBox
-        Visible = True
-      end
       inherited sepAno: TSpTBXSeparatorItem
         Visible = True
       end
+      inherited cbxListaAnos: TSpTBXComboBox
+        Left = 33
+        Visible = True
+        ExplicitLeft = 33
+      end
     end
     inherited tbxMenu: TSpTBXToolbar
       ExplicitWidth = 645
     end
     inherited TBXTMain2: TSpTBXToolbar
-      Left = 427
-      ExplicitLeft = 427
+      Left = 435
+      ExplicitLeft = 435
       ExplicitWidth = 66
       object TBXItem38: TSpTBXItem
         Action = actInformes
@@ -130,6 +132,7 @@ inherited fEditorRecibosCliente: TfEditorRecibosCliente
       Width = 645
       ExplicitWidth = 645
       inherited TBXDockablePanel1: TSpTBXDockablePanel
+        Width = 645
         ExplicitWidth = 645
         inherited dxLayoutControl1: TdxLayoutControl
           Width = 645
@@ -172,8 +175,8 @@ inherited fEditorRecibosCliente: TfEditorRecibosCliente
           end
         end
         inherited TBXAlignmentPanel1: TSpTBXDockablePanel
-          Width = 645
-          ExplicitWidth = 645
+          Width = 635
+          ExplicitWidth = 635
           inherited tbxBotones: TSpTBXToolbar
             Width = 635
             ExplicitWidth = 635
@@ -183,14 +186,15 @@ inherited fEditorRecibosCliente: TfEditorRecibosCliente
     end
     inherited pnlAgrupaciones: TSpTBXDockablePanel
       Top = 414
+      Width = 645
       ExplicitTop = 414
       ExplicitWidth = 645
       inherited TBXAlignmentPanel1: TSpTBXDockablePanel
         Width = 645
         ExplicitWidth = 645
         inherited TBXToolbar1: TSpTBXToolbar
-          Width = 635
-          ExplicitWidth = 635
+          Width = 645
+          ExplicitWidth = 645
         end
       end
     end
diff --git a/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.pas b/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.pas
index 7ea581c..c22ed6a 100644
--- a/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.pas	
+++ b/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.pas	
@@ -36,7 +36,8 @@ uses
   uEditorGridBase, uCustomView, 
   
   uBizRecibosCliente, uIEditorRecibosCliente, uRecibosClienteController,
-  uViewRecibosCliente, JSDialog, uDAInterfaces;
+  uViewRecibosCliente, JSDialog, uDAInterfaces, StdCtrls, TntStdCtrls,
+  SpTBXEditors;
 
 type
 
diff --git a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm
index 0249f17..1463e9f 100644
--- a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm	
+++ b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm	
@@ -167,6 +167,7 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente
     Width = 531
     ExplicitWidth = 531
     inherited TBXDockablePanel1: TSpTBXDockablePanel
+      Width = 531
       ExplicitWidth = 531
       inherited dxLayoutControl1: TdxLayoutControl
         Width = 531
@@ -204,12 +205,10 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
           ExplicitLeft = 389
-          ExplicitWidth = 215
-          Width = 215
         end
       end
       inherited TBXAlignmentPanel1: TSpTBXDockablePanel
-        Width = 531
+        Width = 521
         ExplicitWidth = 531
         inherited tbxBotones: TSpTBXToolbar
           Width = 521
@@ -220,6 +219,7 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente
   end
   inherited pnlAgrupaciones: TSpTBXDockablePanel
     Top = 361
+    Width = 531
     Visible = True
     ExplicitTop = 361
     ExplicitWidth = 531
@@ -227,7 +227,7 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente
       Width = 531
       ExplicitWidth = 531
       inherited TBXToolbar1: TSpTBXToolbar
-        Width = 521
+        Width = 531
         ExplicitWidth = 521
         object TBXSeparatorItem1: TSpTBXSeparatorItem
         end
diff --git a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.pas b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.pas
index c4329f1..6354839 100644
--- a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.pas	
+++ b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.pas	
@@ -14,7 +14,9 @@ uses
   cxImage, Grids, DBGrids, uBizRecibosCliente, cxGridCustomPopupMenu,
   cxGridPopupMenu, cxCalendar, cxCurrencyEdit, uViewFiltroBase, TB2Item, SpTBXItem,
   TB2Toolbar, SpTBXDkPanels, TB2Dock, dxPgsDlg, uDAInterfaces, uCustomView,
-  uViewBase;
+  uViewBase, cxLookAndFeels, cxLookAndFeelPainters, dxPSPDFExportCore,
+  dxPSPDFExport, cxDrawTextUtils, dxPSPrVwStd, dxPSPrVwAdv,
+  dxPScxEditorProducers, dxPScxExtEditorProducers, dxPScxPageControlProducer;
    
 type
   IViewRecibosCliente = interface(IViewGrid)