diff --git a/Build/Build.fbl6 b/Build/Build.fbl6
index 1e7fed4..69ee71d 100644
Binary files a/Build/Build.fbl6 and b/Build/Build.fbl6 differ
diff --git a/Build/Installer.fbpInf b/Build/Installer.fbpInf
index 2a3bdc4..7b7175e 100644
--- a/Build/Installer.fbpInf
+++ b/Build/Installer.fbpInf
@@ -6,7 +6,7 @@
   <propertysets/>
   <variables>
     <project_path>
-      <![CDATA[C:\Codigo Acana]]>
+      <![CDATA[C:\Codigo]]>
     </project_path>
   </variables>
   <properties>
diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj
index 8799ffb..741563e 100644
--- a/Source/Cliente/FactuGES.dproj
+++ b/Source/Cliente/FactuGES.dproj
@@ -51,9 +51,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">2</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">2.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">2.4.6.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
-      
-      
+<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">2</VersionInfo><VersionInfo Name="MinorVer">4</VersionInfo><VersionInfo Name="Release">7</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">2.4.7.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">2.4.7.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
       
       <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages>
     </Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res
index 67a95d4..17e3721 100644
Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ
diff --git a/Source/GUIBase/GUIBase.res b/Source/GUIBase/GUIBase.res
index 1641339..8b251f3 100644
Binary files a/Source/GUIBase/GUIBase.res and b/Source/GUIBase/GUIBase.res differ
diff --git a/Source/Modulos/Contabilidad/Views/Contabilidad_view.res b/Source/Modulos/Contabilidad/Views/Contabilidad_view.res
index 1641339..8b251f3 100644
Binary files a/Source/Modulos/Contabilidad/Views/Contabilidad_view.res and b/Source/Modulos/Contabilidad/Views/Contabilidad_view.res differ
diff --git a/Source/Modulos/Contabilidad/Views/uEditorApunte.dfm b/Source/Modulos/Contabilidad/Views/uEditorApunte.dfm
index 7543bc2..4a47445 100644
--- a/Source/Modulos/Contabilidad/Views/uEditorApunte.dfm
+++ b/Source/Modulos/Contabilidad/Views/uEditorApunte.dfm
@@ -94,6 +94,14 @@ inherited fEditorApunte: TfEditorApunte
       end
     end
   end
+  inherited StatusBar: TJvStatusBar
+    Width = 632
+    Panels = <
+      item
+        Width = 200
+      end>
+    ExplicitWidth = 632
+  end
   inherited pgPaginas: TPageControl
     Width = 626
     ExplicitWidth = 626
@@ -103,28 +111,25 @@ inherited fEditorApunte: TfEditorApunte
       ExplicitWidth = 618
     end
   end
-  inherited StatusBar: TJvStatusBar
+  inherited PnlComentario: TPanel
     Width = 632
-    Panels = <
-      item
-        Width = 200
-      end>
-    ExplicitWidth = 632
+    inherited lbComentario: TLabel
+      Width = 622
+      Height = 25
+    end
   end
   inherited EditorActionList: TActionList
     Top = 128
   end
-  inherited SmallImages: TPngImageList
-    Top = 112
-  end
   inherited dsDataTable: TDADataSource [6]
     Left = 168
     Top = 120
   end
-  inherited LargeImages: TPngImageList [7]
+  inherited LargeImages: TPngImageList
     Top = 112
   end
-  inherited JvFormStorage: TJvFormStorage [8]
+  inherited SmallImages: TPngImageList [9]
+    Top = 112
   end
   object dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList
     Left = 320
diff --git a/Source/Modulos/Contabilidad/Views/uEditorAsiento.dfm b/Source/Modulos/Contabilidad/Views/uEditorAsiento.dfm
index ff147e0..eadc3ae 100644
--- a/Source/Modulos/Contabilidad/Views/uEditorAsiento.dfm
+++ b/Source/Modulos/Contabilidad/Views/uEditorAsiento.dfm
@@ -4,20 +4,20 @@ inherited fEditorAsiento: TfEditorAsiento
   HorzScrollBar.Visible = False
   VertScrollBar.Visible = False
   Caption = 'Ficha de asiento'
