Version 1.8.8 Subida de informes estadísticos de Facturas de Cliente y proveedor

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@1031 0c75b7a4-871f-7646-8a2f-f78d34cc349f

Database/scripts/factuges.sql

@@ -39,6 +39,11 @@ DECLARE EXTERNAL FUNCTION SUBSTR
     ENTRY_POINT 'IB_UDF_substr' MODULE_NAME 'ib_udf';
 
 
+DECLARE EXTERNAL FUNCTION DIV
+    INTEGER,
+    INTEGER
+RETURNS DOUBLE PRECISION BY VALUE
+ENTRY_POINT 'IB_UDF_div' MODULE_NAME 'ib_udf';
 
 
 /******************************************************************************/
@@ -253,6 +258,12 @@ SET GENERATOR GEN_USUARIOS_ID TO 1;
 /****                                Tables                                ****/
 /******************************************************************************/
 
+CREATE TABLE PERIODOS_AUX (
+    ID           INTEGER,
+    PERIODO      VARCHAR(20) COLLATE ES_ES,
+    VALOR        SMALLINT,
+    DESCRIPCION  VARCHAR(20) COLLATE ES_ES
+);
 
 
 CREATE TABLE AGENTES_COMISIONES (
@@ -3453,6 +3464,76 @@ FROM
 GROUP BY 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17
 ;
 
+
+/*VISTAS PARA INFORMES ESTADISTICOS*/
+
+CREATE VIEW V_INF_FAC_CLIENTE_TOTAL_ANO(
+    ID_EMPRESA,
+    ANO,
+    IMPORTE_TOTAL)
+AS
+select ID_EMPRESA, EXTRACT(YEAR FROM FECHA_FACTURA) as ANO, SUM(IMPORTE_TOTAL) as IMPORTE_TOTAL
+from FACTURAS_CLIENTE
+group by 1,2
+;
+
+CREATE VIEW V_INF_FAC_PROVEEDOR_TOTAL_ANO(
+    ID_EMPRESA,
+    ANO,
+    IMPORTE_TOTAL)
+AS
+select ID_EMPRESA, EXTRACT(YEAR FROM FECHA_FACTURA) as ANO, SUM(IMPORTE_TOTAL) as IMPORTE_TOTAL
+from FACTURAS_PROVEEDOR
+group by 1,2
+;
+
+CREATE VIEW V_INF_FAC_CLIENTE(
+    ID_EMPRESA,
+    ANO,
+    SEMESTRE,
+    TRIMESTRE,
+    MES,
+    FECHA_FACTURA,
+    ID_CLIENTE,
+    NOMBRE,
+    IMPORTE_DESCUENTO,
+    IMPORTE_TOTAL,
+    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),4)+1) 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
+inner join V_INF_FAC_CLIENTE_TOTAL_ANO v on ((v.id_empresa = f.id_empresa) and (v.Ano = EXTRACT(YEAR FROM f.FECHA_FACTURA)))
+order by 1,2,3,4,5 asc
+;
+
+CREATE VIEW V_INF_FAC_PROVEEDOR(
+    ID_EMPRESA,
+    ANO,
+    SEMESTRE,
+    TRIMESTRE,
+    MES,
+    FECHA_FACTURA,
+    ID_PROVEEDOR,
+    NOMBRE,
+    IMPORTE_DESCUENTO,
+    IMPORTE_TOTAL,
+    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),4)+1) 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
+inner join V_INF_FAC_PROVEEDOR_TOTAL_ANO v on ((v.id_empresa = f.id_empresa) and (v.Ano = EXTRACT(YEAR FROM f.FECHA_FACTURA)))
+order by 1,2,3,4,5 asc
+;
+
+
 /******************************************************************************/
 /****                             Primary Keys                             ****/
 /******************************************************************************/

Database/scripts/factuges_sysdata.sql

@@ -2,6 +2,26 @@ SET SQL DIALECT 3;
 
 SET NAMES UTF8;
 
