diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc
index b93d80d9..42fa1512 100644
--- a/Source/Cliente/FactuGES.rc
+++ b/Source/Cliente/FactuGES.rc
@@ -1,7 +1,7 @@
 MAINICON ICON "C:\Codigo Tecsitel\Resources\Iconos\Factuges.ico"
 1 VERSIONINFO
-FILEVERSION 1,3,4,0
-PRODUCTVERSION 1,3,4,0
+FILEVERSION 1,3,5,0
+PRODUCTVERSION 1,3,5,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@@ -13,10 +13,10 @@ BEGIN
          BLOCK "0C0A04E4"
          BEGIN
               VALUE "CompanyName", "Rodax Software S.L.\0"
-              VALUE "FileVersion", "1.3.4.0\0"
+              VALUE "FileVersion", "1.3.5.0\0"
               VALUE "InternalName", "FactuGES\0"
               VALUE "ProductName", "FactuGES\0"
-              VALUE "ProductVersion", "1.3.4.0\0"
+              VALUE "ProductVersion", "1.3.5.0\0"
          END
     END
     BLOCK "VarFileInfo"
diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res
index 357a80d6..ee82ca1d 100644
Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ
diff --git a/Source/GUIBase/uViewDetallesBase.dfm b/Source/GUIBase/uViewDetallesBase.dfm
index 99efb495..4cca2c13 100644
--- a/Source/GUIBase/uViewDetallesBase.dfm
+++ b/Source/GUIBase/uViewDetallesBase.dfm
@@ -299,8 +299,10 @@ inherited frViewDetallesBase: TfrViewDetallesBase
         Tag = 1
         Caption = 'Cantidad'
         DataBinding.FieldName = 'CANTIDAD'
-        PropertiesClassName = 'TcxMaskEditProperties'
+        PropertiesClassName = 'TcxCurrencyEditProperties'
         Properties.Alignment.Horz = taRightJustify
+        Properties.DisplayFormat = ',0.##;-,0.##'
+        Properties.EditFormat = ',0.##;-,0.##'
         BestFitMaxWidth = 64
         HeaderAlignmentHorz = taRightJustify
         MinWidth = 50
diff --git a/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteClient_Intf.pas b/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteClient_Intf.pas
index 8e6e4121..c83d161c 100644
--- a/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteClient_Intf.pas	
+++ b/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteClient_Intf.pas	
@@ -3,7 +3,7 @@ unit schAlbaranesClienteClient_Intf;
 interface
 
 uses
