Version 4.1.4

git-svn-id: https://192.168.0.254/svn/Proyectos.LuisLeon_FactuGES2/trunk@116 b2cfbe5a-eba1-4a0c-8b32-7feea0a119f2

Database/scripts/factuges.sql

@@ -4172,8 +4172,8 @@ CREATE VIEW V_INF_FAC_CLIENTE(
     IMPORTE_TOTAL_ANO)
 AS
 select f.ID_EMPRESA, EXTRACT(YEAR FROM f.FECHA_FACTURA) as ANO,
-CAST((DIV(EXTRACT(MONTH FROM f.FECHA_FACTURA),8)+1) AS SMALLINT) as SEMESTRE,
+CAST((DIV(EXTRACT(MONTH FROM f.FECHA_FACTURA),7)+1) AS SMALLINT) as SEMESTRE,
-CAST((DIV(EXTRACT(MONTH FROM f.FECHA_FACTURA),4)+1) AS SMALLINT) as TRIMESTRE,
+CAST((DIV(EXTRACT(MONTH FROM f.FECHA_FACTURA)+2,3)) AS SMALLINT) as TRIMESTRE,
 EXTRACT(MONTH FROM f.FECHA_FACTURA) as MES,
 f.FECHA_FACTURA, f.ID_CLIENTE, f.NOMBRE, f.IMPORTE_DESCUENTO, f.IMPORTE_TOTAL, v.importe_total as IMPORTE_TOTAL_ANO
 from FACTURAS_CLIENTE f
@@ -4195,8 +4195,8 @@ CREATE VIEW V_INF_FAC_PROVEEDOR(
     IMPORTE_TOTAL_ANO)
 AS
 select f.ID_EMPRESA, EXTRACT(YEAR FROM f.FECHA_FACTURA) as ANO,
-CAST((DIV(EXTRACT(MONTH FROM f.FECHA_FACTURA),8)+1) AS SMALLINT) as SEMESTRE,
+CAST((DIV(EXTRACT(MONTH FROM f.FECHA_FACTURA),7)+1) AS SMALLINT) as SEMESTRE,
-CAST((DIV(EXTRACT(MONTH FROM f.FECHA_FACTURA),4)+1) AS SMALLINT) as TRIMESTRE,
+CAST((DIV(EXTRACT(MONTH FROM f.FECHA_FACTURA)+2,3)) AS SMALLINT) as TRIMESTRE,
 EXTRACT(MONTH FROM f.FECHA_FACTURA) as MES,
 f.FECHA_FACTURA, f.ID_PROVEEDOR, f.NOMBRE, f.IMPORTE_DESCUENTO, f.IMPORTE_TOTAL, v.importe_total as IMPORTE_TOTAL_ANO
 from FACTURAS_PROVEEDOR f
@@ -4229,8 +4229,8 @@ AS
 select FD.ID,
 F.ID_EMPRESA,
 EXTRACT(YEAR FROM f.FECHA_FACTURA) as ANO,
-CAST((DIV(EXTRACT(MONTH FROM f.FECHA_FACTURA),8)+1) AS SMALLINT) as SEMESTRE,
+CAST((DIV(EXTRACT(MONTH FROM f.FECHA_FACTURA),7)+1) AS SMALLINT) as SEMESTRE,
-CAST((DIV(EXTRACT(MONTH FROM f.FECHA_FACTURA),4)+1) AS SMALLINT) as TRIMESTRE,
+CAST((DIV(EXTRACT(MONTH FROM f.FECHA_FACTURA)+2,3)) AS SMALLINT) as TRIMESTRE,
 EXTRACT(MONTH FROM f.FECHA_FACTURA) as MES,
 f.FECHA_FACTURA,
 FD.ID_FACTURA, F.ID_PROVEEDOR, f.NOMBRE, FD.ID_ARTICULO, FD.CONCEPTO, FD.CANTIDAD, FD.IMPORTE_UNIDAD, (FD.CANTIDAD * FD.IMPORTE_UNIDAD) as IMPORTE_NETO,
@@ -4275,8 +4275,8 @@ AS
 select FD.ID,
 F.ID_EMPRESA,
 EXTRACT(YEAR FROM f.FECHA_FACTURA) as ANO,
-CAST((DIV(EXTRACT(MONTH FROM f.FECHA_FACTURA),8)+1) AS SMALLINT) as SEMESTRE,
+CAST((DIV(EXTRACT(MONTH FROM f.FECHA_FACTURA),7)+1) AS SMALLINT) as SEMESTRE,
-CAST((DIV(EXTRACT(MONTH FROM f.FECHA_FACTURA),4)+1) AS SMALLINT) as TRIMESTRE,
+CAST((DIV(EXTRACT(MONTH FROM f.FECHA_FACTURA)+2,3)) AS SMALLINT) as TRIMESTRE,
 EXTRACT(MONTH FROM f.FECHA_FACTURA) as MES,
 f.FECHA_FACTURA,
 FD.ID_FACTURA, F.ID_CLIENTE, f.NOMBRE, CD.ID_AGENTE, FD.ID_ARTICULO, FD.CONCEPTO, FD.CANTIDAD, FD.IMPORTE_UNIDAD, (FD.CANTIDAD * FD.IMPORTE_UNIDAD) as IMPORTE_NETO,

Source/Cliente/FactuGES.dproj

@@ -53,7 +53,7 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>VCLApplication</Borland.ProjectType>
     <BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">4</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">3</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">4.1.3.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">4.1.3.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages></Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">4</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">4</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">4.1.4.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">4.1.4.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages></Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
   </ProjectExtensions>
   <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
   <ItemGroup>

Source/Cliente/FactuGES.rc

@@ -1,7 +1,7 @@
 MAINICON ICON "C:\Codigo\Resources\Iconos\Factuges.ico"
 1 VERSIONINFO
-FILEVERSION 4,1,2,0
+FILEVERSION 4,1,4,0
-PRODUCTVERSION 4,1,2,0
+PRODUCTVERSION 4,1,4,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@@ -13,10 +13,10 @@ BEGIN
          BLOCK "0C0A04E4"
          BEGIN
               VALUE "CompanyName", "Rodax Software S.L.\0"
-              VALUE "FileVersion", "4.1.2.0\0"
+              VALUE "FileVersion", "4.1.4.0\0"
               VALUE "InternalName", "FactuGES\0"
               VALUE "ProductName", "FactuGES\0"
-              VALUE "ProductVersion", "4.1.2.0\0"
+              VALUE "ProductVersion", "4.1.4.0\0"
          END
     END
     BLOCK "VarFileInfo"

Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas

@@ -100,10 +100,13 @@ type
     frxDBInformeListadoClientesMayorDescuentoResumen: TfrxDBDataset;
     DADSInformeListadoClientesMayorDescuentoResumen: TDADataSource;
     tbl_InformeListadoClientesMayorDescuentoResumen: TDAMemDataTable;
-    schReport: TDASchema;
     frxDBInformeListadoAgentesMayorFacturacionResumen: TfrxDBDataset;
     DADInformeListadoAgentesMayorFacturacionResumen: TDADataSource;
     tbl_InformeListadoAgentesMayorFacturacionResumen: TDAMemDataTable;
+    tbl_InformeListadoBeneficiosGrafCompSemestral: TDAMemDataTable;
+    tbl_InformeListadoBeneficiosGrafCompTrimestral: TDAMemDataTable;
+    tbl_InformeListadoBeneficiosGrafCompMensual: TDAMemDataTable;
+    schReport: TDASchema;
     procedure DataModuleCreate(Sender: TObject);
     procedure DataModuleDestroy(Sender: TObject);
     procedure frxReportGetValue(const VarName: string; var Value: Variant);
@@ -141,6 +144,7 @@ type
     function GenerarInformeListadoFacturas(const IdEmpresa: Integer; const FechaInicio: Variant; const FechaFin: Variant; const FechaVenInicio: Variant; const FechaVenFin: Variant; const ListaIDClientes: TIntegerArray; const Desglosado: Boolean; const ImporteMinimo: Currency): Binary;
     function GenerarInformeListadoFacturasPendientes(const IdEmpresa: Integer; const FechaInicio: Variant; const FechaFin: Variant; const FechaVenInicio: Variant; const FechaVenFin: Variant; const ListaIDClientes: TIntegerArray; const Desglosado: Boolean; const ImporteMinimo: Currency): Binary;
     function GenerarInformeFacturasGrafComp(const IdEmpresa: Integer; const Intervalo: Variant; const Ano1: Variant; const Ano2: Variant; const ListaIDClientes: TIntegerArray; const TopN: Integer): Binary;
+    function GenerarInformeBeneficiosGrafComp(const IdEmpresa: Integer; const Intervalo: Variant; const Ano1: Variant; const Ano2: Variant; const Serie: Variant): Binary;    
   end;
 
 implementation
@@ -160,6 +164,7 @@ const
   rptInformeListadoFactuasClientePendiente = 'InformeListadoFacturasClientePendientes.fr3';
   rptInformeListadoFactuasClientePendienteDesglosado = 'InformeListadoFacturasClientePendientesDesglosado.fr3';
   rptInformeListadoFacturasClienteGrafComp = 'InformeListadoFacturasClienteGrafComp.fr3';
+  rptInformeListadoBeneficiosGrafComp = 'InformeListadoBeneficiosGrafComp.fr3';  
 
   { Dataset names for schReport }
   ds_InformeListadoFacturasResumen = 'InformeListadoFacturasResumen';
@@ -237,6 +242,51 @@ begin
   end;
 end;
 
+function TRptFacturasCliente.GenerarInformeBeneficiosGrafComp(
+  const IdEmpresa: Integer; const Intervalo, Ano1, Ano2,
+  Serie: Variant): Binary;
+var
+  AStream: TMemoryStream;
+  AInforme: Variant;
+
+begin
+  FConnection.BeginTransaction; //<--- Creo que no va a hacer falta. "PUES SI ES NECESARIO"
+
+  AStream := TMemoryStream.Create;
+  try
+    //Inicializamos parametros
+    FIdEmpresa := IdEmpresa;
+    FAno1 := Ano1;
+    FAno2 := Ano2;
+    FIntervalo := Intervalo;
+
+    //Preparamos la tabla correspondiente y la abrimos para el informe
+    if (FIntervalo = CTE_MENSUAL) then
+       PrepararTablaInformeGrafComp(tbl_InformeListadoBeneficiosGrafCompMensual)
+    else if (FIntervalo = CTE_TRIMESTRAL) then
+       PrepararTablaInformeGrafComp(tbl_InformeListadoBeneficiosGrafCompTrimestral)
+    else
+       PrepararTablaInformeGrafComp(tbl_InformeListadoBeneficiosGrafCompSemestral);
+
+    Result := Binary.Create;
+
+    AInforme := DarRutaFichero(DarRutaInformes, rptInformeListadoBeneficiosGrafComp, IntTostr(FIdEmpresa));
+    if VarIsNull(AInforme) then
+       raise Exception.Create (('Error Servidor: GenerarInformeBeneficiosGrafComp, no encuentra informe ' + rptInformeListadoBeneficiosGrafComp));
+
+    frxReport.LoadFromFile(AInforme, True);
+//    IniciarParametrosInforme;
+
+    frxReport.Variables.Variables['Serie']:= Serie;
+    frxReport.PrepareReport(False);
+    frxReport.PreviewPages.SaveToStream(Result);
+
+  finally
+    AStream.Free;
+    FConnection.RollbackTransaction; //<--- Creo que no va a hacer falta. "PUES SI ES NECESARIO"
+  end;
+end;
+
 function TRptFacturasCliente.GenerarInformeFacturasGrafComp(
   const IdEmpresa: Integer; const Intervalo, Ano1, Ano2: Variant;
   const ListaIDClientes: TIntegerArray; const TopN: Integer): Binary;

Source/Modulos/Gestor de informes/Controller/GestorInformes_controller.dpk

@@ -45,6 +45,7 @@ contains
   uIEditorInformeRecibosProveedorReport in 'View\uIEditorInformeRecibosProveedorReport.pas',
   uIEditorInformePedidosReport in 'View\uIEditorInformePedidosReport.pas',
   uIEditorInformeFacturasProveedorReportGrafComp in 'View\uIEditorInformeFacturasProveedorReportGrafComp.pas',
-  uIEditorInformeFacturasClienteReportGrafComp in 'View\uIEditorInformeFacturasClienteReportGrafComp.pas';
+  uIEditorInformeFacturasClienteReportGrafComp in 'View\uIEditorInformeFacturasClienteReportGrafComp.pas',
+  uIEditorInformeBeneficiosReportGrafComp in 'View\uIEditorInformeBeneficiosReportGrafComp.pas';
 
 end.

Source/Modulos/Gestor de informes/Controller/GestorInformes_controller.dproj

@@ -43,6 +43,7 @@
     <DCCReference Include="View\Base.dcp" />
     <DCCReference Include="View\GestorInformes_data.dcp" />
     <DCCReference Include="View\uIEditorInformeBase.pas" />
