Subida operacion de cierre de ejercicios en módulo de contabilidad

git-svn-id: https://192.168.0.254/svn/Proyectos.Acana_FactuGES2/trunk@392 f4e31baf-9722-1c47-927c-6f952f962d4b
2009-02-03 19:11:42 +00:00 · 2009-02-03 19:11:42 +00:00 · 423818ddfc
commit 423818ddfc
parent 0a73f1cdff
31 changed files with 1158 additions and 497 deletions
--- a/Database/scripts/factuges.sql
+++ b/Database/scripts/factuges.sql
@ -463,6 +463,11 @@ begin
      end
      num_orden = num_orden + 1;
     end
+     
+     /*Finalmente cambiamos de estado los ejercicio cerrado*/
+     update cont_ejercicios
+     set ESTADO = 'CERRADO'
+     where id = :id_ejercicio_cierre;
  end

  suspend;
--- a/Source/ApplicationBase/ApplicationBase.dpk
+++ b/Source/ApplicationBase/ApplicationBase.dpk
@ -41,7 +41,14 @@ requires
  dxThemeD11,
  dxGDIPlusD11,
  dxNavBarD11,
-  vcljpg;
+  vcljpg,
+  GUISDK_D11,
+  xmlrtl,
+  cfpack_d11,
+  vclx,
+  vclactnband,
+  designide,
+  ccpackD11;

 contains
  uFactuGES_App in 'uFactuGES_App.pas',
@ -109,6 +116,8 @@ contains
  uViewConfiguracionGeneral in 'Configuracion\Views\uViewConfiguracionGeneral.pas' {frViewConfiguracionGeneral: TFrame},
  uIViewConfiguracionBase in 'Configuracion\Controller\Views\uIViewConfiguracionBase.pas',
  schUsuariosClient_Intf in 'Usuarios\Model\schUsuariosClient_Intf.pas',
-  schUsuariosServer_Intf in 'Usuarios\Model\schUsuariosServer_Intf.pas';
+  schUsuariosServer_Intf in 'Usuarios\Model\schUsuariosServer_Intf.pas',
+  uEditorElegirEjercicios in 'Ejercicios\Views\uEditorElegirEjercicios.pas' {fEditorElegirEjercicios: TCustomEditor},
+  uIEditorElegirEjercicios in 'Ejercicios\Controller\View\uIEditorElegirEjercicios.pas';

 end.
--- a/Source/ApplicationBase/ApplicationBase.dproj
+++ b/Source/ApplicationBase/ApplicationBase.dproj
@ -46,6 +46,9 @@
    <Borland.ProjectType>Package</Borland.ProjectType>
    <BorlandProject>
 <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+      
+      
+      
      <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\DataAbstract_SQLiteDriver_D11.bpl">RemObjects Data Abstract - SQLite Driver</Excluded_Packages>
      <Excluded_Packages Name="$(BDS)\bin\dcloffice2k100.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
      <Excluded_Packages Name="$(BDS)\bin\dclofficexp100.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
@ -70,8 +73,32 @@
      <DesignClass>TFrame</DesignClass>
    </DCCReference>
    <DCCReference Include="Ejercicios\Controller\uEjerciciosController.pas" />
+    <DCCReference Include="Ejercicios\Controller\View\adortl.dcp" />
+    <DCCReference Include="Ejercicios\Controller\View\Base.dcp" />
+    <DCCReference Include="Ejercicios\Controller\View\ccpackD11.dcp" />
+    <DCCReference Include="Ejercicios\Controller\View\cfpack_d11.dcp" />
+    <DCCReference Include="Ejercicios\Controller\View\cxLibraryD11.dcp" />
+    <DCCReference Include="Ejercicios\Controller\View\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="Ejercicios\Controller\View\dbrtl.dcp" />
+    <DCCReference Include="Ejercicios\Controller\View\designide.dcp" />
+    <DCCReference Include="Ejercicios\Controller\View\dsnap.dcp" />
+    <DCCReference Include="Ejercicios\Controller\View\dxGDIPlusD11.dcp" />
+    <DCCReference Include="Ejercicios\Controller\View\dxNavBarD11.dcp" />
+    <DCCReference Include="Ejercicios\Controller\View\dxThemeD11.dcp" />
+    <DCCReference Include="Ejercicios\Controller\View\GUIBase.dcp" />
+    <DCCReference Include="Ejercicios\Controller\View\GUISDK_D11.dcp" />
+    <DCCReference Include="Ejercicios\Controller\View\JvJansD11R.dcp" />
+    <DCCReference Include="Ejercicios\Controller\View\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="Ejercicios\Controller\View\rtl.dcp" />
    <DCCReference Include="Ejercicios\Controller\View\uIEditorEjercicio.pas" />
    <DCCReference Include="Ejercicios\Controller\View\uIEditorEjercicios.pas" />
+    <DCCReference Include="Ejercicios\Controller\View\uIEditorElegirEjercicios.pas" />
+    <DCCReference Include="Ejercicios\Controller\View\vcl.dcp" />
+    <DCCReference Include="Ejercicios\Controller\View\vclactnband.dcp" />
+    <DCCReference Include="Ejercicios\Controller\View\vcldb.dcp" />
+    <DCCReference Include="Ejercicios\Controller\View\vcljpg.dcp" />
+    <DCCReference Include="Ejercicios\Controller\View\vclx.dcp" />
+    <DCCReference Include="Ejercicios\Controller\View\xmlrtl.dcp" />
    <DCCReference Include="Ejercicios\Data\uDataModuleEjercicios.pas">
      <Form>DataModuleEjercicios</Form>
    </DCCReference>
@ -87,6 +114,10 @@
      <Form>fEditorEjercicios</Form>
      <DesignClass>TCustomEditor</DesignClass>
    </DCCReference>
+    <DCCReference Include="Ejercicios\Views\uEditorElegirEjercicios.pas">
+      <Form>fEditorElegirEjercicios</Form>
+      <DesignClass>TCustomEditor</DesignClass>
+    </DCCReference>
    <DCCReference Include="Ejercicios\Views\uEjerciciosViewRegister.pas" />
    <DCCReference Include="Ejercicios\Views\uViewEjercicio.pas">
      <Form>frViewEjercicio</Form>
@ -154,26 +185,10 @@
      <Form>DataModuleUsuarios</Form>
    </DCCReference>
    <DCCReference Include="Usuarios\Data\uUCROConn.pas" />
-    <DCCReference Include="Usuarios\Model\adortl.dcp" />
-    <DCCReference Include="Usuarios\Model\Base.dcp" />
-    <DCCReference Include="Usuarios\Model\cxLibraryD11.dcp" />
-    <DCCReference Include="Usuarios\Model\DataAbstract_Core_D11.dcp" />
    <DCCReference Include="Usuarios\Model\Data\uIDataModuleUsuarios.pas" />
-    <DCCReference Include="Usuarios\Model\dbrtl.dcp" />
-    <DCCReference Include="Usuarios\Model\dsnap.dcp" />
-    <DCCReference Include="Usuarios\Model\dxGDIPlusD11.dcp" />
-    <DCCReference Include="Usuarios\Model\dxNavBarD11.dcp" />
-    <DCCReference Include="Usuarios\Model\dxThemeD11.dcp" />
-    <DCCReference Include="Usuarios\Model\GUIBase.dcp" />
-    <DCCReference Include="Usuarios\Model\JvJansD11R.dcp" />
-    <DCCReference Include="Usuarios\Model\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="Usuarios\Model\rtl.dcp" />
    <DCCReference Include="Usuarios\Model\schUsuariosClient_Intf.pas" />
    <DCCReference Include="Usuarios\Model\schUsuariosServer_Intf.pas" />
    <DCCReference Include="Usuarios\Model\uBizUsuarios.pas" />
-    <DCCReference Include="Usuarios\Model\vcl.dcp" />
-    <DCCReference Include="Usuarios\Model\vcldb.dcp" />
-    <DCCReference Include="Usuarios\Model\vcljpg.dcp" />
    <DCCReference Include="Usuarios\Views\uEditorCambiarPassword.pas">
      <Form>fEditorCambiarPassword</Form>
      <DesignClass>TCustomEditor</DesignClass>
--- a/Source/ApplicationBase/Ejercicios/Controller/View/uIEditorElegirEjercicios.pas
+++ b/Source/ApplicationBase/Ejercicios/Controller/View/uIEditorElegirEjercicios.pas
@ -0,0 +1,26 @@
+unit uIEditorElegirEjercicios;
+
+interface
+
+uses
+  uIEditorEjercicios, uBizEjercicios, uGUIBase;
+
+type
+  IEditorElegirEjercicios = interface(IEditorEjercicios)
+  ['{4A5003AE-BF4E-466A-9C9D-FECDD69454D2}']
+    function GetEjerciciosSeleccionados: IBizEjercicio;
+    property EjerciciosSeleccionados: IBizEjercicio read GetEjerciciosSeleccionados;
+
+    procedure SetMultiSelect (AValue : Boolean);
+    function GetMultiSelect : Boolean;
+    property MultiSelect : Boolean read GetMultiSelect write SetMultiSelect;
+
+    procedure SetMensaje (const AValue: String);
+    function GetMensaje: String;
+    property Mensaje : String read GetMensaje write SetMensaje;
+  end;
+
+
+implementation
+
+end.
--- a/Source/ApplicationBase/Ejercicios/Controller/uEjerciciosController.pas
+++ b/Source/ApplicationBase/Ejercicios/Controller/uEjerciciosController.pas
@ -21,6 +21,9 @@ type
    procedure DescartarCambios(AEjercicio : IBizEjercicio);
    function Localizar(AEjercicios: IBizEjercicio; ADescripcion:String): Boolean;
    function DarListaEjercicios: TStringList;
+    function ElegirEjercicio(AEjercicios : IBizEjercicio): IBizEjercicio;
+    function ExtraerSeleccionados(AEjercicios: IBizEjercicio) : IBizEjercicio;
+    function CerrarEjercicio(AEjercicio: IBizEjercicio): Boolean;
  end;

  TEjerciciosController = class(TControllerBase, IEjerciciosController)
@ -52,6 +55,9 @@ type
    function GenerarPCG(IdEjercicioCopia, IdEjercicio: Integer): Boolean;
    function Localizar(AEjercicios: IBizEjercicio; ADescripcion:String): Boolean;
    function DarListaEjercicios: TStringList;
+    function ElegirEjercicio(AEjercicios : IBizEjercicio): IBizEjercicio;
+    function ExtraerSeleccionados(AEjercicios: IBizEjercicio) : IBizEjercicio;
+    function CerrarEjercicio(AEjercicio: IBizEjercicio): Boolean;
  end;

 implementation
@ -60,29 +66,15 @@ uses
  cxControls, DB, uEditorRegistryUtils, schEjerciciosClient_Intf,
  uIEditorEjercicios, uIEditorEjercicio, uDataModuleEjercicios,
  uDAInterfaces, uDataTableUtils, uDialogUtils, uFactuGES_App,
-  uDateUtils, uROTypes, DateUtils, Controls, Windows, Dialogs;
+  uDateUtils, uROTypes, DateUtils, Controls, Windows, Dialogs, uIEditorElegirEjercicios;



 { TEjerciciosController }

 procedure TEjerciciosController.Anadir(AEjercicio: IBizEjercicio);
-{var
-  FechaInicio: TDate;
-  FechaFin: TDate;}
 begin
  AEjercicio.Insert;
-
-  //Asignar fecha de inicio y fin siguientes
-  ShowHourglassCursor;
-  try
-//    FDataModule.DarAnoSiguiente(FechaInicio, FechaFin);
-//    AEjercicio.FECHA_INICIO :=
-
-  finally
-    HideHourglassCursor;
-  end;
-
 end;

 procedure TEjerciciosController.AsignarDataModule;
@ -144,6 +136,32 @@ begin
  FiltrarEmpresa(Result);  
 end;