-  ClientHeight = 373
-  ClientWidth = 504
+  ClientHeight = 464
+  ClientWidth = 843
   Scaled = False
   OnClose = CustomEditorClose
-  ExplicitWidth = 512
-  ExplicitHeight = 407
+  ExplicitWidth = 851
+  ExplicitHeight = 498
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
-    Width = 504
+    Width = 843
     Caption = 'Asiento'
     ExplicitWidth = 504
     inherited Image1: TImage
-      Left = 477
+      Left = 816
       Picture.Data = {
         0B546478504E47496D61676589504E470D0A1A0A0000000D4948445200000018
         000000180806000000E0773DF8000000017352474200AECE1CE9000000046741
@@ -44,7 +44,7 @@ inherited fEditorAsiento: TfEditorAsiento
     end
   end
   inherited TBXDock: TTBXDock
-    Width = 504
+    Width = 843
     ExplicitWidth = 504
     inherited tbxMain: TTBXToolbar
       ExplicitWidth = 330
@@ -63,7 +63,7 @@ inherited fEditorAsiento: TfEditorAsiento
     end
     inherited tbxMenu: TTBXToolbar
       DockPos = 0
-      ExplicitWidth = 504
+      ExplicitWidth = 843
       inherited TBXSubmenuItem4: TTBXSubmenuItem
         inherited TBXItem8: TTBXItem
           Visible = False
@@ -98,8 +98,8 @@ inherited fEditorAsiento: TfEditorAsiento
     end
   end
   inherited StatusBar: TJvStatusBar
-    Top = 354
-    Width = 504
+    Top = 445
+    Width = 843
     Panels = <
       item
         Width = 200
@@ -108,11 +108,13 @@ inherited fEditorAsiento: TfEditorAsiento
     ExplicitWidth = 504
   end
   inherited pgPaginas: TPageControl
-    Width = 498
-    Height = 242
+    Width = 837
+    Height = 333
+    ActivePage = EntradaSalida
     ExplicitWidth = 498
     ExplicitHeight = 242
     inherited pagGeneral: TTabSheet
+      TabVisible = False
       ExplicitLeft = 4
       ExplicitTop = 24
       ExplicitWidth = 490
@@ -120,15 +122,17 @@ inherited fEditorAsiento: TfEditorAsiento
       object dxLayoutControl1: TdxLayoutControl
         Left = 0
         Top = 0
-        Width = 490
-        Height = 214
+        Width = 829
+        Height = 305
         Align = alClient
         TabOrder = 0
         TabStop = False
         AutoContentSizes = [acsWidth, acsHeight]
+        ExplicitWidth = 490
+        ExplicitHeight = 214
         DesignSize = (
-          490
-          214)
+          829
+          305)
         object edtOrden: TcxDBSpinEdit
           Left = 293
           Top = 10
@@ -209,10 +213,10 @@ inherited fEditorAsiento: TfEditorAsiento
           ExplicitWidth = 811
           inherited Panel1: TPanel
             Width = 811
-            ExplicitWidth = 811
+            ExplicitWidth = 785
             inherited Panel2: TPanel
               Left = 627
-              ExplicitLeft = 627
+              ExplicitLeft = 601
               inherited eDescuadre: TcxCurrencyEdit
                 Top = 3
                 ExplicitTop = 3
@@ -221,7 +225,8 @@ inherited fEditorAsiento: TfEditorAsiento
           end
           inherited cxGrid: TcxGrid
             Width = 811
-            ExplicitWidth = 811
+            ExplicitWidth = 785
+            ExplicitHeight = 198
             inherited cxGridView: TcxGridDBTableView
               DataController.Summary.FooterSummaryItems = <
                 item
@@ -277,18 +282,23 @@ inherited fEditorAsiento: TfEditorAsiento
     object EntradaSalida: TTabSheet
       Caption = 'Entrada/Salida'
       ImageIndex = 1