+    <DCCReference Include="View\uIEditorInformeBeneficiosReportGrafComp.pas" />
     <DCCReference Include="View\uIEditorInformeFacturasClientePendientesReport.pas" />
     <DCCReference Include="View\uIEditorInformeFacturasClienteReport.pas" />
     <DCCReference Include="View\uIEditorInformeFacturasClienteReportGrafComp.pas" />

Source/Modulos/Gestor de informes/Controller/View/uIEditorInformeBeneficiosReportGrafComp.pas

@@ -0,0 +1,26 @@
+unit uIEditorInformeBeneficiosReportGrafComp;
+
+interface
+
+uses
+  FactuGES_Intf, uIEditorInformeBase;
+
+type
+  IEditorInformeBeneficiosReportGrafComp = interface(IEditorInformeBase)
+  ['{88554CB3-E8A6-4BC8-80CC-174D1FC614A5}']
+
+    function GetIntervalo: Variant;
+    function GetAno1: Variant;
+    function GetAno2: Variant;
+    function GetSerie: Variant;
+
+    property Intervalo: Variant read GetIntervalo;
+    property Ano1: Variant read GetAno1;
+    property Ano2: Variant read GetAno2;
+    property Serie: Variant read GetSerie;
+  end;
+
+
+implementation
+
+end.

Source/Modulos/Gestor de informes/Controller/uGestorInformesController.pas

@@ -25,6 +25,7 @@ type
     procedure VerInformeListadoFacturasCliPendientes;
     procedure VerInformeFacturasCliGrafComp;
     function DarListaAnosFacturasCli: TStringList;
+    procedure VerInformeBeneficiosCliGrafComp;
 
     //MODULO RECIBOS DE CLIENTE
     procedure VerInformeListadoRecibosCliPendientes;
@@ -80,6 +81,7 @@ type
     procedure VerInformeListadoFacturasCliPendientes;
     procedure VerInformeFacturasCliGrafComp;
     function DarListaAnosFacturasCli: TStringList;
+    procedure VerInformeBeneficiosCliGrafComp;    
 
     //MODULO RECIBOS DE CLIENTE
     procedure VerInformeListadoRecibosCliPendientes;
@@ -116,7 +118,8 @@ uses
   uIEditorInformeFacturasProveedorPendientesReport, uIEditorInformeRecibosProveedorReport,
   uIEditorInformeRecibosProvPendientesReport,
   uIEditorInformePedidosReport, uIEditorInformeFacturasClienteReportGrafComp,
