diff --git a/Source/ApplicationBase/ApplicationBase.dproj b/Source/ApplicationBase/ApplicationBase.dproj
index ef59f35..5ab31c7 100644
--- a/Source/ApplicationBase/ApplicationBase.dproj
+++ b/Source/ApplicationBase/ApplicationBase.dproj
@@ -55,10 +55,10 @@
     <DelphiCompile Include="ApplicationBase.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\Modulos\Contactos\Views\Base.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Views\GUIBase.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Views\JvJansD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Views\PluginSDK_D11R.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Base.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\GUIBase.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\JvJansD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\PluginSDK_D11R.dcp" />
     <DCCReference Include="Empresas\Controller\uDatosBancariosEmpresaController.pas" />
     <DCCReference Include="Empresas\Controller\uEmpresasController.pas" />
     <DCCReference Include="Empresas\Controller\View\uIEditorDatosBancarioEmpresa.pas" />
diff --git a/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm b/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm
index 913ec6e..e8e05ef 100644
--- a/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm
+++ b/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm
@@ -125,115 +125,115 @@ inherited fEditorEmpresa: TfEditorEmpresa
             ExplicitTop = 267
           end
           inherited eCalle: TcxDBTextEdit
-            Top = 294
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
-            ExplicitTop = 294
-            ExplicitWidth = 234
-            Width = 234
-          end
-          inherited eCodigoPostal: TcxDBTextEdit
             Top = 321
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
             ExplicitTop = 321
+            ExplicitWidth = 234
+            Width = 234
+          end
+          inherited eCodigoPostal: TcxDBTextEdit
+            Top = 348
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitTop = 348
           end
           inherited ePaginaWeb: TcxDBTextEdit
-            Left = 508
+            Left = 515
             Top = 216
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 508
+            ExplicitLeft = 515
             ExplicitTop = 216
             ExplicitWidth = 164
             Width = 164
           end
           inherited eMailParticular: TcxDBTextEdit
-            Left = 508
+            Left = 515
             Top = 189
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 508
+            ExplicitLeft = 515
             ExplicitTop = 189
             ExplicitWidth = 164
             Width = 164
           end
           inherited eMailTrabajo: TcxDBTextEdit
-            Left = 508
+            Left = 515
             Top = 162
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 508
+            ExplicitLeft = 515
             ExplicitTop = 162
             ExplicitWidth = 164
             Width = 164
           end
           inherited cxDBMemo1: TcxDBMemo
-            Top = 399
+            Top = 426
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitTop = 399
+            ExplicitTop = 426
             ExplicitWidth = 329
             ExplicitHeight = 64
             Height = 64
             Width = 329
           end
           inherited eTlfParticular: TcxDBTextEdit
-            Left = 508
+            Left = 515
             Top = 57
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 508
+            ExplicitLeft = 515
             ExplicitTop = 57
             ExplicitWidth = 164
             Width = 164
           end
           inherited eTlfTrabajo: TcxDBTextEdit
-            Left = 508
+            Left = 515
             Top = 30
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 508
+            ExplicitLeft = 515
             ExplicitTop = 30
             ExplicitWidth = 164
             Width = 164
           end
           inherited eTlfMovil: TcxDBTextEdit
-            Left = 508
+            Left = 515
             Top = 84
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 508
+            ExplicitLeft = 515
             ExplicitTop = 84
             ExplicitWidth = 164
             Width = 164
           end
           inherited eFax: TcxDBTextEdit
-            Left = 508
+            Left = 515
             Top = 111
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 508
+            ExplicitLeft = 515
             ExplicitTop = 111
             ExplicitWidth = 164
             Width = 164
@@ -269,13 +269,13 @@ inherited fEditorEmpresa: TfEditorEmpresa
             Width = 234
           end
           inherited cxDBImage1: TcxDBImage
-            Left = 413
+            Left = 420
             Top = 267
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 413
+            ExplicitLeft = 420
             ExplicitTop = 267
             ExplicitWidth = 230
             ExplicitHeight = 142
@@ -283,43 +283,53 @@ inherited fEditorEmpresa: TfEditorEmpresa
             Width = 230
           end
           inherited eParamMargen: TcxDBSpinEdit
-            Top = 243
+            Top = 270
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitTop = 243
+            ExplicitTop = 270
           end
           inherited eParamTiempo: TcxDBCurrencyEdit
-            Top = 243
+            Top = 270
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitTop = 243
+            ExplicitTop = 270
           end
           inherited cbProvincia: TcxDBComboBox
-            Top = 321
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
-            ExplicitTop = 321
-            ExplicitWidth = 91
-            Width = 91
-          end
-          inherited cbPoblacion: TcxDBComboBox
             Top = 348
-            Properties.OnInitPopup = nil
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
             ExplicitTop = 348
+            ExplicitWidth = 91
+            Width = 91
+          end
+          inherited cbPoblacion: TcxDBComboBox
+            Top = 375
+            Properties.OnInitPopup = nil
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitTop = 375
             ExplicitWidth = 234
             Width = 234
           end
           inherited cbFormaPago: TcxComboBox
+            Top = 192
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitTop = 192
+            ExplicitWidth = 202
+            Width = 202
+          end
+          inherited cbTipoIVA: TcxComboBox
             Top = 165
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
@@ -329,23 +339,23 @@ inherited fEditorEmpresa: TfEditorEmpresa
             ExplicitWidth = 202
             Width = 202
           end