+function TEjerciciosController.CerrarEjercicio(AEjercicio: IBizEjercicio): Boolean;
+var
+  IdEjercicioCierre: Integer;
+  AFechaInicioApertura: TDate;
+  AFechaFinApertura: TDate;
+
+begin
+  Result := False;
+  
+  if Assigned(AEjercicio) then
+  begin
+     IdEjercicioCierre := AEjercicio.ID;
+     AFechaInicioApertura := StartOfAYear((YearOf(AEjercicio.FECHA_INICIO)+1));
+     AFechaFinApertura := EndOfAYear((YearOf(AEjercicio.FECHA_INICIO)+1));
+
+     Anadir(AEjercicio);
+     AEjercicio.FECHA_INICIO := AFechaInicioApertura;
+     AEjercicio.FECHA_FIN := AFechaFinApertura;
+     AEjercicio.NOMBRE := 'Ejercicio ' + IntToStr(YearOf(AFechaInicioApertura));
+     AEjercicio.ESTADO := CTE_ABIERTO;
+     Guardar(AEjercicio);
+     GenerarPCG(IdEjercicioCierre, AEjercicio.ID);
+     Result := FDataModule.CerrarEjercicio(IdEjercicioCierre, AEjercicio.ID);
+  end;
+end;
+
 constructor TEjerciciosController.Create;
 begin
  inherited;
@ -253,6 +271,27 @@ begin
    end;
 end;

+function TEjerciciosController.ElegirEjercicio(AEjercicios: IBizEjercicio): IBizEjercicio;
+var
+  AEditor : IEditorElegirEjercicios;
+begin
+  Result := NIL;
+
+  CreateEditor('EditorElegirEjercicios', IEditorElegirEjercicios, AEditor);
+  if Assigned(AEditor) then
+    try
+      AEditor.Ejercicios := AEjercicios;
+      AEditor.Controller := Self;
+      AEditor.MultiSelect := False;
+      AEditor.Mensaje := 'Seleccione el ejercicio de la empresa activa que desee:';
+      if IsPositiveResult(AEditor.ShowModal) then
+         Result := AEditor.EjerciciosSeleccionados;
+    finally
+      AEditor.Release;
+      AEditor := NIL;
+    end;
+end;
+
 function TEjerciciosController.Eliminar(AEjercicio: IBizEjercicio): Boolean;
 begin
  if not Assigned(AEjercicio) then
@ -275,6 +314,15 @@ begin
  end;
 end;

+function TEjerciciosController.ExtraerSeleccionados(AEjercicios: IBizEjercicio): IBizEjercicio;
+var
+  ASeleccionados : IBizEjercicio;
+begin
+  ASeleccionados := Self.Buscar(ID_NULO);
+  CopyDataTableDA5(AEjercicios.DataTable, ASeleccionados.DataTable, True);
+  Result := ASeleccionados;
+end;
+
 procedure TEjerciciosController.FiltrarEmpresa(AEjercicio: IBizEjercicio);
 var
  Condicion: TDAWhereExpression;
--- a/Source/ApplicationBase/Ejercicios/Data/uDataModuleEjercicios.pas
+++ b/Source/ApplicationBase/Ejercicios/Data/uDataModuleEjercicios.pas
@ -20,7 +20,7 @@ type
  public
    function GetItems: IBizEjercicio;
    function GenerarPGC(const IdEjercicioCopia: Integer; const IdEjercicio: Integer): Boolean;
-//    function DarAnoSiguiente(var FechaInicio: TDate; var FechaFin: TDate): Boolean;
+    function CerrarEjercicio(const IdEjercicioCierre: Integer; const IdEjercicioApertura: Integer): Boolean;
  end;

 implementation
@ -33,6 +33,11 @@ uses

 { TdmEjercicios }

+function TDataModuleEjercicios.CerrarEjercicio(const IdEjercicioCierre, IdEjercicioApertura: Integer): Boolean;
+begin
+  Result := (RORemoteService as IsrvEjercicios).CerrarEjercicio(IdEjercicioCierre, IdEjercicioApertura);
+end;
+
 procedure TDataModuleEjercicios.DAClientDataModuleCreate(Sender: TObject);
 begin
  RORemoteService.Channel := dmConexion.Channel;
--- a/Source/ApplicationBase/Ejercicios/Model/Data/uIDataModuleEjercicios.pas
+++ b/Source/ApplicationBase/Ejercicios/Model/Data/uIDataModuleEjercicios.pas
@ -10,6 +10,7 @@ type
    ['{E32DF99C-8AA1-42E5-84C0-198205BD2A90}']
    function GetItems: IBizEjercicio;
    function GenerarPGC(const IdEjercicioCopia: Integer; const IdEjercicio: Integer): Boolean;
+    function CerrarEjercicio(const IdEjercicioCierre: Integer; const IdEjercicioApertura: Integer): Boolean;    
  end;

 implementation
--- a/Source/ApplicationBase/Ejercicios/Model/uBizEjercicios.pas
+++ b/Source/ApplicationBase/Ejercicios/Model/uBizEjercicios.pas
@ -3,7 +3,7 @@ unit uBizEjercicios;
 interface

 uses
-  uDAInterfaces, uDADataTable, schEjerciciosClient_Intf;
+  uDAInterfaces, uDADataTable, uDBSelectionListUtils, schEjerciciosClient_Intf;

 const
  BIZ_CLIENT_Ejercicio = 'Client.Ejercicio';
@ -16,10 +16,15 @@ type
    function EsNuevo : Boolean;
  end;

-  TBizEjercicio = class(TEjerciciosDataTableRules, IBizEjercicio)
+  TBizEjercicio = class(TEjerciciosDataTableRules, IBizEjercicio, ISeleccionable)
  protected
+    FSeleccionableInterface: ISeleccionable;
    procedure OnNewRecord(Sender: TDADataTable); override;
  public
+    property SeleccionableInterface : ISeleccionable read FSeleccionableInterface write FSeleccionableInterface implements ISeleccionable;
+    constructor Create(aDataTable: TDADataTable); override;
+    destructor Destroy; override;
+
    procedure IniciarValoresEjercicioNueva;
    function EsNuevo : Boolean;
  end;
@ -31,6 +36,18 @@ implementation
 uses
  SysUtils, uDataTableUtils, uDateUtils, uFactuGES_App;

+constructor TBizEjercicio.Create(aDataTable: TDADataTable);
+begin
+  inherited;
+  FSeleccionableInterface := TSeleccionable.Create(aDataTable);
+end;
+
+destructor TBizEjercicio.Destroy;
+begin
+  FSeleccionableInterface := NIL;
+  inherited;
+end;
+
 function TBizEjercicio.EsNuevo: Boolean;
 begin
  Result := (ID < 0);
--- a/Source/ApplicationBase/Ejercicios/Servidor/srvEjercicios_Impl.dfm
+++ b/Source/ApplicationBase/Ejercicios/Servidor/srvEjercicios_Impl.dfm
@ -292,6 +292,27 @@ object srvEjercicios: TsrvEjercicios
            ColumnMappings = <>
          end>
        Name = 'GenerarPGC'
+      end
+      item
+        Params = <
+          item
+            Name = 'id_ejercicio_cierre'
+            Value = ''
+          end
+          item
+            Name = 'id_ejercicio_apertura'
+            Value = ''
+          end>
+        Statements = <
+          item
+            Connection = 'IBX'
+            SQL = 
+              'execute procedure PROC_CIERRE_APERTURA :id_ejercicio_cierre, :id' +
+              '_ejercicio_apertura'#10
+            StatementType = stSQL
+            ColumnMappings = <>
+          end>
+        Name = 'CerrarEjercicio'
      end>
    RelationShips = <>
    UpdateRules = <>
--- a/Source/ApplicationBase/Ejercicios/Servidor/srvEjercicios_Impl.pas
+++ b/Source/ApplicationBase/Ejercicios/Servidor/srvEjercicios_Impl.pas
@ -31,6 +31,7 @@ type

  protected
    function GenerarPGC(const ID_EJERCICIO_COPIA: Integer; const ID_EJERCICIO: Integer): Boolean;
+    function CerrarEjercicio(const ID_EJERCICIO_CIERRE: Integer; const ID_EJERCICIO_APERTURA: Integer): Boolean;
  public  
    function DarEjercicioActivo(const ID_EMPRESA: Integer): Integer;
  end;
@ -48,6 +49,21 @@ begin
 end;

 { srvEjercicios }
+function TsrvEjercicios.CerrarEjercicio(const ID_EJERCICIO_CIERRE, ID_EJERCICIO_APERTURA: Integer): Boolean;
+begin
+  Result := False;
+
+  Connection.BeginTransaction;
+  try
+    schEjercicios.NewCommand(Connection, 'CerrarEjercicio', ['ID_EJERCICIO_CIERRE', 'ID_EJERCICIO_APERTURA'], [ID_EJERCICIO_CIERRE, ID_EJERCICIO_APERTURA]);
+    Connection.CommitTransaction;
+    Result := True;
+  except
+    Connection.RollbackTransaction;
+    RaiseError('Error al cerrar el ejercicio');
+  end;
+end;
+
 function TsrvEjercicios.DarEjercicioActivo(const ID_EMPRESA: Integer): Integer;
 var
  AConn : IDAConnection;
--- a/Source/ApplicationBase/Ejercicios/Views/uEditorEjercicio.dfm
+++ b/Source/ApplicationBase/Ejercicios/Views/uEditorEjercicio.dfm
@ -15,7 +15,7 @@ inherited fEditorEjercicio: TfEditorEjercicio
  inherited JvNavPanelHeader: TJvNavPanelHeader
    Width = 519
    Caption = 'Ejercicio'