-  uIEditorInformeFacturasProveedorReportGrafComp;
+  uIEditorInformeFacturasProveedorReportGrafComp,
+  uIEditorInformeBeneficiosReportGrafComp;
 
 
 {procedure CopiarArticulosPedido(AOrigen: IBizDetallesPedidoCliente;
@@ -302,6 +305,30 @@ begin
   Result := FDataModule;
 end;
 
+procedure TGestorInformesController.VerInformeBeneficiosCliGrafComp;
+var
+  AStream: Binary;
+  AEditor : IEditorInformeBeneficiosReportGrafComp;
+begin
+  AEditor := NIL;
+  CreateEditor('EditorInformeBeneficiosReportGrafComp', IEditorInformeBeneficiosReportGrafComp, AEditor);
+  if Assigned(AEditor) then
+    try
+      AEditor.Controller := Self;
+      AEditor.Title := 'Informe comparativo de beneficios';
+
+      AStream := FDataModule.GenerarInformeBeneficiosGrafComp(AppFactuGES.EmpresaActiva.ID,
+        AEditor.Intervalo, AEditor.Ano1, AEditor.Ano2, AEditor.Serie);
+
+      AEditor.LoadFromStream(AStream);
+      AEditor.Preview;
+    finally
+      AEditor.Release;
+      AEditor := Nil;
+      FreeAndNil(AStream);
+    end;
+end;
+
 procedure TGestorInformesController.VerInformeFacturasCliGrafComp;
 var
   AStream: Binary;

Source/Modulos/Gestor de informes/Data/uDataModuleGestorInformes.pas

@@ -32,6 +32,7 @@ type
     function GenerarInformeListadoFacturasCliPendientes(const IdEmpresa: Integer; const FechaInicio: Variant; const FechaFin: Variant; const FechaVenInicio: Variant; const FechaVenFin: Variant; const ListaIDClientes: TIntegerArray; const Desglosado: Boolean; const ImporteMinimo: Currency): Binary;
     function GenerarInformeFacturasCliGrafComp(const IdEmpresa: Integer; const Intervalo: Variant; const Ano1: Variant; const Ano2: Variant; const ListaIDClientes: TIntegerArray; Const NTop: Variant): Binary;
     function DarListaAnosFacturasCli: TStringList;
+    function GenerarInformeBeneficiosGrafComp(const IdEmpresa: Integer; const Intervalo: Variant; const Ano1: Variant; const Ano2: Variant; const Serie: Variant): Binary;
 
     //MODULO RECIBOS DE CLIENTE
     function GenerarInformeListadoRecibosCliPendientes(const IdEmpresa: Integer; const FechaInicio: Variant; const FechaFin: Variant; const FechaVenInicio: Variant; const FechaVenFin: Variant; const ListaIDClientes: TIntegerArray; const Desglosado: Boolean; const ImporteMinimo: Currency): Binary;
@@ -118,6 +119,16 @@ begin
   end;
 end;
 
+function TDataModuleGestorInformes.GenerarInformeBeneficiosGrafComp(
+  const IdEmpresa: Integer; const Intervalo, Ano1, Ano2,
+  Serie: Variant): Binary;
+begin
+  try
+    Result := (RORemoteService as IsrvGestorInformes).GenerarInformeBeneficiosGrafComp(IdEmpresa, Intervalo, Ano1, Ano2, Serie);
+  finally
+  end;
+end;
+
 function TDataModuleGestorInformes.GenerarInformeFacturasCliGrafComp(
   const IdEmpresa: Integer; const Intervalo, Ano1, Ano2: Variant;
   const ListaIDClientes: TIntegerArray; const NTop: Variant): Binary;

Source/Modulos/Gestor de informes/Model/Data/uIDataModuleGestorInformes.pas

@@ -21,6 +21,7 @@ type
     function GenerarInformeListadoFacturasCliPendientes(const IdEmpresa: Integer; const FechaInicio: Variant; const FechaFin: Variant; const FechaVenInicio: Variant; const FechaVenFin: Variant; const ListaIDClientes: TIntegerArray; const Desglosado: Boolean; const ImporteMinimo: Currency): Binary;
     function GenerarInformeFacturasCliGrafComp(const IdEmpresa: Integer; const Intervalo: Variant; const Ano1: Variant; const Ano2: Variant; const ListaIDClientes: TIntegerArray; Const NTop: Variant): Binary;
     function DarListaAnosFacturasCli: TStringList;
+    function GenerarInformeBeneficiosGrafComp(const IdEmpresa: Integer; const Intervalo: Variant; const Ano1: Variant; const Ano2: Variant; const Serie: Variant): Binary;    
 
     //MODULO RECIBOS DE CLIENTE
     function GenerarInformeListadoRecibosCliPendientes(const IdEmpresa: Integer; const FechaInicio: Variant; const FechaFin: Variant; const FechaVenInicio: Variant; const FechaVenFin: Variant; const ListaIDClientes: TIntegerArray; const Desglosado: Boolean; const ImporteMinimo: Currency): Binary;

Source/Modulos/Gestor de informes/Plugin/uPluginGestorInformes.dfm

@@ -135,6 +135,12 @@ object PluginGestorInformes: TPluginGestorInformes
       ImageIndex = 0
       OnExecute = actInformeFacturasProveedorGrafCompExecute
     end
+    object actInformeBeneficiosGrafComp: TAction
+      Category = 'Facturas de cliente'
+      Caption = 'Informe comparativo de beneficios'
+      ImageIndex = 0
+      OnExecute = actInformeBeneficiosGrafCompExecute
+    end
   end
   object MainMenu: TMainMenu
     Images = LargeImages
@@ -199,11 +205,17 @@ object PluginGestorInformes: TPluginGestorInformes
         Caption = '-'
       end
       object Informecomparativodefacturacindeclientes1: TMenuItem
+        Tag = 160
         Action = actInformeFacturasClienteGrafComp
       end
       object Informecomparativodefacturacindeproveedores1: TMenuItem
+        Tag = 170
         Action = actInformeFacturasProveedorGrafComp
       end
+      object Informecomparativodebeneficios1: TMenuItem
+        Tag = 180
+        Action = actInformeBeneficiosGrafComp
+      end
     end
   end
   object SmallImages: TPngImageList

Source/Modulos/Gestor de informes/Plugin/uPluginGestorInformes.pas

@@ -46,6 +46,8 @@ type
     N5: TMenuItem;
     Informecomparativodefacturacindeclientes1: TMenuItem;
     Informecomparativodefacturacindeproveedores1: TMenuItem;
+    actInformeBeneficiosGrafComp: TAction;
+    Informecomparativodebeneficios1: TMenuItem;
     procedure actInformeFacturasClienteExecute(Sender: TObject);
     procedure actInformeFacturasClientePendientesExecute(Sender: TObject);
     procedure actInformeFacturasClienteIVAExecute(Sender: TObject);
@@ -58,6 +60,7 @@ type
     procedure actInformeRecibosProvPendientesExecute(Sender: TObject);
     procedure actInformeFacturasClienteGrafCompExecute(Sender: TObject);
     procedure actInformeFacturasProveedorGrafCompExecute(Sender: TObject);
+    procedure actInformeBeneficiosGrafCompExecute(Sender: TObject);
   private
     FController : IGestorInformesController;
   public
@@ -81,6 +84,12 @@ end;
 exports
   GetModule name GET_MODULE_FUNC;
 
+procedure TPluginGestorInformes.actInformeBeneficiosGrafCompExecute(
+  Sender: TObject);
+begin
+  FController.VerInformeBeneficiosCliGrafComp;
+end;
+
 procedure TPluginGestorInformes.actInformeFacturasClienteExecute(
   Sender: TObject);
 begin

Source/Modulos/Gestor de informes/Servidor/srvGestorInformes_Impl.pas

@@ -48,6 +48,7 @@ type
 
     function GenerarInformeFacturasCliGrafComp(const IdEmpresa: Integer; const Intervalo: Variant; const Ano1: Variant; const Ano2: Variant; const ListaIDClientes: TIntegerArray; const TopN: Integer): Binary;
     function DarListaAnosFacturasCli: StringArray;
+    function GenerarInformeBeneficiosGrafComp(const IdEmpresa: Integer; const Intervalo: Variant; const Ano1: Variant; const Ano2: Variant; const Serie: Variant): Binary;    
 
     //MODULO RECIBOS CLIENTE
     function GenerarInformeListadoRecibosCliente(const IdEmpresa: Integer; const FechaInicio: Variant; const FechaFin: Variant; const FechaVenInicio: Variant; const FechaVenFin: Variant; const ListaIDClientes: TIntegerArray; const Desglosado: Boolean; const ImporteMinimo: Currency): Binary;
@@ -117,6 +118,20 @@ begin
   Result.Add(CTE_SEMESTRAL);
 end;
 
+function TsrvGestorInformes.GenerarInformeBeneficiosGrafComp(
+  const IdEmpresa: Integer; const Intervalo, Ano1, Ano2,
+  Serie: Variant): Binary;
+var
+  AReportGenerator : TRptFacturasCliente;
+begin
+  AReportGenerator := TRptFacturasCliente.Create(nil);
+  try
+    Result := AReportGenerator.GenerarInformeBeneficiosGrafComp(IdEmpresa, Intervalo, Ano1, Ano2, Serie);
+  finally
+    FreeAndNIL(AReportGenerator);
+  end;
+end;
+
 function TsrvGestorInformes.GenerarInformeFacturasCliGrafComp(
   const IdEmpresa: Integer; const Intervalo, Ano1, Ano2: Variant;
   const ListaIDClientes: TIntegerArray; const TopN: Integer): Binary;

Source/Modulos/Gestor de informes/Views/GestorInformes_view.dpk

@@ -91,6 +91,7 @@ contains
   uEditorInformePresupuestosReport in 'uEditorInformePresupuestosReport.pas' {fEditorInformePresupuestosReport: TForm},
   uViewIntervaloComparativo in 'uViewIntervaloComparativo.pas' {frViewIntervaloComparativo: TFrame},
   uEditorInformeFacturasClienteReportGrafComp in 'uEditorInformeFacturasClienteReportGrafComp.pas' {fEditorInformeFacturasClienteReportGrafComp: TForm},
-  uEditorInformeFacturasProveedorReportGrafComp in 'uEditorInformeFacturasProveedorReportGrafComp.pas' {fEditorInformeFacturasProveedorReportGrafComp: TForm};
+  uEditorInformeFacturasProveedorReportGrafComp in 'uEditorInformeFacturasProveedorReportGrafComp.pas' {fEditorInformeFacturasProveedorReportGrafComp: TForm},
+  uEditorInformeBeneficiosReportGrafComp in 'uEditorInformeBeneficiosReportGrafComp.pas' {fEditorInformeBeneficiosReportGrafComp: TForm};
 
 end.

Source/Modulos/Gestor de informes/Views/GestorInformes_view.dproj

@@ -79,6 +79,10 @@
       <Form>fEditorInformeBase</Form>
       <DesignClass>TForm</DesignClass>
     </DCCReference>
+    <DCCReference Include="uEditorInformeBeneficiosReportGrafComp.pas">
+      <Form>fEditorInformeFacturasProveedorReportGrafComp</Form>
+      <DesignClass>TForm</DesignClass>
+    </DCCReference>
     <DCCReference Include="uEditorInformeFacturasClientePendientesReport.pas">
       <Form>fEditorInformeFacturasClientePendientesReport</Form>
       <DesignClass>t</DesignClass>

Source/Modulos/Gestor de informes/Views/uEditorInformeBase.dfm

@@ -65,6 +65,7 @@ inherited fEditorInformeBase: TfEditorInformeBase
         FloatingHeight = 128
         SupportedDocks = [dkStandardDock, dkMultiDock]
         TabOrder = 0
+        ExplicitWidth = 128
         object TBXButton1: TTBXButton
           Left = 16
           Top = 12

Source/Modulos/Gestor de informes/Views/uEditorInformeBeneficiosReportGrafComp.dfm

@@ -0,0 +1,209 @@
+inherited fEditorInformeBeneficiosReportGrafComp: TfEditorInformeBeneficiosReportGrafComp
+  Caption = 'fEditorInformeBeneficiosReportGrafComp'
+  ClientHeight = 655
+  ClientWidth = 895
+  ExplicitWidth = 903
+  ExplicitHeight = 689
+  PixelsPerInch = 96
+  TextHeight = 13
+  inherited JvNavPanelHeader: TJvNavPanelHeader
+    Width = 895
+    ExplicitWidth = 895
+    inherited Image1: TImage
+      Left = 868
+      ExplicitLeft = 868
+    end
+  end
+  inherited TBXDock: TTBXDock
+    Width = 895
+    ExplicitWidth = 895
+    inherited tbxMenu: TTBXToolbar
+      ExplicitWidth = 895
+    end
+    inherited TBXToolbar1: TTBXToolbar
+      ExplicitWidth = 591
+      object TBXItem58: TTBXItem [0]
+        Action = actRefrescar
+        DisplayMode = nbdmImageAndText
+        Images = SmallImages
+      end
+    end
+  end
+  inherited StatusBar: TJvStatusBar
+    Top = 636
+    Width = 895
+    ExplicitTop = 636
+    ExplicitWidth = 895
+  end
+  inherited TBXMultiDockIzquierdo: TTBXMultiDock
+    Height = 534
+    ExplicitHeight = 534
+  end
+  inherited TBXMultiDockDerecho: TTBXMultiDock
+    Left = 703
+    Width = 192
+    Height = 534
+    ExplicitLeft = 703
+    ExplicitWidth = 192
+    ExplicitHeight = 534
+    inherited pnlParametros: TTBXDockablePanel
+      DockedWidth = 188
+      ExplicitWidth = 192
+      ExplicitHeight = 518
+      inherited TBXDockablePanel1: TTBXDockablePanel
+        Top = 368
+        ExplicitTop = 368
+        ExplicitWidth = 188
+        inherited TBXButton1: TTBXButton
+          AlignWithMargins = True
+          Left = 3
+          Top = 3
+          Width = 182
+          Height = 37
+          Margins.Left = 8
+          Margins.Top = 8
+          Margins.Right = 8
+          Margins.Bottom = 8
+          Align = alTop
+          ExplicitLeft = 3
+          ExplicitTop = 3
+          ExplicitWidth = 182
+          ExplicitHeight = 37
+        end
+      end
+      inline frViewIntervaloComparativo1: TfrViewIntervaloComparativo
+        Left = 0
+        Top = 0
+        Width = 188
+        Height = 230
+        Align = alTop
+        Font.Charset = DEFAULT_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -11
+        Font.Name = 'Tahoma'
+        Font.Style = []
+        ParentFont = False
+        TabOrder = 1
+        ReadOnly = False
+        ExplicitWidth = 188
+        ExplicitHeight = 230
+        inherited TBXAlignmentPanel2: TTBXAlignmentPanel
+          Width = 182
+          ExplicitWidth = 182
+          DesignSize = (
+            182
+            42)
+          inherited Label3: TLabel
+            Width = 172
+          end
+          inherited cbIntervalo: TcxComboBox
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitWidth = 166
+            Width = 166
+          end
+        end
+        inherited TBXLabel2: TTBXLabel
+          Width = 188
+          ExplicitWidth = 188
+        end
+        inherited TBXAlignmentPanel3: TTBXAlignmentPanel
+          Width = 182
+          ExplicitWidth = 182
+          DesignSize = (
+            182
+            42)
+          inherited lis: TLabel
+            Width = 172
+          end
+          inherited cbAno1: TcxComboBox
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitWidth = 166
+            Width = 166
+          end
+        end
+        inherited TBXAlignmentPanel1: TTBXAlignmentPanel
+          Width = 182
+          ExplicitWidth = 182
+          DesignSize = (
+            182
+            42)
+          inherited Label1: TLabel
+            Width = 172
+          end
+          inherited cbAno2: TcxComboBox
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitWidth = 166
+            Width = 166
+          end
+        end
+        inherited TBXAlignmentPanel4: TTBXAlignmentPanel
+          Width = 182
+          Visible = False
+          ExplicitWidth = 182
+          inherited Label2: TLabel
+            Width = 172
+          end
+        end
+        inherited TBXAlignmentPanel5: TTBXAlignmentPanel
+          Width = 182
+          ExplicitTop = 225
+          ExplicitWidth = 182
+          inherited Label4: TLabel
+            Width = 172
+          end
+          inherited cbSerie: TcxComboBox
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitWidth = 166
+            Width = 166
+          end
+        end
+      end
+      inline frViewFiltroClientes1: TfrViewFiltroClientes
+        Left = 0
+        Top = 230
+        Width = 188
+        Height = 195
+        Align = alTop
+        Font.Charset = DEFAULT_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -11
+        Font.Name = 'Tahoma'
+        Font.Style = []
+        ParentFont = False
+        TabOrder = 2
+        Visible = False
+        ReadOnly = False
+        ExplicitTop = 230
+        ExplicitWidth = 188
+        inherited TBXLabel2: TTBXLabel
+          Width = 188
+          ExplicitWidth = 188
+        end
+        inherited bElegirCliente: TBitBtn
+          Width = 119
+          ExplicitWidth = 119
+        end
+        inherited edtCliente: TcxTextEdit
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
+          ExplicitWidth = 152
+          Width = 152
+        end
+      end
+    end
+  end
+end

Source/Modulos/Gestor de informes/Views/uEditorInformeBeneficiosReportGrafComp.pas

@@ -0,0 +1,184 @@
+unit uEditorInformeBeneficiosReportGrafComp;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, uEditorPreview, frxExportText, frxExportRTF, frxExportMail,
+  frxExportXLS, frxExportImage, frxExportPDF, frxClass, frxDCtrl, frxGradient,
+  frxChBox, frxCross, frxRich, frxOLE, frxBarcode, JvAppStorage,
+  JvAppRegistryStorage, JvComponentBase, JvFormPlacement, ImgList, PngImageList,
+  StdActns, ActnList, ComCtrls, JvExComCtrls, JvStatusBar, TB2ExtItems,
+  TBXExtItems, TBX, TB2Item, TB2Dock, TB2Toolbar, pngimage, ExtCtrls,
+  JvExControls, JvNavigationPane, uCustomView,
+  uViewBase, uViewPeriodoFechas, uControllerBase,
+  dxLayoutControl, cxControls, uViewFiltroImportes,
+  FactuGES_Intf, TBXDkPanels, uEditorInformeBase,
+  uIEditorInformeBase, uViewParametrosInforme, uIEditorInformeBeneficiosReportGrafComp,
+  uViewIntervaloComparativo, uViewFiltroClientes;
+
+type
+  TfEditorInformeBeneficiosReportGrafComp = class(TfEditorInformeBase, IEditorInformeBeneficiosReportGrafComp)
+    TBXItem58: TTBXItem;
+    frViewIntervaloComparativo1: TfrViewIntervaloComparativo;
+    frViewFiltroClientes1: TfrViewFiltroClientes;
+    procedure actRefrescarExecute(Sender: TObject);
+    procedure FormShow(Sender: TObject);
+
+  private
+    FListaIDClientes: TIntegerArray;
+    function GetIntervalo: Variant;
+    function GetAno1: Variant;
+    function GetAno2: Variant;
+    function GetSerie: variant;
+    function GetListaIDClientes: TIntegerArray;
+    function GetNTop: Variant;
+
+    procedure RefrescarInforme;
+
+  protected
+    procedure SetController (const Value : IControllerBase); override;
+
+  public
+    property Intervalo: Variant read GetIntervalo;
+    property Ano1: Variant read GetAno1;
+    property Ano2: Variant read GetAno2;
+    property Serie: Variant read GetSerie;
+    property ListaIDClientes: TIntegerArray read GetListaIDClientes;
+    property NTop: Variant read GetNTop;
+
+    constructor Create(AOwner: TComponent); override;
+    destructor Destroy; override;
+  end;
+
+
+implementation
+
+{$R *.dfm}
+
+uses uROTypes, DateUtils, uGestorInformesController, uFactuGES_App;
+
+{ TfEditorGestorInformesReport }
+
+procedure TfEditorInformeBeneficiosReportGrafComp.actRefrescarExecute(Sender: TObject);
+begin
+  inherited;
+  RefrescarInforme;
+end;
+
+constructor TfEditorInformeBeneficiosReportGrafComp.Create(AOwner: TComponent);
+begin
+  inherited;
+  FListaIDClientes := TIntegerArray.Create;
+end;
+
+destructor TfEditorInformeBeneficiosReportGrafComp.Destroy;
+begin
+  FListaIDClientes.Free;
+  inherited;
+end;
+
+procedure TfEditorInformeBeneficiosReportGrafComp.FormShow(Sender: TObject);
+begin
+  inherited;
+  actTodaPagina.Execute;
+end;
+
+function TfEditorInformeBeneficiosReportGrafComp.GetIntervalo: Variant;
+begin
+  Result := frViewIntervaloComparativo1.cbIntervalo.EditValue;
+end;
+
+function TfEditorInformeBeneficiosReportGrafComp.GetAno1: Variant;
+begin
+  Result := frViewIntervaloComparativo1.cbAno1.EditValue;
+end;
+
+function TfEditorInformeBeneficiosReportGrafComp.GetAno2: Variant;
+begin
+  Result := frViewIntervaloComparativo1.cbAno2.EditValue;
+end;
+
+function TfEditorInformeBeneficiosReportGrafComp.GetListaIDClientes: TIntegerArray;
+begin
+  FListaIDClientes.Clear;
+  if Assigned(frViewFiltroClientes1.Cliente) then
+     FListaIDClientes.Add(frViewFiltroClientes1.Cliente.ID);
+
+  Result := FListaIDClientes;
+end;
+
+function TfEditorInformeBeneficiosReportGrafComp.GetNTop: Variant;
+begin
+  Result := frViewIntervaloComparativo1.stopN.Value;
+end;
+
+function TfEditorInformeBeneficiosReportGrafComp.GetSerie: Variant;
+begin
+  Result := frViewIntervaloComparativo1.Serie;
+end;
+
+procedure TfEditorInformeBeneficiosReportGrafComp.RefrescarInforme;
+var
+  AStream: Binary;
+begin
+  ShowHourglassCursor;
+  try
+
+    AStream := (Controller as IGestorInformesController).DataModule.GenerarInformeBeneficiosGrafComp(
+      AppFactuGES.EmpresaActiva.ID,
+      Intervalo,
+      Ano1,
+      Ano2,
+      Serie);
+
+    LoadFromStream(AStream);
+    Report.ShowPreparedReport;
+  finally
+    FreeAndNil(AStream);
+    HideHourglassCursor;
+  end;
+end;
+
+procedure TfEditorInformeBeneficiosReportGrafComp.SetController(
+  const Value: IControllerBase);
+var
+  AListaAnos: TStringList;
+  AListaIntervalos: TStringList;
+  i: Integer;
+
+begin
+  inherited;
+
+  AListaIntervalos := (Controller as IGestorInformesController).DarListaIntervalos;
+  AListaAnos := (Controller as IGestorInformesController).DarListaAnosFacturasCli;
+
+  if Assigned(AListaIntervalos) then
+  begin
+    frViewIntervaloComparativo1.cbIntervalo.Properties.Items.BeginUpdate;
+    frViewIntervaloComparativo1.cbIntervalo.Properties.Items.Clear;
+    for i := 0 to AListaIntervalos.Count - 1 do
+        frViewIntervaloComparativo1.cbIntervalo.Properties.Items.Append(AListaIntervalos.Strings[i]);
+    frViewIntervaloComparativo1.cbIntervalo.Properties.Items.EndUpdate;
+  end;
+
+  if Assigned(AListaAnos) then
+  begin
+    frViewIntervaloComparativo1.cbAno1.Properties.Items.BeginUpdate;
+    frViewIntervaloComparativo1.cbAno2.Properties.Items.BeginUpdate;
+    frViewIntervaloComparativo1.cbAno1.Properties.Items.Clear;
+    frViewIntervaloComparativo1.cbAno2.Properties.Items.Clear;
+    for i := 0 to AListaAnos.Count - 1 do
+    begin
+        frViewIntervaloComparativo1.cbAno1.Properties.Items.Append(AListaAnos.Strings[i]);
+        frViewIntervaloComparativo1.cbAno2.Properties.Items.Append(AListaAnos.Strings[i]);
+    end;
+    frViewIntervaloComparativo1.cbAno1.Properties.Items.EndUpdate;
+    frViewIntervaloComparativo1.cbAno2.Properties.Items.EndUpdate;
+  end;
+
+  frViewIntervaloComparativo1.cbIntervalo.ItemIndex := 0;
+  frViewIntervaloComparativo1.cbAno1.ItemIndex := 0;
+end;
+
+end.

Source/Modulos/Gestor de informes/Views/uGestorInformesViewRegister.pas

@@ -16,7 +16,7 @@ uses
   uEditorInformeIVAProveedoresReport, uEditorInformeFacturasProveedorReport, uEditorInformeFacturasProveedorPendientesReport,
   uEditorInformeRecibosProveedorReport, uEditorInformeRecibosProvPendientesReport,
 
-  uEditorInformeFacturasProveedorReportGrafComp, uEditorInformeFacturasClienteReportGrafComp;
+  uEditorInformeFacturasProveedorReportGrafComp, uEditorInformeFacturasClienteReportGrafComp, uEditorInformeBeneficiosReportGrafComp;
 
 procedure RegisterViews;
 begin
@@ -36,6 +36,7 @@ begin
 
   EditorRegistry.RegisterClass(TfEditorInformeFacturasProveedorReportGrafComp, 'EditorInformeFacturasProveedorReportGrafComp');
   EditorRegistry.RegisterClass(TfEditorInformeFacturasClienteReportGrafComp, 'EditorInformeFacturasClienteReportGrafComp');
+  EditorRegistry.RegisterClass(TfEditorInformeBeneficiosReportGrafComp, 'EditorInformeBeneficiosReportGrafComp');
 end;
 
 procedure UnregisterViews;
@@ -53,6 +54,7 @@ begin
   EditorRegistry.UnRegisterClass(TfEditorInformeFacturasProveedorPendientesReport);
   EditorRegistry.UnRegisterClass(TfEditorInformeRecibosProveedorReport);
   EditorRegistry.UnRegisterClass(TfEditorInformeRecibosProvPendientesReport);
+  EditorRegistry.UnRegisterClass(TfEditorInformeBeneficiosReportGrafComp);  
 
   EditorRegistry.UnRegisterClass(TfEditorInformeFacturasProveedorReportGrafComp);
   EditorRegistry.UnRegisterClass(TfEditorInformeFacturasClienteReportGrafComp);    

Source/Modulos/Gestor de informes/Views/uViewIntervaloComparativo.dfm

@@ -1,14 +1,14 @@
 inherited frViewIntervaloComparativo: TfrViewIntervaloComparativo
-  Width = 451
+  Width = 326
-  Height = 238
+  Height = 273
   Align = alTop
-  ExplicitWidth = 451
+  ExplicitWidth = 326
-  ExplicitHeight = 238
+  ExplicitHeight = 273
   object TBXAlignmentPanel2: TTBXAlignmentPanel
     AlignWithMargins = True
     Left = 3
     Top = 32
-    Width = 445
+    Width = 320
     Height = 42
     Margins.Left = 5
     Margins.Top = 5
@@ -16,13 +16,14 @@ inherited frViewIntervaloComparativo: TfrViewIntervaloComparativo
     Align = alTop
     AutoSize = True
     TabOrder = 0
+    ExplicitWidth = 445
     DesignSize = (
-      445
+      320
       42)
     object Label3: TLabel
       Left = 5
       Top = 5
-      Width = 435
+      Width = 310
       Height = 13
       Align = alTop
       Caption = 'Intervalo comparativo'
@@ -52,13 +53,14 @@ inherited frViewIntervaloComparativo: TfrViewIntervaloComparativo
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 0
-      Width = 429
+      ExplicitWidth = 429
+      Width = 304
     end
   end
   object TBXLabel2: TTBXLabel
     Left = 0
     Top = 0
-    Width = 451
+    Width = 326
     Height = 29
     Margins.Top = 5
     Margins.Bottom = 10
@@ -72,12 +74,13 @@ inherited frViewIntervaloComparativo: TfrViewIntervaloComparativo
     ParentColor = True
     ParentFont = False
     Underline = True
+    ExplicitWidth = 451
   end
   object TBXAlignmentPanel3: TTBXAlignmentPanel
     AlignWithMargins = True
     Left = 3
     Top = 80
-    Width = 445
+    Width = 320
     Height = 42
     Margins.Left = 5
     Margins.Top = 5
@@ -85,13 +88,14 @@ inherited frViewIntervaloComparativo: TfrViewIntervaloComparativo
     Align = alTop
     AutoSize = True
     TabOrder = 2
+    ExplicitWidth = 445
     DesignSize = (
-      445
+      320
       42)
     object lis: TLabel
       Left = 5
       Top = 5
-      Width = 435
+      Width = 310
       Height = 13
       Align = alTop
       Caption = 'A'#241'o'
@@ -121,14 +125,15 @@ inherited frViewIntervaloComparativo: TfrViewIntervaloComparativo
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 0
-      Width = 429
+      ExplicitWidth = 429
+      Width = 304
     end
   end
   object TBXAlignmentPanel1: TTBXAlignmentPanel
     AlignWithMargins = True
     Left = 3
     Top = 128
-    Width = 445
+    Width = 320
     Height = 42
     Margins.Left = 5
     Margins.Top = 5
@@ -136,13 +141,14 @@ inherited frViewIntervaloComparativo: TfrViewIntervaloComparativo
     Align = alTop
     AutoSize = True
     TabOrder = 3
+    ExplicitWidth = 445
     DesignSize = (
-      445
+      320
       42)
     object Label1: TLabel
       Left = 5
       Top = 5
-      Width = 435
+      Width = 310
       Height = 13
       Align = alTop
       Caption = 'Comparar con a'#241'o'
@@ -172,37 +178,99 @@ inherited frViewIntervaloComparativo: TfrViewIntervaloComparativo
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 0
-      Width = 429
+      ExplicitWidth = 429
+      Width = 304
     end
   end
   object TBXAlignmentPanel4: TTBXAlignmentPanel
     AlignWithMargins = True
     Left = 3
     Top = 176
-    Width = 445
+    Width = 320
-    Height = 41
+    Height = 43
     Margins.Left = 5
     Margins.Top = 5
     Margins.Right = 5
     Align = alTop
     AutoSize = True
     TabOrder = 4
+    ExplicitWidth = 445
     object Label2: TLabel
       Left = 5
       Top = 5
-      Width = 435
+      Width = 310
       Height = 13
       Align = alTop
-      Caption = 'Top N'
+      Caption = 'Top N:'
       Transparent = True
-      ExplicitWidth = 28
+      ExplicitWidth = 32
     end
     object stopN: TcxSpinEdit
       Left = 3
-      Top = 20
+      Top = 22
       TabOrder = 0
       Value = 5
-      Width = 121
+      Width = 110
+    end
+  end
+  object TBXAlignmentPanel5: TTBXAlignmentPanel
+    AlignWithMargins = True
+    Left = 3
+    Top = 225
+    Width = 320
+    Height = 42
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Align = alTop
+    AutoSize = True
+    TabOrder = 5
+    ExplicitTop = 181
+    ExplicitWidth = 445
+    DesignSize = (
+      320
+      42)
+    object Label4: TLabel
+      Left = 5
+      Top = 5
+      Width = 310
+      Height = 13
+      Align = alTop
+      Caption = 'Mostrar gr'#225'fico de:'
+      Transparent = True
+      ExplicitWidth = 92
+    end
+    object cbSerie: TcxComboBox
+      Left = 3
+      Top = 21
+      Anchors = [akLeft, akTop, akRight]
+      Properties.DropDownListStyle = lsFixedList
+      Properties.Items.Strings = (
+        'Todos'
+        'Ingresos'
+        'Gastos'
+        'Beneficios')
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      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
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 0
+      Text = 'Todos'
+      ExplicitWidth = 429
+      Width = 304
     end
   end
 end

Source/Modulos/Gestor de informes/Views/uViewIntervaloComparativo.pas

@@ -28,19 +28,25 @@ type
     TBXAlignmentPanel4: TTBXAlignmentPanel;
     Label2: TLabel;
     stopN: TcxSpinEdit;
+    TBXAlignmentPanel5: TTBXAlignmentPanel;
+    Label4: TLabel;
+    cbSerie: TcxComboBox;
 
   private
     function GetIntervalo: Variant;
     function GetAno1: Variant;
     function GetAno2: Variant;
+    function GetSerie: Variant;
     procedure SetIntervalo(const Value: Variant);
     procedure SetAno1(const Value: Variant);
     procedure SetAno2(const Value: Variant);
+    procedure SetSerie(const Value: Variant);
 
   public
     property Intevalo : Variant read GetIntervalo write SetIntervalo;
     property Ano1 : Variant read GetAno1 write SetAno1;
     property Ano2 : Variant read GetAno2 write SetAno2;
+    property Serie : Variant read GetSerie write SetSerie;
     constructor Create(AOwner: TComponent); override;
   end;
 
@@ -57,6 +63,11 @@ begin
   Result := cbIntervalo.EditValue;
 end;
 
+function TfrViewIntervaloComparativo.GetSerie: Variant;
+begin
+  Result := cbSerie.ItemIndex;
+end;
+
 function TfrViewIntervaloComparativo.GetAno1: Variant;
 begin
   Result := cbAno1.EditValue;
@@ -72,6 +83,11 @@ begin
   cbIntervalo.EditValue := Value;
 end;
 
+procedure TfrViewIntervaloComparativo.SetSerie(const Value: Variant);
+begin
+  cbSerie.ItemIndex := Value;
+end;
+
 procedure TfrViewIntervaloComparativo.SetAno1(const Value: Variant);
 begin
   cbAno1.EditValue := Value;

Source/Modulos/Informe margen por articulo/Data/InfMargenArticulo_data.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo\Source\Modulos\Informe margen por articulo\Data\uDataModuleInfMargenArticulo.dfm */
 /* C:\Codigo\Source\Modulos\Informe margen por articulo\Data\InfMargenArticulo_data.res */
-/* c:\temp\dtf300.tmp */
+/* c:\temp\dtf7E.tmp */

Source/Modulos/Informe margen por articulo/Model/InfMargenArticulo_model.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo\Source\Modulos\Informe margen por articulo\Model\InfMargenArticulo_model.res */
-/* c:\temp\dtf2FE.tmp */
+/* c:\temp\dtf7C.tmp */

Source/Modulos/Informe margen por articulo/Views/InfMargenArticulo_view.drc

@@ -16,4 +16,4 @@ END
 /* C:\Codigo\Source\Modulos\Informe margen por articulo\Views\uViewInfMargenArticulo.dfm */
 /* C:\Codigo\Source\Modulos\Informe margen por articulo\Views\uEditorInfMargenArticulo.dfm */
 /* C:\Codigo\Source\Modulos\Informe margen por articulo\Views\InfMargenArticulo_view.res */
-/* c:\temp\dtf304.tmp */
+/* c:\temp\dtf82.tmp */

Source/Modulos/Informe ventas por articulo/Data/InfVentasArticulo_data.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo\Source\Modulos\Informe ventas por articulo\Data\uDataModuleInfVentasArticulo.dfm */
 /* C:\Codigo\Source\Modulos\Informe ventas por articulo\Data\InfVentasArticulo_data.res */
-/* c:\temp\dtf2F6.tmp */
+/* c:\temp\dtf74.tmp */

Source/Modulos/Informe ventas por articulo/Model/InfVentasArticulo_model.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo\Source\Modulos\Informe ventas por articulo\Model\InfVentasArticulo_model.res */
-/* c:\temp\dtf2F4.tmp */
+/* c:\temp\dtf72.tmp */

Source/Modulos/Informe ventas por articulo/Views/InfVentasArticulo_view.drc

@@ -16,4 +16,4 @@ END
 /* C:\Codigo\Source\Modulos\Informe ventas por articulo\Views\uViewInfVentasArticulo.dfm */
 /* C:\Codigo\Source\Modulos\Informe ventas por articulo\Views\uEditorInfVentasArticulo.dfm */
 /* C:\Codigo\Source\Modulos\Informe ventas por articulo\Views\InfVentasArticulo_view.res */
-/* c:\temp\dtf2FA.tmp */
+/* c:\temp\dtf78.tmp */

Source/Modulos/Informes base/Controller/InformesBase_controller.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo\Source\Modulos\Informes base\Controller\InformesBase_controller.res */
-/* c:\temp\dtf2EA.tmp */
+/* c:\temp\dtf68.tmp */

Source/Modulos/Informes base/Data/Informes_data.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo\Source\Modulos\Informes base\Data\uDataModuleInformes.dfm */
 /* C:\Codigo\Source\Modulos\Informes base\Data\Informes_data.res */
-/* c:\temp\dtf2E4.tmp */
+/* c:\temp\dtf64.tmp */

Source/Modulos/Informes base/Model/Informes_model.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo\Source\Modulos\Informes base\Model\Informes_model.res */
-/* c:\temp\dtf2E2.tmp */
+/* c:\temp\dtf62.tmp */

Source/Modulos/Informes base/Views/Informes_view.drc

@@ -15,4 +15,4 @@ END
 /* C:\Codigo\Source\Modulos\Informes base\Views\uViewInformes.dfm */
 /* C:\Codigo\Source\Modulos\Informes base\Views\uEditorInformes.dfm */
 /* C:\Codigo\Source\Modulos\Informes base\Views\Informes_view.res */
-/* c:\temp\dtf2EE.tmp */
+/* c:\temp\dtf6C.tmp */

Source/Modulos/Pedidos de cliente/Controller/PedidosCliente_controller.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo\Source\Modulos\Pedidos de cliente\Controller\PedidosCliente_controller.RES */
-/* c:\temp\dtf338.tmp */
+/* c:\temp\dtfB6.tmp */

Source/Modulos/Pedidos de cliente/Data/PedidosCliente_data.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo\Source\Modulos\Pedidos de cliente\Data\uDataModulePedidosCliente.dfm */
 /* C:\Codigo\Source\Modulos\Pedidos de cliente\Data\PedidosCliente_data.RES */
-/* c:\temp\dtf336.tmp */
+/* c:\temp\dtfB4.tmp */

Source/Modulos/Pedidos de cliente/Model/PedidosCliente_model.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo\Source\Modulos\Pedidos de cliente\Model\PedidosCliente_model.RES */
-/* c:\temp\dtf334.tmp */
+/* c:\temp\dtfB2.tmp */

Source/Modulos/Pedidos de cliente/Plugin/PedidosCliente_plugin.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo\Source\Modulos\Pedidos de cliente\Plugin\uPluginPedidosCliente.dfm */
 /* C:\Codigo\Source\Modulos\Pedidos de cliente\Plugin\PedidosCliente_plugin.RES */
-/* c:\temp\dtf39C.tmp */
+/* c:\temp\dtf11A.tmp */

Source/Modulos/Pedidos de cliente/Views/PedidosCliente_view.drc

@@ -26,4 +26,4 @@ END
 /* C:\Codigo\Source\Modulos\Pedidos de cliente\Views\uEditorElegirArticulosPedidoCliente.dfm */
 /* C:\Codigo\Source\Modulos\Pedidos de cliente\Views\uEditorDireccionEntregaPedidoCliente.dfm */
 /* C:\Codigo\Source\Modulos\Pedidos de cliente\Views\PedidosCliente_view.RES */
-/* c:\temp\dtf39A.tmp */
+/* c:\temp\dtf118.tmp */

Source/Modulos/Tienda web/Data/TiendaWeb_data.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo\Source\Modulos\Tienda web\Data\uDataModuleTiendaWeb.dfm */
 /* C:\Codigo\Source\Modulos\Tienda web\Data\TiendaWeb_data.res */
-/* c:\temp\dtf34E.tmp */
+/* c:\temp\dtfCC.tmp */

Source/Servicios/FactuGES.RODL

@@ -990,6 +990,22 @@
 </Parameter>
 </Parameters>
 </Operation>
+<Operation Name="GenerarInformeBeneficiosGrafComp" UID="{A94F57D9-1252-49A2-8487-467FA346CB9B}">
+<Parameters>
+<Parameter Name="Result" DataType="Binary" Flag="Result">
+</Parameter>
+<Parameter Name="IdEmpresa" DataType="Integer" Flag="In" >
+</Parameter>
+<Parameter Name="Intervalo" DataType="Variant" Flag="In" >
+</Parameter>
+<Parameter Name="Ano1" DataType="Variant" Flag="In" >
+</Parameter>
+<Parameter Name="Ano2" DataType="Variant" Flag="In" >
+</Parameter>
+<Parameter Name="Serie" DataType="Variant" Flag="In" >
+</Parameter>
+</Parameters>
+</Operation>
 </Operations>
 </Interface>
 </Interfaces>

Source/Servicios/FactuGES_Intf.pas

@@ -826,6 +826,7 @@ type
                                                 const TopN: Integer): Binary;
     function GenerarInformeFacturasCliGrafComp(const IdEmpresa: Integer; const Intervalo: Variant; const Ano1: Variant; const Ano2: Variant; const ListaIDClientes: TIntegerArray; 
                                                const TopN: Integer): Binary;
+    function GenerarInformeBeneficiosGrafComp(const IdEmpresa: Integer; const Intervalo: Variant; const Ano1: Variant; const Ano2: Variant; const Serie: Variant): Binary;
   end;
 
   { CosrvGestorInformes }
@@ -869,6 +870,7 @@ type
                                                 const TopN: Integer): Binary;
     function GenerarInformeFacturasCliGrafComp(const IdEmpresa: Integer; const Intervalo: Variant; const Ano1: Variant; const Ano2: Variant; const ListaIDClientes: TIntegerArray; 
                                                const TopN: Integer): Binary;