-          inherited cbTipoIVA: TcxComboBox
+          inherited cbAlmacen: TcxComboBox
+            Top = 219
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitTop = 219
+          end
+          inherited eValidez: TcxDBSpinEdit
             Top = 138
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
             ExplicitTop = 138
-            ExplicitWidth = 202
-            Width = 202
-          end
-          inherited cbAlmacen: TcxComboBox
-            Top = 192
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
-            ExplicitTop = 192
+            ExplicitWidth = 60
+            Width = 60
           end
         end
       end
@@ -378,6 +388,18 @@ inherited fEditorEmpresa: TfEditorEmpresa
         inherited ToolBar1: TToolBar
           Width = 660
           ExplicitWidth = 660
+          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
diff --git a/Source/ApplicationBase/Usuarios/Views/uEditorCambiarPassword.dfm b/Source/ApplicationBase/Usuarios/Views/uEditorCambiarPassword.dfm
index a35428a..5a7936a 100644
--- a/Source/ApplicationBase/Usuarios/Views/uEditorCambiarPassword.dfm
+++ b/Source/ApplicationBase/Usuarios/Views/uEditorCambiarPassword.dfm
@@ -15,6 +15,7 @@ object fEditorCambiarPassword: TfEditorCambiarPassword
   Position = poScreenCenter
   OnClose = FormClose
   OnCloseQuery = FormCloseQuery
+  OnShow = FormShow
   PixelsPerInch = 96
   TextHeight = 13
   object Bevel4: TBevel
diff --git a/Source/ApplicationBase/Usuarios/Views/uEditorCambiarPassword.pas b/Source/ApplicationBase/Usuarios/Views/uEditorCambiarPassword.pas
index 0f5ec15..b4d087f 100644
--- a/Source/ApplicationBase/Usuarios/Views/uEditorCambiarPassword.pas
+++ b/Source/ApplicationBase/Usuarios/Views/uEditorCambiarPassword.pas
@@ -25,6 +25,7 @@ type
     procedure FormCloseQuery(Sender: TObject; var CanClose: Boolean);
     procedure actCancelarExecute(Sender: TObject);
     procedure actAceptarExecute(Sender: TObject);
+    procedure FormShow(Sender: TObject);
   public
     Usuario : IBizUsuario;
     Controller : IUsuariosController;
@@ -36,7 +37,7 @@ implementation
 {$R *.dfm}
 
 uses
-  uDialogUtils;
+  uDialogUtils, uDisplayUtils;
 
 procedure TfEditorCambiarPassword.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
@@ -98,4 +99,9 @@ begin
   end;
 end;
 
+procedure TfEditorCambiarPassword.FormShow(Sender: TObject);
+begin
+  ScaleFormFont(Self);
+end;
+
 end.
diff --git a/Source/ApplicationBase/Usuarios/Views/uEditorLogin.pas b/Source/ApplicationBase/Usuarios/Views/uEditorLogin.pas
index ced385f..39dc80d 100644
--- a/Source/ApplicationBase/Usuarios/Views/uEditorLogin.pas
+++ b/Source/ApplicationBase/Usuarios/Views/uEditorLogin.pas
@@ -44,7 +44,7 @@ type
 implementation
 
 uses
-  uFactuGES_App, uDataModuleConexion;
+  uFactuGES_App, uDataModuleConexion, uDisplayUtils;
 
 {$R *.dfm}
 
@@ -110,6 +110,7 @@ end;
 
 procedure TfEditorLogin.FormShow(Sender: TObject);
 begin
+  ScaleFormFont(Self);
   Self.Caption := AppFactuGES.AppFullName;
 //  JvFormStorage1.RestoreFormPlacement;   Que se meta usuario y contraseña siempre
 
diff --git a/Source/Base/Base.dpk b/Source/Base/Base.dpk
index 68859af..9174ecb 100644
--- a/Source/Base/Base.dpk
+++ b/Source/Base/Base.dpk
@@ -122,6 +122,7 @@ contains
   RegExpr in 'Utiles\RegExpr.pas',
   IBANMetrics in 'Utiles\TIBAN\IBANMetrics.pas',
   IBAN in 'Utiles\TIBAN\IBAN.pas',
-  uIBANUtils in 'Utiles\uIBANUtils.pas';
+  uIBANUtils in 'Utiles\uIBANUtils.pas',
+  uDisplayUtils in 'Utiles\uDisplayUtils.pas';
 
 end.
diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj
index 12474a2..2f86c71 100644
--- a/Source/Base/Base.dproj
+++ b/Source/Base/Base.dproj
@@ -54,58 +54,6 @@
     <DelphiCompile Include="Base.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\Modulos\Facturas de cliente\adortl.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\cxDataD11.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\cxEditorsD11.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\cxExportD11.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\cxExtEditorsD11.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\cxGridD11.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\cxIntl6D11.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\cxIntlPrintSys3D11.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\cxLibraryD11.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\cxPageControlD11.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\dbrtl.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\dclIndyCore.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\designide.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\dsnap.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\dxCoreD11.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\dxGDIPlusD11.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\dxPSCoreD11.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\dxThemeD11.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\GUISDK_D11R.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\IndyCore.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\IndyProtocols.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\IndySystem.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\Jcl.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\JclVcl.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\JSDialog100.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\JvCmpD11R.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\JvCoreD11R.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\JvCtrlsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\JvDlgsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\JvMMD11R.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\JvNetD11R.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\JvPageCompsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\JvSystemD11R.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\pckMD5.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\pckUCDataConnector.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\pckUserControl_RT.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\PngComponentsD10.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\PNG_D10.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\RemObjects_Indy_D11.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\rtl.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\TB2k_D10.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\tbx_d10.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\vcl.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\vclactnband.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\vcldb.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\vcljpg.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\VclSmp.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\vclx.dcp" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\xmlrtl.dcp" />
     <DCCReference Include="..\Modulos\Impresiones\Data\uDataModuleImpresiones.pas">
       <Form>DataModuleImpresiones</Form>
       <DesignClass>TDataModule</DesignClass>