+      ExplicitWidth = 490
+      ExplicitHeight = 214
       object dxLayoutControl2: TdxLayoutControl
         Left = 0
         Top = 0
-        Width = 490
-        Height = 214
+        Width = 829
+        Height = 305
         Align = alClient
+        ParentBackground = True
         TabOrder = 0
         TabStop = False
         AutoContentSizes = [acsWidth, acsHeight]
+        ExplicitWidth = 490
+        ExplicitHeight = 214
         DesignSize = (
-          490
-          214)
+          829
+          305)
         object edtFecha2: TcxDBDateEdit
           Left = 73
           Top = 10
@@ -313,15 +323,30 @@ inherited fEditorAsiento: TfEditorAsiento
           StyleHot.LookAndFeel.NativeStyle = True
           StyleHot.LookAndFeel.SkinName = ''
           TabOrder = 0
-          Width = 200
+          Width = 128
         end
         object Tipo: TcxComboBox
-          Left = 358
+          Left = 487
           Top = 10
+          Properties.DropDownListStyle = lsFixedList
           Properties.ImmediatePost = True
+          Properties.ImmediateUpdateText = True
           Properties.Items.Strings = (
             'Entrada'
             'Salida')
+          Style.BorderStyle = ebs3D
+          Style.Color = clInfoBk
+          Style.HotTrack = False
+          Style.LookAndFeel.Kind = lfUltraFlat
+          Style.LookAndFeel.NativeStyle = True
+          Style.ButtonStyle = bts3D
+          Style.PopupBorderStyle = epbsFrame3D
+          StyleDisabled.LookAndFeel.Kind = lfUltraFlat
+          StyleDisabled.LookAndFeel.NativeStyle = True
+          StyleFocused.LookAndFeel.Kind = lfUltraFlat
+          StyleFocused.LookAndFeel.NativeStyle = True
+          StyleHot.LookAndFeel.Kind = lfUltraFlat
+          StyleHot.LookAndFeel.NativeStyle = True
           TabOrder = 1
           Text = 'Entrada'
           Width = 121
@@ -355,11 +380,15 @@ inherited fEditorAsiento: TfEditorAsiento
             LayoutDirection = ldHorizontal
             ShowBorder = False
             object dxLayoutControl2Item1: TdxLayoutItem
+              AutoAligns = [aaVertical]
+              AlignHorz = ahClient
               Caption = 'Fecha:'
               Control = edtFecha2
               ControlOptions.ShowBorder = False
             end
             object dxLayoutControl2Item2: TdxLayoutItem
+              AutoAligns = [aaVertical]
+              AlignHorz = ahClient
               Caption = 'Entrada/Salida:'
               Control = Tipo
               ControlOptions.ShowBorder = False
@@ -380,10 +409,10 @@ inherited fEditorAsiento: TfEditorAsiento
     end
   end
   inherited PnlComentario: TPanel
-    Width = 504
+    Width = 843
     ExplicitWidth = 504
     inherited lbComentario: TLabel
-      Width = 494
+      Width = 833
       Height = 25
     end
   end
diff --git a/Source/Modulos/Contabilidad/Views/uEditorAsiento.pas b/Source/Modulos/Contabilidad/Views/uEditorAsiento.pas
index 412dae0..730136c 100644
--- a/Source/Modulos/Contabilidad/Views/uEditorAsiento.pas
+++ b/Source/Modulos/Contabilidad/Views/uEditorAsiento.pas
@@ -135,9 +135,9 @@ begin
   if Assigned(Asiento) then
   begin
     if Asiento.EsNuevo then
-      FTitulo := 'Nuevo asiento - ' + AppFactuGES.EmpresaActiva.NOMBRE + ' - ' + AppFactuGES.EjercicioActivo.NOMBRE + ' (' + AppFactuGES.EjercicioActivo.ESTADO + ')'
+      FTitulo := 'Nueva entrada/salida - ' + AppFactuGES.EmpresaActiva.NOMBRE // + ' - ' + AppFactuGES.EjercicioActivo.NOMBRE + ' (' + AppFactuGES.EjercicioActivo.ESTADO + ')'
     else
