diff --git a/Database/scripts/factuges.sql b/Database/scripts/factuges.sql index 794612f..ab4200f 100644 --- a/Database/scripts/factuges.sql +++ b/Database/scripts/factuges.sql @@ -4204,6 +4204,97 @@ inner join V_INF_FAC_PROVEEDOR_TOTAL_ANO v on ((v.id_empresa = f.id_empresa) and order by 1,2,3,4,5 asc ; +CREATE VIEW V_INF_FAC_DET_PROVEEDOR( + ID, + ID_EMPRESA, + ANO, + SEMESTRE, + TRIMESTRE, + MES, + FECHA_FACTURA, + ID_FACTURA, + ID_PROVEEDOR, + NOMBRE, + ID_ARTICULO, + CONCEPTO, + CANTIDAD, + IMPORTE_UNIDAD, + IMPORTE_NETO, + DESCUENTO, + IMPORTE_PORTE, + IMPORTE_DESCUENTO, + IMPORTE_TOTAL, + IMPORTE_TOTAL_ANO) +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),4)+1) 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, +FD.DESCUENTO, FD.IMPORTE_PORTE, +CASE +when FD.DESCUENTO = 0 then 0 +else ((FD.CANTIDAD * FD.IMPORTE_UNIDAD) - FD.IMPORTE_TOTAL) +end as IMPORTE_DESCUENTO, +FD.IMPORTE_TOTAL, +v.importe_total as IMPORTE_TOTAL_ANO + + +from facturas_proveedor_detalles FD +left join facturas_proveedor F on (F.ID = FD.ID_FACTURA) +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))) +where (FD.TIPO_DETALLE = 'Concepto') +; + +CREATE VIEW V_INF_FAC_DET_CLIENTE( + ID, + ID_EMPRESA, + ANO, + SEMESTRE, + TRIMESTRE, + MES, + FECHA_FACTURA, + ID_FACTURA, + ID_CLIENTE, + NOMBRE, + ID_AGENTE, + ID_ARTICULO, + CONCEPTO, + CANTIDAD, + IMPORTE_UNIDAD, + IMPORTE_NETO, + DESCUENTO, + IMPORTE_PORTE, + IMPORTE_DESCUENTO, + IMPORTE_TOTAL, + IMPORTE_TOTAL_ANO) +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),4)+1) 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, +FD.DESCUENTO, FD.IMPORTE_PORTE, +CASE +when FD.DESCUENTO = 0 then 0 +else ((FD.CANTIDAD * FD.IMPORTE_UNIDAD) - FD.IMPORTE_TOTAL) +end as IMPORTE_DESCUENTO, +FD.IMPORTE_TOTAL, +v.importe_total as IMPORTE_TOTAL_ANO + + +from facturas_cliente_detalles FD +left join facturas_cliente F on (F.ID = FD.ID_FACTURA) +left join clientes_datos cd on (cd.ID_CLIENTE = F.ID_CLIENTE) +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))) +where (FD.TIPO_DETALLE = 'Concepto') +; /******************************************************************************/ /**** Primary Keys ****/ /******************************************************************************/ diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index 6ca73f3..967e11c 100644 --- a/Source/Cliente/FactuGES.dproj +++ b/Source/Cliente/FactuGES.dproj @@ -53,7 +53,7 @@ Delphi.Personality VCLApplication -FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse4120FalseFalseFalseFalseFalse30821252Rodax Software S.L.4.1.2.0FactuGESFactuGES4.1.2.0FactuGES.dprFalse +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse4130FalseFalseFalseFalseFalse30821252Rodax Software S.L.4.1.3.0FactuGESFactuGES4.1.3.0FactuGES.dprFalse diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index 372bc84..fc18575 100644 Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ diff --git a/Source/Informes/1/InformeListadoFacturasClienteGrafComp.fr3 b/Source/Informes/1/InformeListadoFacturasClienteGrafComp.fr3 index 535a2f7..861907e 100644 --- a/Source/Informes/1/InformeListadoFacturasClienteGrafComp.fr3 +++ b/Source/Informes/1/InformeListadoFacturasClienteGrafComp.fr3 @@ -1,5 +1,5 @@ - + @@ -35,13 +35,13 @@ - + - + @@ -63,5 +63,16 @@ + + + + + + + + + + + diff --git a/Source/Informes/2/InformeListadoFacturasClienteGrafComp.fr3 b/Source/Informes/2/InformeListadoFacturasClienteGrafComp.fr3 index f9755ca..316376b 100644 --- a/Source/Informes/2/InformeListadoFacturasClienteGrafComp.fr3 +++ b/Source/Informes/2/InformeListadoFacturasClienteGrafComp.fr3 @@ -1,5 +1,5 @@ - + @@ -18,7 +18,7 @@ - + @@ -36,13 +36,13 @@ - + - + @@ -64,5 +64,16 @@ + + + + + + + + + + + diff --git a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm index ad9596a..59e5ed8 100644 --- a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm +++ b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm @@ -2,7 +2,7 @@ object RptFacturasCliente: TRptFacturasCliente OldCreateOrder = True OnCreate = DataModuleCreate OnDestroy = DataModuleDestroy - Height = 678 + Height = 715 Width = 977 object schReport: TDASchema ConnectionManager = dmServer.ConnectionManager @@ -30,13 +30,12 @@ object RptFacturasCliente: TRptFacturasCliente SQL = 'select P.ANO, C.REFERENCIA, COALESCE(C.NOMBRE, P.NOMBRE) as NOMB' + 'RE,'#10'SUM(P.IMPORTE_DESCUENTO) as IMPORTE_DESCUENTO, SUM(P.IMPORTE' + - '_TOTAL) as IMPORTE_TOTAL,'#10'(SUM(P.IMPORTE_TOTAL) - SUM(P.IMPORTE_' + - 'DESCUENTO)) as IMPORTE_COBRADO,'#10'case when SUM(P.IMPORTE_TOTAL) =' + - ' 0 then 0'#10'else ((SUM(P.IMPORTE_DESCUENTO) * 100) / SUM(P.IMPORTE' + - '_TOTAL)) end as PORCENTAJE'#10#10'from V_INF_FAC_CLIENTE P'#10'left join C' + - 'ONTACTOS C on P.ID_CLIENTE = C.ID'#10#10'where p.ID_EMPRESA = :ID_EMPR' + - 'ESA'#10'and P.ANO = :ANO'#10'group by 1,2,3'#10'order by 1,5 desc'#10'rows 1 to ' + - ':NTOP'#10#10 + '_NETO) as IMPORTE_TOTAL,'#10'SUM(P.IMPORTE_TOTAL) as IMPORTE_COBRADO' + + ','#10'case when SUM(P.IMPORTE_NETO) = 0 then 0'#10'else ((SUM(P.IMPORTE_' + + 'DESCUENTO) * 100) / SUM(P.IMPORTE_NETO)) end as PORCENTAJE'#10#10'from' + + ' V_INF_FAC_DET_CLIENTE P'#10'left join CONTACTOS C on P.ID_CLIENTE =' + + ' C.ID'#10#10'where p.ID_EMPRESA = :ID_EMPRESA'#10'and P.ANO = :ANO'#10'group b' + + 'y 1,2,3'#10'order by 1,5 desc'#10'rows 1 to :NTOP'#10 StatementType = stSQL ColumnMappings = < item @@ -98,7 +97,7 @@ object RptFacturasCliente: TRptFacturasCliente end item Name = 'PORCENTAJE' - DataType = datCurrency + DataType = datDecimal end> end item @@ -1524,6 +1523,88 @@ object RptFacturasCliente: TRptFacturasCliente Name = 'IMPORTE_TOTAL' DataType = datCurrency end> + end + item + Params = < + item + Name = 'ID_EMPRESA' + Value = '' + end + item + Name = 'ANO' + Value = '' + end + item + Name = 'NTOP' + Value = '' + end> + Statements = < + item + Connection = 'IBX' + ConnectionType = 'Interbase' + Default = True + SQL = + 'select P.ANO, C.REFERENCIA, COALESCE(C.NOMBRE, '#39'Agente no asigna' + + 'do'#39') as NOMBRE, p.Importe_TOTAL_ANO,'#10'SUM(P.IMPORTE_TOTAL) as IMP' + + 'ORTE_TOTAL, ((SUM(P.IMPORTE_TOTAL)*100)/p.Importe_TOTAL_ANO) as ' + + 'PORCENTAJE'#10#10'from V_INF_FAC_DET_CLIENTE P'#10'left join CONTACTOS C o' + + 'n P.ID_AGENTE = 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,6 desc'#10'rows 1 to :NTOP'#10 + StatementType = stSQL + ColumnMappings = < + item + DatasetField = 'ANO' + TableField = 'ANO' + end + item + DatasetField = 'REFERENCIA' + TableField = 'REFERENCIA' + end + item + DatasetField = 'NOMBRE' + TableField = 'NOMBRE' + end + item + DatasetField = 'IMPORTE_TOTAL_ANO' + TableField = 'IMPORTE_TOTAL_ANO' + end + item + DatasetField = 'IMPORTE_TOTAL' + TableField = 'IMPORTE_TOTAL' + end + item + DatasetField = 'PORCENTAJE' + TableField = 'PORCENTAJE' + end> + end> + Name = 'InformeListadoAgentesMayorFacturacionResumen' + Fields = < + item + Name = 'ANO' + DataType = datSmallInt + end + item + Name = 'REFERENCIA' + DataType = datString + Size = 255 + end + item + Name = 'NOMBRE' + DataType = datString + Size = 255 + end + item + Name = 'IMPORTE_TOTAL_ANO' + DataType = datCurrency + end + item + Name = 'IMPORTE_TOTAL' + DataType = datCurrency + end + item + Name = 'PORCENTAJE' + DataType = datCurrency + end> end> JoinDataTables = <> UnionDataTables = <> @@ -3212,4 +3293,75 @@ object RptFacturasCliente: TRptFacturasCliente Left = 624 Top = 600 end + object frxDBInformeListadoAgentesMayorFacturacionResumen: TfrxDBDataset + UserName = 'frxDBInformeListadoAgentesMayorFacturacionResumen' + CloseDataSource = False + DataSource = DADInformeListadoAgentesMayorFacturacionResumen + BCDToCurrency = False + Left = 64 + Top = 488 + end + object DADInformeListadoAgentesMayorFacturacionResumen: TDADataSource + DataSet = tbl_InformeListadoAgentesMayorFacturacionResumen.Dataset + DataTable = tbl_InformeListadoAgentesMayorFacturacionResumen + Left = 64 + Top = 544 + end + object tbl_InformeListadoAgentesMayorFacturacionResumen: TDAMemDataTable + RemoteUpdatesOptions = [] + Fields = < + item + Name = 'ANO' + DataType = datSmallInt + end + item + Name = 'REFERENCIA' + DataType = datString + Size = 255 + end + item + Name = 'NOMBRE' + DataType = datString + Size = 255 + end + item + Name = 'IMPORTE_TOTAL_ANO' + DataType = datCurrency + end + item + Name = 'NUMFAC' + DataType = datInteger + end + item + Name = 'IMPORTE_TOTAL' + DataType = datCurrency + end + item + Name = 'PORCENTAJE' + DataType = datCurrency + end> + Params = < + item + Name = 'ID_EMPRESA' + Value = '' + end + item + Name = 'ANO' + Value = '' + end + item + Name = 'NTOP' + Value = '' + end> + MasterMappingMode = mmDataRequest + LogChanges = False + StreamingOptions = [soDisableEventsWhileStreaming] + RemoteFetchEnabled = False + LocalSchema = schReport + LocalDataStreamer = Bin2DataStreamer + LogicalName = 'InformeListadoAgentesMayorFacturacionResumen' + IndexDefs = <> + Left = 64 + Top = 600 + end end diff --git a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas index 42a7186..3617824 100644 --- a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas +++ b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas @@ -89,7 +89,6 @@ type DADSInformeListadoFacturasResumen: TDADataSource; tbl_InformeListadoFacturasResumen: TDAMemDataTable; Bin2DataStreamer: TDABin2DataStreamer; - schReport: TDASchema; frxDBInformeListadoFacturasGrafComp: TfrxDBDataset; DASInformeListadoFacturasGrafComp: TDADataSource; tbl_InformeListadoFacturasGrafCompMensual: TDAMemDataTable; @@ -101,6 +100,10 @@ type frxDBInformeListadoClientesMayorDescuentoResumen: TfrxDBDataset; DADSInformeListadoClientesMayorDescuentoResumen: TDADataSource; tbl_InformeListadoClientesMayorDescuentoResumen: TDAMemDataTable; + schReport: TDASchema; + frxDBInformeListadoAgentesMayorFacturacionResumen: TfrxDBDataset; + DADInformeListadoAgentesMayorFacturacionResumen: TDADataSource; + tbl_InformeListadoAgentesMayorFacturacionResumen: TDAMemDataTable; procedure DataModuleCreate(Sender: TObject); procedure DataModuleDestroy(Sender: TObject); procedure frxReportGetValue(const VarName: string; var Value: Variant); @@ -268,6 +271,7 @@ begin //Se preparan las tablas del listado resumen del informe PrepararTablaResumenInformeGrafComp(tbl_InformeListadoClientesMayorFacturacionResumen); PrepararTablaResumenInformeGrafComp(tbl_InformeListadoClientesMayorDescuentoResumen); + PrepararTablaResumenInformeGrafComp(tbl_InformeListadoAgentesMayorFacturacionResumen); Result := Binary.Create; diff --git a/Source/Modulos/Facturas de proveedor/Reports/uRptFacturasProveedor_Server.dfm b/Source/Modulos/Facturas de proveedor/Reports/uRptFacturasProveedor_Server.dfm index ad33f86..86ad308 100644 --- a/Source/Modulos/Facturas de proveedor/Reports/uRptFacturasProveedor_Server.dfm +++ b/Source/Modulos/Facturas de proveedor/Reports/uRptFacturasProveedor_Server.dfm @@ -161,13 +161,12 @@ object RptFacturasProveedor: TRptFacturasProveedor SQL = 'select P.ANO, C.REFERENCIA, COALESCE(C.NOMBRE, P.NOMBRE) as NOMB' + 'RE,'#10'SUM(P.IMPORTE_DESCUENTO) as IMPORTE_DESCUENTO, SUM(P.IMPORTE' + - '_TOTAL) as IMPORTE_TOTAL,'#10'(SUM(P.IMPORTE_TOTAL) - SUM(P.IMPORTE_' + - 'DESCUENTO)) as IMPORTE_COBRADO,'#10'case when SUM(P.IMPORTE_TOTAL) =' + - ' 0 then 0'#10'else ((SUM(P.IMPORTE_DESCUENTO) * 100) / SUM(P.IMPORTE' + - '_TOTAL)) end as PORCENTAJE'#10#10'from V_INF_FAC_PROVEEDOR P'#10'left 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'#10'order by 1,5 desc'#10'rows 1' + - ' to :NTOP'#10#10#10 + '_NETO) as IMPORTE_TOTAL,'#10'SUM(P.IMPORTE_TOTAL) as IMPORTE_COBRADO' + + ','#10'case when SUM(P.IMPORTE_NETO) = 0 then 0'#10'else ((SUM(P.IMPORTE_' + + 'DESCUENTO) * 100) / SUM(P.IMPORTE_NETO)) end as PORCENTAJE'#10#10'from' + + ' V_INF_FAC_DET_PROVEEDOR P'#10'left join CONTACTOS C on P.ID_PROVEED' + + 'OR = C.ID'#10#10'where p.ID_EMPRESA = :ID_EMPRESA'#10'and P.ANO = :ANO'#10'gro' + + 'up by 1,2,3'#10'order by 1,5 desc'#10'rows 1 to :NTOP'#10 StatementType = stSQL ColumnMappings = < item @@ -229,7 +228,7 @@ object RptFacturasProveedor: TRptFacturasProveedor end item Name = 'PORCENTAJE' - DataType = datCurrency + DataType = datDecimal end> end item diff --git a/Source/Modulos/Facturas de proveedor/Reports/uRptFacturasProveedor_Server.pas b/Source/Modulos/Facturas de proveedor/Reports/uRptFacturasProveedor_Server.pas index 86a86a7..5f70097 100644 --- a/Source/Modulos/Facturas de proveedor/Reports/uRptFacturasProveedor_Server.pas +++ b/Source/Modulos/Facturas de proveedor/Reports/uRptFacturasProveedor_Server.pas @@ -46,7 +46,6 @@ type frxDBVencimientos: TfrxDBDataset; DADSVencimientos: TDADataSource; tbl_Vencimientos: TDAMemDataTable; - schReport: TDASchema; frxDBInformeListadoFacturasGrafComp: TfrxDBDataset; DASInformeListadoFacturasGrafComp: TDADataSource; tbl_InformeListadoFacturasGrafCompMensual: TDAMemDataTable; @@ -58,6 +57,7 @@ type frxDBInformeListadoProveedoresMayorDescuentoResumen: TfrxDBDataset; DADSInformeListadoProveedoresMayorDescuentoResumen: TDADataSource; tbl_InformeListadoProveedoresMayorDescuentoResumen: TDAMemDataTable; + schReport: TDASchema; procedure DataModuleCreate(Sender: TObject); procedure DataModuleDestroy(Sender: TObject); private diff --git a/Source/Modulos/Gestor de informes/Views/uEditorInformeBase.dfm b/Source/Modulos/Gestor de informes/Views/uEditorInformeBase.dfm index 585cd3e..a6a2250 100644 --- a/Source/Modulos/Gestor de informes/Views/uEditorInformeBase.dfm +++ b/Source/Modulos/Gestor de informes/Views/uEditorInformeBase.dfm @@ -65,7 +65,6 @@ inherited fEditorInformeBase: TfEditorInformeBase FloatingHeight = 128 SupportedDocks = [dkStandardDock, dkMultiDock] TabOrder = 0 - ExplicitWidth = 128 object TBXButton1: TTBXButton Left = 16 Top = 12 diff --git a/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasClienteReportGrafComp.dfm b/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasClienteReportGrafComp.dfm index 49de23e..44ec1ff 100644 --- a/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasClienteReportGrafComp.dfm +++ b/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasClienteReportGrafComp.dfm @@ -75,7 +75,7 @@ inherited fEditorInformeFacturasClienteReportGrafComp: TfEditorInformeFacturasCl Left = 0 Top = 0 Width = 188 - Height = 182 + Height = 220 Align = alTop Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -86,11 +86,12 @@ inherited fEditorInformeFacturasClienteReportGrafComp: TfEditorInformeFacturasCl TabOrder = 1 ReadOnly = False ExplicitWidth = 188 + ExplicitHeight = 220 inherited TBXAlignmentPanel2: TTBXAlignmentPanel Width = 182 ExplicitWidth = 182 inherited Label3: TLabel - Width = 106 + Width = 172 end inherited cbIntervalo: TcxComboBox Style.LookAndFeel.SkinName = '' @@ -109,7 +110,7 @@ inherited fEditorInformeFacturasClienteReportGrafComp: TfEditorInformeFacturasCl Width = 182 ExplicitWidth = 182 inherited lis: TLabel - Width = 19 + Width = 172 end inherited cbAno1: TcxComboBox Style.LookAndFeel.SkinName = '' @@ -124,7 +125,7 @@ inherited fEditorInformeFacturasClienteReportGrafComp: TfEditorInformeFacturasCl Width = 182 ExplicitWidth = 182 inherited Label1: TLabel - Width = 88 + Width = 172 end inherited cbAno2: TcxComboBox Style.LookAndFeel.SkinName = '' @@ -135,10 +136,17 @@ inherited fEditorInformeFacturasClienteReportGrafComp: TfEditorInformeFacturasCl Width = 166 end end + inherited TBXAlignmentPanel4: TTBXAlignmentPanel + Width = 182 + ExplicitWidth = 182 + inherited Label2: TLabel + Width = 172 + end + end end inline frViewFiltroClientes1: TfrViewFiltroClientes Left = 0 - Top = 182 + Top = 220 Width = 188 Height = 195 Align = alTop diff --git a/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasClienteReportGrafComp.pas b/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasClienteReportGrafComp.pas index 5cf547e..b9a9418 100644 --- a/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasClienteReportGrafComp.pas +++ b/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasClienteReportGrafComp.pas @@ -108,7 +108,7 @@ end; function TfEditorInformeFacturasClienteReportGrafComp.GetNTop: Variant; begin - Result := 5; + Result := frViewIntervaloComparativo1.stopN.Value; end; procedure TfEditorInformeFacturasClienteReportGrafComp.RefrescarInforme; diff --git a/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasProveedorReportGrafComp.dfm b/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasProveedorReportGrafComp.dfm index bb5f932..175128e 100644 --- a/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasProveedorReportGrafComp.dfm +++ b/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasProveedorReportGrafComp.dfm @@ -75,7 +75,7 @@ inherited fEditorInformeFacturasProveedorReportGrafComp: TfEditorInformeFacturas Left = 0 Top = 0 Width = 188 - Height = 182 + Height = 220 Align = alTop Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -85,13 +85,13 @@ inherited fEditorInformeFacturasProveedorReportGrafComp: TfEditorInformeFacturas ParentFont = False TabOrder = 1 ReadOnly = False - ExplicitTop = 195 ExplicitWidth = 188 + ExplicitHeight = 220 inherited TBXAlignmentPanel2: TTBXAlignmentPanel Width = 182 ExplicitWidth = 182 inherited Label3: TLabel - Width = 106 + Width = 172 end inherited cbIntervalo: TcxComboBox Style.LookAndFeel.SkinName = '' @@ -110,7 +110,7 @@ inherited fEditorInformeFacturasProveedorReportGrafComp: TfEditorInformeFacturas Width = 182 ExplicitWidth = 182 inherited lis: TLabel - Width = 19 + Width = 172 end inherited cbAno1: TcxComboBox Style.LookAndFeel.SkinName = '' @@ -125,7 +125,7 @@ inherited fEditorInformeFacturasProveedorReportGrafComp: TfEditorInformeFacturas Width = 182 ExplicitWidth = 182 inherited Label1: TLabel - Width = 88 + Width = 172 end inherited cbAno2: TcxComboBox Style.LookAndFeel.SkinName = '' @@ -136,10 +136,17 @@ inherited fEditorInformeFacturasProveedorReportGrafComp: TfEditorInformeFacturas Width = 166 end end + inherited TBXAlignmentPanel4: TTBXAlignmentPanel + Width = 182 + ExplicitWidth = 182 + inherited Label2: TLabel + Width = 172 + end + end end inline frViewFiltroProveedores1: TfrViewFiltroProveedores Left = 0 - Top = 182 + Top = 220 Width = 188 Height = 195 Align = alTop diff --git a/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasProveedorReportGrafComp.pas b/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasProveedorReportGrafComp.pas index 3fe6a93..966a95a 100644 --- a/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasProveedorReportGrafComp.pas +++ b/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasProveedorReportGrafComp.pas @@ -109,7 +109,7 @@ end; function TfEditorInformeFacturasProveedorReportGrafComp.GetNTop: Variant; begin - Result := 5; + Result := frViewIntervaloComparativo1.stopN.Value; end; procedure TfEditorInformeFacturasProveedorReportGrafComp.RefrescarInforme; diff --git a/Source/Modulos/Gestor de informes/Views/uViewIntervaloComparativo.dfm b/Source/Modulos/Gestor de informes/Views/uViewIntervaloComparativo.dfm index 27364fe..84bbaab 100644 --- a/Source/Modulos/Gestor de informes/Views/uViewIntervaloComparativo.dfm +++ b/Source/Modulos/Gestor de informes/Views/uViewIntervaloComparativo.dfm @@ -1,9 +1,9 @@ inherited frViewIntervaloComparativo: TfrViewIntervaloComparativo Width = 451 - Height = 182 + Height = 238 Align = alTop ExplicitWidth = 451 - ExplicitHeight = 182 + ExplicitHeight = 238 object TBXAlignmentPanel2: TTBXAlignmentPanel AlignWithMargins = True Left = 3 @@ -175,4 +175,34 @@ inherited frViewIntervaloComparativo: TfrViewIntervaloComparativo Width = 429 end end + object TBXAlignmentPanel4: TTBXAlignmentPanel + AlignWithMargins = True + Left = 3 + Top = 176 + Width = 445 + Height = 41 + Margins.Left = 5 + Margins.Top = 5 + Margins.Right = 5 + Align = alTop + AutoSize = True + TabOrder = 4 + object Label2: TLabel + Left = 5 + Top = 5 + Width = 435 + Height = 13 + Align = alTop + Caption = 'Top N' + Transparent = True + ExplicitWidth = 28 + end + object stopN: TcxSpinEdit + Left = 3 + Top = 20 + TabOrder = 0 + Value = 5 + Width = 121 + end + end end diff --git a/Source/Modulos/Gestor de informes/Views/uViewIntervaloComparativo.pas b/Source/Modulos/Gestor de informes/Views/uViewIntervaloComparativo.pas index 7d16d29..788e757 100644 --- a/Source/Modulos/Gestor de informes/Views/uViewIntervaloComparativo.pas +++ b/Source/Modulos/Gestor de informes/Views/uViewIntervaloComparativo.pas @@ -7,7 +7,7 @@ uses Dialogs, cxGraphics, cxEdit, cxDropDownEdit, cxCalendar, StdCtrls, cxControls, cxContainer, cxTextEdit, cxMaskEdit, TBXDkPanels, cxEditRepositoryItems, dxLayoutControl, dxLayoutLookAndFeels, uViewBase, - Mask, JvExMask, JvToolEdit, TB2Dock, uViewParametrosInforme; + Mask, JvExMask, JvToolEdit, TB2Dock, uViewParametrosInforme, cxSpinEdit; type IViewPeriodoFechas = interface(IViewParametrosInforme) @@ -25,6 +25,9 @@ type TBXAlignmentPanel1: TTBXAlignmentPanel; Label1: TLabel; cbAno2: TcxComboBox; + TBXAlignmentPanel4: TTBXAlignmentPanel; + Label2: TLabel; + stopN: TcxSpinEdit; private function GetIntervalo: Variant; diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index 87c8068..6966466 100644 Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj index 871511f..bbd2957 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -1,405 +1,411 @@ - + - - {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1} - FactuGES_Server.dpr - Debug - AnyCPU - DCC32 - ..\..\Output\Debug\Servidor\FactuGES_Server.exe - 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 - - - 7.0 - False - False - 0 - 3 - ..\..\Output\Release\Servidor - RELEASE - - - 7.0 - 3 - ..\..\Output\Debug\Servidor - DEBUG; - True - True - True - C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - - - Delphi.Personality - - - FalseTrueFalse/standaloneTrueFalse4120FalseFalseFalseFalseFalse308212524.1.2.04.1.2.0miércoles, 09 de febrero de 2011 19:22 - ExpressPrinting System by Developer Express Inc. - FactuGES_Server.dprFalse - - - - - MainSource - - - - - -
srvEmpresas
- TDARemoteService - - -
srvProvinciasPoblaciones_Impl
- TDataModule - - - - -
srvUsuarios
- TDataAbstractService - - - - - - - - -
RptAlbaranesCliente
- TDataModule - - -
RptWordAlbaranCliente
- TDataModule - - -
srvAlbaranesCliente
- TDataAbstractService - - - - - -
RptAlbaranesProveedor
- TDataModule - - -
RptWordAlbaranProveedor
- TDataModule - - -
srvAlbaranesProveedor
- TDataAbstractService - - - - -
srvAlmacenes
- TDARemoteService - - - - - -
srvArticulos
- TDARemoteService - - - - - -
RptComisiones
- TDataModule - - -
srvComisiones
- TDataAbstractService - - - - - - - - - -
RptEtiquetasContacto
- TDataModule - - -
RptFichasEmpleado
- TDataModule - - -
srvContactos
- TDARemoteService - - - - -
srvFabricantes
- TDataAbstractService - - - - - -
RptFacturasCliente
- TDataModule - - -
RptWordFacturaCliente
- TDataModule - - -
srvFacturasCliente
- TDataAbstractService - - - - - -
RptFacturasProveedor
- TDataModule - - -
srvFacturasProveedor
- TDataAbstractService - - - - -
srvFamilias
- TDataAbstractService - - - - -
srvFormasPago
- TDataAbstractService - - -
srvGestorDocumentos
- TDataAbstractService - - -
srvGestorInformes
- TDataAbstractService - - - - -
srvHistoricoMovimientos
- TDataAbstractService - - - - -
srvImpresiones
- TDARemoteService - - -
srvInfMargenArticulo
- TDARemoteService - - -
srvInfVentasArticulo
- TDataAbstractService - - - - -
srvInformes
- TDataAbstractService - - - - -
srvInventario
- TDataAbstractService - - - - - -
srvObras
- TDataAbstractService - - - - - -
RptPedidosProveedor
- TDataModule - - -
RptWordPedidoProveedor
- TDataModule - - -
srvPedidosProveedor
- TDataAbstractService - - - - - -
RptPedidosCliente
- TDataModule - - -
srvPedidosCliente
- TDataAbstractService - - - - - -
RptPresupuestosCliente
- TDataModule - - -
RptWordCertificadoTrabajo
- TDataModule - - -
RptWordPresupuestoCliente
- TDataModule - - -
srvPresupuestosCliente
- TDataAbstractService - - - - -
RptRecibosCliente
- TDataModule - - -
srvRecibosCliente
- TDataAbstractService - - - - -
RptRecibosProveedor
- TDataModule - - -
srvRecibosProveedor
- TDataAbstractService - - - - -
srvReferencias
- TDataAbstractService - - -
srvRegistroCorreos
- TDataAbstractService - - - - - -
RptRemesasCliente
- TDataModule - - -
srvRemesasCliente
- TDataAbstractService - - - - - -
RptRemesasProveedor
- TDataModule - - -
srvRemesasProveedor
- TDataAbstractService - - - - - - - - - - -
srvTiendaWeb
- TDataAbstractService - - - - -
srvTiposIVA
- TDataAbstractService - - - - -
srvUnidadesMedida
- TDataAbstractService - - - - -
srvConfiguracion
- TDataAbstractService - - -
frConexionBD
- TFrame - - -
frConexionOSC
- TFrame - - -
frConfGeneral
- TFrame - - -
fConfiguracion
- TForm - - -
FrameConfiguracion
- TFrame - - -
srvLogin
- TDARemoteService - - -
fAcercaDe
- - -
dmServer
- TDataModule - - -
fServerForm
- - - - - - - - - - - - + + {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1} + FactuGES_Server.dpr + Debug + AnyCPU + DCC32 + ..\..\Output\Debug\Servidor\FactuGES_Server.exe + 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 + + + 7.0 + False + False + 0 + 3 + ..\..\Output\Release\Servidor + RELEASE + + + 7.0 + 3 + ..\..\Output\Debug\Servidor + DEBUG; + True + True + True + C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + + + Delphi.Personality + + +FalseTrueFalse/standaloneTrueFalse4130FalseFalseFalseFalseFalse308212524.1.3.04.1.3.0viernes, 11 de febrero de 2011 13:14 + + + + + + + ExpressPrinting System by Developer Express Inc. + FactuGES_Server.dprFalse + + + + + MainSource + + + + + +
srvEmpresas
+ TDARemoteService + + +
srvProvinciasPoblaciones_Impl
+ TDataModule + + + + +
srvUsuarios
+ TDataAbstractService + + + + + + + + +
RptAlbaranesCliente
+ TDataModule + + +
RptWordAlbaranCliente
+ TDataModule + + +
srvAlbaranesCliente
+ TDataAbstractService + + + + + +
RptAlbaranesProveedor
+ TDataModule + + +
RptWordAlbaranProveedor
+ TDataModule + + +
srvAlbaranesProveedor
+ TDataAbstractService + + + + +
srvAlmacenes
+ TDARemoteService + + + + + +
srvArticulos
+ TDARemoteService + + + + + +
RptComisiones
+ TDataModule + + +
srvComisiones
+ TDataAbstractService + + + + + + + + + +
RptEtiquetasContacto
+ TDataModule + + +
RptFichasEmpleado
+ TDataModule + + +
srvContactos
+ TDARemoteService + + + + +
srvFabricantes
+ TDataAbstractService + + + + + +
RptFacturasCliente
+ TDataModule + + +
RptWordFacturaCliente
+ TDataModule + + +
srvFacturasCliente
+ TDataAbstractService + + + + + +
RptFacturasProveedor
+ TDataModule + + +
srvFacturasProveedor
+ TDataAbstractService + + + + +
srvFamilias
+ TDataAbstractService + + + + +
srvFormasPago
+ TDataAbstractService + + +
srvGestorDocumentos
+ TDataAbstractService + + +
srvGestorInformes
+ TDataAbstractService + + + + +
srvHistoricoMovimientos
+ TDataAbstractService + + + + +
srvImpresiones
+ TDARemoteService + + +
srvInfMargenArticulo
+ TDARemoteService + + +
srvInfVentasArticulo
+ TDataAbstractService + + + + +
srvInformes
+ TDataAbstractService + + + + +
srvInventario
+ TDataAbstractService + + + + + +
srvObras
+ TDataAbstractService + + + + + +
RptPedidosProveedor
+ TDataModule + + +
RptWordPedidoProveedor
+ TDataModule + + +
srvPedidosProveedor
+ TDataAbstractService + + + + + +
RptPedidosCliente
+ TDataModule + + +
srvPedidosCliente
+ TDataAbstractService + + + + + +
RptPresupuestosCliente
+ TDataModule + + +
RptWordCertificadoTrabajo
+ TDataModule + + +
RptWordPresupuestoCliente
+ TDataModule + + +
srvPresupuestosCliente
+ TDataAbstractService + + + + +
RptRecibosCliente
+ TDataModule + + +
srvRecibosCliente
+ TDataAbstractService + + + + +
RptRecibosProveedor
+ TDataModule + + +
srvRecibosProveedor
+ TDataAbstractService + + + + +
srvReferencias
+ TDataAbstractService + + +
srvRegistroCorreos
+ TDataAbstractService + + + + + +
RptRemesasCliente
+ TDataModule + + +
srvRemesasCliente
+ TDataAbstractService + + + + + +
RptRemesasProveedor
+ TDataModule + + +
srvRemesasProveedor
+ TDataAbstractService + + + + + + + + + + +
srvTiendaWeb
+ TDataAbstractService + + + + +
srvTiposIVA
+ TDataAbstractService + + + + +
srvUnidadesMedida
+ TDataAbstractService + + + + +
srvConfiguracion
+ TDataAbstractService + + +
frConexionBD
+ TFrame + + +
frConexionOSC
+ TFrame + + +
frConfGeneral
+ TFrame + + +
fConfiguracion
+ TForm + + +
FrameConfiguracion
+ TFrame + + +
srvLogin
+ TDARemoteService + + +
fAcercaDe
+ + +
dmServer
+ TDataModule + + +
fServerForm
+ + + + + + + + + + + +