+INSERT INTO PERIODOS_AUX (ID, PERIODO, VALOR, DESCRIPCION) VALUES (1, 'MENSUAL', 1, 'Ene');
+INSERT INTO PERIODOS_AUX (ID, PERIODO, VALOR, DESCRIPCION) VALUES (2, 'MENSUAL', 2, 'Feb');
+INSERT INTO PERIODOS_AUX (ID, PERIODO, VALOR, DESCRIPCION) VALUES (3, 'MENSUAL', 3, 'Mar');
+INSERT INTO PERIODOS_AUX (ID, PERIODO, VALOR, DESCRIPCION) VALUES (4, 'MENSUAL', 4, 'Abr');
+INSERT INTO PERIODOS_AUX (ID, PERIODO, VALOR, DESCRIPCION) VALUES (5, 'MENSUAL', 5, 'May');
+INSERT INTO PERIODOS_AUX (ID, PERIODO, VALOR, DESCRIPCION) VALUES (6, 'MENSUAL', 6, 'Jun');
+INSERT INTO PERIODOS_AUX (ID, PERIODO, VALOR, DESCRIPCION) VALUES (7, 'MENSUAL', 7, 'Jul');
+INSERT INTO PERIODOS_AUX (ID, PERIODO, VALOR, DESCRIPCION) VALUES (8, 'MENSUAL', 8, 'Ago');
+INSERT INTO PERIODOS_AUX (ID, PERIODO, VALOR, DESCRIPCION) VALUES (9, 'MENSUAL', 9, 'Sep');
+INSERT INTO PERIODOS_AUX (ID, PERIODO, VALOR, DESCRIPCION) VALUES (10, 'MENSUAL', 10, 'Oct');
+INSERT INTO PERIODOS_AUX (ID, PERIODO, VALOR, DESCRIPCION) VALUES (11, 'MENSUAL', 11, 'Nov');
+INSERT INTO PERIODOS_AUX (ID, PERIODO, VALOR, DESCRIPCION) VALUES (12, 'MENSUAL', 12, 'Dic');
+INSERT INTO PERIODOS_AUX (ID, PERIODO, VALOR, DESCRIPCION) VALUES (13, 'SEMESTRAL', 1, 'Primer semestre');
+INSERT INTO PERIODOS_AUX (ID, PERIODO, VALOR, DESCRIPCION) VALUES (14, 'SEMESTRAL', 2, 'Segundo semestre');
+INSERT INTO PERIODOS_AUX (ID, PERIODO, VALOR, DESCRIPCION) VALUES (15, 'TRIMESTRAL', 1, 'Primer trimestre');
+INSERT INTO PERIODOS_AUX (ID, PERIODO, VALOR, DESCRIPCION) VALUES (16, 'TRIMESTRAL', 2, 'Segundo trimestre');
+INSERT INTO PERIODOS_AUX (ID, PERIODO, VALOR, DESCRIPCION) VALUES (17, 'TRIMESTRAL', 3, 'Tercer trimestre');
+INSERT INTO PERIODOS_AUX (ID, PERIODO, VALOR, DESCRIPCION) VALUES (18, 'TRIMESTRAL', 4, 'Cuarto trimestre');
+COMMIT WORK;
+
 INSERT INTO CATEGORIAS (ID, CATEGORIA) VALUES (1, 'CLIENTE');
 INSERT INTO CATEGORIAS (ID, CATEGORIA) VALUES (2, 'PROVEEDOR');
 INSERT INTO CATEGORIAS (ID, CATEGORIA) VALUES (3, 'EMPLEADO');

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">1</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">7</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.8.7.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.8.7.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">1</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">8</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.8.8.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">1.8.8.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/Informes/1/InformeListadoFacturasProveedorGrafComp.fr3

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TfrxReport Version="4.7.71" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.Zoom="1" PrintOptions.Printer="Por defecto" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="37800,8077143519" ReportOptions.Description.Text="" ReportOptions.LastChange="40577,7554863542" ScriptLanguage="PascalScript" ScriptText.Text="procedure Chart1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if (&#60;frxDBInformeListadoFacturasGrafComp.&#34;ANO1&#34;&#62; &#60;&#62; 0) then    &#13;&#10;     TLineSeries(Chart1.Series[0]).Title := 'Total Facturado ' + IntToStr(&#60;frxDBInformeListadoFacturasGrafComp.&#34;ANO1&#34;&#62;);&#13;&#10;&#13;&#10;  if (&#60;frxDBInformeListadoFacturasGrafComp.&#34;ANO2&#34;&#62; &#60;&#62; 0) then&#13;&#10;     TLineSeries(Chart1.Series[1]).Title := 'Total Facturado ' + IntToStr(&#60;frxDBInformeListadoFacturasGrafComp.&#34;ANO2&#34;&#62;)&#13;&#10;  else&#13;&#10;    Chart1.Series[1].Active := False;      &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Memo16OnBeforePrint(Sender: TfrxComponent);&#13;&#10;var&#13;&#10; Valor:Double;                            &#13;&#10;begin&#13;&#10;  Valor := SUM(&#60;frxDBInformeListadoFacturasGrafComp.&#34;IMPORTE_TOTAL1&#34;&#62;) * 100;    &#13;&#10;  if (SUM(&#60;frxDBInformeListadoFacturasGrafComp.&#34;IMPORTE_TOTAL&#34;&#62;) = 0) then&#13;&#10;     Valor := 100 - Valor              &#13;&#10;  else&#13;&#10;     Valor := 100 - (Valor/SUM(&#60;frxDBInformeListadoFacturasGrafComp.&#34;IMPORTE_TOTAL&#34;&#62;));              &#13;&#10;&#13;&#10;  memo16.lines.add(FormatFloat('#,##0.00 %',Valor));&#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;end.          " ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403990003546F70021008446174617365747301010C6000000020446174615365743D226672784442496E666F726D654C69737461646F466163747572617347726166436F6D702220446174615365744E616D653D226672784442496E666F726D654C69737461646F466163747572617347726166436F6D702200010C8000000020446174615365743D226672784442496E666F726D654C69737461646F50726F766565646F7265734D61796F724465736375656E746F526573756D656E2220446174615365744E616D653D226672784442496E666F726D654C69737461646F50726F766565646F7265734D61796F724465736375656E746F526573756D656E2200010C8400000020446174615365743D226672784442496E666F726D654C69737461646F50726F766565646F7265734D61796F724661637475726163696F6E526573756D656E2220446174615365744E616D653D226672784442496E666F726D654C69737461646F50726F766565646F7265734D61796F724661637475726163696F6E526573756D656E220000095661726961626C65730100055374796C650100">
+<TfrxReport Version="4.7.71" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.Zoom="1" PrintOptions.Printer="Por defecto" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="37800,8077143519" ReportOptions.Description.Text="" ReportOptions.LastChange="40577,757522338" ScriptLanguage="PascalScript" ScriptText.Text="procedure Chart1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if (&#60;frxDBInformeListadoFacturasGrafComp.&#34;ANO1&#34;&#62; &#60;&#62; 0) then    &#13;&#10;     TLineSeries(Chart1.Series[0]).Title := 'Total Facturado ' + IntToStr(&#60;frxDBInformeListadoFacturasGrafComp.&#34;ANO1&#34;&#62;);&#13;&#10;&#13;&#10;  if (&#60;frxDBInformeListadoFacturasGrafComp.&#34;ANO2&#34;&#62; &#60;&#62; 0) then&#13;&#10;     TLineSeries(Chart1.Series[1]).Title := 'Total Facturado ' + IntToStr(&#60;frxDBInformeListadoFacturasGrafComp.&#34;ANO2&#34;&#62;)&#13;&#10;  else&#13;&#10;    Chart1.Series[1].Active := False;      &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Memo16OnBeforePrint(Sender: TfrxComponent);&#13;&#10;var&#13;&#10; Valor:Double;                            &#13;&#10;begin&#13;&#10;  Valor := SUM(&#60;frxDBInformeListadoFacturasGrafComp.&#34;IMPORTE_TOTAL1&#34;&#62;) * 100;    &#13;&#10;  if (SUM(&#60;frxDBInformeListadoFacturasGrafComp.&#34;IMPORTE_TOTAL&#34;&#62;) = 0) then&#13;&#10;     Valor := 100 - Valor              &#13;&#10;  else&#13;&#10;     Valor := 100 - (Valor/SUM(&#60;frxDBInformeListadoFacturasGrafComp.&#34;IMPORTE_TOTAL&#34;&#62;));              &#13;&#10;&#13;&#10;  memo16.lines.add(FormatFloat('#,##0.00 %',Valor));&#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;end.          " ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403990003546F70021008446174617365747301010C6000000020446174615365743D226672784442496E666F726D654C69737461646F466163747572617347726166436F6D702220446174615365744E616D653D226672784442496E666F726D654C69737461646F466163747572617347726166436F6D702200010C8000000020446174615365743D226672784442496E666F726D654C69737461646F50726F766565646F7265734D61796F724465736375656E746F526573756D656E2220446174615365744E616D653D226672784442496E666F726D654C69737461646F50726F766565646F7265734D61796F724465736375656E746F526573756D656E2200010C8400000020446174615365743D226672784442496E666F726D654C69737461646F50726F766565646F7265734D61796F724661637475726163696F6E526573756D656E2220446174615365744E616D653D226672784442496E666F726D654C69737461646F50726F766565646F7265734D61796F724661637475726163696F6E526573756D656E220000095661726961626C65730100055374796C650100">
   <TfrxDataPage Name="Data" Height="1000" Left="0" Top="0" Width="1000"/>
   <TfrxReportPage Name="Page1" PaperWidth="210" PaperHeight="297" PaperSize="9" LeftMargin="10,00125" RightMargin="10,00125" TopMargin="10,00125" BottomMargin="10,00125" ColumnWidth="0" ColumnPositions.Text="" HGuides.Text="" VGuides.Text="">
     <TfrxMasterData Name="MasterData1" Height="15" Left="0" Top="294" Width="718,101251175" ColumnWidth="0" ColumnGap="0" DataSet="frxDBInformeListadoFacturasGrafComp" DataSetName="frxDBInformeListadoFacturasGrafComp" RowCount="0">

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

@@ -1356,7 +1356,7 @@ object RptFacturasCliente: TRptFacturasCliente
               '.IMPORTE_TOTAL) as IMPORTE_TOTAL,'#10'((SUM(P.IMPORTE_TOTAL)*100)/p.' +
               'Importe_TOTAL_ANO) as PORCENTAJE'#10#10'from V_INF_FAC_CLIENTE P'#10'left ' +
               'join CONTACTOS C on P.ID_CLIENTE = C.ID'#10#10'where p.ID_EMPRESA = :I' +