-      FTitulo := 'Asiento' + ' ' + IntToStr(Asiento.ORDEN) + ' - ' + AppFactuGES.EmpresaActiva.NOMBRE + ' - ' + AppFactuGES.EjercicioActivo.NOMBRE + ' (' + AppFactuGES.EjercicioActivo.ESTADO + ')';
+      FTitulo := 'Entrada/salida' + ' ' + IntToStr(Asiento.ORDEN) + ' - ' + AppFactuGES.EmpresaActiva.NOMBRE; // + ' - ' + AppFactuGES.EjercicioActivo.NOMBRE + ' (' + AppFactuGES.EjercicioActivo.ESTADO + ')';
   end;
 
   inherited PonerTitulos(FTitulo);
diff --git a/Source/Modulos/Contabilidad/Views/uEditorCuenta.dfm b/Source/Modulos/Contabilidad/Views/uEditorCuenta.dfm
index 9c5df60..9fcacc6 100644
--- a/Source/Modulos/Contabilidad/Views/uEditorCuenta.dfm
+++ b/Source/Modulos/Contabilidad/Views/uEditorCuenta.dfm
@@ -8,7 +8,6 @@ inherited fEditorCuenta: TfEditorCuenta
   Scaled = False
   OnClose = CustomEditorClose
   ExplicitWidth = 640
-  ExplicitHeight = 240
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
@@ -128,19 +127,6 @@ inherited fEditorCuenta: TfEditorCuenta
       end
     end
   end
-  inherited pgPaginas: TPageControl
-    Width = 626
-    ExplicitLeft = 3
-    ExplicitTop = 79
-    ExplicitWidth = 626
-    ExplicitHeight = 358
-    inherited pagGeneral: TTabSheet
-      ExplicitLeft = 4
-      ExplicitTop = 24
-      ExplicitWidth = 618
-      ExplicitHeight = 330
-    end
-  end
   inherited StatusBar: TJvStatusBar
     Width = 632
     Panels = <
@@ -149,20 +135,35 @@ inherited fEditorCuenta: TfEditorCuenta
       end>
     ExplicitWidth = 632
   end
+  inherited pgPaginas: TPageControl
+    Width = 626
+    ExplicitWidth = 626
+    inherited pagGeneral: TTabSheet
+      ExplicitLeft = 4
+      ExplicitTop = 24
+      ExplicitWidth = 618
+      ExplicitHeight = 300
+    end
+  end
+  inherited PnlComentario: TPanel
+    Width = 632
+    inherited lbComentario: TLabel
+      Width = 622
+      Height = 25
+    end
+  end
   inherited EditorActionList: TActionList
     Top = 128
   end
-  inherited SmallImages: TPngImageList
-    Top = 112
-  end
   inherited dsDataTable: TDADataSource [6]
     Left = 168
     Top = 120
   end
-  inherited LargeImages: TPngImageList [7]
+  inherited LargeImages: TPngImageList
     Top = 112
   end
-  inherited JvFormStorage: TJvFormStorage [8]
+  inherited SmallImages: TPngImageList [9]
+    Top = 112
   end
   object dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList
     Left = 320
diff --git a/Source/Modulos/Contabilidad/Views/uEditorElegirBalances.dfm b/Source/Modulos/Contabilidad/Views/uEditorElegirBalances.dfm
index 36e8f94..5853e6b 100644
--- a/Source/Modulos/Contabilidad/Views/uEditorElegirBalances.dfm
+++ b/Source/Modulos/Contabilidad/Views/uEditorElegirBalances.dfm
@@ -7,8 +7,7 @@ inherited fEditorElegirBalances: TfEditorElegirBalances
     Top = 64
     Width = 656
     Visible = False
-    ExplicitLeft = -8
-    ExplicitTop = -6
+    ExplicitTop = 64
     ExplicitWidth = 656
     inherited Image1: TImage
       Left = 629
@@ -24,7 +23,7 @@ inherited fEditorElegirBalances: TfEditorElegirBalances
     ExplicitHeight = 49
     inherited tbxMain: TTBXToolbar
       Align = alRight