+    function GenerarInformeBeneficiosGrafComp(const IdEmpresa: Integer; const Intervalo: Variant; const Ano1: Variant; const Ano2: Variant; const Serie: Variant): Binary;
   end;
 
   { IsrvComisiones }
@@ -3027,6 +3029,27 @@ begin
   end
 end;
 
+function TsrvGestorInformes_Proxy.GenerarInformeBeneficiosGrafComp(const IdEmpresa: Integer; const Intervalo: Variant; const Ano1: Variant; const Ano2: Variant; const Serie: Variant): Binary;
+begin
+  try
+    result := nil;
+    __Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'GenerarInformeBeneficiosGrafComp');
+    __Message.Write('IdEmpresa', TypeInfo(Integer), IdEmpresa, []);
+    __Message.Write('Intervalo', TypeInfo(Variant), Intervalo, []);
+    __Message.Write('Ano1', TypeInfo(Variant), Ano1, []);
+    __Message.Write('Ano2', TypeInfo(Variant), Ano2, []);
+    __Message.Write('Serie', TypeInfo(Variant), Serie, []);
+    __Message.Finalize;
+
+    __TransportChannel.Dispatch(__Message);
+
+    __Message.Read('Result', TypeInfo(Binary), result, []);
+  finally
+    __Message.UnsetAttributes(__TransportChannel);
+    __Message.FreeStream;
+  end
+end;
+
 { CosrvComisiones }
 
 class function CosrvComisiones.Create(const aMessage: IROMessage; aTransportChannel: IROTransportChannel): IsrvComisiones;