-  Classes, DB, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf;
+  Classes, DB, schBase_Intf, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf;
 
 const
   { Data table rules ids
@@ -385,7 +385,7 @@ type
   end;
 
   { TAlbaranesClienteDataTableRules }
-  TAlbaranesClienteDataTableRules = class(TDADataTableRules, IAlbaranesCliente)
+  TAlbaranesClienteDataTableRules = class(TIntfObjectDADataTableRules, IAlbaranesCliente)
   private
     f_OBSERVACIONES: IROStrings;
     f_INCIDENCIAS: IROStrings;
@@ -746,7 +746,7 @@ type
   end;
 
   { TAlbaranesCliente_DetallesDataTableRules }
-  TAlbaranesCliente_DetallesDataTableRules = class(TDADataTableRules, IAlbaranesCliente_Detalles)
+  TAlbaranesCliente_DetallesDataTableRules = class(TIntfObjectDADataTableRules, IAlbaranesCliente_Detalles)
   private
   protected
     { Property getters and setters }
diff --git a/Source/Modulos/Albaranes de proveedor/Model/schAlbaranesProveedorClient_Intf.pas b/Source/Modulos/Albaranes de proveedor/Model/schAlbaranesProveedorClient_Intf.pas
index 22262dae..a25402b8 100644
--- a/Source/Modulos/Albaranes de proveedor/Model/schAlbaranesProveedorClient_Intf.pas	
+++ b/Source/Modulos/Albaranes de proveedor/Model/schAlbaranesProveedorClient_Intf.pas	
@@ -3,7 +3,7 @@ unit schAlbaranesProveedorClient_Intf;
 interface
 
 uses
-  Classes, DB, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf;
+  Classes, DB, schBase_Intf, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf;
 
 const
   { Data table rules ids
@@ -363,7 +363,7 @@ type
   end;
 
   { TAlbaranesProveedorDataTableRules }
-  TAlbaranesProveedorDataTableRules = class(TDADataTableRules, IAlbaranesProveedor)
+  TAlbaranesProveedorDataTableRules = class(TIntfObjectDADataTableRules, IAlbaranesProveedor)
   private
     f_OBSERVACIONES: IROStrings;
     f_INCIDENCIAS: IROStrings;
@@ -712,7 +712,7 @@ type
   end;
 
   { TAlbaranesProveedor_DetallesDataTableRules }
-  TAlbaranesProveedor_DetallesDataTableRules = class(TDADataTableRules, IAlbaranesProveedor_Detalles)
+  TAlbaranesProveedor_DetallesDataTableRules = class(TIntfObjectDADataTableRules, IAlbaranesProveedor_Detalles)
   private
   protected
     { Property getters and setters }
diff --git a/Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas b/Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas
index 3184ba9c..d2398143 100644
--- a/Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas	
+++ b/Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas	
@@ -3,7 +3,7 @@ unit schFacturasClienteClient_Intf;
 interface
 
 uses
-  Classes, DB, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf;
+  Classes, DB, schBase_Intf, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf;
 
 const
   { Data table rules ids
@@ -344,7 +344,7 @@ type
   end;
 
   { TFacturasClienteDataTableRules }
-  TFacturasClienteDataTableRules = class(TDADataTableRules, IFacturasCliente)
+  TFacturasClienteDataTableRules = class(TIntfObjectDADataTableRules, IFacturasCliente)
   private
     f_OBSERVACIONES: IROStrings;
     procedure OBSERVACIONES_OnChange(Sender: TObject);
@@ -668,7 +668,7 @@ type
   end;
 
   { TFacturasCliente_DetallesDataTableRules }
-  TFacturasCliente_DetallesDataTableRules = class(TDADataTableRules, IFacturasCliente_Detalles)
+  TFacturasCliente_DetallesDataTableRules = class(TIntfObjectDADataTableRules, IFacturasCliente_Detalles)
   private
   protected
     { Property getters and setters }
diff --git a/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorClient_Intf.pas b/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorClient_Intf.pas
index 043a3671..dd8dcc63 100644
--- a/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorClient_Intf.pas	
+++ b/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorClient_Intf.pas	
@@ -3,7 +3,7 @@ unit schFacturasProveedorClient_Intf;
 interface
 
 uses
-  Classes, DB, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf;
+  Classes, DB, schBase_Intf, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf;
 
 const
   { Data table rules ids
@@ -342,7 +342,7 @@ type
   end;
 
   { TFacturasProveedorDataTableRules }
-  TFacturasProveedorDataTableRules = class(TDADataTableRules, IFacturasProveedor)
+  TFacturasProveedorDataTableRules = class(TIntfObjectDADataTableRules, IFacturasProveedor)
   private
     f_OBSERVACIONES: IROStrings;
     procedure OBSERVACIONES_OnChange(Sender: TObject);
@@ -654,7 +654,7 @@ type
   end;
 
   { TFacturasProveedor_DetallesDataTableRules }
-  TFacturasProveedor_DetallesDataTableRules = class(TDADataTableRules, IFacturasProveedor_Detalles)
+  TFacturasProveedor_DetallesDataTableRules = class(TIntfObjectDADataTableRules, IFacturasProveedor_Detalles)
   private
   protected
     { Property getters and setters }
@@ -815,7 +815,7 @@ type
   end;
 
   { TFacturasProveedor_PedidosDataTableRules }
-  TFacturasProveedor_PedidosDataTableRules = class(TDADataTableRules, IFacturasProveedor_Pedidos)
+  TFacturasProveedor_PedidosDataTableRules = class(TIntfObjectDADataTableRules, IFacturasProveedor_Pedidos)
   private
   protected
     { Property getters and setters }
diff --git a/Source/Modulos/Inventario/Model/schInventarioClient_Intf.pas b/Source/Modulos/Inventario/Model/schInventarioClient_Intf.pas
index bec4deb1..7468575b 100644
--- a/Source/Modulos/Inventario/Model/schInventarioClient_Intf.pas
+++ b/Source/Modulos/Inventario/Model/schInventarioClient_Intf.pas
@@ -3,7 +3,7 @@ unit schInventarioClient_Intf;
 interface
 
 uses
-  Classes, DB, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf;
+  Classes, DB, schBase_Intf, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf;
 
 const
   { Data table rules ids
@@ -219,7 +219,7 @@ type
   end;
 
   { TInventarioDataTableRules }
-  TInventarioDataTableRules = class(TDADataTableRules, IInventario)
+  TInventarioDataTableRules = class(TIntfObjectDADataTableRules, IInventario)
   private
   protected
     { Property getters and setters }
@@ -452,7 +452,7 @@ type
   end;
 
   { TDetalleReservasDataTableRules }
-  TDetalleReservasDataTableRules = class(TDADataTableRules, IDetalleReservas)
+  TDetalleReservasDataTableRules = class(TIntfObjectDADataTableRules, IDetalleReservas)
   private
   protected
     { Property getters and setters }
diff --git a/Source/Modulos/Inventario/Views/uViewEntradaSalidaArticulos.dfm b/Source/Modulos/Inventario/Views/uViewEntradaSalidaArticulos.dfm
index 30a1dc77..2de98230 100644
--- a/Source/Modulos/Inventario/Views/uViewEntradaSalidaArticulos.dfm
+++ b/Source/Modulos/Inventario/Views/uViewEntradaSalidaArticulos.dfm
@@ -13,8 +13,10 @@ inherited frViewEntradaSalidaArticulos: TfrViewEntradaSalidaArticulos
     Margins.Top = 8
     Margins.Right = 8
     Margins.Bottom = 8
-    ExplicitWidth = 674
-    ExplicitHeight = 336
+    ExplicitLeft = 8
+    ExplicitTop = 110
+    ExplicitWidth = 658
+    ExplicitHeight = 320
     inherited cxGridView: TcxGridDBTableView
       DataController.KeyFieldNames = 'ID_ALMACEN;ID_ARTICULO'
       DataController.Options = [dcoAnsiSort, dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoSortByDisplayText, dcoFocusTopRowAfterSorting, dcoImmediatePost]
@@ -66,8 +68,9 @@ inherited frViewEntradaSalidaArticulos: TfrViewEntradaSalidaArticulos
       object cxGridViewSTOCK: TcxGridDBColumn
         Caption = 'Stock actual'
         DataBinding.FieldName = 'STOCK'
-        PropertiesClassName = 'TcxTextEditProperties'
-        Properties.Alignment.Horz = taRightJustify
+        PropertiesClassName = 'TcxSpinEditProperties'
+        Properties.DisplayFormat = ',0.##;-,0.##'
+        Properties.EditFormat = ',0.##;-,0.##'
         Properties.ReadOnly = True
         HeaderAlignmentHorz = taRightJustify
         Width = 94
@@ -77,6 +80,8 @@ inherited frViewEntradaSalidaArticulos: TfrViewEntradaSalidaArticulos
         DataBinding.FieldName = 'CANTIDAD'
         PropertiesClassName = 'TcxSpinEditProperties'
         Properties.Alignment.Horz = taRightJustify
+        Properties.DisplayFormat = ',0.##;-,0.##'
+        Properties.EditFormat = ',0.##;-,0.##'
         FooterAlignmentHorz = taRightJustify
         HeaderAlignmentHorz = taRightJustify
         Width = 80
@@ -96,21 +101,37 @@ inherited frViewEntradaSalidaArticulos: TfrViewEntradaSalidaArticulos
         Width = 674
         ExplicitWidth = 674
         inherited txtFiltroTodo: TcxTextEdit
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
           ExplicitWidth = 577
           Width = 577
         end
         inherited edtFechaIniFiltro: TcxDateEdit
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
           ExplicitWidth = 121
           Width = 121
         end
         inherited edtFechaFinFiltro: TcxDateEdit
           Left = 225
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
           ExplicitLeft = 225
           ExplicitWidth = 121
           Width = 121
         end
         inherited eLista: TcxComboBox
           Left = 383
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
           ExplicitLeft = 383
           ExplicitWidth = 281
           Width = 281
diff --git a/Source/Modulos/Pedidos a proveedor/Model/schPedidosProveedorClient_Intf.pas b/Source/Modulos/Pedidos a proveedor/Model/schPedidosProveedorClient_Intf.pas
index 474b550b..4fcb1a7e 100644
--- a/Source/Modulos/Pedidos a proveedor/Model/schPedidosProveedorClient_Intf.pas	
+++ b/Source/Modulos/Pedidos a proveedor/Model/schPedidosProveedorClient_Intf.pas	
@@ -3,7 +3,7 @@ unit schPedidosProveedorClient_Intf;
 interface
 
 uses
-  Classes, DB, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf;
+  Classes, DB, schBase_Intf, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf;
 
 const
   { Data table rules ids
@@ -403,7 +403,7 @@ type
   end;
 
   { TPedidosProveedorDataTableRules }
-  TPedidosProveedorDataTableRules = class(TDADataTableRules, IPedidosProveedor)
+  TPedidosProveedorDataTableRules = class(TIntfObjectDADataTableRules, IPedidosProveedor)
   private
     f_OBSERVACIONES: IROStrings;
     f_INCIDENCIAS: IROStrings;
@@ -764,7 +764,7 @@ type
   end;
 
   { TPedidosProveedor_DetallesDataTableRules }
-  TPedidosProveedor_DetallesDataTableRules = class(TDADataTableRules, IPedidosProveedor_Detalles)
+  TPedidosProveedor_DetallesDataTableRules = class(TIntfObjectDADataTableRules, IPedidosProveedor_Detalles)
   private
   protected
     { Property getters and setters }
@@ -919,7 +919,7 @@ type
   end;
 
   { TPedidosProveedor_Articulos_PendientesDataTableRules }
-  TPedidosProveedor_Articulos_PendientesDataTableRules = class(TDADataTableRules, IPedidosProveedor_Articulos_Pendientes)
+  TPedidosProveedor_Articulos_PendientesDataTableRules = class(TIntfObjectDADataTableRules, IPedidosProveedor_Articulos_Pendientes)
   private
   protected
     { Property getters and setters }
diff --git a/Source/Modulos/Presupuestos de cliente/Model/schPresupuestosClienteClient_Intf.pas b/Source/Modulos/Presupuestos de cliente/Model/schPresupuestosClienteClient_Intf.pas
index 8965f1e5..0d869cc5 100644
--- a/Source/Modulos/Presupuestos de cliente/Model/schPresupuestosClienteClient_Intf.pas	
+++ b/Source/Modulos/Presupuestos de cliente/Model/schPresupuestosClienteClient_Intf.pas	
@@ -3,7 +3,7 @@ unit schPresupuestosClienteClient_Intf;
 interface
 
 uses
-  Classes, DB, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf;
+  Classes, DB, schBase_Intf, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf;
 
 const
   { Data table rules ids
@@ -325,7 +325,7 @@ type
   end;
 
   { TPresupuestosClienteDataTableRules }
-  TPresupuestosClienteDataTableRules = class(TDADataTableRules, IPresupuestosCliente)
+  TPresupuestosClienteDataTableRules = class(TIntfObjectDADataTableRules, IPresupuestosCliente)
   private
     f_PORTADA: IROStrings;
     f_MEMORIA: IROStrings;
@@ -640,7 +640,7 @@ type
   end;
 
   { TPresupuestosCliente_DetallesDataTableRules }
-  TPresupuestosCliente_DetallesDataTableRules = class(TDADataTableRules, IPresupuestosCliente_Detalles)
+  TPresupuestosCliente_DetallesDataTableRules = class(TIntfObjectDADataTableRules, IPresupuestosCliente_Detalles)
   private
   protected
     { Property getters and setters }
diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES
index 7a5a1511..8d404d3b 100644
Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ
diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc
index 639f508d..03b330c1 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -14,7 +14,7 @@ BEGIN
          BEGIN
               VALUE "FileVersion", "1.3.5.0\0"
               VALUE "ProductVersion", "1.3.5.0\0"
-              VALUE "CompileDate", "viernes, 26 de septiembre de 2008 15:25\0"
+              VALUE "CompileDate", "martes, 30 de septiembre de 2008 14:03\0"
          END
     END
     BLOCK "VarFileInfo"