-      ExplicitWidth = 269
+      ExplicitWidth = 126
       inherited TBXItem2: TTBXItem
         Visible = False
       end
@@ -42,11 +41,11 @@ inherited fEditorElegirBalances: TfEditorElegirBalances
       end
     end
     inherited tbxFiltro: TTBXToolbar
-      Left = 269
+      Left = 126
       Top = 23
       DockPos = 115
       DockRow = 1
-      ExplicitLeft = 269
+      ExplicitLeft = 126
       ExplicitTop = 23
       inherited TBXItem34: TTBXItem
         Action = actQuitarFiltro2
@@ -56,11 +55,11 @@ inherited fEditorElegirBalances: TfEditorElegirBalances
       ExplicitWidth = 656
     end
     inherited TBXTMain2: TTBXToolbar
-      Left = 538
+      Left = 536
       Top = 23
       DockPos = 536
       DockRow = 1
-      ExplicitLeft = 538
+      ExplicitLeft = 536
       ExplicitTop = 23
     end
   end
@@ -145,15 +144,23 @@ inherited fEditorElegirBalances: TfEditorElegirBalances
           Width = 656
           ExplicitWidth = 656
           inherited txtFiltroTodo: TcxTextEdit
-            ExplicitWidth = 273
-            Width = 273
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
           end
           inherited edtFechaIniFiltro: TcxDateEdit
-            ExplicitWidth = 121
-            Width = 121
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
           end
           inherited edtFechaFinFiltro: TcxDateEdit
             Left = 225
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
             ExplicitLeft = 225
             ExplicitWidth = 421
             Width = 421
@@ -210,7 +217,6 @@ inherited fEditorElegirBalances: TfEditorElegirBalances
     Padding.Bottom = 8
     ParentBackground = False
     TabOrder = 5
-    ExplicitTop = -37
     object lblTitle: TLabel
       AlignWithMargins = True
       Left = 25
diff --git a/Source/Modulos/Contabilidad/Views/uEditorExtractoMovimientos.dfm b/Source/Modulos/Contabilidad/Views/uEditorExtractoMovimientos.dfm
index c6473cc..0d6c919 100644
--- a/Source/Modulos/Contabilidad/Views/uEditorExtractoMovimientos.dfm
+++ b/Source/Modulos/Contabilidad/Views/uEditorExtractoMovimientos.dfm
@@ -127,11 +127,32 @@ inherited fEditorExtractoMovimientos: TfEditorExtractoMovimientos
             Column = frViewExtractoMovimientos1.cxGridViewCONCEPTO
           end>
         inherited cxGridViewPUNTEADO: TcxGridDBColumn
+          Visible = False
+          VisibleForCustomization = False
           IsCaptionAssigned = True
         end
         inherited cxGridViewID_ASIENTO: TcxGridDBColumn
           IsCaptionAssigned = True
         end
+        inherited cxGridViewORDEN: TcxGridDBColumn
+          Visible = False
+          SortIndex = -1
+        end
+        inherited cxGridViewREF_SUBCUENTA: TcxGridDBColumn
+          Visible = False
+          VisibleForCustomization = False
+        end
+        inherited cxGridViewSUBCUENTA: TcxGridDBColumn
+          Visible = False
+          VisibleForCustomization = False
+        end
+        inherited cxGridViewDOCUMENTO: TcxGridDBColumn
+          Visible = False
+          VisibleForCustomization = False
+        end
+        inherited cxGridViewSaldo: TcxGridDBColumn
+          HeaderAlignmentHorz = taRightJustify
+        end
       end
     end
     inherited frViewFiltroBase1: TfrViewFiltroBase
diff --git a/Source/Modulos/Contabilidad/Views/uEditorSubCuenta.dfm b/Source/Modulos/Contabilidad/Views/uEditorSubCuenta.dfm
index 76b32f9..d35d2dd 100644
--- a/Source/Modulos/Contabilidad/Views/uEditorSubCuenta.dfm
+++ b/Source/Modulos/Contabilidad/Views/uEditorSubCuenta.dfm
@@ -8,7 +8,6 @@ inherited fEditorSubCuenta: TfEditorSubCuenta
   Scaled = False
   OnClose = CustomEditorClose
   ExplicitWidth = 640