Source/Servicios/FactuGES_Invk.pas

@@ -314,6 +314,7 @@ type
     procedure Invoke_DarListaIntervalos(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
     procedure Invoke_GenerarInformeFacturasProvGrafComp(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
     procedure Invoke_GenerarInformeFacturasCliGrafComp(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
+    procedure Invoke_GenerarInformeBeneficiosGrafComp(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
   end;
 
   TsrvComisiones_Invoker = class(TDataAbstractService_Invoker)
@@ -2644,6 +2645,42 @@ begin
   end;
 end;
 
+procedure TsrvGestorInformes_Invoker.Invoke_GenerarInformeBeneficiosGrafComp(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
+{ function GenerarInformeBeneficiosGrafComp(const IdEmpresa: Integer; const Intervalo: Variant; const Ano1: Variant; const Ano2: Variant; const Serie: Variant): Binary; }
+var
+  IdEmpresa: Integer;
+  Intervalo: Variant;
+  Ano1: Variant;
+  Ano2: Variant;
+  Serie: Variant;
+  lResult: Binary;
+  __lObjectDisposer: TROObjectDisposer;
+begin
+  lResult := nil;
+  try
+    __Message.Read('IdEmpresa', TypeInfo(Integer), IdEmpresa, []);
+    __Message.Read('Intervalo', TypeInfo(Variant), Intervalo, []);
+    __Message.Read('Ano1', TypeInfo(Variant), Ano1, []);
+    __Message.Read('Ano2', TypeInfo(Variant), Ano2, []);
+    __Message.Read('Serie', TypeInfo(Variant), Serie, []);
+
+    lResult := (__Instance as IsrvGestorInformes).GenerarInformeBeneficiosGrafComp(IdEmpresa, Intervalo, Ano1, Ano2, Serie);
+
+    __Message.InitializeResponseMessage(__Transport, 'FactuGES', 'srvGestorInformes', 'GenerarInformeBeneficiosGrafCompResponse');
+    __Message.Write('Result', TypeInfo(Binary), lResult, []);
+    __Message.Finalize;
+    __Message.UnsetAttributes(__Transport);
+
+  finally
+    __lObjectDisposer := TROObjectDisposer.Create(__Instance);
+    try
+      __lObjectDisposer.Add(lResult);
+    finally
+      __lObjectDisposer.Free();
+    end;
+  end;
+end;
+
 { TsrvComisiones_Invoker }
 
 constructor TsrvComisiones_Invoker.Create;

Source/Servidor/FactuGES_Server.dproj

@@ -1,411 +1,405 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
+	<PropertyGroup>
-    <ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
+		<ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
-    <MainSource>FactuGES_Server.dpr</MainSource>
+		<MainSource>FactuGES_Server.dpr</MainSource>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+		<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+		<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+		<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
-    <DCC_DependencyCheckOutputName>..\..\Output\Debug\Servidor\FactuGES_Server.exe</DCC_DependencyCheckOutputName>
+		<DCC_DependencyCheckOutputName>..\..\Output\Debug\Servidor\FactuGES_Server.exe</DCC_DependencyCheckOutputName>
-    <DCC_UsePackage>vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11R;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100</DCC_UsePackage>
+		<DCC_UsePackage>vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11R;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100</DCC_UsePackage>
-  </PropertyGroup>
+	</PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <Version>7.0</Version>
+		<Version>7.0</Version>
-    <DCC_DebugInformation>False</DCC_DebugInformation>
+		<DCC_DebugInformation>False</DCC_DebugInformation>
-    <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
+		<DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
-    <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+		<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
-    <DCC_MapFile>3</DCC_MapFile>
+		<DCC_MapFile>3</DCC_MapFile>
-    <DCC_ExeOutput>..\..\Output\Release\Servidor</DCC_ExeOutput>
+		<DCC_ExeOutput>..\..\Output\Release\Servidor</DCC_ExeOutput>
-    <DCC_Define>RELEASE</DCC_Define>
+		<DCC_Define>RELEASE</DCC_Define>
-  </PropertyGroup>
+	</PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <Version>7.0</Version>
+		<Version>7.0</Version>
-    <DCC_MapFile>3</DCC_MapFile>
+		<DCC_MapFile>3</DCC_MapFile>
-    <DCC_ExeOutput>..\..\Output\Debug\Servidor</DCC_ExeOutput>
+		<DCC_ExeOutput>..\..\Output\Debug\Servidor</DCC_ExeOutput>
-    <DCC_Define>DEBUG;</DCC_Define>
+		<DCC_Define>DEBUG;</DCC_Define>
-    <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
+		<DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
-    <DCC_DebugInfoInExe>True</DCC_DebugInfoInExe>
+		<DCC_DebugInfoInExe>True</DCC_DebugInfoInExe>
-    <DCC_DebugVN>True</DCC_DebugVN>
+		<DCC_DebugVN>True</DCC_DebugVN>
-    <DCC_UnitSearchPath>C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_UnitSearchPath>
+		<DCC_UnitSearchPath>C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_UnitSearchPath>
-    <DCC_ResourcePath>C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_ResourcePath>
+		<DCC_ResourcePath>C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_ResourcePath>
-    <DCC_ObjPath>C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_ObjPath>
+		<DCC_ObjPath>C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_ObjPath>
-    <DCC_IncludePath>C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_IncludePath>
+		<DCC_IncludePath>C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_IncludePath>
-  </PropertyGroup>
+	</PropertyGroup>
-  <ProjectExtensions>
+	<ProjectExtensions>
-    <Borland.Personality>Delphi.Personality</Borland.Personality>
+		<Borland.Personality>Delphi.Personality</Borland.Personality>
-    <Borland.ProjectType />
+		<Borland.ProjectType/>
-    <BorlandProject>
+		<BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters><Parameters Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">4</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">3</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">4.1.3.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">4.1.3.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">viernes, 11 de febrero de 2011 13:14</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+			<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters><Parameters Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">4</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">4</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">4.1.4.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">4.1.4.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">martes, 01 de marzo de 2011 18:10</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
-      
+						<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPSCoreD11.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages>
-      
+					</Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
-      
+	</ProjectExtensions>
-      
+	<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets"/>
-      
+	<ItemGroup>
-      
+		<DelphiCompile Include="FactuGES_Server.dpr">
-      <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPSCoreD11.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages>
+			<MainSource>MainSource</MainSource>
-    </Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
+		</DelphiCompile>
-  </ProjectExtensions>
+		<DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas"/>
-  <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
+		<DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas"/>
-  <ItemGroup>
+		<DCCReference Include="..\ApplicationBase\Empresas\Model\uBizEmpresasServer.pas"/>
-    <DelphiCompile Include="FactuGES_Server.dpr">
+		<DCCReference Include="..\ApplicationBase\Empresas\Servidor\srvEmpresas_Impl.pas">
-      <MainSource>MainSource</MainSource>
+			<Form>srvEmpresas</Form>
-    </DelphiCompile>
+			<DesignClass>TDARemoteService</DesignClass>
-    <DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas" />
+		</DCCReference>
-    <DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas" />
+		<DCCReference Include="..\ApplicationBase\ProvinciasPoblaciones\Servidor\srvProvinciasPoblaciones_Impl.pas">
-    <DCCReference Include="..\ApplicationBase\Empresas\Model\uBizEmpresasServer.pas" />
+			<Form>srvProvinciasPoblaciones_Impl</Form>
-    <DCCReference Include="..\ApplicationBase\Empresas\Servidor\srvEmpresas_Impl.pas">
+			<DesignClass>TDataModule</DesignClass>
-      <Form>srvEmpresas</Form>
+		</DCCReference>
-      <DesignClass>TDARemoteService</DesignClass>
+		<DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosClient_Intf.pas"/>
-    </DCCReference>
+		<DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosServer_Intf.pas"/>
-    <DCCReference Include="..\ApplicationBase\ProvinciasPoblaciones\Servidor\srvProvinciasPoblaciones_Impl.pas">
+		<DCCReference Include="..\ApplicationBase\Usuarios\Servidor\srvUsuarios_Impl.pas">
-      <Form>srvProvinciasPoblaciones_Impl</Form>
+			<Form>srvUsuarios</Form>
-      <DesignClass>TDataModule</DesignClass>
+			<DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosClient_Intf.pas" />
+		<DCCReference Include="..\Base\schBase_Intf.pas"/>
-    <DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosServer_Intf.pas" />
+		<DCCReference Include="..\Base\Utiles\uSistemaFunc.pas"/>
-    <DCCReference Include="..\ApplicationBase\Usuarios\Servidor\srvUsuarios_Impl.pas">
+		<DCCReference Include="..\Base\Utiles\uStringsUtils.pas"/>
-      <Form>srvUsuarios</Form>
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas"/>
-      <DesignClass>TDataAbstractService</DesignClass>
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas"/>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Model\uBizAlbaranClienteServer.pas"/>
-    <DCCReference Include="..\Base\schBase_Intf.pas" />
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Reports\uRptAlbaranesCliente_Server.pas">
-    <DCCReference Include="..\Base\Utiles\uSistemaFunc.pas" />
+			<Form>RptAlbaranesCliente</Form>
-    <DCCReference Include="..\Base\Utiles\uStringsUtils.pas" />
+			<DesignClass>TDataModule</DesignClass>
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas" />
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Reports\uRptWordAlbaranCliente.pas">
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Model\uBizAlbaranClienteServer.pas" />
+			<Form>RptWordAlbaranCliente</Form>
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Reports\uRptAlbaranesCliente_Server.pas">
+			<DesignClass>TDataModule</DesignClass>
-      <Form>RptAlbaranesCliente</Form>
+		</DCCReference>
-      <DesignClass>TDataModule</DesignClass>
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Servidor\srvAlbaranesCliente_Impl.pas">
-    </DCCReference>
+			<Form>srvAlbaranesCliente</Form>
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Reports\uRptWordAlbaranCliente.pas">
+			<DesignClass>TDataAbstractService</DesignClass>
-      <Form>RptWordAlbaranCliente</Form>
+		</DCCReference>
-      <DesignClass>TDataModule</DesignClass>
+		<DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorClient_Intf.pas"/>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Servidor\srvAlbaranesCliente_Impl.pas">
+		<DCCReference Include="..\Modulos\Albaranes de proveedor\Model\uBizAlbaranProveedorServer.PAS"/>
-      <Form>srvAlbaranesCliente</Form>
+		<DCCReference Include="..\Modulos\Albaranes de proveedor\Reports\uRptAlbaranesProveedor_Server.pas">
-      <DesignClass>TDataAbstractService</DesignClass>
+			<Form>RptAlbaranesProveedor</Form>
-    </DCCReference>
+			<DesignClass>TDataModule</DesignClass>
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorClient_Intf.pas" />
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Albaranes de proveedor\Reports\uRptWordAlbaranProveedor.pas">
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\Model\uBizAlbaranProveedorServer.PAS" />
+			<Form>RptWordAlbaranProveedor</Form>
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\Reports\uRptAlbaranesProveedor_Server.pas">
+			<DesignClass>TDataModule</DesignClass>
-      <Form>RptAlbaranesProveedor</Form>
+		</DCCReference>
-      <DesignClass>TDataModule</DesignClass>
+		<DCCReference Include="..\Modulos\Albaranes de proveedor\Servidor\srvAlbaranesProveedor_Impl.pas">
-    </DCCReference>
+			<Form>srvAlbaranesProveedor</Form>
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\Reports\uRptWordAlbaranProveedor.pas">
+			<DesignClass>TDataAbstractService</DesignClass>
-      <Form>RptWordAlbaranProveedor</Form>
+		</DCCReference>
-      <DesignClass>TDataModule</DesignClass>
+		<DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesClient_Intf.pas"/>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\Servidor\srvAlbaranesProveedor_Impl.pas">
+		<DCCReference Include="..\Modulos\Almacenes\Servidor\srvAlmacenes_Impl.pas">
-      <Form>srvAlbaranesProveedor</Form>
+			<Form>srvAlmacenes</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
+			<DesignClass>TDARemoteService</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Articulos\Model\schArticulosClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Articulos\Model\schArticulosServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Almacenes\Servidor\srvAlmacenes_Impl.pas">
+		<DCCReference Include="..\Modulos\Articulos\Model\uBizArticulosServer.pas"/>
-      <Form>srvAlmacenes</Form>
+		<DCCReference Include="..\Modulos\Articulos\Servidor\srvArticulos_Impl.pas">
-      <DesignClass>TDARemoteService</DesignClass>
+			<Form>srvArticulos</Form>
-    </DCCReference>
+			<DesignClass>TDARemoteService</DesignClass>
-    <DCCReference Include="..\Modulos\Articulos\Model\schArticulosClient_Intf.pas" />
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Articulos\Model\schArticulosServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Comisiones\Model\schComisionesClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Articulos\Model\uBizArticulosServer.pas" />
+		<DCCReference Include="..\Modulos\Comisiones\Model\schComisionesServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Articulos\Servidor\srvArticulos_Impl.pas">
+		<DCCReference Include="..\Modulos\Comisiones\Model\uBizComisionesServer.pas"/>
-      <Form>srvArticulos</Form>
+		<DCCReference Include="..\Modulos\Comisiones\Reports\uRptComisiones_Server.pas">
-      <DesignClass>TDARemoteService</DesignClass>
+			<Form>RptComisiones</Form>
-    </DCCReference>
+			<DesignClass>TDataModule</DesignClass>
-    <DCCReference Include="..\Modulos\Comisiones\Model\schComisionesClient_Intf.pas" />
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Comisiones\Model\schComisionesServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Comisiones\Servidor\srvComisiones_Impl.pas">
-    <DCCReference Include="..\Modulos\Comisiones\Model\uBizComisionesServer.pas" />
+			<Form>srvComisiones</Form>
-    <DCCReference Include="..\Modulos\Comisiones\Reports\uRptComisiones_Server.pas">
+			<DesignClass>TDataAbstractService</DesignClass>
-      <Form>RptComisiones</Form>
+		</DCCReference>
-      <DesignClass>TDataModule</DesignClass>
+		<DCCReference Include="..\Modulos\Contactos\Model\schContactosClient_Intf.pas"/>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Contactos\Model\schContactosServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Comisiones\Servidor\srvComisiones_Impl.pas">
+		<DCCReference Include="..\Modulos\Contactos\Model\uBizAgentesServer.pas"/>
-      <Form>srvComisiones</Form>
+		<DCCReference Include="..\Modulos\Contactos\Model\uBizClientesServer.pas"/>
-      <DesignClass>TDataAbstractService</DesignClass>
+		<DCCReference Include="..\Modulos\Contactos\Model\uBizContactosServer.pas"/>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Contactos\Model\uBizEmpleadosServer.pas"/>
-    <DCCReference Include="..\Modulos\Contactos\Model\schContactosClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Contactos\Model\uBizProveedoresServer.pas"/>
-    <DCCReference Include="..\Modulos\Contactos\Model\schContactosServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Contactos\Reports\uRptEtiquetasContacto_Server.pas">
-    <DCCReference Include="..\Modulos\Contactos\Model\uBizAgentesServer.pas" />
+			<Form>RptEtiquetasContacto</Form>
-    <DCCReference Include="..\Modulos\Contactos\Model\uBizClientesServer.pas" />
+			<DesignClass>TDataModule</DesignClass>
-    <DCCReference Include="..\Modulos\Contactos\Model\uBizContactosServer.pas" />
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Contactos\Model\uBizEmpleadosServer.pas" />
+		<DCCReference Include="..\Modulos\Contactos\Reports\uRptFichasEmpleado_Server.pas">
-    <DCCReference Include="..\Modulos\Contactos\Model\uBizProveedoresServer.pas" />
+			<Form>RptFichasEmpleado</Form>
-    <DCCReference Include="..\Modulos\Contactos\Reports\uRptEtiquetasContacto_Server.pas">
+			<DesignClass>TDataModule</DesignClass>
-      <Form>RptEtiquetasContacto</Form>
+		</DCCReference>
-      <DesignClass>TDataModule</DesignClass>
+		<DCCReference Include="..\Modulos\Contactos\Servidor\srvContactos_Impl.pas">
-    </DCCReference>
+			<Form>srvContactos</Form>
-    <DCCReference Include="..\Modulos\Contactos\Reports\uRptFichasEmpleado_Server.pas">
+			<DesignClass>TDARemoteService</DesignClass>
-      <Form>RptFichasEmpleado</Form>
+		</DCCReference>
-      <DesignClass>TDataModule</DesignClass>
+		<DCCReference Include="..\Modulos\Fabricantes\Model\schFabricantesClient_Intf.pas"/>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Fabricantes\Model\schFabricantesServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Contactos\Servidor\srvContactos_Impl.pas">
+		<DCCReference Include="..\Modulos\Fabricantes\Servidor\srvFabricantes_Impl.pas">
-      <Form>srvContactos</Form>
+			<Form>srvFabricantes</Form>
-      <DesignClass>TDARemoteService</DesignClass>
+			<DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Fabricantes\Model\schFabricantesClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Fabricantes\Model\schFabricantesServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Fabricantes\Servidor\srvFabricantes_Impl.pas">
+		<DCCReference Include="..\Modulos\Facturas de cliente\Model\uBizFacturasClienteServer.pas"/>
-      <Form>srvFabricantes</Form>
+		<DCCReference Include="..\Modulos\Facturas de cliente\Reports\uRptFacturasCliente_Server.pas">
-      <DesignClass>TDataAbstractService</DesignClass>
+			<Form>RptFacturasCliente</Form>
-    </DCCReference>
+			<DesignClass>TDataModule</DesignClass>
-    <DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas" />
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Facturas de cliente\Reports\uRptWordFacturaCliente.pas">
-    <DCCReference Include="..\Modulos\Facturas de cliente\Model\uBizFacturasClienteServer.pas" />
+			<Form>RptWordFacturaCliente</Form>
-    <DCCReference Include="..\Modulos\Facturas de cliente\Reports\uRptFacturasCliente_Server.pas">
+			<DesignClass>TDataModule</DesignClass>
-      <Form>RptFacturasCliente</Form>
+		</DCCReference>
-      <DesignClass>TDataModule</DesignClass>
+		<DCCReference Include="..\Modulos\Facturas de cliente\Servidor\srvFacturasCliente_Impl.pas">
-    </DCCReference>
+			<Form>srvFacturasCliente</Form>
-    <DCCReference Include="..\Modulos\Facturas de cliente\Reports\uRptWordFacturaCliente.pas">
+			<DesignClass>TDataAbstractService</DesignClass>
-      <Form>RptWordFacturaCliente</Form>
+		</DCCReference>
-      <DesignClass>TDataModule</DesignClass>
+		<DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas"/>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Facturas de cliente\Servidor\srvFacturasCliente_Impl.pas">
+		<DCCReference Include="..\Modulos\Facturas de proveedor\Model\uBizFacturasProveedorServer.pas"/>
-      <Form>srvFacturasCliente</Form>
+		<DCCReference Include="..\Modulos\Facturas de proveedor\Reports\uRptFacturasProveedor_Server.pas">
-      <DesignClass>TDataAbstractService</DesignClass>
+			<Form>RptFacturasProveedor</Form>
-    </DCCReference>
+			<DesignClass>TDataModule</DesignClass>
-    <DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas" />
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Facturas de proveedor\Servidor\srvFacturasProveedor_Impl.pas">
-    <DCCReference Include="..\Modulos\Facturas de proveedor\Model\uBizFacturasProveedorServer.pas" />
+			<Form>srvFacturasProveedor</Form>
-    <DCCReference Include="..\Modulos\Facturas de proveedor\Reports\uRptFacturasProveedor_Server.pas">
+			<DesignClass>TDataAbstractService</DesignClass>
-      <Form>RptFacturasProveedor</Form>
+		</DCCReference>
-      <DesignClass>TDataModule</DesignClass>
+		<DCCReference Include="..\Modulos\Familias\Model\schFamiliasClient_Intf.pas"/>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Familias\Model\schFamiliasServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Facturas de proveedor\Servidor\srvFacturasProveedor_Impl.pas">
+		<DCCReference Include="..\Modulos\Familias\Servidor\srvFamilias_Impl.pas">
-      <Form>srvFacturasProveedor</Form>
+			<Form>srvFamilias</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
+			<DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Familias\Model\schFamiliasClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Familias\Model\schFamiliasServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Familias\Servidor\srvFamilias_Impl.pas">
+		<DCCReference Include="..\Modulos\Formas de pago\Servidor\srvFormasPago_Impl.pas">
-      <Form>srvFamilias</Form>
+			<Form>srvFormasPago</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
+			<DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Gestion de documentos\Servidor\srvGestorDocumentos_Impl.pas">
-    <DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoServer_Intf.pas" />
+			<Form>srvGestorDocumentos</Form>
-    <DCCReference Include="..\Modulos\Formas de pago\Servidor\srvFormasPago_Impl.pas">
+			<DesignClass>TDataAbstractService</DesignClass>
-      <Form>srvFormasPago</Form>
+		</DCCReference>
-      <DesignClass>TDataAbstractService</DesignClass>
+		<DCCReference Include="..\Modulos\Gestor de informes\Servidor\srvGestorInformes_Impl.pas">
-    </DCCReference>
+			<Form>srvGestorInformes</Form>
-    <DCCReference Include="..\Modulos\Gestion de documentos\Servidor\srvGestorDocumentos_Impl.pas">
+			<DesignClass>TDataAbstractService</DesignClass>
-      <Form>srvGestorDocumentos</Form>
+		</DCCReference>
-      <DesignClass>TDataAbstractService</DesignClass>
+		<DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosClient_Intf.pas"/>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Gestor de informes\Servidor\srvGestorInformes_Impl.pas">
+		<DCCReference Include="..\Modulos\Historico de movimientos\Servidor\srvHistoricoMovimientos_Impl.pas">
-      <Form>srvGestorInformes</Form>
+			<Form>srvHistoricoMovimientos</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
+			<DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Impresiones\Model\schImpresionesClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Impresiones\Model\schImpresionesServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Historico de movimientos\Servidor\srvHistoricoMovimientos_Impl.pas">
+		<DCCReference Include="..\Modulos\Impresiones\Servidor\srvImpresiones_Impl.pas">
-      <Form>srvHistoricoMovimientos</Form>
+			<Form>srvImpresiones</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
+			<DesignClass>TDARemoteService</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Impresiones\Model\schImpresionesClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Informe margen por articulo\Servidor\srvInfMargenArticulo_Impl.pas">
-    <DCCReference Include="..\Modulos\Impresiones\Model\schImpresionesServer_Intf.pas" />
+			<Form>srvInfMargenArticulo</Form>
-    <DCCReference Include="..\Modulos\Impresiones\Servidor\srvImpresiones_Impl.pas">
+			<DesignClass>TDARemoteService</DesignClass>
-      <Form>srvImpresiones</Form>
+		</DCCReference>
-      <DesignClass>TDARemoteService</DesignClass>
+		<DCCReference Include="..\Modulos\Informe ventas por articulo\Servidor\srvInfVentasArticulo_Impl.pas">
-    </DCCReference>
+			<Form>srvInfVentasArticulo</Form>
-    <DCCReference Include="..\Modulos\Informe margen por articulo\Servidor\srvInfMargenArticulo_Impl.pas">
+			<DesignClass>TDataAbstractService</DesignClass>
-      <Form>srvInfMargenArticulo</Form>
+		</DCCReference>
-      <DesignClass>TDARemoteService</DesignClass>
+		<DCCReference Include="..\Modulos\Informes base\Model\schInformesClient_Intf.pas"/>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Informes base\Model\schInformesServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Informe ventas por articulo\Servidor\srvInfVentasArticulo_Impl.pas">
+		<DCCReference Include="..\Modulos\Informes base\Servidor\srvInformes_Impl.pas">
-      <Form>srvInfVentasArticulo</Form>
+			<Form>srvInformes</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
+			<DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Informes base\Model\schInformesClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Inventario\Model\schInventarioClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Informes base\Model\schInformesServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Inventario\Model\schInventarioServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Informes base\Servidor\srvInformes_Impl.pas">
+		<DCCReference Include="..\Modulos\Inventario\Servidor\srvInventario_Impl.pas">
-      <Form>srvInformes</Form>
+			<Form>srvInventario</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
+			<DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Inventario\Model\schInventarioClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Obras\Model\schObrasClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Inventario\Model\schInventarioServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Obras\Model\schObrasServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Inventario\Servidor\srvInventario_Impl.pas">
+		<DCCReference Include="..\Modulos\Obras\Model\uBizObrasServer.pas"/>
-      <Form>srvInventario</Form>
+		<DCCReference Include="..\Modulos\Obras\Servidor\srvObras_Impl.pas">
-      <DesignClass>TDataAbstractService</DesignClass>
+			<Form>srvObras</Form>
-    </DCCReference>
+			<DesignClass>TDataAbstractService</DesignClass>
-    <DCCReference Include="..\Modulos\Obras\Model\schObrasClient_Intf.pas" />
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Obras\Model\schObrasServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Obras\Model\uBizObrasServer.pas" />
+		<DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Obras\Servidor\srvObras_Impl.pas">
+		<DCCReference Include="..\Modulos\Pedidos a proveedor\Model\uBizPedidosProveedorServer.pas"/>
-      <Form>srvObras</Form>
+		<DCCReference Include="..\Modulos\Pedidos a proveedor\Reports\uRptPedidosProveedor_Server.pas">
-      <DesignClass>TDataAbstractService</DesignClass>
+			<Form>RptPedidosProveedor</Form>
-    </DCCReference>
+			<DesignClass>TDataModule</DesignClass>
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas" />
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Pedidos a proveedor\Reports\uRptWordPedidoProveedor.pas">
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\uBizPedidosProveedorServer.pas" />
+			<Form>RptWordPedidoProveedor</Form>
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Reports\uRptPedidosProveedor_Server.pas">
+			<DesignClass>TDataModule</DesignClass>
-      <Form>RptPedidosProveedor</Form>
+		</DCCReference>
-      <DesignClass>TDataModule</DesignClass>
+		<DCCReference Include="..\Modulos\Pedidos a proveedor\Servidor\srvPedidosProveedor_Impl.pas">
-    </DCCReference>
+			<Form>srvPedidosProveedor</Form>
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Reports\uRptWordPedidoProveedor.pas">
+			<DesignClass>TDataAbstractService</DesignClass>
-      <Form>RptWordPedidoProveedor</Form>
+		</DCCReference>
-      <DesignClass>TDataModule</DesignClass>
+		<DCCReference Include="..\Modulos\Pedidos de cliente\Model\schPedidosClienteClient_Intf.pas"/>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Pedidos de cliente\Model\schPedidosClienteServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Servidor\srvPedidosProveedor_Impl.pas">
+		<DCCReference Include="..\Modulos\Pedidos de cliente\Model\uBizPedidosClienteServer.pas"/>
-      <Form>srvPedidosProveedor</Form>
+		<DCCReference Include="..\Modulos\Pedidos de cliente\Reports\uRptPedidosCliente_Server.pas">
-      <DesignClass>TDataAbstractService</DesignClass>
+			<Form>RptPedidosCliente</Form>
-    </DCCReference>
+			<DesignClass>TDataModule</DesignClass>
-    <DCCReference Include="..\Modulos\Pedidos de cliente\Model\schPedidosClienteClient_Intf.pas" />
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Pedidos de cliente\Model\schPedidosClienteServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Pedidos de cliente\Servidor\srvPedidosCliente_Impl.pas">
-    <DCCReference Include="..\Modulos\Pedidos de cliente\Model\uBizPedidosClienteServer.pas" />
+			<Form>srvPedidosCliente</Form>
-    <DCCReference Include="..\Modulos\Pedidos de cliente\Reports\uRptPedidosCliente_Server.pas">
+			<DesignClass>TDataAbstractService</DesignClass>
-      <Form>RptPedidosCliente</Form>
+		</DCCReference>
-      <DesignClass>TDataModule</DesignClass>
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas"/>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Pedidos de cliente\Servidor\srvPedidosCliente_Impl.pas">
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Model\uBizPresupuestosClienteServer.pas"/>
-      <Form>srvPedidosCliente</Form>
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptPresupuestosCliente_Server.pas">
-      <DesignClass>TDataAbstractService</DesignClass>
+			<Form>RptPresupuestosCliente</Form>
-    </DCCReference>
+			<DesignClass>TDataModule</DesignClass>
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas" />
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptWordCertificadoTrabajo_Server.pas">
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Model\uBizPresupuestosClienteServer.pas" />
+			<Form>RptWordCertificadoTrabajo</Form>
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptPresupuestosCliente_Server.pas">
+			<DesignClass>TDataModule</DesignClass>
-      <Form>RptPresupuestosCliente</Form>
+		</DCCReference>
-      <DesignClass>TDataModule</DesignClass>
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptWordPresupuestoCliente.pas">
-    </DCCReference>
+			<Form>RptWordPresupuestoCliente</Form>
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptWordCertificadoTrabajo_Server.pas">
+			<DesignClass>TDataModule</DesignClass>
-      <Form>RptWordCertificadoTrabajo</Form>
+		</DCCReference>
-      <DesignClass>TDataModule</DesignClass>
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Servidor\srvPresupuestosCliente_Impl.pas">
-    </DCCReference>
+			<Form>srvPresupuestosCliente</Form>
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptWordPresupuestoCliente.pas">
+			<DesignClass>TDataAbstractService</DesignClass>
-      <Form>RptWordPresupuestoCliente</Form>
+		</DCCReference>
-      <DesignClass>TDataModule</DesignClass>
+		<DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas"/>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Servidor\srvPresupuestosCliente_Impl.pas">
+		<DCCReference Include="..\Modulos\Recibos de cliente\Reports\uRptRecibosCliente_Server.pas">
-      <Form>srvPresupuestosCliente</Form>
+			<Form>RptRecibosCliente</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
+			<DesignClass>TDataModule</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Recibos de cliente\Servidor\srvRecibosCliente_Impl.pas">
-    <DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas" />
+			<Form>srvRecibosCliente</Form>
-    <DCCReference Include="..\Modulos\Recibos de cliente\Reports\uRptRecibosCliente_Server.pas">
+			<DesignClass>TDataAbstractService</DesignClass>
-      <Form>RptRecibosCliente</Form>
+		</DCCReference>
-      <DesignClass>TDataModule</DesignClass>
+		<DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorClient_Intf.pas"/>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Recibos de cliente\Servidor\srvRecibosCliente_Impl.pas">
+		<DCCReference Include="..\Modulos\Recibos de proveedor\Reports\uRptRecibosProveedor_Server.pas">
-      <Form>srvRecibosCliente</Form>
+			<Form>RptRecibosProveedor</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
+			<DesignClass>TDataModule</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Recibos de proveedor\Servidor\srvRecibosProveedor_Impl.pas">
-    <DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_Intf.pas" />
+			<Form>srvRecibosProveedor</Form>
-    <DCCReference Include="..\Modulos\Recibos de proveedor\Reports\uRptRecibosProveedor_Server.pas">
+			<DesignClass>TDataAbstractService</DesignClass>
-      <Form>RptRecibosProveedor</Form>
+		</DCCReference>
-      <DesignClass>TDataModule</DesignClass>
+		<DCCReference Include="..\Modulos\Referencias\Model\schReferenciasClient_Intf.pas"/>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Referencias\Model\schReferenciasServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Recibos de proveedor\Servidor\srvRecibosProveedor_Impl.pas">
+		<DCCReference Include="..\Modulos\Referencias\Servidor\srvReferencias_Impl.pas">
-      <Form>srvRecibosProveedor</Form>
+			<Form>srvReferencias</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
+			<DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Referencias\Model\schReferenciasClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Registro de correos\Servidor\srvRegistroCorreos_Impl.pas">
-    <DCCReference Include="..\Modulos\Referencias\Model\schReferenciasServer_Intf.pas" />
+			<Form>srvRegistroCorreos</Form>
-    <DCCReference Include="..\Modulos\Referencias\Servidor\srvReferencias_Impl.pas">
+			<DesignClass>TDataAbstractService</DesignClass>
-      <Form>srvReferencias</Form>
+		</DCCReference>
-      <DesignClass>TDataAbstractService</DesignClass>
+		<DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteClient_Intf.pas"/>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Registro de correos\Servidor\srvRegistroCorreos_Impl.pas">
+		<DCCReference Include="..\Modulos\Remesas de cliente\Model\uBizRemesasClienteServer.pas"/>
-      <Form>srvRegistroCorreos</Form>
+		<DCCReference Include="..\Modulos\Remesas de cliente\Reports\uRptRemesasCliente_Server.pas">
-      <DesignClass>TDataAbstractService</DesignClass>
+			<Form>RptRemesasCliente</Form>
-    </DCCReference>
+			<DesignClass>TDataModule</DesignClass>
-    <DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteClient_Intf.pas" />
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Remesas de cliente\Servidor\srvRemesasCliente_Impl.pas">
-    <DCCReference Include="..\Modulos\Remesas de cliente\Model\uBizRemesasClienteServer.pas" />
+			<Form>srvRemesasCliente</Form>
-    <DCCReference Include="..\Modulos\Remesas de cliente\Reports\uRptRemesasCliente_Server.pas">
+			<DesignClass>TDataAbstractService</DesignClass>
-      <Form>RptRemesasCliente</Form>
+		</DCCReference>
-      <DesignClass>TDataModule</DesignClass>
+		<DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorClient_Intf.pas"/>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Remesas de cliente\Servidor\srvRemesasCliente_Impl.pas">
+		<DCCReference Include="..\Modulos\Remesas de proveedor\Model\uBizRemesasProveedorServer.pas"/>
-      <Form>srvRemesasCliente</Form>
+		<DCCReference Include="..\Modulos\Remesas de proveedor\Reports\uRptRemesasProveedor_Server.pas">
-      <DesignClass>TDataAbstractService</DesignClass>
+			<Form>RptRemesasProveedor</Form>
-    </DCCReference>
+			<DesignClass>TDataModule</DesignClass>
-    <DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorClient_Intf.pas" />
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Remesas de proveedor\Servidor\srvRemesasProveedor_Impl.pas">
-    <DCCReference Include="..\Modulos\Remesas de proveedor\Model\uBizRemesasProveedorServer.pas" />
+			<Form>srvRemesasProveedor</Form>
-    <DCCReference Include="..\Modulos\Remesas de proveedor\Reports\uRptRemesasProveedor_Server.pas">
+			<DesignClass>TDataAbstractService</DesignClass>
-      <Form>RptRemesasProveedor</Form>
+		</DCCReference>
-      <DesignClass>TDataModule</DesignClass>
+		<DCCReference Include="..\Modulos\Tienda web\Model\schTiendaWebClient_Intf.pas"/>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Tienda web\Model\schTiendaWebServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Remesas de proveedor\Servidor\srvRemesasProveedor_Impl.pas">
+		<DCCReference Include="..\Modulos\Tienda web\Model\uBizOscAddressBookServer.pas"/>
-      <Form>srvRemesasProveedor</Form>
+		<DCCReference Include="..\Modulos\Tienda web\Model\uBizOscCustomerServer.pas"/>
-      <DesignClass>TDataAbstractService</DesignClass>
+		<DCCReference Include="..\Modulos\Tienda web\Model\uBizOscManufacturerServer.pas"/>
-    </DCCReference>
+		<DCCReference Include="..\Modulos\Tienda web\Model\uBizOscOrderServer.pas"/>
-    <DCCReference Include="..\Modulos\Tienda web\Model\schTiendaWebClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Tienda web\Model\uBizOscProductServer.pas"/>
-    <DCCReference Include="..\Modulos\Tienda web\Model\schTiendaWebServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Tienda web\Model\uBizTiendaWebServer.pas"/>
-    <DCCReference Include="..\Modulos\Tienda web\Model\uBizOscAddressBookServer.pas" />
+		<DCCReference Include="..\Modulos\Tienda web\Servidor\srvTiendaWeb_Impl.pas">
-    <DCCReference Include="..\Modulos\Tienda web\Model\uBizOscCustomerServer.pas" />
+			<Form>srvTiendaWeb</Form>
-    <DCCReference Include="..\Modulos\Tienda web\Model\uBizOscManufacturerServer.pas" />
+			<DesignClass>TDataAbstractService</DesignClass>
-    <DCCReference Include="..\Modulos\Tienda web\Model\uBizOscOrderServer.pas" />
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Tienda web\Model\uBizOscProductServer.pas" />
+		<DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Tienda web\Model\uBizTiendaWebServer.pas" />
+		<DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Tienda web\Servidor\srvTiendaWeb_Impl.pas">
+		<DCCReference Include="..\Modulos\Tipos de IVA\Servidor\srvTiposIVA_Impl.pas">
-      <Form>srvTiendaWeb</Form>
+			<Form>srvTiposIVA</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
+			<DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Tipos de IVA\Servidor\srvTiposIVA_Impl.pas">
+		<DCCReference Include="..\Modulos\Unidades de medida\Servidor\srvUnidadesMedida_Impl.pas">
-      <Form>srvTiposIVA</Form>
+			<Form>srvUnidadesMedida</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
+			<DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaClient_Intf.pas" />
+		<DCCReference Include="..\Servicios\FactuGES_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaServer_Intf.pas" />
+		<DCCReference Include="..\Servicios\FactuGES_Invk.pas"/>
-    <DCCReference Include="..\Modulos\Unidades de medida\Servidor\srvUnidadesMedida_Impl.pas">
+		<DCCReference Include="Configuracion\srvConfiguracion_Impl.pas">
-      <Form>srvUnidadesMedida</Form>
+			<Form>srvConfiguracion</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
+			<DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
+		<DCCReference Include="Configuracion\uConexionBD.pas">
-    <DCCReference Include="..\Servicios\FactuGES_Invk.pas" />
+			<Form>frConexionBD</Form>
-    <DCCReference Include="Configuracion\srvConfiguracion_Impl.pas">
+			<DesignClass>TFrame</DesignClass>
-      <Form>srvConfiguracion</Form>
+		</DCCReference>
-      <DesignClass>TDataAbstractService</DesignClass>
+		<DCCReference Include="Configuracion\uConexionOSC.pas">
-    </DCCReference>
+			<Form>frConexionOSC</Form>
-    <DCCReference Include="Configuracion\uConexionBD.pas">
+			<DesignClass>TFrame</DesignClass>
-      <Form>frConexionBD</Form>
+		</DCCReference>
-      <DesignClass>TFrame</DesignClass>
+		<DCCReference Include="Configuracion\uConfGeneral.pas">
-    </DCCReference>
+			<Form>frConfGeneral</Form>
-    <DCCReference Include="Configuracion\uConexionOSC.pas">
+			<DesignClass>TFrame</DesignClass>
-      <Form>frConexionOSC</Form>
+		</DCCReference>
-      <DesignClass>TFrame</DesignClass>
+		<DCCReference Include="Configuracion\uConfiguracion.pas">
-    </DCCReference>
+			<Form>fConfiguracion</Form>
-    <DCCReference Include="Configuracion\uConfGeneral.pas">
+			<DesignClass>TForm</DesignClass>
-      <Form>frConfGeneral</Form>
+		</DCCReference>
-      <DesignClass>TFrame</DesignClass>
+		<DCCReference Include="Configuracion\uFrameConfiguracion.pas">
-    </DCCReference>
+			<Form>FrameConfiguracion</Form>
-    <DCCReference Include="Configuracion\uConfiguracion.pas">
+			<DesignClass>TFrame</DesignClass>
-      <Form>fConfiguracion</Form>
+		</DCCReference>
-      <DesignClass>TForm</DesignClass>
+		<DCCReference Include="srvLogin_Impl.pas">
-    </DCCReference>
+			<Form>srvLogin</Form>
-    <DCCReference Include="Configuracion\uFrameConfiguracion.pas">
+			<DesignClass>TDARemoteService</DesignClass>
-      <Form>FrameConfiguracion</Form>
+		</DCCReference>
-      <DesignClass>TFrame</DesignClass>
+		<DCCReference Include="uAcercaDe.pas">
-    </DCCReference>
+			<Form>fAcercaDe</Form>
-    <DCCReference Include="srvLogin_Impl.pas">
+		</DCCReference>
-      <Form>srvLogin</Form>
+		<DCCReference Include="uDataModuleServer.pas">
-      <DesignClass>TDARemoteService</DesignClass>
+			<Form>dmServer</Form>
-    </DCCReference>
+			<DesignClass>TDataModule</DesignClass>
-    <DCCReference Include="uAcercaDe.pas">
+		</DCCReference>
-      <Form>fAcercaDe</Form>
+		<DCCReference Include="uServerMainForm.pas">
-    </DCCReference>
+			<Form>fServerForm</Form>
-    <DCCReference Include="uDataModuleServer.pas">
+		</DCCReference>
-      <Form>dmServer</Form>
+		<DCCReference Include="Utiles\AHWord97.pas"/>
-      <DesignClass>TDataModule</DesignClass>
+		<DCCReference Include="Utiles\MidasSpeedFix.pas"/>
-    </DCCReference>
+		<DCCReference Include="Utiles\uBusinessUtils.pas"/>
-    <DCCReference Include="uServerMainForm.pas">
+		<DCCReference Include="Utiles\uDatabaseUtils.pas"/>
-      <Form>fServerForm</Form>
+		<DCCReference Include="Utiles\uReferenciasUtils.pas"/>
-    </DCCReference>
+		<DCCReference Include="Utiles\uRestriccionesUsuarioUtils.pas"/>
-    <DCCReference Include="Utiles\AHWord97.pas" />
+		<DCCReference Include="Utiles\uSchemaUtilsServer.pas"/>
-    <DCCReference Include="Utiles\MidasSpeedFix.pas" />
+		<DCCReference Include="Utiles\uServerAppUtils.pas"/>
-    <DCCReference Include="Utiles\uBusinessUtils.pas" />
+		<DCCReference Include="Utiles\uSesionesUtils.pas"/>
-    <DCCReference Include="Utiles\uDatabaseUtils.pas" />
+		<DCCReference Include="Utiles\uTiendaWebUtils.pas"/>
-    <DCCReference Include="Utiles\uReferenciasUtils.pas" />
+	</ItemGroup>
-    <DCCReference Include="Utiles\uRestriccionesUsuarioUtils.pas" />
-    <DCCReference Include="Utiles\uSchemaUtilsServer.pas" />
-    <DCCReference Include="Utiles\uServerAppUtils.pas" />
-    <DCCReference Include="Utiles\uSesionesUtils.pas" />
-    <DCCReference Include="Utiles\uTiendaWebUtils.pas" />
-  </ItemGroup>
 </Project>
 <!-- EurekaLog First Line
 [Exception Log]

Source/Servidor/FactuGES_Server.rc

@@ -1,7 +1,7 @@
 MAINICON ICON "C:\Codigo\Resources\Iconos\Servidor.ico"
 1 VERSIONINFO
-FILEVERSION 4,1,2,0
+FILEVERSION 4,1,4,0
-PRODUCTVERSION 4,1,2,0
+PRODUCTVERSION 4,1,4,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@@ -12,9 +12,9 @@ BEGIN
     BEGIN
          BLOCK "0C0A04E4"
          BEGIN
-              VALUE "FileVersion", "4.1.2.0\0"
+              VALUE "FileVersion", "4.1.4.0\0"
-              VALUE "ProductVersion", "4.1.2.0\0"
+              VALUE "ProductVersion", "4.1.4.0\0"
-              VALUE "CompileDate", "viernes, 11 de febrero de 2011 13:14\0"
+              VALUE "CompileDate", "martes, 08 de marzo de 2011 18:50\0"
          END
     END
     BLOCK "VarFileInfo"