-    ExplicitWidth = 632
+    ExplicitWidth = 519
    inherited Image1: TImage
      Left = 492
      Picture.Data = {
@ -58,7 +58,7 @@ inherited fEditorEjercicio: TfEditorEjercicio
  end
  inherited TBXDock: TTBXDock
    Width = 519
-    ExplicitWidth = 632
+    ExplicitWidth = 519
    inherited tbxMain: TTBXToolbar
      ExplicitWidth = 330
      inherited TBXItem2: TTBXItem
@ -115,13 +115,13 @@ inherited fEditorEjercicio: TfEditorEjercicio
    Height = 344
    ExplicitLeft = 3
    ExplicitTop = 79
-    ExplicitWidth = 626
-    ExplicitHeight = 360
+    ExplicitWidth = 513
+    ExplicitHeight = 344
    inherited pagGeneral: TTabSheet
      ExplicitLeft = 4
      ExplicitTop = 24
-      ExplicitWidth = 618
-      ExplicitHeight = 332
+      ExplicitWidth = 505
+      ExplicitHeight = 316
    end
  end
  inherited StatusBar: TJvStatusBar
@ -132,7 +132,7 @@ inherited fEditorEjercicio: TfEditorEjercicio
        Width = 200
      end>
    ExplicitTop = 426
-    ExplicitWidth = 632
+    ExplicitWidth = 519
  end
  inherited EditorActionList: TActionList
    Top = 128
--- a/Source/ApplicationBase/Ejercicios/Views/uEditorEjercicio.pas
+++ b/Source/ApplicationBase/Ejercicios/Views/uEditorEjercicio.pas
@ -93,11 +93,12 @@ procedure TfEditorEjercicio.GuardarInterno;
 var
  bEsNuevo: Boolean;
  Respuesta : Integer;
+  AEjercicio: IBizEjercicio;
+

 begin
  inherited;
  bEsNuevo := FEjercicio.EsNuevo;
-  FController.Guardar(FEjercicio);

  //Si el ejercicio guardado es nuevo generamos el pgc
  if bEsNuevo then
@ -107,15 +108,26 @@ begin
    begin
      case JsNuevoEjercicioDialog.CustomButtonResult of
        300   : begin   // No generar PGC
+                  FController.Guardar(FEjercicio);
                end;
-        200   : begin   // Utilizar un ejercicio anterior para copiar el PGC
+        200   : begin // Utilizar un ejercicio anterior para copiar el PGC, OJO ORDEN MUY IMPORTANTE
+
+                  AEjercicio := FController.ElegirEjercicio(FController.BuscarTodos);
+                  if Assigned(AEjercicio) then
+                  begin
+                    FController.Guardar(FEjercicio);
+                    FController.GenerarPCG(AEjercicio.ID, FEjercicio.ID);
+                  end;
                end;
-        100   : begin   // Utilizar el PGC base
+        100   : begin   // Utilizar el PGC base OJO ORDEN MUY IMPORTANTE
+                  FController.Guardar(FEjercicio);
                  FController.GenerarPCG(0, FEjercicio.ID);
                end;
      end;
    end;
-  end;
+  end
+  //Es una modificación
+  else FController.Guardar(FEjercicio);

  Modified := False;
  RefrescarInterno; //Es necesario sino no se actualiza el campo ACTIVO de todas las tuplas  
--- a/Source/ApplicationBase/Ejercicios/Views/uEditorEjercicios.dfm
+++ b/Source/ApplicationBase/Ejercicios/Views/uEditorEjercicios.dfm
@ -45,9 +45,6 @@ inherited fEditorEjercicios: TfEditorEjercicios
    end
  end
  inherited TBXDock: TTBXDock
-    inherited tbxMain: TTBXToolbar
-      ExplicitWidth = 474
-    end
    inherited tbxFiltro: TTBXToolbar
      ExplicitWidth = 269
      inherited tbxEditFiltro: TTBXEditItem
@ -60,7 +57,12 @@ inherited fEditorEjercicios: TfEditorEjercicios
    inherited TBXTMain2: TTBXToolbar
      Left = 275
      DockPos = 275
+      Visible = True
      ExplicitLeft = 275
+      ExplicitWidth = 96
+      object TBXItem38: TTBXItem
+        Action = actCerrarEjercicio
+      end
    end
  end
  inline frViewEjercicios1: TfrViewEjercicios [3]
@ -106,15 +108,27 @@ inherited fEditorEjercicios: TfEditorEjercicios
          Width = 543
          ExplicitWidth = 543
          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
            Left = 337
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
            ExplicitLeft = 337
            ExplicitWidth = 121
            Width = 121
@ -162,6 +176,16 @@ inherited fEditorEjercicios: TfEditorEjercicios
    inherited actNuevo: TAction
      ImageIndex = 23
    end
+    inherited actDuplicar: TAction
+      Enabled = False
+      Visible = False
+    end
+    object actCerrarEjercicio: TAction
+      Category = 'AccionesExtra'
+      Caption = 'Cerrar ejercicio'
+      OnExecute = actCerrarEjercicioExecute
+      OnUpdate = actCerrarEjercicioUpdate
+    end
  end
  inherited SmallImages: TPngImageList [5]
    PngImages = <
--- a/Source/ApplicationBase/Ejercicios/Views/uEditorEjercicios.pas
+++ b/Source/ApplicationBase/Ejercicios/Views/uEditorEjercicios.pas
@ -17,7 +17,11 @@ uses
 type
  TfEditorEjercicios = class(TfEditorGridBase, IEditorEjercicios)
    frViewEjercicios1: TfrViewEjercicios;
+    actCerrarEjercicio: TAction;
+    TBXItem38: TTBXItem;
    procedure FormShow(Sender: TObject);
+    procedure actCerrarEjercicioExecute(Sender: TObject);
+    procedure actCerrarEjercicioUpdate(Sender: TObject);
  private
    FEjercicios: IBizEjercicio;
    FController : IEjerciciosController;
@ -30,10 +34,9 @@ type
    procedure NuevoInterno; override;
    procedure EliminarInterno; override;
    procedure ModificarInterno; override;
-    procedure DuplicarInterno; override;

  public
-    procedure PonerTitulos(const ATitulo: string = ''); override;  
+    procedure PonerTitulos(const ATitulo: string = ''); override;
    property Ejercicios: IBizEjercicio read GetEjercicios write SetEjercicios;
    property Controller : IEjerciciosController read GetController write SetController;
    constructor Create(AOwner: TComponent); override;
@ -45,7 +48,7 @@ implementation
 uses
  uCustomEditor, uDataModuleEjercicios, uDataModuleUsuarios, uDialogUtils,
  uEditorEjercicio, uEditorDBBase, uFactuGES_App,
-  cxGrid, cxGridCustomTableView; //, uListaEjercicios;
+  cxGrid, cxGridCustomTableView, DateUtils;

 {$R *.dfm}

@ -116,22 +119,6 @@ begin
  inherited;
 end;

-procedure TfEditorEjercicios.DuplicarInterno;
-{var
-  AEjercicio : IBizEjercicio;}
-begin
-AppFactuGES.ShowCapado;
-{
-  inherited;
-  AEjercicio := FController.Duplicar(Ejercicios);
-  try
-    FController.Ver(AEjercicio);
-  finally
-    actRefrescar.Execute;
-  end;
-}  
-end;
-
 procedure TfEditorEjercicios.EliminarInterno;
 begin
  if (ShowConfirmMessage('Eliminar un ejercicio', Format('¿Desea borrar el ejercicio ''%s''?' + #10#13 + 'Tenga en cuenta que se eliminará también todo el plan general contable asociado al ejercicio.', [Ejercicios.NOMBRE])) = IDYES) then
@ -144,6 +131,31 @@ begin
  end;
 end;

+procedure TfEditorEjercicios.actCerrarEjercicioExecute(Sender: TObject);
+var
+  Cadena: String;
+  Ano: Integer;
+begin
+  inherited;
+  Ano := YearOf(Ejercicios.FECHA_INICIO);
+  Cadena := 'Se creará un nuevo ejercicio ( Ejercicio ' + InttoStr(Ano + 1) + ' ) con los asientos de apertura correspondientes a los asientos de cierre del ejercicio seleccionado. ¿Desea continuar?';
+
+  if (Application.MessageBox(PChar(Cadena), 'Atención', MB_YESNO) = IDYES) then
+     if Controller.CerrarEjercicio(Ejercicios) then
+     begin
+        Ejercicios.DataTable.Refresh;
+        Cadena := 'Se ha cerrado correctamente el ejercicio ' + IntToStr(Ano) + '. El ejercicio ' + IntToStr(Ano + 1) + ' será el nuevo ejercicio activo';
+        Application.MessageBox(PChar(Cadena), 'FactuGES', MB_OK);
+     end;
+end;
+
+procedure TfEditorEjercicios.actCerrarEjercicioUpdate(Sender: TObject);
+begin
+  inherited;
+  (Sender as TAction).Enabled := HayDatos
+                                 and (FEjercicios.ESTADO = CTE_ABIERTO);
+end;
+
 constructor TfEditorEjercicios.Create(AOwner: TComponent);
 begin
  inherited;
--- a/Source/ApplicationBase/Ejercicios/Views/uEditorElegirEjercicios.dfm
+++ b/Source/ApplicationBase/Ejercicios/Views/uEditorElegirEjercicios.dfm
@ -0,0 +1,217 @@
+inherited fEditorElegirEjercicios: TfEditorElegirEjercicios
+  Caption = 'fEditorElegirEjercicios'
+  ClientHeight = 533
+  ExplicitHeight = 567
+  PixelsPerInch = 96
+  TextHeight = 13
+  object JvgWizardHeader1: TJvgWizardHeader [0]
+    Left = 0
+    Top = 27
+    Width = 543
+    Height = 60
+    CaptionFont.Charset = DEFAULT_CHARSET
+    CaptionFont.Color = clWindowText
+    CaptionFont.Height = -11
+    CaptionFont.Name = 'Tahoma'
+    CaptionFont.Style = [fsBold]
+    CommentFont.Charset = DEFAULT_CHARSET
+    CommentFont.Color = clWindowText
+    CommentFont.Height = -11
+    CommentFont.Name = 'Tahoma'
+    CommentFont.Style = []
+    SymbolFont.Charset = DEFAULT_CHARSET
+    SymbolFont.Color = clHighlightText
+    SymbolFont.Height = -35
+    SymbolFont.Name = 'Wingdings'
+    SymbolFont.Style = [fsBold]
+    Captions.Strings = (
+      'Seleccione la subcuenta')
+    Comments.Strings = (
+      ' ')
+    Gradient.FromColor = clHighlight
+    Gradient.ToColor = clWindow
+    Gradient.Active = False
+    Gradient.Orientation = fgdVertical
+    BufferedDraw = False
+    ExplicitLeft = -113
+    ExplicitWidth = 656
+  end
+  inherited TBXDock: TTBXDock
+    Top = 87
+    ExplicitTop = 87
+    inherited tbxMain: TTBXToolbar
+      ExplicitWidth = 269
+      inherited TBXItem36: TTBXItem
+        Action = actAnchoAuto2
+      end
+    end
+    inherited tbxFiltro: TTBXToolbar
+      inherited TBXItem34: TTBXItem
+        Action = actQuitarFiltro2
+      end
+    end
+  end
+  inherited StatusBar: TJvStatusBar
+    Top = 514
+    ExplicitTop = 514
+  end
+  inherited frViewEjercicios1: TfrViewEjercicios
+    Top = 162
+    Height = 303
+    ExplicitTop = 162
+    ExplicitHeight = 303
+    inherited cxGrid: TcxGrid
+      Height = 175
+      ExplicitHeight = 175
+      inherited cxGridView: TcxGridDBTableView
+        DataController.Summary.FooterSummaryItems = <
+          item
+            Format = '0 ejercicios'
+            Kind = skCount
+            Column = frViewEjercicios1.cxGridViewNOMBRE
+          end>
+        inherited cxGridViewID: TcxGridDBColumn
+          IsCaptionAssigned = True
+        end
+      end
+    end
+    inherited frViewFiltroBase1: TfrViewFiltroBase
+      inherited TBXDockablePanel1: TTBXDockablePanel
+        inherited dxLayoutControl1: TdxLayoutControl
+          inherited txtFiltroTodo: TcxTextEdit
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+          end
+          inherited edtFechaIniFiltro: TcxDateEdit
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+          end
+          inherited edtFechaFinFiltro: TcxDateEdit
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+          end
+        end
+      end
+    end
+    inherited pnlAgrupaciones: TTBXDockablePanel
+      Top = 277
+      ExplicitTop = 277
+    end
+    inherited dxComponentPrinter: TdxComponentPrinter
+      inherited dxComponentPrinterLink: TdxGridReportLink
+        BuiltInReportLink = True
+      end
+    end
+    inherited cxViewGridPopupMenu: TcxGridPopupMenu
+      PopupMenus = <
+        item
+          GridView = frViewEjercicios1.cxGridView
+          HitTypes = [gvhtCell]
+          Index = 0
+        end>
+    end
+  end
+  inline frViewBarraSeleccion1: TfrViewBarraSeleccion [5]
+    Left = 0
+    Top = 465
+    Width = 543
+    Height = 49
+    Align = alBottom
+    Font.Charset = DEFAULT_CHARSET
+    Font.Color = clWindowText
+    Font.Height = -11
+    Font.Name = 'Tahoma'
+    Font.Style = []
+    ParentFont = False
+    TabOrder = 4
+    ReadOnly = False
+    ExplicitTop = 465
+    ExplicitWidth = 543
+    inherited JvFooter1: TJvFooter
+      Width = 543
+      ExplicitWidth = 543
+      inherited bSeleccionar: TJvFooterBtn
+        Left = 331
+        ExplicitLeft = 444
+      end
+      inherited bCancelar: TJvFooterBtn
+        Left = 435
+        ExplicitLeft = 435
+      end
+    end
+    inherited BarraSeleccionActionList: TActionList
+      inherited actSeleccionar: TAction
+        OnExecute = frViewBarraSeleccion1actSeleccionarExecute
+        OnUpdate = frViewBarraSeleccion1actSeleccionarUpdate
+      end
+      inherited actCancelar: TAction
+        OnExecute = frViewBarraSeleccion1actCancelarExecute
+      end
+    end
+  end
+  inherited EditorActionList: TActionList [6]
+    inherited actNuevo: TAction
+      Enabled = False
+      Visible = False
+    end
+    inherited actModificar: TAction
+      Enabled = False
+      Visible = False
+    end
+    inherited actGuardarCerrar: TAction
+      Visible = False
+    end
+    inherited actGuardar: TAction
+      Visible = False
+    end
+    inherited actEliminar: TAction
+      Enabled = False
+      Visible = False
+    end
+    inherited actRefrescar: TAction
+      Enabled = False
+      Visible = False
+    end
+  end
+  inherited SmallImages: TPngImageList [7]
+  end
+  inherited LargeImages: TPngImageList [8]
+  end
+  inherited JvFormStorage: TJvFormStorage [9]
+  end
+  inherited JvAppRegistryStorage: TJvAppRegistryStorage [10]
+  end
+  inherited dsDataTable: TDADataSource [11]
+  end
+  inherited StatusBarImages: TPngImageList [12]
+  end
+  object EditorSeleccionActionList: TActionList
+    Images = SmallImages
+    Left = 112
+    Top = 152
+    object actBuscar2: TAction
+      Category = 'Buscar'
+      Caption = 'Buscar'
+      ImageIndex = 10
+      ShortCut = 114
+    end
+    object actQuitarFiltro2: TAction
+      Category = 'Buscar'
+      Caption = 'Quitar filtro y ver todo'
+      ImageIndex = 19
+      OnExecute = actQuitarFiltro2Execute
+    end
+    object actAnchoAuto2: TAction
+      Category = 'Ver'
+      Caption = 'Ancho autom'#225'tico'
+      ImageIndex = 21
+      OnExecute = actAnchoAuto2Execute
+    end
+  end
+end
--- a/Source/ApplicationBase/Ejercicios/Views/uEditorElegirEjercicios.pas
+++ b/Source/ApplicationBase/Ejercicios/Views/uEditorElegirEjercicios.pas
@ -0,0 +1,124 @@
+unit uEditorElegirEjercicios;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, uEditorEjercicios, Menus, DB, uDAInterfaces, uDADataTable,
+  JvAppStorage, JvAppRegistryStorage, JvComponentBase, JvFormPlacement, ImgList,
+  PngImageList, StdActns, ActnList, uCustomView, uViewBase, uViewGridBase,
+  uViewGrid, uViewEjercicios, ComCtrls, JvExComCtrls, JvStatusBar, TBX,
+  TB2ExtItems, TBXExtItems, TB2Item, TB2Dock, TB2Toolbar, dxGDIPlusClasses,
+  ExtCtrls, JvExControls, JvNavigationPane, uViewBarraSeleccion, uIEditorElegirEjercicios,
+  UBizEjercicios, JvgWizardHeader;
+
+type
+  TfEditorElegirEjercicios = class(TfEditorEjercicios, IEditorElegirEjercicios)
+    frViewBarraSeleccion1: TfrViewBarraSeleccion;
+    JvgWizardHeader1: TJvgWizardHeader;
+    EditorSeleccionActionList: TActionList;
+    actBuscar2: TAction;
+    actQuitarFiltro2: TAction;
+    actAnchoAuto2: TAction;
+    procedure frViewBarraSeleccion1actSeleccionarExecute(Sender: TObject);
+    procedure frViewBarraSeleccion1actSeleccionarUpdate(Sender: TObject);
+    procedure frViewBarraSeleccion1actCancelarExecute(Sender: TObject);
+    procedure FormShow(Sender: TObject);
+    procedure actAnchoAuto2Execute(Sender: TObject);
+    procedure actQuitarFiltro2Execute(Sender: TObject);
+  private
+
+  protected
+    procedure SetMultiSelect (AValue : Boolean);
+    function GetMultiSelect : Boolean;
+    function GetEjerciciosSeleccionados: IBizEjercicio;
+    procedure SetViewGrid(const Value: IViewGridBase); override;
+    procedure SetMensaje (const AValue: String);
+    function GetMensaje: String;
+  public
+    property Mensaje : String read GetMensaje write SetMensaje;
+    property EjerciciosSeleccionados: IBizEjercicio read GetEjerciciosSeleccionados;
+    property MultiSelect : Boolean read GetMultiSelect write SetMultiSelect;
+  end;
+
+
+implementation
+{$R *.dfm}
+
+uses uGridUtils, uDBSelectionListUtils, uEjerciciosController;
+
+{ TfEditorElegirEjercicios }
+
+procedure TfEditorElegirEjercicios.actAnchoAuto2Execute(Sender: TObject);
+begin
+  inherited;
+  actAnchoAuto.Execute;
+end;
+
+procedure TfEditorElegirEjercicios.actQuitarFiltro2Execute(Sender: TObject);
+begin
+  inherited;
+  actQuitarFiltro.Execute;
+end;
+
+procedure TfEditorElegirEjercicios.FormShow(Sender: TObject);
+begin
+  inherited;
+  EditorActionList.State := asSuspended;
+end;
+
+procedure TfEditorElegirEjercicios.frViewBarraSeleccion1actCancelarExecute(
+  Sender: TObject);
+begin
+  inherited;
+  Close;
+end;
+
+procedure TfEditorElegirEjercicios.frViewBarraSeleccion1actSeleccionarExecute(
+  Sender: TObject);
+begin
+  inherited;
+  ModalResult := mrOk;
+end;
+
+procedure TfEditorElegirEjercicios.frViewBarraSeleccion1actSeleccionarUpdate(
+  Sender: TObject);
+begin
+  inherited;
+  (Sender as TAction).Enabled := (ViewGrid._FocusedView.Controller.SelectedRowCount > 0)
+end;
+
+function TfEditorElegirEjercicios.GetEjerciciosSeleccionados: IBizEjercicio;
+begin
+  SeleccionarFilasDesdeGrid(ViewGrid._FocusedView, (Ejercicios as ISeleccionable).SelectedRecords);
+  // En SelectedRecords tengo los ID de las filas seleccionadas del grid
+  Result := (Controller as IEjerciciosController).ExtraerSeleccionados(Ejercicios) as IBizEjercicio;
+end;
+
+function TfEditorElegirEjercicios.GetMensaje: String;
+begin
+  Result := JvgWizardHeader1.Comments.Text;
+end;
+
+function TfEditorElegirEjercicios.GetMultiSelect: Boolean;
+begin
+  Result := ViewGrid.MultiSelect;
+end;
+
+procedure TfEditorElegirEjercicios.SetMensaje(const AValue: String);
+begin
+  JvgWizardHeader1.Comments.Text := AValue;
+end;
+
+procedure TfEditorElegirEjercicios.SetMultiSelect(AValue: Boolean);
+begin
+  ViewGrid.MultiSelect := AValue;
+end;
+
+procedure TfEditorElegirEjercicios.SetViewGrid(const Value: IViewGridBase);
+begin
+  inherited;
+  ViewGrid.OnDblClick := frViewBarraSeleccion1.actSeleccionar.OnExecute;
+end;
+
+end.
--- a/Source/ApplicationBase/Ejercicios/Views/uEjerciciosViewRegister.pas
+++ b/Source/ApplicationBase/Ejercicios/Views/uEjerciciosViewRegister.pas
@ -8,18 +8,20 @@ procedure UnregisterViews;
 implementation

 uses
-  uEditorRegistryUtils, uEditorEjercicio, uEditorEjercicios;
+  uEditorRegistryUtils, uEditorEjercicio, uEditorEjercicios, uEditorElegirEjercicios;

 procedure RegisterViews;
 begin
  EditorRegistry.RegisterClass(TfEditorEjercicios, 'EditorEjercicios');
  EditorRegistry.RegisterClass(TfEditorEjercicio, 'EditorEjercicio');
+  EditorRegistry.RegisterClass(TfEditorElegirEjercicios, 'EditorElegirEjercicios');
 end;

 procedure UnregisterViews;
 begin
  EditorRegistry.UnRegisterClass(TfEditorEjercicios);
  EditorRegistry.UnRegisterClass(TfEditorEjercicio);
+  EditorRegistry.UnRegisterClass(TfEditorElegirEjercicios);
 end;

 end.
--- a/Source/Base/Base.res
+++ b/Source/Base/Base.res
--- a/Source/Cliente/FactuGES.rc
+++ b/Source/Cliente/FactuGES.rc
@ -1,7 +1,7 @@
 MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Factuges.ico"
 1 VERSIONINFO
-FILEVERSION 2,2,7,0
-PRODUCTVERSION 2,2,7,0
+FILEVERSION 2,2,8,0
+PRODUCTVERSION 2,2,8,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@ -13,10 +13,10 @@ BEGIN
         BLOCK "0C0A04E4"
         BEGIN
              VALUE "CompanyName", "Rodax Software S.L.\0"
-              VALUE "FileVersion", "2.2.7.0\0"
+              VALUE "FileVersion", "2.2.8.0\0"
              VALUE "InternalName", "FactuGES\0"
              VALUE "ProductName", "FactuGES\0"
-              VALUE "ProductVersion", "2.2.7.0\0"
+              VALUE "ProductVersion", "2.2.8.0\0"
         END
    END
    BLOCK "VarFileInfo"
--- a/Source/Cliente/FactuGES.res
+++ b/Source/Cliente/FactuGES.res
--- a/Source/GUIBase/uViewTotales.dfm
+++ b/Source/GUIBase/uViewTotales.dfm
@ -1,14 +1,14 @@
 inherited frViewTotales: TfrViewTotales
-  Width = 451
-  Height = 220
+  Width = 888
+  Height = 210
  Align = alBottom
-  ExplicitWidth = 451
-  ExplicitHeight = 220
+  ExplicitWidth = 870
+  ExplicitHeight = 210
  object dxLayoutControl1: TdxLayoutControl
    AlignWithMargins = True
    Left = 0
    Top = 0
-    Width = 451
+    Width = 888
    Height = 217
    Margins.Left = 0
    Margins.Top = 0
@ -19,37 +19,30 @@ inherited frViewTotales: TfrViewTotales
    TabOrder = 0
    TabStop = False
    AutoContentSizes = [acsWidth, acsHeight]
-    object Bevel1: TBevel
-      Left = 104
-      Top = 109
-      Width = 73
-      Height = 9
-      Shape = bsBottomLine
-    end
+    ExplicitWidth = 451
    object Bevel3: TBevel
-      Left = 278
+      Left = 436
      Top = 28
      Width = 3
      Height = 122
      Shape = bsRightLine
    end
    object Bevel4: TBevel
-      Left = 390
-      Top = 109
-      Width = 192
+      Left = 548
+      Top = 70
+      Width = 210
      Height = 9
      Shape = bsBottomLine
    end
    object ImporteDto: TcxDBCurrencyEdit
      Left = 175
-      Top = 129
+      Top = 55
      AutoSize = False
      DataBinding.DataField = 'IMPORTE_DESCUENTO'
      DataBinding.DataSource = DADataSource
-      Enabled = False
      ParentFont = False
      Properties.Alignment.Horz = taRightJustify
-	  Properties.DisplayFormat = '-,0.00 '#8364';,0.00 '#8364
+      Properties.DisplayFormat = '-,0.00 '#8364';,0.00 '#8364
      Properties.ReadOnly = True
      Properties.UseLeftAlignmentOnEditing = False
      Properties.UseThousandSeparator = True
@ -62,19 +55,23 @@ inherited frViewTotales: TfrViewTotales
      Style.Font.Style = []
      Style.HotTrack = False
      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
      Style.TextColor = clWindowText
      Style.IsFontAssigned = True
      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
      StyleDisabled.TextColor = clWindowText
      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
      StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 5
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 2
      Height = 21
      Width = 93
    end
    object ImporteIVA: TcxDBCurrencyEdit
-      Left = 461
-      Top = 55
+      Left = 619
+      Top = 105
      AutoSize = False
      DataBinding.DataField = 'IMPORTE_IVA'
      DataBinding.DataSource = DADataSource
@ -93,19 +90,23 @@ inherited frViewTotales: TfrViewTotales
      Style.Font.Style = []
      Style.HotTrack = False
      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
      Style.TextColor = clWindowText
      Style.IsFontAssigned = True
      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
      StyleDisabled.TextColor = clWindowText
      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
      StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
      TabOrder = 9
      Height = 21
      Width = 137
    end
    object ImporteTotal: TcxDBCurrencyEdit
-      Left = 391
-      Top = 129
+      Left = 549
+      Top = 159
      AutoSize = False
      DataBinding.DataField = 'IMPORTE_TOTAL'
      DataBinding.DataSource = DADataSource
@ -124,20 +125,24 @@ inherited frViewTotales: TfrViewTotales
      Style.Font.Style = []
      Style.HotTrack = False
      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
      Style.TextColor = clActiveCaption
      Style.TextStyle = [fsBold]
      Style.IsFontAssigned = True
      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
      StyleDisabled.TextColor = clWindowText
      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
      StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
      TabOrder = 12
      Height = 21
      Width = 137
    end
    object edtDescuento: TcxDBSpinEdit
      Left = 104
-      Top = 129
+      Top = 55
      AutoSize = False
      DataBinding.DataField = 'DESCUENTO'
      DataBinding.DataSource = DADataSource
@ -155,19 +160,23 @@ inherited frViewTotales: TfrViewTotales
      Style.Font.Style = []
      Style.HotTrack = False
      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
      Style.TextColor = clWindowText
      Style.ButtonStyle = bts3D
      Style.IsFontAssigned = True
      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
      StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 4
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 1
      Height = 21
      Width = 65
    end
    object edtIVA: TcxDBSpinEdit
-      Left = 390
-      Top = 55
+      Left = 548
+      Top = 105
      AutoSize = False
      DataBinding.DataField = 'IVA'
      DataBinding.DataSource = DADataSource
@ -188,27 +197,30 @@ inherited frViewTotales: TfrViewTotales
      Style.HotTrack = False
      Style.LookAndFeel.Kind = lfStandard
      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
      Style.TextColor = clWindowText
      Style.ButtonStyle = bts3D
      Style.IsFontAssigned = True
      StyleDisabled.LookAndFeel.Kind = lfStandard
      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
      StyleDisabled.TextColor = clWindowText
      StyleFocused.LookAndFeel.Kind = lfStandard
      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
      StyleHot.LookAndFeel.Kind = lfStandard
      StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
      TabOrder = 8
      Height = 21
      Width = 65
    end
    object ImporteBase: TcxDBCurrencyEdit
-      Left = 390
+      Left = 548
      Top = 28
      AutoSize = False
      DataBinding.DataField = 'BASE_IMPONIBLE'
      DataBinding.DataSource = DADataSource
-      Enabled = False
      ParentFont = False
      Properties.Alignment.Horz = taRightJustify
      Properties.ReadOnly = True
@ -223,19 +235,23 @@ inherited frViewTotales: TfrViewTotales
      Style.Font.Style = [fsBold]
      Style.HotTrack = False
      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
      Style.TextColor = clWindowText
      Style.IsFontAssigned = True
      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
      StyleDisabled.TextColor = clWindowText
      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
      StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
      TabOrder = 7
      Height = 21
      Width = 92
    end
    object edtRE: TcxDBSpinEdit
-      Left = 390
-      Top = 82
+      Left = 548
+      Top = 132
      AutoSize = False
      DataBinding.DataField = 'RE'
      DataBinding.DataSource = DADataSource
@ -256,23 +272,27 @@ inherited frViewTotales: TfrViewTotales
      Style.HotTrack = False
      Style.LookAndFeel.Kind = lfStandard
      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
      Style.TextColor = clWindowText
      Style.ButtonStyle = bts3D
      Style.IsFontAssigned = True
      StyleDisabled.LookAndFeel.Kind = lfStandard
      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
      StyleDisabled.TextColor = clWindowText
      StyleFocused.LookAndFeel.Kind = lfStandard
      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
      StyleHot.LookAndFeel.Kind = lfStandard
      StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
      TabOrder = 10
      Height = 21
      Width = 65
    end
    object ImporteRE: TcxDBCurrencyEdit
-      Left = 461
-      Top = 82
+      Left = 619
+      Top = 132
      AutoSize = False
      DataBinding.DataField = 'IMPORTE_RE'
      DataBinding.DataSource = DADataSource
@ -291,12 +311,16 @@ inherited frViewTotales: TfrViewTotales
      Style.Font.Style = []
      Style.HotTrack = False
      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
      Style.TextColor = clWindowText
      Style.IsFontAssigned = True
      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
      StyleDisabled.TextColor = clWindowText
      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
      StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
      TabOrder = 11
      Height = 21
      Width = 56
@ -322,19 +346,23 @@ inherited frViewTotales: TfrViewTotales
      Style.Font.Style = [fsBold]
      Style.HotTrack = False
      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
      Style.TextColor = clWindowText
      Style.IsFontAssigned = True
      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
      StyleDisabled.TextColor = clWindowText
      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
      StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
      TabOrder = 0
      Height = 21
      Width = 147
    end
    object ePorte: TcxDBCurrencyEdit
      Left = 104
-      Top = 156
+      Top = 82
      AutoSize = False
      DataBinding.DataField = 'IMPORTE_PORTE'
      DataBinding.DataSource = DADataSource
@ -352,19 +380,23 @@ inherited frViewTotales: TfrViewTotales
      Style.Font.Style = []
      Style.HotTrack = False
      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
      Style.TextColor = clWindowText
      Style.IsFontAssigned = True
      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
      StyleDisabled.TextColor = clWindowText
      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
      StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 6
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 3
      Height = 21
      Width = 147
    end
    object eIVA: TcxDBLookupComboBox
      Left = 104
-      Top = 55
+      Top = 109
      DataBinding.DataField = 'ID_TIPO_IVA'
      DataBinding.DataSource = DADataSource
      Properties.DropDownListStyle = lsFixedList
@ -383,28 +415,32 @@ inherited frViewTotales: TfrViewTotales
      Style.HotTrack = False
      Style.LookAndFeel.Kind = lfStandard
      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
      Style.ButtonStyle = bts3D
      Style.PopupBorderStyle = epbsFrame3D
      StyleDisabled.LookAndFeel.Kind = lfStandard
      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
      StyleFocused.LookAndFeel.Kind = lfStandard
      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
      StyleHot.LookAndFeel.Kind = lfStandard
      StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 1
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 4
      Width = 81
    end
    object bTiposIVA: TButton
-      Left = 130
-      Top = 55
+      Left = 288
+      Top = 109
      Width = 132
      Height = 21
      Caption = 'Ver los tipos de IVA...'
-      TabOrder = 2
+      TabOrder = 5
    end
    object cbRecargoEquivalencia: TcxDBCheckBox
      Left = 104
-      Top = 82
+      Top = 136
      Caption = 'Aplicar recargo de equivalencia'
      DataBinding.DataField = 'RECARGO_EQUIVALENCIA'
      DataBinding.DataSource = DADataSource
@ -419,13 +455,17 @@ inherited frViewTotales: TfrViewTotales
      Style.HotTrack = False
      Style.LookAndFeel.Kind = lfStandard
      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
      StyleDisabled.LookAndFeel.Kind = lfStandard
      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
      StyleFocused.LookAndFeel.Kind = lfStandard
      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
      StyleHot.LookAndFeel.Kind = lfStandard
      StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 3
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 6
      Width = 219
    end
    object dxLayoutControl1Group_Root: TdxLayoutGroup
@ -448,6 +488,38 @@ inherited frViewTotales: TfrViewTotales
            Control = eImporteNeto
            ControlOptions.ShowBorder = False
          end
+          object dxLayoutControl1Group7: TdxLayoutGroup
+            ShowCaption = False
+            Hidden = True
+            ShowBorder = False
+            object dxLayoutControl1Group10: TdxLayoutGroup
+              ShowCaption = False
+              Hidden = True
+              LayoutDirection = ldHorizontal
+              ShowBorder = False
+              object dxLayoutControl1Item4: TdxLayoutItem
+                AutoAligns = [aaVertical]
+                Caption = 'Descuento (%):'
+                Control = edtDescuento
+                ControlOptions.ShowBorder = False
+              end
+              object dxLayoutControl1Item1: TdxLayoutItem
+                AutoAligns = [aaVertical]
+                AlignHorz = ahClient
+                Caption = 'Importe de dto:'
+                ShowCaption = False
+                Control = ImporteDto
+                ControlOptions.ShowBorder = False
+              end
+            end
+            object dxLayoutControl1Item9: TdxLayoutItem
+              AutoAligns = [aaVertical]
+              AlignHorz = ahClient
+              Caption = 'Porte:'
+              Control = ePorte
+              ControlOptions.ShowBorder = False
+            end
+          end
          object dxLayoutControl1Group6: TdxLayoutGroup
            ShowCaption = False
            Hidden = True
@ -473,38 +545,6 @@ inherited frViewTotales: TfrViewTotales
            Control = cbRecargoEquivalencia
            ControlOptions.ShowBorder = False
          end
-          object dxLayoutControl1Item10: TdxLayoutItem
-            Caption = ' '
-            Control = Bevel1
-            ControlOptions.ShowBorder = False
-          end
-          object dxLayoutControl1Group7: TdxLayoutGroup
-            ShowCaption = False
-            Hidden = True
-            LayoutDirection = ldHorizontal
-            ShowBorder = False
-            object dxLayoutControl1Item4: TdxLayoutItem
-              AutoAligns = [aaVertical]
-              Caption = 'Descuento (%):'
-              Control = edtDescuento
-              ControlOptions.ShowBorder = False
-            end
-            object dxLayoutControl1Item1: TdxLayoutItem
-              AutoAligns = [aaVertical]
-              AlignHorz = ahClient
-              Caption = 'Importe de dto:'
-              ShowCaption = False
-              Control = ImporteDto
-              ControlOptions.ShowBorder = False
-            end
-          end
-          object dxLayoutControl1Item9: TdxLayoutItem
-            AutoAligns = [aaVertical]
-            AlignHorz = ahClient
-            Caption = 'Porte:'
-            Control = ePorte
-            ControlOptions.ShowBorder = False
-          end
        end
        object dxLayoutControl1Group5: TdxLayoutGroup
          AutoAligns = [aaVertical]
@ -529,12 +569,26 @@ inherited frViewTotales: TfrViewTotales
            ShowCaption = False
            Hidden = True
            ShowBorder = False
-            object dxLayoutControl1Item12: TdxLayoutItem
-              AutoAligns = [aaVertical]
-              AlignHorz = ahClient
-              Caption = 'Base imponible:'
-              Control = ImporteBase
-              ControlOptions.ShowBorder = False
+            object dxLayoutControl1Group11: TdxLayoutGroup
+              ShowCaption = False
+              Hidden = True
+              ShowBorder = False
+              object dxLayoutControl1Item12: TdxLayoutItem
+                AutoAligns = [aaVertical]
+                AlignHorz = ahClient
+                Caption = 'Base imponible:'
+                Control = ImporteBase
+                ControlOptions.ShowBorder = False
+              end
+              object dxLayoutControl1Item14: TdxLayoutItem
+                AutoAligns = [aaVertical]
+                AlignHorz = ahClient
+                Caption = ' '
+                Offsets.Bottom = 15
+                Offsets.Top = 15
+                Control = Bevel4
+                ControlOptions.ShowBorder = False
+              end
            end
            object dxLayoutControl1Group9: TdxLayoutGroup
              ShowCaption = False
@ -579,13 +633,6 @@ inherited frViewTotales: TfrViewTotales
                ControlOptions.ShowBorder = False
              end
            end
-            object dxLayoutControl1Item14: TdxLayoutItem
-              AutoAligns = [aaVertical]
-              AlignHorz = ahClient
-              Caption = ' '
-              Control = Bevel4
-              ControlOptions.ShowBorder = False
-            end
            object dxLayoutControl1Item3: TdxLayoutItem
              AutoAligns = [aaVertical]
              AlignHorz = ahClient
--- a/Source/GUIBase/uViewTotales.pas
+++ b/Source/GUIBase/uViewTotales.pas
@ -39,8 +39,6 @@ type
    dxLayoutControl1Item9: TdxLayoutItem;
    ePorte: TcxDBCurrencyEdit;
    dxLayoutControl1Group2: TdxLayoutGroup;
-    Bevel1: TBevel;
-    dxLayoutControl1Item10: TdxLayoutItem;
    dxLayoutControl1Group7: TdxLayoutGroup;
    Bevel3: TBevel;
    dxLayoutControl1Item13: TdxLayoutItem;
@ -59,6 +57,8 @@ type
    dsTiposIVA: TDADataSource;
    dxLayoutControl1Item16: TdxLayoutItem;
    cbRecargoEquivalencia: TcxDBCheckBox;
+    dxLayoutControl1Group10: TdxLayoutGroup;
+    dxLayoutControl1Group11: TdxLayoutGroup;
  public
    { Public declarations }
  end;
--- a/Source/Modulos/Contabilidad/Views/uEditorElegirSubCuentas.dfm
+++ b/Source/Modulos/Contabilidad/Views/uEditorElegirSubCuentas.dfm
@ -1,13 +1,14 @@
 inherited fEditorElegirSubCuentas: TfEditorElegirSubCuentas
  Caption = 'Seleccionar subcuenta'
-  ClientWidth = 656
-  ExplicitWidth = 664
+  ClientWidth = 851
+  ExplicitWidth = 859
+  ExplicitHeight = 478
  PixelsPerInch = 96
  TextHeight = 13
  object JvgWizardHeader1: TJvgWizardHeader [0]
    Left = 0
    Top = 27
-    Width = 656
+    Width = 851
    Height = 60
    CaptionFont.Charset = DEFAULT_CHARSET
    CaptionFont.Color = clWindowText
@ -34,25 +35,26 @@ inherited fEditorElegirSubCuentas: TfEditorElegirSubCuentas
    Gradient.Orientation = fgdVertical
    BufferedDraw = False
    ExplicitTop = 16
+    ExplicitWidth = 656
  end
  inherited JvNavPanelHeader: TJvNavPanelHeader
-    Width = 656
+    Width = 851
    Caption = 'Lista de subcuentas'
    Visible = False
-    ExplicitWidth = 656
+    ExplicitWidth = 851
    inherited Image1: TImage
-      Left = 629
+      Left = 824
      ExplicitLeft = 629
    end
  end
  inherited TBXDock: TTBXDock
    Top = 87
-    Width = 656
+    Width = 851
    ExplicitTop = 87
-    ExplicitWidth = 656
+    ExplicitWidth = 851
    inherited tbxMain: TTBXToolbar
      Align = alRight
-      ExplicitWidth = 126
+      ExplicitWidth = 269
      inherited TBXItem2: TTBXItem
        Visible = False
      end
@ -70,29 +72,29 @@ inherited fEditorElegirSubCuentas: TfEditorElegirSubCuentas
      end
    end
    inherited tbxFiltro: TTBXToolbar
-      Left = 126
+      Left = 269
      Top = 23
      DockPos = 115
      DockRow = 1
-      ExplicitLeft = 126
+      ExplicitLeft = 269
      ExplicitTop = 23
      inherited TBXItem34: TTBXItem
        Action = actQuitarFiltro2
      end
    end
    inherited tbxMenu: TTBXToolbar
-      ExplicitWidth = 656
+      ExplicitWidth = 851
    end
  end
  inherited StatusBar: TJvStatusBar
-    Width = 656
+    Width = 851
    Visible = False
-    ExplicitWidth = 656
+    ExplicitWidth = 851
  end
  inline frViewBarraSeleccion1: TfrViewBarraSeleccion [4]
    Left = 0
    Top = 376
-    Width = 656
+    Width = 851
    Height = 49
    Align = alBottom
    Font.Charset = DEFAULT_CHARSET
@ -104,17 +106,17 @@ inherited fEditorElegirSubCuentas: TfEditorElegirSubCuentas
    TabOrder = 4
    ReadOnly = False
    ExplicitTop = 376
-    ExplicitWidth = 656
+    ExplicitWidth = 851
    inherited JvFooter1: TJvFooter
-      Width = 656
-      ExplicitWidth = 656
+      Width = 851
+      ExplicitWidth = 851
      inherited bSeleccionar: TJvFooterBtn
-        Left = 444
+        Left = 639
        ExplicitLeft = 444
      end
      inherited bCancelar: TJvFooterBtn
-        Left = 548
-        ExplicitLeft = 548
+        Left = 743
+        ExplicitLeft = 743
      end
    end
    inherited BarraSeleccionActionList: TActionList
@ -129,15 +131,15 @@ inherited fEditorElegirSubCuentas: TfEditorElegirSubCuentas
  end
  inherited frViewSubCuentas1: TfrViewSubCuentas [5]
    Top = 162
-    Width = 656
+    Width = 851
    Height = 214
    ExplicitTop = 162
-    ExplicitWidth = 656
+    ExplicitWidth = 851
    ExplicitHeight = 214
    inherited cxGrid: TcxGrid
-      Width = 656
+      Width = 851
      Height = 86
-      ExplicitWidth = 656
+      ExplicitWidth = 851
      ExplicitHeight = 86
      inherited cxGridView: TcxGridDBTableView
        DataController.Summary.DefaultGroupSummaryItems = <
@ -157,34 +159,42 @@ inherited fEditorElegirSubCuentas: TfEditorElegirSubCuentas
      end
    end
    inherited frViewFiltroBase1: TfrViewFiltroBase
-      Width = 656
-      ExplicitWidth = 656
+      Width = 851
+      ExplicitWidth = 851
      inherited TBXDockablePanel1: TTBXDockablePanel
-        ExplicitWidth = 656
+        ExplicitWidth = 851
        inherited dxLayoutControl1: TdxLayoutControl
-          Width = 656
-          ExplicitWidth = 656
+          Width = 851
+          ExplicitWidth = 851
          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
-            ExplicitLeft = 225
+            Left = 372
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 372
            ExplicitWidth = 421
            Width = 421
          end
        end
        inherited TBXAlignmentPanel1: TTBXAlignmentPanel
-          Width = 656
-          ExplicitWidth = 656
+          Width = 851
+          ExplicitWidth = 851
          inherited tbxBotones: TTBXToolbar
-            Width = 646
-            ExplicitWidth = 646
+            Width = 841
+            ExplicitWidth = 841
          end
        end
      end
@ -192,13 +202,13 @@ inherited fEditorElegirSubCuentas: TfEditorElegirSubCuentas
    inherited pnlAgrupaciones: TTBXDockablePanel
      Top = 188
      ExplicitTop = 188
-      ExplicitWidth = 656
+      ExplicitWidth = 851
      inherited TBXAlignmentPanel1: TTBXAlignmentPanel
-        Width = 656
-        ExplicitWidth = 656
+        Width = 851
+        ExplicitWidth = 851
        inherited TBXToolbar1: TTBXToolbar
-          Width = 646
-          ExplicitWidth = 646
+          Width = 841
+          ExplicitWidth = 841
        end
      end
    end
--- a/Source/Modulos/Contabilidad/Views/uEditorElegirSubCuentas.pas
+++ b/Source/Modulos/Contabilidad/Views/uEditorElegirSubCuentas.pas
@ -12,7 +12,7 @@ uses
  JvNavigationPane, uViewBarraSeleccion, JvgWizardHeader, StdCtrls,
  uBizSubCuentas, uIEditorElegirSubCuentas,
  JvExComCtrls, JvStatusBar, uEditorSubCuentas, uViewSubCuentas,
-  JSDialog, uDAInterfaces;
+  JSDialog, uDAInterfaces, dxGDIPlusClasses;

 type
  TfEditorElegirSubCuentas = class(TfEditorSubCuentas, IEditorElegirSubCuentas)
--- a/Source/Servicios/FactuGES.RODL
+++ b/Source/Servicios/FactuGES.RODL
@ -390,6 +390,16 @@
 </Parameter>
 </Parameters>
 </Operation>
+<Operation Name="CerrarEjercicio" UID="{4F2DC535-F250-45BB-82BA-64EDB04CD397}">
+<Parameters>
+<Parameter Name="Result" DataType="Boolean" Flag="Result">
+</Parameter>
+<Parameter Name="ID_EJERCICIO_CIERRE" DataType="Integer" Flag="In" >
+</Parameter>
+<Parameter Name="ID_EJERCICIO_APERTURA" DataType="Integer" Flag="In" >
+</Parameter>
+</Parameters>
+</Operation>
 </Operations>
 </Interface>
 </Interfaces>
--- a/Source/Servicios/FactuGES_Intf.pas
+++ b/Source/Servicios/FactuGES_Intf.pas
@ -624,6 +624,7 @@ type
    ['{E99052D5-4ED9-480C-B4D4-384E8C6E4B08}']
    function GenerarPGC(const ID_EJERCICIO_COPIA: Integer; const ID_EJERCICIO: Integer): Boolean;
    function darEjercicioActivo(const ID_EMPRESA: Integer): Integer;
+    function CerrarEjercicio(const ID_EJERCICIO_CIERRE: Integer; const ID_EJERCICIO_APERTURA: Integer): Boolean;
  end;

  { CosrvEjercicios }
@ -638,6 +639,7 @@ type

    function GenerarPGC(const ID_EJERCICIO_COPIA: Integer; const ID_EJERCICIO: Integer): Boolean;
    function darEjercicioActivo(const ID_EMPRESA: Integer): Integer;
+    function CerrarEjercicio(const ID_EJERCICIO_CIERRE: Integer; const ID_EJERCICIO_APERTURA: Integer): Boolean;
  end;

  { IsrvReferencias }
@ -1949,6 +1951,23 @@ begin
  end
 end;

+function TsrvEjercicios_Proxy.CerrarEjercicio(const ID_EJERCICIO_CIERRE: Integer; const ID_EJERCICIO_APERTURA: Integer): Boolean;
+begin
+  try
+    __Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'CerrarEjercicio');
+    __Message.Write('ID_EJERCICIO_CIERRE', TypeInfo(Integer), ID_EJERCICIO_CIERRE, []);
+    __Message.Write('ID_EJERCICIO_APERTURA', TypeInfo(Integer), ID_EJERCICIO_APERTURA, []);
+    __Message.Finalize;
+
+    __TransportChannel.Dispatch(__Message);
+
+    __Message.Read('Result', TypeInfo(Boolean), result, []);
+  finally
+    __Message.UnsetAttributes(__TransportChannel);
+    __Message.FreeStream;
+  end
+end;
+
 { CosrvReferencias }

 class function CosrvReferencias.Create(const aMessage: IROMessage; aTransportChannel: IROTransportChannel): IsrvReferencias;
--- a/Source/Servicios/FactuGES_Invk.pas
+++ b/Source/Servicios/FactuGES_Invk.pas
@ -180,6 +180,7 @@ type
  published
    procedure Invoke_GenerarPGC(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
    procedure Invoke_darEjercicioActivo(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
+    procedure Invoke_CerrarEjercicio(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
  end;

  TsrvReferencias_Invoker = class(TDataAbstractService_Invoker)
@ -904,6 +905,28 @@ begin
  end;
 end;

+procedure TsrvEjercicios_Invoker.Invoke_CerrarEjercicio(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
+{ function CerrarEjercicio(const ID_EJERCICIO_CIERRE: Integer; const ID_EJERCICIO_APERTURA: Integer): Boolean; }
+var
+  ID_EJERCICIO_CIERRE: Integer;
+  ID_EJERCICIO_APERTURA: Integer;
+  lResult: Boolean;
+begin
+  try
+    __Message.Read('ID_EJERCICIO_CIERRE', TypeInfo(Integer), ID_EJERCICIO_CIERRE, []);
+    __Message.Read('ID_EJERCICIO_APERTURA', TypeInfo(Integer), ID_EJERCICIO_APERTURA, []);
+
+    lResult := (__Instance as IsrvEjercicios).CerrarEjercicio(ID_EJERCICIO_CIERRE, ID_EJERCICIO_APERTURA);
+
+    __Message.InitializeResponseMessage(__Transport, 'FactuGES', 'srvEjercicios', 'CerrarEjercicioResponse');
+    __Message.Write('Result', TypeInfo(Boolean), lResult, []);
+    __Message.Finalize;
+    __Message.UnsetAttributes(__Transport);
+
+  finally
+  end;
+end;
+
 { TsrvReferencias_Invoker }

 procedure TsrvReferencias_Invoker.Invoke_DarNuevaReferencia(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
--- a/Source/Servicios/RODLFILE.res
+++ b/Source/Servicios/RODLFILE.res
--- a/Source/Servidor/FactuGES_Server.RES
+++ b/Source/Servidor/FactuGES_Server.RES
--- a/Source/Servidor/FactuGES_Server.dproj
+++ b/Source/Servidor/FactuGES_Server.dproj
@ -1,286 +1,284 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
-    <MainSource>FactuGES_Server.dpr</MainSource>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
-    <DCC_DependencyCheckOutputName>..\..\Output\Debug\Servidor\FactuGES_Server.exe</DCC_DependencyCheckOutputName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <Version>7.0</Version>
-    <DCC_DebugInformation>False</DCC_DebugInformation>
-    <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
-    <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
-    <DCC_MapFile>3</DCC_MapFile>
-    <DCC_ExeOutput>..\..\Output\Release\Servidor</DCC_ExeOutput>
-    <DCC_Define>RELEASE</DCC_Define>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <Version>7.0</Version>
-    <DCC_MapFile>3</DCC_MapFile>
-    <DCC_ExeOutput>..\..\Output\Debug\Servidor</DCC_ExeOutput>
-    <DCC_Define>DEBUG;</DCC_Define>
-    <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
-  </PropertyGroup>
-  <ProjectExtensions>
-    <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">2</VersionInfo><VersionInfo Name="Release">8</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.2.8.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.2.8.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">jueves, 08 de enero de 2009 20:14</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
-      
-      
-      <Excluded_Packages Name="C:\Archivos de programa\RemObjects Software\Pascal Script\Dcu\D10\PascalScript_RO_D10.bpl">RemObjects Pascal Script - RemObjects SDK 3.0 Integration</Excluded_Packages>
-    </Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
-  </ProjectExtensions>
-  <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
-  <ItemGroup>
-    <DelphiCompile Include="FactuGES_Server.dpr">
-      <MainSource>MainSource</MainSource>
-    </DelphiCompile>
-    <DCCReference Include="..\ApplicationBase\Ejercicios\Model\schEjerciciosClient_Intf.pas" />
-    <DCCReference Include="..\ApplicationBase\Ejercicios\Model\schEjerciciosServer_Intf.pas" />
-    <DCCReference Include="..\ApplicationBase\Ejercicios\Model\uBizEjerciciosServer.pas" />
-    <DCCReference Include="..\ApplicationBase\Ejercicios\Servidor\srvEjercicios_Impl.pas">
-      <Form>srvEjercicios</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas" />
-    <DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas" />
-    <DCCReference Include="..\ApplicationBase\Empresas\Servidor\srvEmpresas_Impl.pas">
-      <Form>srvEmpresas</Form>
-      <DesignClass>TDARemoteService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\ApplicationBase\ProvinciasPoblaciones\Servidor\srvProvinciasPoblaciones_Impl.pas">
-      <Form>srvProvinciasPoblaciones</Form>
-      <DesignClass>TRORemoteDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosClient_Intf.pas" />
-    <DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosServer_Intf.pas" />
-    <DCCReference Include="..\ApplicationBase\Usuarios\Servidor\srvUsuarios_Impl.pas" />
-    <DCCReference Include="..\Base\schBase_Intf.pas" />
-    <DCCReference Include="..\Base\Utiles\uSistemaFunc.pas" />
-    <DCCReference Include="..\Base\Utiles\uStringsUtils.pas" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Model\uBizAlbaranClienteServer.pas" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Reports\uRptAlbaranesCliente_Server.pas" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Servidor\srvAlbaranesCliente_Impl.pas">
-      <Form>srvAlbaranesCliente</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\Model\uBizAlbaranProveedorServer.PAS" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\Servidor\srvAlbaranesProveedor_Impl.pas">
-      <Form>srvAlbaranesProveedor</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Almacenes\Servidor\srvAlmacenes_Impl.pas">
-      <Form>srvAlmacenes</Form>
-      <DesignClass>TDARemoteService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Articulos\Model\schArticulosClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Articulos\Model\schArticulosServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Articulos\Servidor\srvArticulos_Impl.pas" />
-    <DCCReference Include="..\Modulos\Comisiones\Model\schComisionesClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Comisiones\Model\schComisionesServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Comisiones\Model\uBizComisionesServer.pas" />
-    <DCCReference Include="..\Modulos\Comisiones\Reports\uRptComisiones_Server.pas">
-      <Form>RptComisiones</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Comisiones\Servidor\srvComisiones_Impl.pas">
-      <Form>srvComisiones</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Contabilidad\Model\schContabilidadClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Contabilidad\Model\schContabilidadServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Contabilidad\Model\uBizAsientosServer.pas" />
-    <DCCReference Include="..\Modulos\Contabilidad\Servidor\srvContabilidad_Impl.pas">
-      <Form>srvContabilidad</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Contactos\Model\schContactosClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Contactos\Model\schContactosServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Contactos\Model\uBizClientesServer.pas" />
-    <DCCReference Include="..\Modulos\Contactos\Model\uBizContactosServer.pas" />
-    <DCCReference Include="..\Modulos\Contactos\Model\uBizProveedoresServer.pas" />
-    <DCCReference Include="..\Modulos\Contactos\Model\uBizVendedoresServer.pas" />
-    <DCCReference Include="..\Modulos\Contactos\Reports\uRptEtiquetasContacto_Server.pas">
-      <Form>RptEtiquetasContacto</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Contactos\Servidor\srvContactos_Impl.pas">
-      <Form>srvContactos</Form>
-      <DesignClass>TDARemoteService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\Model\uBizFacturasClienteServer.pas" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\Reports\uRptFacturasCliente_Server.pas">
-      <Form>RptFacturasCliente</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Facturas de cliente\Servidor\srvFacturasCliente_Impl.pas">
-      <Form>srvFacturasCliente</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\Model\uBizFacturasProveedorServer.pas" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\Reports\uRptFacturasProveedor_Server.pas">
-      <Form>RptFacturasProveedor</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Facturas de proveedor\Servidor\srvFacturasProveedor_Impl.pas">
-      <Form>srvFacturasProveedor</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Familias\Model\schFamiliasClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Familias\Model\schFamiliasServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Familias\Servidor\srvFamilias_Impl.pas" />
-    <DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Formas de pago\Servidor\srvFormasPago_Impl.pas" />
-    <DCCReference Include="..\Modulos\Gestion de documentos\Servidor\srvGestorDocumentos_Impl.pas">
-      <Form>srvGestorDocumentos</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Gestor de informes\Servidor\srvGestorInformes_Impl.pas">
-      <Form>srvGestorInformes</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Historico de movimientos\Servidor\srvHistoricoMovimientos_Impl.pas">
-      <Form>srvHistoricoMovimientos</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Inventario\Model\schInventarioClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Inventario\Model\schInventarioServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Inventario\Servidor\srvInventario_Impl.pas">
-      <Form>srvInventario</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\uBizPedidosProveedorServer.pas" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Servidor\srvPedidosProveedor_Impl.pas">
-      <Form>srvPedidosProveedor</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Model\uBizPresupuestosClienteServer.pas" />
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptPresupuestosCliente_Server.pas">
-      <Form>RptPresupuestosCliente</Form>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Servidor\srvPresupuestosCliente_Impl.pas">
-      <Form>srvPresupuestosCliente</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\Model\uBizPagosClienteServer.pas" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\Model\uBizRecibosClienteServer.pas" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\Reports\uRptRecibosCliente_Server.pas">
-      <Form>RptRecibosCliente</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Recibos de cliente\Servidor\srvRecibosCliente_Impl.pas">
-      <Form>srvRecibosCliente</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Recibos de proveedor\Model\uBizPagosProveedorServer.pas" />
-    <DCCReference Include="..\Modulos\Recibos de proveedor\Model\uBizRecibosProveedorServer.pas" />
-    <DCCReference Include="..\Modulos\Recibos de proveedor\Reports\uRptRecibosProveedor_Server.pas">
-      <Form>RptRecibosProveedor</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Recibos de proveedor\Servidor\srvRecibosProveedor_Impl.pas">
-      <Form>srvRecibosProveedor</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Referencias\Model\schReferenciasClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Referencias\Model\schReferenciasServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Referencias\Servidor\srvReferencias_Impl.pas">
-      <Form>srvReferencias</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Remesas de cliente\Model\uBizRemesasClienteServer.pas" />
-    <DCCReference Include="..\Modulos\Remesas de cliente\Servidor\srvRemesasCliente_Impl.pas">
-      <Form>srvRemesasCliente</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Remesas de proveedor\Model\uBizRemesasProveedorServer.pas" />
-    <DCCReference Include="..\Modulos\Remesas de proveedor\Servidor\srvRemesasProveedor_Impl.pas">
-      <Form>srvRemesasProveedor</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Tipos de IVA\Servidor\srvTiposIVA_Impl.pas" />
-    <DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Unidades de medida\Servidor\srvUnidadesMedida_Impl.pas">
-      <Form>srvUnidadesMedida</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
-    <DCCReference Include="..\Servicios\FactuGES_Invk.pas" />
-    <DCCReference Include="Configuracion\srvConfiguracion_Impl.pas">
-      <Form>srvConfiguracion</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="Configuracion\uConexionBD.pas">
-      <Form>frConexionBD</Form>
-      <DesignClass>TFrame</DesignClass>
-    </DCCReference>
-    <DCCReference Include="Configuracion\uConfGeneral.pas">
-      <Form>frConfGeneral</Form>
-      <DesignClass>TFrame</DesignClass>
-    </DCCReference>
-    <DCCReference Include="Configuracion\uConfiguracion.pas">
-      <Form>fConfiguracion</Form>
-      <DesignClass>TForm</DesignClass>
-    </DCCReference>
-    <DCCReference Include="Configuracion\uFrameConfiguracion.pas">
-      <Form>FrameConfiguracion</Form>
-      <DesignClass>TFrame</DesignClass>
-    </DCCReference>
-    <DCCReference Include="srvLogin_Impl.pas">
-      <Form>srvLogin</Form>
-      <DesignClass>TDARemoteService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="uAcercaDe.pas">
-      <Form>fAcercaDe</Form>
-    </DCCReference>
-    <DCCReference Include="uDataModuleServer.pas">
-      <Form>dmServer</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="uServerMainForm.pas">
-      <Form>fServerForm</Form>
-    </DCCReference>
-    <DCCReference Include="Utiles\RegExpr.pas" />
-    <DCCReference Include="Utiles\uBusinessUtils.pas" />
-    <DCCReference Include="Utiles\uDatabaseUtils.pas" />
-    <DCCReference Include="Utiles\uReferenciasUtils.pas" />
-    <DCCReference Include="Utiles\uRestriccionesUsuarioUtils.pas" />
-    <DCCReference Include="Utiles\uSchemaUtilsServer.pas" />
-    <DCCReference Include="Utiles\uServerAppUtils.pas" />
-    <DCCReference Include="Utiles\uSesionesUtils.pas" />
-  </ItemGroup>
+	<PropertyGroup>
+		<ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
+		<MainSource>FactuGES_Server.dpr</MainSource>
+		<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+		<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+		<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+		<DCC_DependencyCheckOutputName>..\..\Output\Debug\Servidor\FactuGES_Server.exe</DCC_DependencyCheckOutputName>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+		<Version>7.0</Version>
+		<DCC_DebugInformation>False</DCC_DebugInformation>
+		<DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
+		<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+		<DCC_MapFile>3</DCC_MapFile>
+		<DCC_ExeOutput>..\..\Output\Release\Servidor</DCC_ExeOutput>
+		<DCC_Define>RELEASE</DCC_Define>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+		<Version>7.0</Version>
+		<DCC_MapFile>3</DCC_MapFile>
+		<DCC_ExeOutput>..\..\Output\Debug\Servidor</DCC_ExeOutput>
+		<DCC_Define>DEBUG;</DCC_Define>
+		<DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
+	</PropertyGroup>
+	<ProjectExtensions>
+		<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">2</VersionInfo><VersionInfo Name="Release">8</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.2.8.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.2.8.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">jueves, 08 de enero de 2009 20:14</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+						<Excluded_Packages Name="C:\Archivos de programa\RemObjects Software\Pascal Script\Dcu\D10\PascalScript_RO_D10.bpl">RemObjects Pascal Script - RemObjects SDK 3.0 Integration</Excluded_Packages>
+					</Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
+	</ProjectExtensions>
+	<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets"/>
+	<ItemGroup>
+		<DelphiCompile Include="FactuGES_Server.dpr">
+			<MainSource>MainSource</MainSource>
+		</DelphiCompile>
+		<DCCReference Include="..\ApplicationBase\Ejercicios\Model\schEjerciciosClient_Intf.pas"/>
+		<DCCReference Include="..\ApplicationBase\Ejercicios\Model\schEjerciciosServer_Intf.pas"/>
+		<DCCReference Include="..\ApplicationBase\Ejercicios\Model\uBizEjerciciosServer.pas"/>
+		<DCCReference Include="..\ApplicationBase\Ejercicios\Servidor\srvEjercicios_Impl.pas">
+			<Form>srvEjercicios</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas"/>
+		<DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas"/>
+		<DCCReference Include="..\ApplicationBase\Empresas\Servidor\srvEmpresas_Impl.pas">
+			<Form>srvEmpresas</Form>
+			<DesignClass>TDARemoteService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\ApplicationBase\ProvinciasPoblaciones\Servidor\srvProvinciasPoblaciones_Impl.pas">
+			<Form>srvProvinciasPoblaciones</Form>
+			<DesignClass>TRORemoteDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosClient_Intf.pas"/>
+		<DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosServer_Intf.pas"/>
+		<DCCReference Include="..\ApplicationBase\Usuarios\Servidor\srvUsuarios_Impl.pas"/>
+		<DCCReference Include="..\Base\schBase_Intf.pas"/>
+		<DCCReference Include="..\Base\Utiles\uSistemaFunc.pas"/>
+		<DCCReference Include="..\Base\Utiles\uStringsUtils.pas"/>
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Model\uBizAlbaranClienteServer.pas"/>
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Reports\uRptAlbaranesCliente_Server.pas"/>
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Servidor\srvAlbaranesCliente_Impl.pas">
+			<Form>srvAlbaranesCliente</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Albaranes de proveedor\Model\uBizAlbaranProveedorServer.PAS"/>
+		<DCCReference Include="..\Modulos\Albaranes de proveedor\Servidor\srvAlbaranesProveedor_Impl.pas">
+			<Form>srvAlbaranesProveedor</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Almacenes\Servidor\srvAlmacenes_Impl.pas">
+			<Form>srvAlmacenes</Form>
+			<DesignClass>TDARemoteService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Articulos\Model\schArticulosClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Articulos\Model\schArticulosServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Articulos\Servidor\srvArticulos_Impl.pas"/>
+		<DCCReference Include="..\Modulos\Comisiones\Model\schComisionesClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Comisiones\Model\schComisionesServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Comisiones\Model\uBizComisionesServer.pas"/>
+		<DCCReference Include="..\Modulos\Comisiones\Reports\uRptComisiones_Server.pas">
+			<Form>RptComisiones</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Comisiones\Servidor\srvComisiones_Impl.pas">
+			<Form>srvComisiones</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Contabilidad\Model\schContabilidadClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Contabilidad\Model\schContabilidadServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Contabilidad\Model\uBizAsientosServer.pas"/>
+		<DCCReference Include="..\Modulos\Contabilidad\Servidor\srvContabilidad_Impl.pas">
+			<Form>srvContabilidad</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Contactos\Model\schContactosClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Contactos\Model\schContactosServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Contactos\Model\uBizClientesServer.pas"/>
+		<DCCReference Include="..\Modulos\Contactos\Model\uBizContactosServer.pas"/>
+		<DCCReference Include="..\Modulos\Contactos\Model\uBizProveedoresServer.pas"/>
+		<DCCReference Include="..\Modulos\Contactos\Model\uBizVendedoresServer.pas"/>
+		<DCCReference Include="..\Modulos\Contactos\Reports\uRptEtiquetasContacto_Server.pas">
+			<Form>RptEtiquetasContacto</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Contactos\Servidor\srvContactos_Impl.pas">
+			<Form>srvContactos</Form>
+			<DesignClass>TDARemoteService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Facturas de cliente\Model\uBizFacturasClienteServer.pas"/>
+		<DCCReference Include="..\Modulos\Facturas de cliente\Reports\uRptFacturasCliente_Server.pas">
+			<Form>RptFacturasCliente</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Facturas de cliente\Servidor\srvFacturasCliente_Impl.pas">
+			<Form>srvFacturasCliente</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Facturas de proveedor\Model\uBizFacturasProveedorServer.pas"/>
+		<DCCReference Include="..\Modulos\Facturas de proveedor\Reports\uRptFacturasProveedor_Server.pas">
+			<Form>RptFacturasProveedor</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Facturas de proveedor\Servidor\srvFacturasProveedor_Impl.pas">
+			<Form>srvFacturasProveedor</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Familias\Model\schFamiliasClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Familias\Model\schFamiliasServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Familias\Servidor\srvFamilias_Impl.pas"/>
+		<DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Formas de pago\Servidor\srvFormasPago_Impl.pas"/>
+		<DCCReference Include="..\Modulos\Gestion de documentos\Servidor\srvGestorDocumentos_Impl.pas">
+			<Form>srvGestorDocumentos</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Gestor de informes\Servidor\srvGestorInformes_Impl.pas">
+			<Form>srvGestorInformes</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Historico de movimientos\Servidor\srvHistoricoMovimientos_Impl.pas">
+			<Form>srvHistoricoMovimientos</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Inventario\Model\schInventarioClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Inventario\Model\schInventarioServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Inventario\Servidor\srvInventario_Impl.pas">
+			<Form>srvInventario</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Pedidos a proveedor\Model\uBizPedidosProveedorServer.pas"/>
+		<DCCReference Include="..\Modulos\Pedidos a proveedor\Servidor\srvPedidosProveedor_Impl.pas">
+			<Form>srvPedidosProveedor</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Model\uBizPresupuestosClienteServer.pas"/>
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptPresupuestosCliente_Server.pas">
+			<Form>RptPresupuestosCliente</Form>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Servidor\srvPresupuestosCliente_Impl.pas">
+			<Form>srvPresupuestosCliente</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Recibos de cliente\Model\uBizPagosClienteServer.pas"/>
+		<DCCReference Include="..\Modulos\Recibos de cliente\Model\uBizRecibosClienteServer.pas"/>
+		<DCCReference Include="..\Modulos\Recibos de cliente\Reports\uRptRecibosCliente_Server.pas">
+			<Form>RptRecibosCliente</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Recibos de cliente\Servidor\srvRecibosCliente_Impl.pas">
+			<Form>srvRecibosCliente</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Recibos de proveedor\Model\uBizPagosProveedorServer.pas"/>
+		<DCCReference Include="..\Modulos\Recibos de proveedor\Model\uBizRecibosProveedorServer.pas"/>
+		<DCCReference Include="..\Modulos\Recibos de proveedor\Reports\uRptRecibosProveedor_Server.pas">
+			<Form>RptRecibosProveedor</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Recibos de proveedor\Servidor\srvRecibosProveedor_Impl.pas">
+			<Form>srvRecibosProveedor</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Referencias\Model\schReferenciasClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Referencias\Model\schReferenciasServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Referencias\Servidor\srvReferencias_Impl.pas">
+			<Form>srvReferencias</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Remesas de cliente\Model\uBizRemesasClienteServer.pas"/>
+		<DCCReference Include="..\Modulos\Remesas de cliente\Servidor\srvRemesasCliente_Impl.pas">
+			<Form>srvRemesasCliente</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Remesas de proveedor\Model\uBizRemesasProveedorServer.pas"/>
+		<DCCReference Include="..\Modulos\Remesas de proveedor\Servidor\srvRemesasProveedor_Impl.pas">
+			<Form>srvRemesasProveedor</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Tipos de IVA\Servidor\srvTiposIVA_Impl.pas"/>
+		<DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Unidades de medida\Servidor\srvUnidadesMedida_Impl.pas">
+			<Form>srvUnidadesMedida</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Servicios\FactuGES_Intf.pas"/>
+		<DCCReference Include="..\Servicios\FactuGES_Invk.pas"/>
+		<DCCReference Include="Configuracion\srvConfiguracion_Impl.pas">
+			<Form>srvConfiguracion</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="Configuracion\uConexionBD.pas">
+			<Form>frConexionBD</Form>
+			<DesignClass>TFrame</DesignClass>
+		</DCCReference>
+		<DCCReference Include="Configuracion\uConfGeneral.pas">
+			<Form>frConfGeneral</Form>
+			<DesignClass>TFrame</DesignClass>
+		</DCCReference>
+		<DCCReference Include="Configuracion\uConfiguracion.pas">
+			<Form>fConfiguracion</Form>
+			<DesignClass>TForm</DesignClass>
+		</DCCReference>
+		<DCCReference Include="Configuracion\uFrameConfiguracion.pas">
+			<Form>FrameConfiguracion</Form>
+			<DesignClass>TFrame</DesignClass>
+		</DCCReference>
+		<DCCReference Include="srvLogin_Impl.pas">
+			<Form>srvLogin</Form>
+			<DesignClass>TDARemoteService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="uAcercaDe.pas">
+			<Form>fAcercaDe</Form>
+		</DCCReference>
+		<DCCReference Include="uDataModuleServer.pas">
+			<Form>dmServer</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="uServerMainForm.pas">
+			<Form>fServerForm</Form>
+		</DCCReference>
+		<DCCReference Include="Utiles\RegExpr.pas"/>
+		<DCCReference Include="Utiles\uBusinessUtils.pas"/>
+		<DCCReference Include="Utiles\uDatabaseUtils.pas"/>
+		<DCCReference Include="Utiles\uReferenciasUtils.pas"/>
+		<DCCReference Include="Utiles\uRestriccionesUsuarioUtils.pas"/>
+		<DCCReference Include="Utiles\uSchemaUtilsServer.pas"/>
+		<DCCReference Include="Utiles\uServerAppUtils.pas"/>
+		<DCCReference Include="Utiles\uSesionesUtils.pas"/>
+	</ItemGroup>
 </Project>
 <!-- EurekaLog First Line
 [Exception Log]
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@ -1,7 +1,7 @@
 MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Servidor.ico"
 1 VERSIONINFO
-FILEVERSION 2,2,9,0
-PRODUCTVERSION 2,2,9,0
+FILEVERSION 2,2,8,0
+PRODUCTVERSION 2,2,8,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@ -13,10 +13,10 @@ BEGIN
         BLOCK "0C0A04E4"
         BEGIN
              VALUE "CompanyName", "Rodax Software S.L.\0"
-              VALUE "FileVersion", "2.2.9.0\0"
+              VALUE "FileVersion", "2.2.8.0\0"
              VALUE "ProductName", "FactuGES (Servidor)\0"
-              VALUE "ProductVersion", "2.2.9.0\0"
-              VALUE "CompileDate", "jueves, 08 de enero de 2009 20:14\0"
+              VALUE "ProductVersion", "2.2.8.0\0"
+              VALUE "CompileDate", "martes, 03 de febrero de 2009 20:01\0"
         END
    END
    BLOCK "VarFileInfo"