-  ExplicitHeight = 240
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
@@ -129,19 +128,6 @@ inherited fEditorSubCuenta: TfEditorSubCuenta
       end
     end
   end
-  inherited pgPaginas: TPageControl
-    Width = 626
-    ExplicitLeft = 3
-    ExplicitTop = 79
-    ExplicitWidth = 626
-    ExplicitHeight = 358
-    inherited pagGeneral: TTabSheet
-      ExplicitLeft = 4
-      ExplicitTop = 24
-      ExplicitWidth = 618
-      ExplicitHeight = 330
-    end
-  end
   inherited StatusBar: TJvStatusBar
     Width = 632
     Panels = <
@@ -150,20 +136,35 @@ inherited fEditorSubCuenta: TfEditorSubCuenta
       end>
     ExplicitWidth = 632
   end
+  inherited pgPaginas: TPageControl
+    Width = 626
+    ExplicitWidth = 626
+    inherited pagGeneral: TTabSheet
+      ExplicitLeft = 4
+      ExplicitTop = 24
+      ExplicitWidth = 618
+      ExplicitHeight = 300
+    end
+  end
+  inherited PnlComentario: TPanel
+    Width = 632
+    inherited lbComentario: TLabel
+      Width = 622
+      Height = 25
+    end
+  end
   inherited EditorActionList: TActionList
     Top = 128
   end
-  inherited SmallImages: TPngImageList
-    Top = 112
-  end
   inherited dsDataTable: TDADataSource [6]
     Left = 168
     Top = 120
   end
-  inherited LargeImages: TPngImageList [7]
+  inherited LargeImages: TPngImageList
     Top = 112
   end
-  inherited JvFormStorage: TJvFormStorage [8]
+  inherited SmallImages: TPngImageList [9]
+    Top = 112
   end
   object dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList
     Left = 320
diff --git a/Source/Modulos/Contabilidad/Views/uViewBalances.dfm b/Source/Modulos/Contabilidad/Views/uViewBalances.dfm
index 63eca66..1785a38 100644
--- a/Source/Modulos/Contabilidad/Views/uViewBalances.dfm
+++ b/Source/Modulos/Contabilidad/Views/uViewBalances.dfm
@@ -63,23 +63,32 @@ inherited frViewBalances: TfrViewBalances
     inherited TBXDockablePanel1: TTBXDockablePanel
       inherited dxLayoutControl1: TdxLayoutControl
         inherited txtFiltroTodo: TcxTextEdit
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
           ExplicitWidth = 273
           Width = 273
         end
         inherited edtFechaIniFiltro: TcxDateEdit
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
           ExplicitWidth = 121
           Width = 121
         end
         inherited edtFechaFinFiltro: TcxDateEdit
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
           ExplicitWidth = 121
           Width = 121
         end
       end
     end
   end
-  inherited pnlAgrupaciones: TTBXDockablePanel
-    ExplicitWidth = 554
-  end
   inherited dxComponentPrinter: TdxComponentPrinter
     inherited dxComponentPrinterLink: TdxGridReportLink
       ReportDocument.CreationDate = 38673.842406053240000000