@@ -138,14 +86,59 @@
       <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\cxIntl6D11.dcp" />
+    <DCCReference Include="Utiles\cxIntlPrintSys3D11.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\RegExpr.pas" />
+    <DCCReference Include="Utiles\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="Utiles\RemObjects_Indy_D11.dcp" />
+    <DCCReference Include="Utiles\rtl.dcp" />
+    <DCCReference Include="Utiles\TB2k_D10.dcp" />
+    <DCCReference Include="Utiles\tbx_d10.dcp" />
     <DCCReference Include="Utiles\TIBAN\IBAN.pas" />
     <DCCReference Include="Utiles\TIBAN\IBANMetrics.pas" />
     <DCCReference Include="Utiles\uAppInfoUtils.pas" />
@@ -154,6 +147,7 @@
     <DCCReference Include="Utiles\uDateUtils.pas" />
     <DCCReference Include="Utiles\uDBSelectionListUtils.pas" />
     <DCCReference Include="Utiles\uDialogUtils.pas" />
+    <DCCReference Include="Utiles\uDisplayUtils.pas" />
     <DCCReference Include="Utiles\uEMailUtils.pas" />
     <DCCReference Include="Utiles\uGridClipboardUtils.pas" />
     <DCCReference Include="Utiles\uGridStatusUtils.pas" />
@@ -169,6 +163,13 @@
     <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/Conexion/uConfigurarConexion.dfm b/Source/Base/Conexion/uConfigurarConexion.dfm
index 8cbbde8..8a70849 100644
--- a/Source/Base/Conexion/uConfigurarConexion.dfm
+++ b/Source/Base/Conexion/uConfigurarConexion.dfm
@@ -14,6 +14,7 @@ object fConfigurarConexion: TfConfigurarConexion
   OldCreateOrder = False
   Position = poScreenCenter
   Scaled = False
+  OnShow = FormShow
   PixelsPerInch = 96
   TextHeight = 13
   object bProbar: TButton
diff --git a/Source/Base/Conexion/uConfigurarConexion.pas b/Source/Base/Conexion/uConfigurarConexion.pas
index 9c3cd55..5ab29d7 100644
--- a/Source/Base/Conexion/uConfigurarConexion.pas
+++ b/Source/Base/Conexion/uConfigurarConexion.pas
@@ -18,6 +18,7 @@ type
     bAceptar: TButton;
     bCancelar: TButton;
     procedure bProbarClick(Sender: TObject);
+    procedure FormShow(Sender: TObject);
   private
     function GetTargetURL: String;
     procedure SetTargetURL(const Value: String);
@@ -32,12 +33,17 @@ var
 implementation
 
 uses
-  StrUtils, JclStrings, uDataModuleConexion, uDialogUtils;
+  StrUtils, JclStrings, uDataModuleConexion, uDialogUtils, uDisplayUtils;
 
 {$R *.dfm}
 
 { TfConfigurarConexion }
 
+procedure TfConfigurarConexion.FormShow(Sender: TObject);
+begin
+  ScaleFormFont(Self);
+end;
+
 function TfConfigurarConexion.GetTargetURL: String;
 begin
   Result := 'http://' + edtServer.Text + ':' + edtPort.Text + '/bin';
diff --git a/Source/Base/Utiles/uGridStatusUtils.pas b/Source/Base/Utiles/uGridStatusUtils.pas
index dfcd1cd..fbf7247 100644
--- a/Source/Base/Utiles/uGridStatusUtils.pas
+++ b/Source/Base/Utiles/uGridStatusUtils.pas
@@ -54,6 +54,8 @@ type
 procedure SeleccionarFilasDesdeGrid(const AView : TcxGridDBTableView;
   ASelectedRowList : TSelectedRecords);
 
+procedure AsignarAnchosPrefijadosAColumnas(const AView : TcxGridDBTableView);
+
 implementation
 
 uses
@@ -302,4 +304,73 @@ begin
 end;
 {$ENDREGION}
 