-              'D_EMPRESA'#10'and P.ANO = :ANO'#10'group by 1,2,3,4'#10'order by 1,5 desc'#10'ro' +
+              'D_EMPRESA'#10'and P.ANO = :ANO'#10'group by 1,2,3,4'#10'order by 1,6 desc'#10'ro' +
               'ws 1 to :NTOP'#10#10#10
             StatementType = stSQL
             ColumnMappings = <

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

@@ -94,13 +94,13 @@ type
     tbl_InformeListadoFacturasGrafCompMensual: TDAMemDataTable;
     tbl_InformeListadoFacturasGrafCompTrimestral: TDAMemDataTable;
     tbl_InformeListadoFacturasGrafCompSemestral: TDAMemDataTable;
-    schReport: TDASchema;
     frxDBInformeListadoClientesMayorFacturacionResumen: TfrxDBDataset;
     DADSInformeListadoClientesMayorFacturacionResumen: TDADataSource;
     tbl_InformeListadoClientesMayorFacturacionResumen: TDAMemDataTable;
     frxDBInformeListadoClientesMayorDescuentoResumen: TfrxDBDataset;
     DADSInformeListadoClientesMayorDescuentoResumen: TDADataSource;
     tbl_InformeListadoClientesMayorDescuentoResumen: TDAMemDataTable;
+    schReport: TDASchema;
     procedure DataModuleCreate(Sender: TObject);
     procedure DataModuleDestroy(Sender: TObject);
   private
@@ -253,8 +253,8 @@ begin
        PrepararTablaInformeGrafComp(tbl_InformeListadoFacturasGrafCompSemestral);
 
     //Se preparan las tablas del listado resumen del informe
-//    PrepararTablaResumenInformeGrafComp(tbl_InformeListadoProveedoresMayorFacturacionResumen);
+    PrepararTablaResumenInformeGrafComp(tbl_InformeListadoClientesMayorFacturacionResumen);
-//    PrepararTablaResumenInformeGrafComp(tbl_InformeListadoProveedoresMayorDescuentoResumen);
+    PrepararTablaResumenInformeGrafComp(tbl_InformeListadoClientesMayorDescuentoResumen);
 
     Result := Binary.Create;
 

Source/Modulos/Facturas de proveedor/Reports/uRptFacturasProveedor_Server.dfm

@@ -1282,7 +1282,7 @@ object RptFacturasProveedor: TRptFacturasProveedor
               '.IMPORTE_TOTAL) as IMPORTE_TOTAL,'#10'((SUM(P.IMPORTE_TOTAL)*100)/p.' +
               'Importe_TOTAL_ANO) as PORCENTAJE'#10#10'from V_INF_FAC_PROVEEDOR P'#10'lef' +
               't join CONTACTOS C on P.ID_PROVEEDOR = C.ID'#10#10'where p.ID_EMPRESA ' +
-              '= :ID_EMPRESA'#10'and P.ANO = :ANO'#10'group by 1,2,3,4'#10'order by 1,5 des' +
+              '= :ID_EMPRESA'#10'and P.ANO = :ANO'#10'group by 1,2,3,4'#10'order by 1,6 des' +
               'c'#10'rows 1 to :NTOP'#10#10#10
             StatementType = stSQL
             ColumnMappings = <

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

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

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

@@ -45,6 +45,7 @@
     <DCCReference Include="View\uIEditorInformeBase.pas" />
     <DCCReference Include="View\uIEditorInformeFacturasClientePendientesReport.pas" />
     <DCCReference Include="View\uIEditorInformeFacturasClienteReport.pas" />
+    <DCCReference Include="View\uIEditorInformeFacturasClienteReportGrafComp.pas" />
     <DCCReference Include="View\uIEditorInformeFacturasProveedorPendientesReport.pas" />
     <DCCReference Include="View\uIEditorInformeFacturasProveedorReport.pas" />
     <DCCReference Include="View\uIEditorInformeFacturasProveedorReportGrafComp.pas" />

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

@@ -0,0 +1,30 @@
+unit uIEditorInformeFacturasClienteReportGrafComp;
+
+interface
+
+uses
+  FactuGES_Intf, uIEditorInformeBase;
+
+type
+  IEditorInformeFacturasClienteReportGrafComp = interface(IEditorInformeBase)
+  ['{12EA329F-37E3-4583-A54E-BE146C8E9D8A}']
+
+    function GetIntervalo: Variant;
+    function GetAno1: Variant;
+    function GetAno2: Variant;
+    function GetNTop: Variant;    
+
+    function GetListaIDClientes: TIntegerArray;
+
+    property Intervalo: Variant read GetIntervalo;
+    property Ano1: Variant read GetAno1;
+    property Ano2: Variant read GetAno2;
+    property NTop: Variant read GetNTop;
+
+    property ListaIDClientes: TIntegerArray read GetListaIDClientes;
+  end;
+
+
+implementation
+
+end.

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

@@ -12,12 +12,14 @@ type
     function GetIntervalo: Variant;
     function GetAno1: Variant;
     function GetAno2: Variant;
+    function GetNTop: Variant;
 
     function GetListaIDProveedores: TIntegerArray;
 
     property Intervalo: Variant read GetIntervalo;
     property Ano1: Variant read GetAno1;
     property Ano2: Variant read GetAno2;
+    property NTop: Variant read GetNTop;    
 
     property ListaIDProveedores: TIntegerArray read GetListaIDProveedores;
   end;

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

@@ -23,6 +23,7 @@ type
     procedure VerInformeIVAClientes;
     procedure VerInformeListadoFacturasCli;
     procedure VerInformeListadoFacturasCliPendientes;
+    procedure VerInformeFacturasCliGrafComp;
 
     //MODULO RECIBOS DE CLIENTE
     procedure VerInformeListadoRecibosCliPendientes;
@@ -74,6 +75,7 @@ type
     procedure VerInformeIVAClientes;
     procedure VerInformeListadoFacturasCli;
     procedure VerInformeListadoFacturasCliPendientes;
+    procedure VerInformeFacturasCliGrafComp;
 
     //MODULO RECIBOS DE CLIENTE
     procedure VerInformeListadoRecibosCliPendientes;
@@ -87,6 +89,7 @@ type
     procedure VerInformeListadoFacturasProv;
     procedure VerInformeListadoFacturasProvPendientes;
     procedure VerInformeFacturasProvGrafComp;
+
     function DarListaAnosFacturasProv: TStringList;
     function DarListaIntervalos: TStringList;
 
@@ -110,7 +113,9 @@ uses
   uIEditorInformeIVAProveedoresReport, uIEditorInformeFacturasProveedorReport,
   uIEditorInformeFacturasProveedorPendientesReport, uIEditorInformeRecibosProveedorReport,
   uIEditorInformeRecibosProvPendientesReport,