diff --git a/Source/Modulos/Contabilidad/Views/uViewBalances.pas b/Source/Modulos/Contabilidad/Views/uViewBalances.pas
index 9db2dc9..325feed 100644
Binary files a/Source/Modulos/Contabilidad/Views/uViewBalances.pas and b/Source/Modulos/Contabilidad/Views/uViewBalances.pas differ
diff --git a/Source/Modulos/Contabilidad/Views/uViewCuentasEspeciales.dfm b/Source/Modulos/Contabilidad/Views/uViewCuentasEspeciales.dfm
index e4888df..e88781c 100644
--- a/Source/Modulos/Contabilidad/Views/uViewCuentasEspeciales.dfm
+++ b/Source/Modulos/Contabilidad/Views/uViewCuentasEspeciales.dfm
@@ -37,23 +37,32 @@ inherited frViewCuentasEspeciales: TfrViewCuentasEspeciales
     inherited TBXDockablePanel1: TTBXDockablePanel
       inherited dxLayoutControl1: TdxLayoutControl
         inherited txtFiltroTodo: TcxTextEdit
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
           ExplicitWidth = 273
           Width = 273
         end
         inherited edtFechaIniFiltro: TcxDateEdit
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
           ExplicitWidth = 121
           Width = 121
         end
         inherited edtFechaFinFiltro: TcxDateEdit
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
           ExplicitWidth = 121
           Width = 121
         end
       end
     end
   end
-  inherited pnlAgrupaciones: TTBXDockablePanel
-    ExplicitWidth = 554
-  end
   inherited dxComponentPrinter: TdxComponentPrinter
     inherited dxComponentPrinterLink: TdxGridReportLink
       ReportDocument.CreationDate = 38673.842406053240000000
diff --git a/Source/Modulos/Contabilidad/Views/uViewCuentasEspeciales.pas b/Source/Modulos/Contabilidad/Views/uViewCuentasEspeciales.pas
index c340c70..7c838da 100644
Binary files a/Source/Modulos/Contabilidad/Views/uViewCuentasEspeciales.pas and b/Source/Modulos/Contabilidad/Views/uViewCuentasEspeciales.pas differ
diff --git a/Source/Modulos/Contabilidad/Views/uViewEpigrafes.dfm b/Source/Modulos/Contabilidad/Views/uViewEpigrafes.dfm
index e523dfb..8887b70 100644
--- a/Source/Modulos/Contabilidad/Views/uViewEpigrafes.dfm
+++ b/Source/Modulos/Contabilidad/Views/uViewEpigrafes.dfm
@@ -72,6 +72,7 @@ inherited frViewEpigrafes: TfrViewEpigrafes
   inherited pnlAgrupaciones: TTBXDockablePanel
     Top = 423
     ExplicitTop = 423
+    ExplicitWidth = 128
   end
   inherited dxComponentPrinter: TdxComponentPrinter
     inherited dxComponentPrinterLink: TdxGridReportLink
diff --git a/Source/Modulos/Contabilidad/Views/uViewEpigrafes.pas b/Source/Modulos/Contabilidad/Views/uViewEpigrafes.pas
index c2103af..d29a80c 100644
--- a/Source/Modulos/Contabilidad/Views/uViewEpigrafes.pas
+++ b/Source/Modulos/Contabilidad/Views/uViewEpigrafes.pas
@@ -14,7 +14,7 @@ uses
   dxPSEdgePatterns, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk,
   cxGridCustomPopupMenu, cxGridPopupMenu, uViewFiltroBase, TB2Item, TBX,
   TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, uDAInterfaces, cxCalendar,
-  cxImageComboBox, cxTextEdit;
+  cxImageComboBox, cxTextEdit, uCustomView, uViewBase;
 
 type
   IViewEpigrafes = interface(IViewGrid)
diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj
index 007a709..8cf76ea 100644
--- a/Source/Servidor/FactuGES_Server.dproj
+++ b/Source/Servidor/FactuGES_Server.dproj
@@ -28,7 +28,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><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">4</VersionInfo><VersionInfo Name="Release">5</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">2.4.5.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES (Servidor)</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.4.6.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">lunes, 11 de octubre de 2010 10:56</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+			<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">4</VersionInfo><VersionInfo Name="Release">7</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">2.4.7.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES (Servidor)</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.4.7.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">martes, 27 de diciembre de 2011 15:54</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
 						<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages>
 					</Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
 	</ProjectExtensions>
diff --git a/Source/Servidor/FactuGES_Server.res b/Source/Servidor/FactuGES_Server.res
index bc766e6..d267a7a 100644
Binary files a/Source/Servidor/FactuGES_Server.res and b/Source/Servidor/FactuGES_Server.res differ