+
+procedure AsignarAnchosPrefijadosAColumnas(const AView : TcxGridDBTableView);
+var
+  DefAnchos : TStringList;
+  AColumn: TcxGridDBColumn;
+  AIndex, i : Integer;
+begin
+  if not Assigned(AView) then
+    raise Exception.Create('No hay vista asignada (AsignarAnchosPrefijadosAColumnas)');
+
+  DefAnchos := TStringList.Create;
+  with DefAnchos do begin
+    CaseSensitive := False;
+    Sorted := False;
+    CommaText := 'CONCEPTO=600,' +
+                 'NOMBRE=600,' +
+                 'CANTIDAD=40,' +
+                 'VISIBLE=20,' +
+                 'VISIBLE2=20,' +
+                 'DESCUENTO=60,' +
+                 'IVA=60,' +
+                 'RE=60,' +
+                 'IMPORTE_UNIDAD=80' +
+                 'REFERENCIA=100,' +
+                 'REF_PEDIDO=100,' +
+                 'REF_CONTRATO=100,' +
+                 'REF_FACTURA=100,' +                 
+                 'REFERENCIA_CLIENTE=100,' +
+                 'REFERENCIA_PROVEEDOR=100,' +
+                 'SITUACION=100,' +
+                 'IMPORTE_NETO=80,' +
+                 'IMPORTE_PORTE=80,' +
+                 'IMPORTE_IVA=80,' +
+                 'IMPORTE_RE=80,' +
+                 'IMPORTE_TOTAL=150,' +
+                 'TIPO=80,' +                 
+                 'TIPO_CONTRATO=80,' +
+                 'TIPO_PRESUPUESTO=80,' +
+                 'VENDEDOR=60,' +
+                 'TIENDA=60,' +
+                 'NIF_CIF=60,' +
+                 'FECHA_FACTURA=80,' +
+                 'FECHA_VENCIMIENTO=80,' +
+                 'FECHA_CONTRATO=80,' +
+                 'FECHA_ALBARAN=80,' +
+                 'FECHA_RECEPCION=80,' +
+                 'FECHA_ENVIO=80,' +
+                 'FECHA_VIGENCIA=80';
+  end;
+
+  ShowHourglassCursor;
+  AView.BeginUpdate;
+  try
+    for i := 0 to (AView.ColumnCount - 1) do
+    begin
+      AColumn := AView.Columns[i];
+      AColumn.BestFitMaxWidth := StrToIntDef(DefAnchos.Values[AColumn.DataBinding.FieldName], 60);
+      Acolumn.MinWidth := 10;
+      if AColumn.Width > AColumn.BestFitMaxWidth then
+        AColumn.Width := AColumn.BestFitMaxWidth;
+    end;
+  finally
+    AView.EndUpdate;
+    HideHourglassCursor;
+    FreeAndNil(DefAnchos);
+  end;
+end;
+
+
 end.
diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj
index 71cc679..5624f3f 100644
--- a/Source/Cliente/FactuGES.dproj
+++ b/Source/Cliente/FactuGES.dproj
@@ -53,7 +53,7 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>VCLApplication</Borland.ProjectType>
     <BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">4</VersionInfo><VersionInfo Name="MinorVer">4</VersionInfo><VersionInfo Name="Release">4</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">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">4.4.4.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">4.4.4.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages></Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">4</VersionInfo><VersionInfo Name="MinorVer">4</VersionInfo><VersionInfo Name="Release">6</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">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">4.4.6.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">4.4.6.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages></Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
   </ProjectExtensions>
   <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
   <ItemGroup>
diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc
index eada623..0bf944c 100644
--- a/Source/Cliente/FactuGES.rc
+++ b/Source/Cliente/FactuGES.rc
@@ -1,7 +1,7 @@
 MAINICON ICON "C:\Codigo\Resources\Iconos\Factuges.ico"
 1 VERSIONINFO
-FILEVERSION 4,4,4,0
-PRODUCTVERSION 4,4,4,0
+FILEVERSION 4,4,6,0
+PRODUCTVERSION 4,4,6,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@@ -13,10 +13,10 @@ BEGIN
          BLOCK "0C0A04E4"
          BEGIN
               VALUE "CompanyName", "Rodax Software S.L.\0"
-              VALUE "FileVersion", "4.4.4.0\0"
+              VALUE "FileVersion", "4.4.6.0\0"
               VALUE "InternalName", "FactuGES\0"
               VALUE "ProductName", "FactuGES\0"
-              VALUE "ProductVersion", "4.4.4.0\0"
+              VALUE "ProductVersion", "4.4.6.0\0"
          END
     END
     BLOCK "VarFileInfo"
diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res
index 21dcd0f..d4c2052 100644
Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ
diff --git a/Source/Cliente/uPantallaPrincipal.pas b/Source/Cliente/uPantallaPrincipal.pas
index 41673e2..4b1e4f7 100644
--- a/Source/Cliente/uPantallaPrincipal.pas
+++ b/Source/Cliente/uPantallaPrincipal.pas
@@ -150,7 +150,7 @@ uses
   uSplash, uAcercaDe, UxTheme, Themes, uMenuUtils, uBizEmpresas,
   uFactuGES_App, uDMBase, uDataModuleConexion,
   uModuleController, uMainMenuController, uNavPaneController,
-  uDialogUtils, cxControls;
+  uDialogUtils, cxControls, uDisplayUtils;
 
 {$R *.dfm}
 
@@ -330,40 +330,42 @@ var
   AListaEmpresas : IBizEmpresa;
   i : Integer;
 begin
-  ShowHourglassCursor;  
+  ShowHourglassCursor;
   try
-	for i := 0 to AppFactuGES.ModuleManager.ModulesCount - 1 do
-       MainMenuController.RegisterModule(AppFactuGES.ModuleManager.Modules[i]);
+    ScaleFormFont(Self);
+    
+    for i := 0 to AppFactuGES.ModuleManager.ModulesCount - 1 do
+         MainMenuController.RegisterModule(AppFactuGES.ModuleManager.Modules[i]);
 
-  MainMenuController.SortMenuByTag;
-  MainMenuController.InitMainMenu;
+    MainMenuController.SortMenuByTag;
+    MainMenuController.InitMainMenu;
 