-  uIEditorInformePedidosReport, uIEditorInformeFacturasProveedorReportGrafComp;
+  uIEditorInformePedidosReport,
+  uIEditorInformeFacturasProveedorReportGrafComp,
+  uIEditorInformeFacturasClienteReportGrafComp;
 
 
 {procedure CopiarArticulosPedido(AOrigen: IBizDetallesPedidoCliente;
@@ -291,6 +296,30 @@ begin
   Result := FDataModule;
 end;
 
+procedure TGestorInformesController.VerInformeFacturasCliGrafComp;
+var
+  AStream: Binary;
+  AEditor : IEditorInformeFacturasClienteReportGrafComp;
+begin
+  AEditor := NIL;
+  CreateEditor('EditorInformeFacturasClienteReportGrafComp', IEditorInformeFacturasClienteReportGrafComp, AEditor);
+  if Assigned(AEditor) then
+    try
+      AEditor.Controller := Self;
+      AEditor.Title := 'Informe comparativo de facturación de clientes';
+
+      AStream := FDataModule.GenerarInformeFacturasCliGrafComp(AppFactuGES.EmpresaActiva.ID,
+        AEditor.Intervalo, AEditor.Ano1, AEditor.Ano2, AEditor.ListaIDClientes, AEditor.NTop);
+
+      AEditor.LoadFromStream(AStream);
+      AEditor.Preview;
+    finally
+      AEditor.Release;
+      AEditor := Nil;
+      FreeAndNil(AStream);
+    end;
+end;
+
 procedure TGestorInformesController.VerInformeFacturasProvGrafComp;
 var
   AStream: Binary;
@@ -304,7 +333,7 @@ begin
       AEditor.Title := 'Informe comparativo de facturación de proveedores';
 
       AStream := FDataModule.GenerarInformeFacturasProvGrafComp(AppFactuGES.EmpresaActiva.ID,
-        AEditor.Intervalo, AEditor.Ano1, AEditor.Ano2, AEditor.ListaIDProveedores);
+        AEditor.Intervalo, AEditor.Ano1, AEditor.Ano2, AEditor.ListaIDProveedores, AEditor.NTop);
 
       AEditor.LoadFromStream(AStream);
       AEditor.Preview;

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

@@ -30,6 +30,8 @@ type
     function GenerarInformeIVAClientes(const IdEmpresa: Integer; const FechaInicio: Variant; const FechaFin: Variant; const ListaIDClientes: TIntegerArray; const Desglosado: Boolean; const ImporteMinimo: Currency): Binary;
     function GenerarInformeListadoFacturasCli(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 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;
 
     //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;
@@ -42,7 +44,7 @@ type
     function GenerarInformeIVAProveedores(const IdEmpresa: Integer; const FechaInicio: Variant; const FechaFin: Variant; const ListaIDProveedores: TIntegerArray; const Desglosado: Boolean; const ImporteMinimo: Currency): Binary;
     function GenerarInformeListadoFacturasProv(const IdEmpresa: Integer; const FechaInicio: Variant; const FechaFin: Variant; const FechaVenInicio: Variant; const FechaVenFin: Variant; const ListaIDProveedores: TIntegerArray; const Desglosado: Boolean; const ImporteMinimo: Currency): Binary;
     function GenerarInformeListadoFacturasProvPendientes(const IdEmpresa: Integer; const FechaInicio: Variant; const FechaFin: Variant; const FechaVenInicio: Variant; const FechaVenFin: Variant; const ListaIDProveedores: TIntegerArray; const Desglosado: Boolean; const ImporteMinimo: Currency): Binary;
-    function GenerarInformeFacturasProvGrafComp(const IdEmpresa: Integer; const Intervalo: Variant; const Ano1: Variant; const Ano2: Variant; const ListaIDProveedores: TIntegerArray): Binary;
+    function GenerarInformeFacturasProvGrafComp(const IdEmpresa: Integer; const Intervalo: Variant; const Ano1: Variant; const Ano2: Variant; const ListaIDProveedores: TIntegerArray; Const NTop: Variant): Binary;
     function DarListaAnosFacturasProv: TStringList;
 
     //MODULO RECIBOS DE CLIENTE
@@ -68,6 +70,22 @@ begin
   RORemoteService.Message := dmConexion.Message;
 end;
 
+function TDataModuleGestorInformes.DarListaAnosFacturasCli: TStringList;
+var
+  i: Integer;
+  AResultado : StringArray;
+begin
+  Result := Nil;
+  try
+    AResultado := (RORemoteService as IsrvGestorInformes).DarListaAnosFacturasCli;
+    Result := TStringList.Create;
+    for i:= 0 to AResultado.Count - 1 do
+        Result.Add(AResultado.Items[i]);
+  finally
+    FreeANDNIL(AResultado)
+  end;
+end;
+
 function TDataModuleGestorInformes.DarListaAnosFacturasProv: TStringList;
 var
   i: Integer;
@@ -100,12 +118,22 @@ begin
   end;
 end;
 
-function TDataModuleGestorInformes.GenerarInformeFacturasProvGrafComp(
+function TDataModuleGestorInformes.GenerarInformeFacturasCliGrafComp(
   const IdEmpresa: Integer; const Intervalo, Ano1, Ano2: Variant;
-  const ListaIDProveedores: TIntegerArray): Binary;
+  const ListaIDClientes: TIntegerArray; Const NTop: Variant): Binary;
 begin
   try
-    Result := (RORemoteService as IsrvGestorInformes).GenerarInformeFacturasProvGrafComp(IdEmpresa, Intervalo, Ano1, Ano2, ListaIdProveedores, 7);
+    Result := (RORemoteService as IsrvGestorInformes).GenerarInformeFacturasCliGrafComp(IdEmpresa, Intervalo, Ano1, Ano2, ListaIdClientes, NTop);
+  finally
+  end;
+end;
+
+function TDataModuleGestorInformes.GenerarInformeFacturasProvGrafComp(
+  const IdEmpresa: Integer; const Intervalo, Ano1, Ano2: Variant;
+  const ListaIDProveedores: TIntegerArray; Const NTop: Variant): Binary;
+begin
+  try
+    Result := (RORemoteService as IsrvGestorInformes).GenerarInformeFacturasProvGrafComp(IdEmpresa, Intervalo, Ano1, Ano2, ListaIdProveedores, NTop);
   finally
   end;
 end;

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

@@ -20,6 +20,8 @@ type
     function GenerarInformeIVAClientes(const IdEmpresa: Integer; const FechaInicio: Variant; const FechaFin: Variant; const ListaIDClientes: TIntegerArray; const Desglosado: Boolean; const ImporteMinimo: Currency): Binary;
     function GenerarInformeListadoFacturasCli(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 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;
 
     //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;
@@ -33,7 +35,7 @@ type
     function GenerarInformeListadoFacturasProv(const IdEmpresa: Integer; const FechaInicio: Variant; const FechaFin: Variant; const FechaVenInicio: Variant; const FechaVenFin: Variant; const ListaIDProveedores: TIntegerArray; const Desglosado: Boolean; const ImporteMinimo: Currency): Binary;
     function GenerarInformeListadoFacturasProvPendientes(const IdEmpresa: Integer; const FechaInicio: Variant; const FechaFin: Variant; const FechaVenInicio: Variant; const FechaVenFin: Variant; const ListaIDProveedores: TIntegerArray; const Desglosado: Boolean; const ImporteMinimo: Currency): Binary;
 
-    function GenerarInformeFacturasProvGrafComp(const IdEmpresa: Integer; const Intervalo: Variant; const Ano1: Variant; const Ano2: Variant; const ListaIDProveedores: TIntegerArray): Binary;    
+    function GenerarInformeFacturasProvGrafComp(const IdEmpresa: Integer; const Intervalo: Variant; const Ano1: Variant; const Ano2: Variant; const ListaIDProveedores: TIntegerArray; Const NTop: Variant): Binary;
     function DarListaAnosFacturasProv: TStringList;
     
     //MODULO RECIBOS DE CLIENTE

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

@@ -109,6 +109,12 @@ object PluginGestorInformes: TPluginGestorInformes
       ImageIndex = 0
       OnExecute = actInformeFacturasProveedorGrafCompExecute
     end
+    object actInformeFacturasClienteGrafComp: TAction
+      Category = 'Facturas de cliente'
+      Caption = 'Informe comparativo de facturaci'#243'n de clientes'
+      ImageIndex = 0
+      OnExecute = actInformeFacturasClienteGrafCompExecute
+    end
   end
   object MainMenu: TMainMenu
     Images = LargeImages
@@ -176,6 +182,10 @@ object PluginGestorInformes: TPluginGestorInformes
         Tag = 150
         Action = actInformeFacturasProveedorGrafComp
       end
+      object Informecomparativodefacturacindeproveedores2: TMenuItem
+        Tag = 160
+        Action = actInformeFacturasClienteGrafComp
+      end
     end
   end
   object SmallImages: TPngImageList

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

@@ -44,6 +44,8 @@ type
     actInformeFacturasProveedorGrafComp: TAction;
     N5: TMenuItem;
     Informecomparativodefacturacindeproveedores1: TMenuItem;
+    actInformeFacturasClienteGrafComp: TAction;
+    Informecomparativodefacturacindeproveedores2: TMenuItem;
     procedure actInformeFacturasClienteExecute(Sender: TObject);
     procedure actInformeFacturasClientePendientesExecute(Sender: TObject);
     procedure actInformeFacturasClienteIVAExecute(Sender: TObject);
@@ -55,6 +57,7 @@ type
     procedure actInformeRecibosProveedorExecute(Sender: TObject);
     procedure actInformeRecibosProvPendientesExecute(Sender: TObject);
     procedure actInformeFacturasProveedorGrafCompExecute(Sender: TObject);
+    procedure actInformeFacturasClienteGrafCompExecute(Sender: TObject);
   private
     FController : IGestorInformesController;
   public
@@ -84,6 +87,12 @@ begin
   FController.VerInformeListadoFacturasCli;
 end;
 
+procedure TPluginGestorInformes.actInformeFacturasClienteGrafCompExecute(
+  Sender: TObject);
+begin
+  FController.VerInformeFacturasCliGrafComp;
+end;
+
 procedure TPluginGestorInformes.actInformeFacturasClienteIVAExecute(
   Sender: TObject);
 begin

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

@@ -90,6 +90,7 @@ contains
   uEditorInformePresupuestosReport in 'uEditorInformePresupuestosReport.pas' {fEditorInformePresupuestosReport: TForm},
   uViewPeriodoFechas in 'uViewPeriodoFechas.pas' {frViewPeriodoFechas: TFrame},
   uViewIntervaloComparativo in 'uViewIntervaloComparativo.pas' {TfrViewIntervaloComparativo: TFrame},
+  uEditorInformeFacturasClienteReportGrafComp in 'uEditorInformeFacturasClienteReportGrafComp.pas' {fEditorInformeFacturasClienteReportGrafComp: TForm},
   uEditorInformeFacturasProveedorReportGrafComp in 'uEditorInformeFacturasProveedorReportGrafComp.pas' {fEditorInformeFacturasProveedorReportGrafComp: TForm};
 
 end.

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

@@ -38,49 +38,43 @@
     <DelphiCompile Include="GestorInformes_view.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\ApplicationBase.dcp" />
+    <DCCReference Include="ApplicationBase.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\Base.dcp" />
+    <DCCReference Include="Base.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\bdertl.dcp" />
+    <DCCReference Include="bdertl.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\ccpackD11.dcp" />
+    <DCCReference Include="ccpackD11.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\cfpack_d11.dcp" />
+    <DCCReference Include="cfpack_d11.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\Contactos_controller.dcp" />
+    <DCCReference Include="Contactos_controller.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\Contactos_model.dcp" />
+    <DCCReference Include="Contactos_model.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\Contactos_view.dcp" />
+    <DCCReference Include="Contactos_view.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\cxDataD11.dcp" />
+    <DCCReference Include="cxDataD11.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\cxEditorsD11.dcp" />
+    <DCCReference Include="cxEditorsD11.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\cxLibraryD11.dcp" />
+    <DCCReference Include="cxLibraryD11.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\dbrtl.dcp" />
+    <DCCReference Include="dbrtl.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\designide.dcp" />
+    <DCCReference Include="designide.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\dxComnD11.dcp" />
+    <DCCReference Include="dxComnD11.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\dxCoreD11.dcp" />
+    <DCCReference Include="dxCoreD11.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\dxGDIPlusD11.dcp" />
+    <DCCReference Include="dxGDIPlusD11.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\dxLayoutControlD11.dcp" />
+    <DCCReference Include="dxLayoutControlD11.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\dxThemeD11.dcp" />
+    <DCCReference Include="dxThemeD11.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\fqb110.dcp" />
+    <DCCReference Include="fqb110.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\frx11.dcp" />
+    <DCCReference Include="frx11.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\frxe11.dcp" />
+    <DCCReference Include="frxe11.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\fs11.dcp" />
+    <DCCReference Include="fs11.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\GestorInformes_controller.dcp" />
+    <DCCReference Include="GestorInformes_controller.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\GUIBase.dcp" />
+    <DCCReference Include="GUIBase.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\GUISDK_D11R.dcp" />
+    <DCCReference Include="GUISDK_D11R.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\Jcl.dcp" />
+    <DCCReference Include="Jcl.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\JclVcl.dcp" />
+    <DCCReference Include="JclVcl.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\JvCoreD11R.dcp" />
+    <DCCReference Include="JvCoreD11R.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\JvPageCompsD11R.dcp" />
+    <DCCReference Include="JvPageCompsD11R.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\JvSystemD11R.dcp" />
+    <DCCReference Include="JvSystemD11R.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\PngComponentsD10.dcp" />
+    <DCCReference Include="PngComponentsD10.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\PNG_D10.dcp" />
+    <DCCReference Include="PNG_D10.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="RemObjects_Core_D11.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\rtl.dcp" />
+    <DCCReference Include="rtl.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\tb2k_d10.dcp" />
+    <DCCReference Include="tb2k_d10.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\tbx_d10.dcp" />
+    <DCCReference Include="tbx_d10.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\vcl.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\vclactnband.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\vcldb.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\vcljpg.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\vclx.dcp" />
-    <DCCReference Include="C:\FR\4.7.71\Demos\Main\xmlrtl.dcp" />
     <DCCReference Include="uEditorInformeBase.pas">
       <Form>fEditorInformeBase</Form>
       <DesignClass>TForm</DesignClass>
@@ -93,6 +87,10 @@
       <Form>fEditorInformeFacturasClienteReport</Form>
       <DesignClass>T</DesignClass>
     </DCCReference>
+    <DCCReference Include="uEditorInformeFacturasClienteReportGrafComp.pas">
+      <Form>fEditorInformeFacturasClienteReportGrafComp</Form>
+      <DesignClass>TForm</DesignClass>
+    </DCCReference>
     <DCCReference Include="uEditorInformeFacturasProveedorPendientesReport.pas">
       <Form>fEditorInformeFacturasProveedorPendientesReport</Form>
       <DesignClass>TForm</DesignClass>
@@ -101,10 +99,7 @@
       <Form>fEditorInformeFacturasProveedorReport</Form>
       <DesignClass>TForm</DesignClass>
     </DCCReference>
-    <DCCReference Include="uEditorInformeFacturasProveedorReportGrafComp.pas">
+    <DCCReference Include="uEditorInformeFacturasProveedorReportGrafComp.pas" />
-      <Form>fEditorInformeFacturasProveedorReportGrafComp</Form>
-      <DesignClass>TForm</DesignClass>
-    </DCCReference>
     <DCCReference Include="uEditorInformeIVAClientesReport.pas">
       <Form>fEditorInformeIVAClientesReport</Form>
       <DesignClass>TForm</DesignClass>
@@ -162,6 +157,12 @@
       <Form>frViewPeriodoFechas</Form>
       <DesignClass>TFrame</DesignClass>
     </DCCReference>
+    <DCCReference Include="vcl.dcp" />
+    <DCCReference Include="vclactnband.dcp" />
+    <DCCReference Include="vcldb.dcp" />
+    <DCCReference Include="vcljpg.dcp" />
+    <DCCReference Include="vclx.dcp" />
+    <DCCReference Include="xmlrtl.dcp" />
   </ItemGroup>
 </Project>
 <!-- EurekaLog First Line

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

@@ -0,0 +1,174 @@
+inherited fEditorInformeFacturasClienteReportGrafComp: TfEditorInformeFacturasClienteReportGrafComp
+  Caption = 'fEditorInformeFacturasClienteReportGrafComp'
+  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 TfrViewIntervaloComparativo1: TTfrViewIntervaloComparativo
+        Left = 0
+        Top = 0
+        Width = 188
+        Height = 182
+        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
+        inherited TBXAlignmentPanel2: TTBXAlignmentPanel
+          Width = 182
+          ExplicitWidth = 182
+          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
+          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
+          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
+      end
+      inline frViewFiltroClientes1: TfrViewFiltroClientes
+        Left = 0
+        Top = 182
+        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
+        ReadOnly = False
+        ExplicitTop = 182
+        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/uEditorInformeFacturasClienteReportGrafComp.pas

@@ -0,0 +1,178 @@
+unit uEditorInformeFacturasClienteReportGrafComp;
+
+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, uIEditorInformeFacturasClienteReportGrafComp,
+  uViewIntervaloComparativo, uViewFiltroClientes;
+
+type
+  TfEditorInformeFacturasClienteReportGrafComp = class(TfEditorInformeBase, IEditorInformeFacturasClienteReportGrafComp)
+    TBXItem58: TTBXItem;
+    TfrViewIntervaloComparativo1: TTfrViewIntervaloComparativo;
+    frViewFiltroClientes1: TfrViewFiltroClientes;
+    procedure actRefrescarExecute(Sender: TObject);
+    procedure FormShow(Sender: TObject);
+
+  private
+    FListaIDClientes: TIntegerArray;
+    function GetIntervalo: Variant;
+    function GetAno1: Variant;
+    function GetAno2: 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 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 TfEditorInformeFacturasClienteReportGrafComp.actRefrescarExecute(Sender: TObject);
+begin
+  inherited;
+  RefrescarInforme;
+end;
+
+constructor TfEditorInformeFacturasClienteReportGrafComp.Create(AOwner: TComponent);
+begin
+  inherited;
+  FListaIDClientes := TIntegerArray.Create;
+end;
+
+destructor TfEditorInformeFacturasClienteReportGrafComp.Destroy;
+begin
+  FListaIDClientes.Free;
+  inherited;
+end;
+
+procedure TfEditorInformeFacturasClienteReportGrafComp.FormShow(Sender: TObject);
+begin
+  inherited;
+  actTodaPagina.Execute;
+end;
+
+function TfEditorInformeFacturasClienteReportGrafComp.GetIntervalo: Variant;
+begin
+  Result := TfrViewIntervaloComparativo1.cbIntervalo.EditValue;
+end;
+
+function TfEditorInformeFacturasClienteReportGrafComp.GetAno1: Variant;
+begin
+  Result := TfrViewIntervaloComparativo1.cbAno1.EditValue;
+end;
+
+function TfEditorInformeFacturasClienteReportGrafComp.GetAno2: Variant;
+begin
+  Result := TfrViewIntervaloComparativo1.cbAno2.EditValue;
+end;
+
+function TfEditorInformeFacturasClienteReportGrafComp.GetListaIDClientes: TIntegerArray;
+begin
+  FListaIDClientes.Clear;
+  if Assigned(frViewFiltroClientes1.Cliente) then
+     FListaIDClientes.Add(frViewFiltroClientes1.Cliente.ID);
+
+  Result := FListaIDClientes;
+end;
+
+function TfEditorInformeFacturasClienteReportGrafComp.GetNTop: Variant;
+begin
+  Result := 5;
+end;
+
+procedure TfEditorInformeFacturasClienteReportGrafComp.RefrescarInforme;
+var
+  AStream: Binary;
+begin
+  ShowHourglassCursor;
+  try
+
+    AStream := (Controller as IGestorInformesController).DataModule.GenerarInformeFacturasCliGrafComp(
+      AppFactuGES.EmpresaActiva.ID,
+      Intervalo,
+      Ano1,
+      Ano2,
+      ListaIDClientes,
+      NTop);
+
+    LoadFromStream(AStream);
+    Report.ShowPreparedReport;
+  finally
+    FreeAndNil(AStream);
+    HideHourglassCursor;
+  end;
+end;
+
+procedure TfEditorInformeFacturasClienteReportGrafComp.SetController(
+  const Value: IControllerBase);
+var
+  AListaAnos: TStringList;
+  AListaIntervalos: TStringList;
+  i: Integer;
+
+begin
+  inherited;
+
+  AListaIntervalos := (Controller as IGestorInformesController).DarListaIntervalos;
+  AListaAnos := (Controller as IGestorInformesController).DarListaAnosFacturasProv;
+
+  if Assigned(AListaIntervalos) then
+  begin
+    TfrViewIntervaloComparativo1.cbIntervalo.Properties.Items.BeginUpdate;
+    TfrViewIntervaloComparativo1.cbIntervalo.Properties.Items.Clear;
+    for i := 0 to AListaIntervalos.Count - 1 do
+        TfrViewIntervaloComparativo1.cbIntervalo.Properties.Items.Append(AListaIntervalos.Strings[i]);
+    TfrViewIntervaloComparativo1.cbIntervalo.Properties.Items.EndUpdate;
+  end;
+
+  if Assigned(AListaAnos) then
+  begin
+    TfrViewIntervaloComparativo1.cbAno1.Properties.Items.BeginUpdate;
+    TfrViewIntervaloComparativo1.cbAno2.Properties.Items.BeginUpdate;
+    TfrViewIntervaloComparativo1.cbAno1.Properties.Items.Clear;
+    TfrViewIntervaloComparativo1.cbAno2.Properties.Items.Clear;
+    for i := 0 to AListaAnos.Count - 1 do
+    begin
+        TfrViewIntervaloComparativo1.cbAno1.Properties.Items.Append(AListaAnos.Strings[i]);
+        TfrViewIntervaloComparativo1.cbAno2.Properties.Items.Append(AListaAnos.Strings[i]);
+    end;
+    TfrViewIntervaloComparativo1.cbAno1.Properties.Items.EndUpdate;
+    TfrViewIntervaloComparativo1.cbAno2.Properties.Items.EndUpdate;
+  end;
+
+  TfrViewIntervaloComparativo1.cbIntervalo.ItemIndex := 0;
+  TfrViewIntervaloComparativo1.cbAno1.ItemIndex := 0;
+end;
+
+end.

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

@@ -152,17 +152,21 @@ inherited fEditorInformeFacturasProveedorReportGrafComp: TfEditorInformeFacturas
         Visible = False
         ReadOnly = False
         ExplicitTop = 182
+        ExplicitWidth = 188
         inherited TBXLabel2: TTBXLabel
           Width = 188
+          ExplicitWidth = 188
         end
         inherited bElegirProveedor: TBitBtn
           Width = 119
+          ExplicitWidth = 119
         end
         inherited edtProveedor: TcxTextEdit
           Style.LookAndFeel.SkinName = ''
           StyleDisabled.LookAndFeel.SkinName = ''
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
+          ExplicitWidth = 152
           Width = 152
         end
       end

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

@@ -31,6 +31,7 @@ type
     function GetAno1: Variant;
     function GetAno2: Variant;
     function GetListaIDProveedores: TIntegerArray;
+    function GetNTop: Variant;
 
     procedure RefrescarInforme;
 
@@ -42,6 +43,7 @@ type
     property Ano1: Variant read GetAno1;
     property Ano2: Variant read GetAno2;
     property ListaIDProveedores: TIntegerArray read GetListaIDProveedores;
+    property NTop: Variant read GetNTop;
 
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
@@ -76,13 +78,9 @@ end;
 
 procedure TfEditorInformeFacturasProveedorReportGrafComp.FormShow(
   Sender: TObject);
-var
-  AListaAnos: TStringList;
-  AListaIntervalos: TStringList;
-  i: Integer;
-
 begin
   inherited;
+  actTodaPagina.Execute;
 end;
 
 function TfEditorInformeFacturasProveedorReportGrafComp.GetIntervalo: Variant;
@@ -109,6 +107,11 @@ begin
   Result := FListaIDProveedores;
 end;
 
+function TfEditorInformeFacturasProveedorReportGrafComp.GetNTop: Variant;
+begin
+  Result := 5;
+end;
+
 procedure TfEditorInformeFacturasProveedorReportGrafComp.RefrescarInforme;
 var
   AStream: Binary;
@@ -121,7 +124,8 @@ begin
       Intervalo,
       Ano1,
       Ano2,
-      ListaIDProveedores);
+      ListaIDProveedores,
+      NTop);
 
     LoadFromStream(AStream);
     Report.ShowPreparedReport;

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

@@ -16,7 +16,7 @@ uses
   uEditorInformeIVAProveedoresReport, uEditorInformeFacturasProveedorReport, uEditorInformeFacturasProveedorPendientesReport,
   uEditorInformeRecibosProveedorReport, uEditorInformeRecibosProvPendientesReport,
 
-  uEditorInformeFacturasProveedorReportGrafComp;
+  uEditorInformeFacturasProveedorReportGrafComp, uEditorInformeFacturasClienteReportGrafComp;
 
 procedure RegisterViews;
 begin
@@ -35,6 +35,7 @@ begin
   EditorRegistry.RegisterClass(TfEditorInformeRecibosProvPendientesReport, 'EditorInformeRecibosProvPendientesReport');
 
   EditorRegistry.RegisterClass(TfEditorInformeFacturasProveedorReportGrafComp, 'EditorInformeFacturasProveedorReportGrafComp');
+  EditorRegistry.RegisterClass(TfEditorInformeFacturasClienteReportGrafComp, 'EditorInformeFacturasClienteReportGrafComp');
 end;
 
 procedure UnregisterViews;
@@ -54,6 +55,7 @@ begin
   EditorRegistry.UnRegisterClass(TfEditorInformeRecibosProvPendientesReport);
 
   EditorRegistry.UnRegisterClass(TfEditorInformeFacturasProveedorReportGrafComp);
+  EditorRegistry.UnRegisterClass(TfEditorInformeFacturasClienteReportGrafComp);  
 end;
 
 end.

Source/Servicios/FactuGES.RODL

@@ -738,6 +738,24 @@
 </Parameter>
 </Parameters>
 </Operation>
+<Operation Name="GenerarInformeFacturasCliGrafComp" UID="{D3CF2A10-FADA-4738-A511-E8B00578B5EC}">
+<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="ListaIDClientes" DataType="TIntegerArray" Flag="In" >
+</Parameter>
+<Parameter Name="TopN" DataType="Integer" Flag="In" >
+</Parameter>
+</Parameters>
+</Operation>
 <Operation Name="GenerarInformeListadoFacturasCliPendientes" UID="{09AD0E02-7104-4B03-A605-97897915E849}">
 <Parameters>
 <Parameter Name="Result" DataType="Binary" Flag="Result">
@@ -912,6 +930,12 @@
 </Parameter>
 </Parameters>
 </Operation>
+<Operation Name="DarListaAnosFacturasCli" UID="{5BCED089-81A1-47BF-9D28-CD74A4B5384C}">
+<Parameters>
+<Parameter Name="Result" DataType="StringArray" Flag="Result">
+</Parameter>
+</Parameters>
+</Operation>
 <Operation Name="DarListaIntervalos" UID="{C269B16F-5CA5-4EB8-8D9A-EAB8133537C4}">
 <Parameters>
 <Parameter Name="Result" DataType="StringArray" Flag="Result">

Source/Servicios/FactuGES_Intf.pas

@@ -777,6 +777,8 @@ type
                                                const FechaVenFin: Variant; const ListaIDProveedores: TIntegerArray; const Desglosado: Boolean; const ImporteMinimo: Currency): Binary;
     function GenerarInformeFacturasProvGrafComp(const IdEmpresa: Integer; const Intervalo: Variant; const Ano1: Variant; const Ano2: Variant; const ListaIDProveedores: TIntegerArray; 
                                                 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 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 GenerarInformeListadoFacturasProvPendientes(const IdEmpresa: Integer; const FechaInicio: Variant; const FechaFin: Variant; const FechaVenInicio: Variant; 
@@ -794,6 +796,7 @@ type
     function GenerarInformeListadoPedidos(const IdEmpresa: Integer; const FechaInicio: Variant; const FechaFin: Variant; const ListaIDProveedores: TIntegerArray; 
                                           const Desglosado: Boolean; const ImporteMinimo: Currency): Binary;
     function DarListaAnosFacturasProv: StringArray;
+    function DarListaAnosFacturasCli: StringArray;
     function DarListaIntervalos: StringArray;
   end;
 
@@ -817,6 +820,8 @@ type
                                                const FechaVenFin: Variant; const ListaIDProveedores: TIntegerArray; const Desglosado: Boolean; const ImporteMinimo: Currency): Binary;
     function GenerarInformeFacturasProvGrafComp(const IdEmpresa: Integer; const Intervalo: Variant; const Ano1: Variant; const Ano2: Variant; const ListaIDProveedores: TIntegerArray; 
                                                 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 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 GenerarInformeListadoFacturasProvPendientes(const IdEmpresa: Integer; const FechaInicio: Variant; const FechaFin: Variant; const FechaVenInicio: Variant; 
@@ -834,6 +839,7 @@ type
     function GenerarInformeListadoPedidos(const IdEmpresa: Integer; const FechaInicio: Variant; const FechaFin: Variant; const ListaIDProveedores: TIntegerArray; 
                                           const Desglosado: Boolean; const ImporteMinimo: Currency): Binary;
     function DarListaAnosFacturasProv: StringArray;
+    function DarListaAnosFacturasCli: StringArray;
     function DarListaIntervalos: StringArray;
   end;
 
@@ -2488,6 +2494,29 @@ begin
   end
 end;
 
+function TsrvGestorInformes_Proxy.GenerarInformeFacturasCliGrafComp(const IdEmpresa: Integer; const Intervalo: Variant; const Ano1: Variant; const Ano2: Variant; const ListaIDClientes: TIntegerArray; 
+                                                                    const TopN: Integer): Binary;
+begin
+  try
+    result := nil;
+    __Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'GenerarInformeFacturasCliGrafComp');
+    __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('ListaIDClientes', TypeInfo(FactuGES_Intf.TIntegerArray), ListaIDClientes, []);
+    __Message.Write('TopN', TypeInfo(Integer), TopN, []);
+    __Message.Finalize;
+
+    __TransportChannel.Dispatch(__Message);
+
+    __Message.Read('Result', TypeInfo(Binary), result, []);
+  finally
+    __Message.UnsetAttributes(__TransportChannel);
+    __Message.FreeStream;
+  end
+end;
+
 function TsrvGestorInformes_Proxy.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;
 begin
@@ -2700,6 +2729,22 @@ begin
   end
 end;
 
+function TsrvGestorInformes_Proxy.DarListaAnosFacturasCli: StringArray;
+begin
+  try
+    result := nil;
+    __Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'DarListaAnosFacturasCli');
+    __Message.Finalize;
+
+    __TransportChannel.Dispatch(__Message);
+
+    __Message.Read('Result', TypeInfo(DataAbstract4_Intf.StringArray), result, []);
+  finally
+    __Message.UnsetAttributes(__TransportChannel);
+    __Message.FreeStream;
+  end
+end;
+
 function TsrvGestorInformes_Proxy.DarListaIntervalos: StringArray;
 begin
   try

Source/Servicios/FactuGES_Invk.pas

@@ -298,6 +298,7 @@ type
     procedure Invoke_GenerarInformeListadoFacturasCli(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
     procedure Invoke_GenerarInformeListadoFacturasProv(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_GenerarInformeListadoFacturasCliPendientes(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
     procedure Invoke_GenerarInformeListadoFacturasProvPendientes(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
     procedure Invoke_GenerarInformeListadoRecibosCliente(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
@@ -307,6 +308,7 @@ type
     procedure Invoke_GenerarInformeListadoPresupuestos(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
     procedure Invoke_GenerarInformeListadoPedidos(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
     procedure Invoke_DarListaAnosFacturasProv(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
+    procedure Invoke_DarListaAnosFacturasCli(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
     procedure Invoke_DarListaIntervalos(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
   end;
 
@@ -1959,6 +1961,47 @@ begin
   end;
 end;
 
+procedure TsrvGestorInformes_Invoker.Invoke_GenerarInformeFacturasCliGrafComp(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
+{ function GenerarInformeFacturasCliGrafComp(const IdEmpresa: Integer; const Intervalo: Variant; const Ano1: Variant; const Ano2: Variant; const ListaIDClientes: TIntegerArray; 
+                                               const TopN: Integer): Binary; }
+var
+  IdEmpresa: Integer;
+  Intervalo: Variant;
+  Ano1: Variant;
+  Ano2: Variant;
+  ListaIDClientes: FactuGES_Intf.TIntegerArray;
+  TopN: Integer;
+  lResult: Binary;
+  __lObjectDisposer: TROObjectDisposer;
+begin
+  ListaIDClientes := nil;
+  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('ListaIDClientes', TypeInfo(FactuGES_Intf.TIntegerArray), ListaIDClientes, []);
+    __Message.Read('TopN', TypeInfo(Integer), TopN, []);
+
+    lResult := (__Instance as IsrvGestorInformes).GenerarInformeFacturasCliGrafComp(IdEmpresa, Intervalo, Ano1, Ano2, ListaIDClientes, TopN);
+
+    __Message.InitializeResponseMessage(__Transport, 'FactuGES', 'srvGestorInformes', 'GenerarInformeFacturasCliGrafCompResponse');
+    __Message.Write('Result', TypeInfo(Binary), lResult, []);
+    __Message.Finalize;
+    __Message.UnsetAttributes(__Transport);
+
+  finally
+    __lObjectDisposer := TROObjectDisposer.Create(__Instance);
+    try
+      __lObjectDisposer.Add(ListaIDClientes);
+      __lObjectDisposer.Add(lResult);
+    finally
+      __lObjectDisposer.Free();
+    end;
+  end;
+end;
+
 procedure TsrvGestorInformes_Invoker.Invoke_GenerarInformeListadoFacturasCliPendientes(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
 { 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; }
@@ -2336,6 +2379,31 @@ begin
   end;
 end;
 
+procedure TsrvGestorInformes_Invoker.Invoke_DarListaAnosFacturasCli(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
+{ function DarListaAnosFacturasCli: StringArray; }
+var
+  lResult: DataAbstract4_Intf.StringArray;
+  __lObjectDisposer: TROObjectDisposer;
+begin
+  lResult := nil;
+  try
+    lResult := (__Instance as IsrvGestorInformes).DarListaAnosFacturasCli;
+
+    __Message.InitializeResponseMessage(__Transport, 'FactuGES', 'srvGestorInformes', 'DarListaAnosFacturasCliResponse');
+    __Message.Write('Result', TypeInfo(DataAbstract4_Intf.StringArray), lResult, []);
+    __Message.Finalize;
+    __Message.UnsetAttributes(__Transport);
+
+  finally
+    __lObjectDisposer := TROObjectDisposer.Create(__Instance);
+    try
+      __lObjectDisposer.Add(lResult);
+    finally
+      __lObjectDisposer.Free();
+    end;
+  end;
+end;
+
 procedure TsrvGestorInformes_Invoker.Invoke_DarListaIntervalos(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
 { function DarListaIntervalos: StringArray; }
 var

Source/Servidor/FactuGES_Server.dproj

@@ -35,17 +35,7 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType />
     <BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters><Parameters Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">7</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.8.7.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.8.7.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">miércoles, 19 de enero de 2011 17:45</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">1</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">8</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.8.8.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.8.8.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">miércoles, 19 de enero 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></BorlandProject></BorlandProject>