diff --git a/Source/Base/Utiles/uNumUtils.pas b/Source/Base/Utiles/uNumUtils.pas
index 8a0ec3e0..05d6f76e 100644
--- a/Source/Base/Utiles/uNumUtils.pas
+++ b/Source/Base/Utiles/uNumUtils.pas
@@ -110,7 +110,9 @@ var
 begin
   Cadena := '';
   Entero := Trunc(Cifra);
-  Decimal := Trunc(((Cifra - Entero) * 100));
+  //Se quita el trunc ya que falla el redondeo y hay desfase de 1 centimo
+//  Decimal := Trunc(((Cifra - Entero) * 100));
+  Decimal := Round((Cifra - Entero) * 100);
 
   if (Decimal > 0) then
      Cadena := ' CON ' + IntToLetras(Decimal) + ' CÉNTIMOS';
diff --git a/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.dfm b/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.dfm
index 9a429044..735532bd 100644
--- a/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.dfm	
+++ b/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.dfm	
@@ -142,15 +142,27 @@ inherited frViewContratosCliente: TfrViewContratosCliente
         Width = 903
         ExplicitWidth = 903
         inherited txtFiltroTodo: TcxTextEdit
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
           ExplicitWidth = 806
           Width = 806
         end
         inherited edtFechaIniFiltro: TcxDateEdit
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
           ExplicitWidth = 285
           Width = 285
         end
         inherited edtFechaFinFiltro: TcxDateEdit
           Left = 389
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
           ExplicitLeft = 389
           ExplicitWidth = 504
           Width = 504
diff --git a/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.pas b/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.pas
index f34d7939..ab4303d9 100644
--- a/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.pas	
+++ b/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.pas	
@@ -203,7 +203,8 @@ begin
   if (ARecord.DisplayTexts[Sender.Index] <> 'Sin incidencias') then
   begin
     AIsHintMultiLine := True;
-    AHintText := ARecord.Values[cxGridViewINCIDENCIAS.Index]
+    if not VarIsNull(ARecord.Values[cxGridViewINCIDENCIAS.Index]) then
+       AHintText := ARecord.Values[cxGridViewINCIDENCIAS.Index];
   end;
 end;
 
diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.dfm
index 5a614698..7624b0db 100644
--- a/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.dfm	
+++ b/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.dfm	
@@ -143,15 +143,27 @@ inherited frViewPresupuestosCliente: TfrViewPresupuestosCliente
         Width = 903
         ExplicitWidth = 903
         inherited txtFiltroTodo: TcxTextEdit
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
           ExplicitWidth = 806
           Width = 806
         end
         inherited edtFechaIniFiltro: TcxDateEdit
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
           ExplicitWidth = 285
           Width = 285
         end
         inherited edtFechaFinFiltro: TcxDateEdit
           Left = 389
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
           ExplicitLeft = 389
           ExplicitWidth = 504
           Width = 504
diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.pas b/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.pas
index 0096e026..bfa4a2da 100644
--- a/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.pas	
+++ b/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.pas	
@@ -276,7 +276,8 @@ begin
   if (ARecord.DisplayTexts[Sender.Index] <> 'Sin incidencias') then
   begin
     AIsHintMultiLine := True;
-    AHintText := ARecord.Values[cxGridViewINCIDENCIAS.Index]
+    if not VarIsNull(ARecord.Values[cxGridViewINCIDENCIAS.Index]) then
+       AHintText := ARecord.Values[cxGridViewINCIDENCIAS.Index];
   end;
 end;
 
diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc
index aee9b03c..275a0489 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -16,7 +16,7 @@ BEGIN
               VALUE "FileVersion", "2.5.6.0\0"
               VALUE "ProductName", "FactuGES (Servidor)\0"
               VALUE "ProductVersion", "2.5.6.0\0"
-              VALUE "CompileDate", "miércoles, 19 de marzo de 2014 18:35\0"
+              VALUE "CompileDate", "miércoles, 07 de mayo de 2014 12:42\0"
          END
     END
     BLOCK "VarFileInfo"
diff --git a/Source/Servidor/FactuGES_Server.res b/Source/Servidor/FactuGES_Server.res
index 11f338a4..82ab8832 100644
Binary files a/Source/Servidor/FactuGES_Server.res and b/Source/Servidor/FactuGES_Server.res differ