-  for i := 0 to AppFactuGES.ModuleManager.ModulesCount - 1 do
-    NavPaneController.RegisterModule(AppFactuGES.ModuleManager.Modules[i]);
+    for i := 0 to AppFactuGES.ModuleManager.ModulesCount - 1 do
+      NavPaneController.RegisterModule(AppFactuGES.ModuleManager.Modules[i]);
 
-  NavPaneController.InitNavPane;
+    NavPaneController.InitNavPane;
 
-  try
-    AListaEmpresas := AppFactuGES.EmpresasController.BuscarTodos(AppFactuGES.UsuarioActivo.ID_PERFIL);
-    if Assigned(AListaEmpresas) then
-    begin
-      AListaEmpresas.Active := True;
-      if AListaEmpresas.RecordCount = 1 then
+    try
+      AListaEmpresas := AppFactuGES.EmpresasController.BuscarTodos(AppFactuGES.UsuarioActivo.ID_PERFIL);
+      if Assigned(AListaEmpresas) then
       begin
-        // Oculto la página de inicio para que no parezca
-        // que se pueden manejar varias empresas.
-        JvNavigationPane.ActivePageIndex := 1;
-        pagInicio.PageList := NIL;
-        pagInicio.Visible := False;
+        AListaEmpresas.Active := True;
+        if AListaEmpresas.RecordCount = 1 then
+        begin
+          // Oculto la página de inicio para que no parezca
+          // que se pueden manejar varias empresas.
+          JvNavigationPane.ActivePageIndex := 1;
+          pagInicio.PageList := NIL;
+          pagInicio.Visible := False;
+        end;
       end;
+
+    finally
+      AListaEmpresas.Close;
+      AListaEmpresas := NIL;
     end;
 
-  finally
-    AListaEmpresas.Close;
-    AListaEmpresas := NIL;
-  end;
-
-  RefrescarUI;
+    RefrescarUI;
   finally
      HideHourglassCursor;
   end;
@@ -453,6 +455,8 @@ begin
       BorderIcons := [];
       BorderStyle := bsNone;
       Parent := WorkPanel;
+      ScaleFormFont(FContenido);
+
       FContenido.Show;
       Align := alClient;
       FContenido.SetFocus;
diff --git a/Source/GUIBase/uDialogBase.pas b/Source/GUIBase/uDialogBase.pas
index 01f3775..14d3059 100644
--- a/Source/GUIBase/uDialogBase.pas
+++ b/Source/GUIBase/uDialogBase.pas
@@ -32,10 +32,11 @@ implementation
 {$R *.dfm}
 
 uses
-  uDMBase;
+  uDMBase, uDisplayUtils;
 
 procedure TfDialogBase.FormShow(Sender: TObject);
 begin
+  ScaleFormFont(Self);
   lblInstruccion.Font.Color := dmBase.StyleManager.Colors.HeaderColorTo;
 end;
 
diff --git a/Source/GUIBase/uEditorBase.pas b/Source/GUIBase/uEditorBase.pas
index 1e009cb..c21a078 100644
--- a/Source/GUIBase/uEditorBase.pas
+++ b/Source/GUIBase/uEditorBase.pas
@@ -170,7 +170,7 @@ implementation
 
 uses
   Menus, uDMBase, cxControls, uDialogUtils,
-  uStringsUtils, cxEdit;
+  uStringsUtils, cxEdit, uDisplayUtils;
 
 
 {Método que coge el componente editor que tenga el foco y le fuerza a hacer post para que la tabla se entere
@@ -402,6 +402,7 @@ end;
 
 procedure TfEditorBase.FormShow(Sender: TObject);
 begin
+  ScaleFormFont(Self);
   ActualizarEstadoEditor;
   if Assigned(Parent) then
   begin
diff --git a/Source/GUIBase/uEditorBasico.dfm b/Source/GUIBase/uEditorBasico.dfm
index ef85a64..1ece1bb 100644
--- a/Source/GUIBase/uEditorBasico.dfm
+++ b/Source/GUIBase/uEditorBasico.dfm
@@ -11,6 +11,7 @@ object fEditorBasico: TfEditorBasico
   Font.Name = 'Tahoma'
   Font.Style = []
   OldCreateOrder = False
+  OnShow = CustomEditorShow
   InstanceID = 0
   ReadOnly = False
   PixelsPerInch = 96
diff --git a/Source/GUIBase/uEditorBasico.pas b/Source/GUIBase/uEditorBasico.pas
index 7a8e97d..0940696 100644
--- a/Source/GUIBase/uEditorBasico.pas
+++ b/Source/GUIBase/uEditorBasico.pas
@@ -13,11 +13,20 @@ type
   end;
 
   TfEditorBasico = class(TCustomEditor, IEditorBasico)
+    procedure CustomEditorShow(Sender: TObject);
   end;
 
 implementation
 {$R *.dfm}
 
+uses
+  uDisplayUtils;
+
+procedure TfEditorBasico.CustomEditorShow(Sender: TObject);
+begin
+  ScaleFormFont(Self);
+end;
+
 initialization
   RegisterClass(TfEditorBasico);
 
diff --git a/Source/GUIBase/uViewDetallesBase.dfm b/Source/GUIBase/uViewDetallesBase.dfm
index e477316..4b846e7 100644
--- a/Source/GUIBase/uViewDetallesBase.dfm
+++ b/Source/GUIBase/uViewDetallesBase.dfm
@@ -10,7 +10,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase
     Left = 0
     Top = 0
     Width = 451
-    Height = 68
+    Height = 73
     AutoSize = True
     ButtonWidth = 141
     Caption = 'ToolBar1'
@@ -42,24 +42,23 @@ inherited frViewDetallesBase: TfrViewDetallesBase
       Top = 0
       Action = actSubir
       AutoSize = True
-      Wrap = True
     end
     object ToolButton4: TToolButton
-      Left = 0
-      Top = 22
+      Left = 184
+      Top = 0
       Action = actBajar
       AutoSize = True
     end
     object ToolButton14: TToolButton
-      Left = 56
-      Top = 22
+      Left = 240
+      Top = 0
       Action = FontEdit1
       AutoSize = True
       Wrap = True
     end
     object FontName: TJvFontComboBox
       Left = 0
-      Top = 44
+      Top = 22
       Width = 145
       Height = 22
       DroppedDownWidth = 145
@@ -75,7 +74,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase
     end
     object FontSize: TEdit
       Left = 145
-      Top = 44
+      Top = 22
       Width = 26
       Height = 22
       Hint = 'Font Size|Select font size'
@@ -86,7 +85,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase
     end
     object UpDown1: TUpDown
       Left = 171
-      Top = 44
+      Top = 22
       Width = 16
       Height = 22
       Associate = FontSize
@@ -95,7 +94,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase
     end
     object ToolButton13: TToolButton
       Left = 187
-      Top = 44
+      Top = 22
       Width = 8
       Caption = 'ToolButton13'
       ImageIndex = 10
@@ -103,54 +102,55 @@ inherited frViewDetallesBase: TfrViewDetallesBase
     end
     object ToolButton6: TToolButton
       Left = 195
-      Top = 44
+      Top = 22
       Action = RichEditBold1
       AutoSize = True
     end
     object ToolButton7: TToolButton
       Left = 261
-      Top = 44
+      Top = 22
       Action = RichEditItalic1
       AutoSize = True
     end
     object ToolButton8: TToolButton
       Left = 328
-      Top = 44
+      Top = 22
       Action = RichEditUnderline1
       AutoSize = True
     end
     object ToolButton12: TToolButton
-      Left = 411
-      Top = 44
+      Left = 0
+      Top = 22
       Width = 8
       Caption = 'ToolButton12'
       ImageIndex = 10
+      Wrap = True
       Style = tbsSeparator
     end
     object ToolButton9: TToolButton
-      Left = 419
-      Top = 44
+      Left = 0
+      Top = 49
       Action = RichEditAlignLeft1
       AutoSize = True
     end
     object ToolButton10: TToolButton
-      Left = 564
-      Top = 44
+      Left = 145
+      Top = 49
       Action = RichEditAlignCenter1
       AutoSize = True
     end
     object ToolButton11: TToolButton
-      Left = 689
-      Top = 44
+      Left = 270
+      Top = 49
       Action = RichEditAlignRight1
       AutoSize = True
     end
   end
   object cxGrid: TcxGrid
     Left = 0
-    Top = 94
+    Top = 99
     Width = 451
-    Height = 210
+    Height = 205
     Align = alClient
     Font.Charset = DEFAULT_CHARSET
     Font.Color = clWindowText
@@ -161,8 +161,6 @@ inherited frViewDetallesBase: TfrViewDetallesBase
     TabOrder = 1
     LookAndFeel.Kind = lfStandard
     LookAndFeel.NativeStyle = True
-    ExplicitTop = 99
-    ExplicitHeight = 205
     object cxGridView: TcxGridDBTableView
       OnKeyDown = cxGridViewKeyDown
       NavigatorButtons.ConfirmDelete = False
@@ -346,12 +344,11 @@ inherited frViewDetallesBase: TfrViewDetallesBase
   end
   object TBXDock1: TTBXDock
     Left = 0
-    Top = 68
+    Top = 73
     Width = 451
     Height = 26
     BackgroundOnToolbars = False
     UseParentBackground = True
-    ExplicitTop = 73
     object TBXToolbar1: TTBXToolbar
       Left = 0
       Top = 0
diff --git a/Source/GUIBase/uViewDetallesBase.pas b/Source/GUIBase/uViewDetallesBase.pas
index 095cdff..eb6f6f7 100644
--- a/Source/GUIBase/uViewDetallesBase.pas
+++ b/Source/GUIBase/uViewDetallesBase.pas
@@ -12,7 +12,7 @@ uses
   uGridStatusUtils, uControllerDetallesBase, cxCurrencyEdit,
   ExtCtrls, Grids, DBGrids, StdCtrls,
   ExtActns, StdActns, cxRichEdit, JvExStdCtrls, JvCombobox, JvColorCombo,
-  TB2Item, TBX, TB2Dock, TB2Toolbar, uDAInterfaces, cxContainer, 
+  TB2Item, TBX, TB2Dock, TB2Toolbar, uDAInterfaces, cxContainer,
   Menus, cxGridCustomPopupMenu, cxGridPopupMenu;
 
 type
@@ -28,6 +28,9 @@ type
     procedure SaveGridStatus;
     procedure RestoreGridStatus;
 
+    procedure RestoreFromIniFile;
+    procedure StoreToIniFile;
+
     procedure SeleccionarTodo;
 
     procedure BeginUpdate;
@@ -219,6 +222,7 @@ type
 
     procedure DoPasteText(Sender: TObject; AText: string);
     procedure TratamientoTeclas(Key: Word; Shift: TShiftState; AItem: TcxCustomGridTableItem = nil);
+    procedure BestFitAllColumns;
 
   protected
     function DarListaSeleccionados: TIntegerArray;
@@ -237,6 +241,8 @@ type
     procedure EndUpdate;
     procedure SaveGridStatus;
     procedure RestoreGridStatus;
+    procedure RestoreFromIniFile;
+    procedure StoreToIniFile;
     procedure ExpandirTodo;
     procedure ContraerTodo;
     procedure AjustarAncho;
@@ -253,8 +259,8 @@ implementation
 {$R *.dfm}
 
 uses
-  uDMBase, uCalculosUtils, dxOffice11, uSistemaFunc, uGridClipboardUtils,
-  Clipbrd, cxGridExportLink;
+  uDMBase, uCalculosUtils, SHFolder, dxOffice11, uSistemaFunc, uGridClipboardUtils,
+  Clipbrd, cxGridExportLink, uAppInfoUtils;
 
 type
   TOnPaste = procedure(Sender: TObject; AText: string) of object;
@@ -530,10 +536,37 @@ begin
                                    and (not _FocusedView.Controller.FocusedRow.IsFirst)
 end;
 
+procedure TfrViewDetallesBase.BestFitAllColumns;
+var
+  i : Integer ;
+
+begin
+  ShowHourglassCursor;
+  _FocusedView.BeginUpdate;
+
+  try
+    AsignarAnchosPrefijadosAColumnas(_FocusedView);
+    for i := 0 to _FocusedView.VisibleColumnCount-1 do
+    begin
+      _FocusedView.VisibleColumns[i].ApplyBestFit;
+      if (_FocusedView.VisibleColumns[i].BestFitMaxWidth > 0) and
+         (_FocusedView.VisibleColumns[i].Width > _FocusedView.VisibleColumns[i].BestFitMaxWidth) then
+          _FocusedView.VisibleColumns[i].Width := _FocusedView.VisibleColumns[i].BestFitMaxWidth;
+    end;
+  finally
+    _FocusedView.EndUpdate;
+    HideHourglassCursor;
+  end;
+end;
+
+
 procedure TfrViewDetallesBase.AjustarAncho;
 begin
   if Assigned(_FocusedView) then
+  begin
+    BestFitAllColumns;
     _FocusedView.ApplyBestFit;
+  end;
 end;
 
 procedure TfrViewDetallesBase.BeginUpdate;
@@ -601,6 +634,7 @@ procedure TfrViewDetallesBase.CustomViewDestroy(Sender: TObject);
 begin
   inherited;
   CurEdit := Nil;
+  StoreToIniFile;  
 end;
 
 procedure TfrViewDetallesBase.cxGridViewEditing(Sender: TcxCustomGridTableView;
@@ -958,6 +992,44 @@ begin
   end;
 end;}
 
+procedure TfrViewDetallesBase.RestoreFromIniFile;
+var
+  AIniFile : String;
+begin
+  inherited;
+  if Assigned(_FocusedView) then
+  begin
+    AIniFile := GetSpecialFolderPath(CSIDL_APPDATA); //[Current Users]\Application Data
+    AIniFile := AIniFile + PathDelim + 'Rodax Software' + PathDelim + GetAppName + PathDelim;
+
+    if not DirectoryExists(AIniFile) then
+      ForceDirectories(AIniFile);
+      
+    _FocusedView.RestoreFromIniFile(AIniFile + 'grid.xml', True, False, []);
+  end;
+end;
+
+procedure TfrViewDetallesBase.StoreToIniFile;
+var
+  AIniFile : String;
+begin
+  inherited;
+
+  if Assigned(_FocusedView) then
+  begin
+    AIniFile := GetSpecialFolderPath(CSIDL_APPDATA); //[Current Users]\Application Data
+    AIniFile := AIniFile + PathDelim + 'Rodax Software' + PathDelim + GetAppName + PathDelim;
+
+    if not DirectoryExists(AIniFile) then
+      ForceDirectories(AIniFile);
+
+    _FocusedView.StoreToIniFile(AIniFile + 'grid.xml', False, []);
+//      _FocusedView.StoreToRegistry(Path + '\\GridSettings\\' + Self.Name, False, [], Self.Name);
+  end;
+end;
+
+
+
 procedure TfrViewDetallesBase.RestoreGridStatus;
 begin
   if Assigned(FGridStatus) and (not IsEmpty) then
@@ -1030,11 +1102,17 @@ begin
   end;
 end;
 
+
+
 procedure TfrViewDetallesBase.SetDetalles(const Value: IDAStronglyTypedDataTable);
 begin
   FDetalles := Value;
   if Assigned(FDetalles) then
-    DADataSource.DataTable := FDetalles.DataTable
+  begin
+    DADataSource.DataTable := FDetalles.DataTable;
+    RestoreFromIniFile; // la restauración de las columnas s?lo funciona cuando hay datos.
+    AjustarAncho;
+  end
   else
     DADataSource.DataTable := NIL;
 end;
diff --git a/Source/GUIBase/uViewGrid.dfm b/Source/GUIBase/uViewGrid.dfm
index 77dadf8..93c8d6c 100644
--- a/Source/GUIBase/uViewGrid.dfm
+++ b/Source/GUIBase/uViewGrid.dfm
@@ -42,7 +42,6 @@ inherited frViewGrid: TfrViewGrid
       OptionsView.NoDataToDisplayInfoText = '<No hay datos a visualizar>'
       OptionsView.CellAutoHeight = True
       OptionsView.ColumnAutoWidth = True
-      OptionsView.DataRowHeight = 22
       OptionsView.Footer = True
       OptionsView.GridLineColor = cl3DLight
       OptionsView.GridLines = glHorizontal
@@ -198,7 +197,7 @@ inherited frViewGrid: TfrViewGrid
       PrinterPage.ScaleMode = smFit
       PrinterPage._dxMeasurementUnits_ = 0
       PrinterPage._dxLastMU_ = 2
-      ReportDocument.CreationDate = 42284.521152384260000000
+      ReportDocument.CreationDate = 42306.739922685180000000
       StyleManager = dmBase.dxPrintStyleManager1
       OptionsCards.Shadow.Depth = 0
       OptionsFormatting.SuppressBackgroundBitmaps = True
diff --git a/Source/GUIBase/uViewGridBase.pas b/Source/GUIBase/uViewGridBase.pas
index e491a9e..c52f44a 100644
--- a/Source/GUIBase/uViewGridBase.pas
+++ b/Source/GUIBase/uViewGridBase.pas
@@ -96,7 +96,8 @@ type
     FFilter: string;
     FOnFilterChanged : TNotifyEvent;
     FGridStatus : TcxGridStatus;
-//		procedure BestFitAllColumns;    
+    procedure BestFitAllColumns;
+   
   protected
     FOnDblClick: TNotifyEvent;
     FPopupMenu: TPopupMenu;
@@ -202,7 +203,7 @@ end;
 
 { TfrViewGrid }
 
-{procedure TfrViewGridBase.BestFitAllColumns;
+procedure TfrViewGridBase.BestFitAllColumns;
 var
   i : Integer ;
 
@@ -211,6 +212,7 @@ begin
   _FocusedView.BeginUpdate;
 
   try
+    AsignarAnchosPrefijadosAColumnas(_FocusedView);
     for i := 0 to _FocusedView.VisibleColumnCount-1 do
     begin
       _FocusedView.VisibleColumns[i].ApplyBestFit;
@@ -222,13 +224,14 @@ begin
     _FocusedView.EndUpdate;
     HideHourglassCursor;
   end;
-end;}
+end;
+
 
 procedure TfrViewGridBase.AjustarAncho;
 begin
   if Assigned(_FocusedView) then
   begin
-    //BestFitAllColumns;
+    BestFitAllColumns;
     _FocusedView.ApplyBestFit(nil, True, False);
   end;
 end;
@@ -434,7 +437,8 @@ var
 begin
   if Assigned(_FocusedView) then
   begin
-
+    // AjustarAncho; <- No activar porque pisa los anchos que ha puesto el usuario.
+    
     AIniFile := GetSpecialFolderPath(CSIDL_APPDATA); //[All Users]\Application Data
     AIniFile := AIniFile + PathDelim + 'Rodax Software' + PathDelim + GetAppName + PathDelim;
 
diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES
index c2913de..865d661 100644
Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ
diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj
index 11a3e1b..d8283a7 100644
--- a/Source/Servidor/FactuGES_Server.dproj
+++ b/Source/Servidor/FactuGES_Server.dproj
@@ -35,7 +35,7 @@
 		<Borland.Personality>Delphi.Personality</Borland.Personality>
 		<Borland.ProjectType/>
 		<BorlandProject>
-			<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters><Parameters Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">4</VersionInfo><VersionInfo Name="MinorVer">4</VersionInfo><VersionInfo Name="Release">4</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">4.4.4.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">4.4.4.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">miércoles, 22 de abril de 2015 17:48</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+			<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters><Parameters Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">4</VersionInfo><VersionInfo Name="MinorVer">4</VersionInfo><VersionInfo Name="Release">6</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">4.4.6.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">4.4.6.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">viernes, 06 de noviembre de 2015 11:28</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
 						<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPSCoreD11.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages>
 					</Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
 	</ProjectExtensions>
diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc
index 39ef747..2c1ea83 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -1,7 +1,7 @@
 MAINICON ICON "C:\Codigo\Resources\Iconos\Servidor.ico"
 1 VERSIONINFO
-FILEVERSION 4,4,4,0
-PRODUCTVERSION 4,4,4,0
+FILEVERSION 4,4,6,0
+PRODUCTVERSION 4,4,6,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@@ -12,9 +12,9 @@ BEGIN
     BEGIN
          BLOCK "0C0A04E4"
          BEGIN
-              VALUE "FileVersion", "4.4.4.0\0"
-              VALUE "ProductVersion", "4.4.4.0\0"
-              VALUE "CompileDate", "miércoles, 07 de octubre de 2015 12:30\0"
+              VALUE "FileVersion", "4.4.6.0\0"
+              VALUE "ProductVersion", "4.4.6.0\0"
+              VALUE "CompileDate", "viernes, 06 de noviembre de 2015 11:40\0"
          END
     END
     BLOCK "VarFileInfo"
diff --git a/Source/Servidor/uAcercaDe.pas b/Source/Servidor/uAcercaDe.pas
index e10a87f..0ed13e1 100644
--- a/Source/Servidor/uAcercaDe.pas
+++ b/Source/Servidor/uAcercaDe.pas
@@ -36,7 +36,7 @@ begin
       memModulos.Lines.Add(CompanyName);
       memModulos.Lines.Add('');
       memModulos.Lines.Add('Se autoriza el uso de este programa a:');
-      memModulos.Lines.Add('TECSITEL S.L.');
+      memModulos.Lines.Add('LUIS LEON REPRESENTACIONES');
     end;
   finally
     FreeAndNil(Obj);