From 97a2eda40903804f875c1c4374a1751ce6661086 Mon Sep 17 00:00:00 2001 From: roberto Date: Thu, 12 Jun 2008 16:50:16 +0000 Subject: [PATCH] Arreglo de informes de remesas git-svn-id: https://192.168.0.254/svn/Proyectos.LuisLeon_FactuGES/trunk@245 c93665c3-c93d-084d-9b98-7d5f4a9c3376 --- Source/Informes/InfRemesaCliente.fr3 | 25 ++++----- Source/Informes/InfRemesaProveedor.fr3 | 51 +++++++++--------- .../Reports/uRptRemesasCliente_Server.dfm | 53 +++++++++++++++++-- .../Reports/uRptRemesasCliente_Server.pas | 2 +- .../Views/uEditorRemesaCliente.dfm | 5 ++ .../Views/uEditorRemesaProveedor.dfm | 45 +++++++++------- 6 files changed, 119 insertions(+), 62 deletions(-) diff --git a/Source/Informes/InfRemesaCliente.fr3 b/Source/Informes/InfRemesaCliente.fr3 index 13d25aee..70b0d70d 100644 --- a/Source/Informes/InfRemesaCliente.fr3 +++ b/Source/Informes/InfRemesaCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -31,12 +31,12 @@ - - - - - - + + + + + + @@ -45,10 +45,11 @@ - - - - - + + + + + + diff --git a/Source/Informes/InfRemesaProveedor.fr3 b/Source/Informes/InfRemesaProveedor.fr3 index 63f758ca..8471f2a6 100644 --- a/Source/Informes/InfRemesaProveedor.fr3 +++ b/Source/Informes/InfRemesaProveedor.fr3 @@ -1,5 +1,5 @@ - + @@ -16,13 +16,13 @@ - + - - - + + + - + @@ -37,27 +37,28 @@ - + - - + + - - - - - - - - - - - + + + + + + + + + + + - - - - - + + + + + + diff --git a/Source/Modulos/Remesas de cliente/Reports/uRptRemesasCliente_Server.dfm b/Source/Modulos/Remesas de cliente/Reports/uRptRemesasCliente_Server.dfm index c57f54e0..90f20a22 100644 --- a/Source/Modulos/Remesas de cliente/Reports/uRptRemesasCliente_Server.dfm +++ b/Source/Modulos/Remesas de cliente/Reports/uRptRemesasCliente_Server.dfm @@ -903,7 +903,7 @@ object RptRemesasCliente: TRptRemesasCliente PreviewOptions.Zoom = 1.000000000000000000 PrintOptions.Printer = 'Default' ReportOptions.CreateDate = 37871.995398692100000000 - ReportOptions.LastChange = 39258.760263842600000000 + ReportOptions.LastChange = 39611.772828229160000000 ReportOptions.VersionBuild = '1' ReportOptions.VersionMajor = '12' ReportOptions.VersionMinor = '13' @@ -913,8 +913,8 @@ object RptRemesasCliente: TRptRemesasCliente 'procedure ReportSummary1OnBeforePrint(Sender: TfrxComponent);' 'begin' - ' Engine.CurY := Engine.CurY + Engine.FreeSpace - ReportSummary1' + - '.Height - 1;' + '// Engine.CurY := Engine.CurY + Engine.FreeSpace - ReportSummar' + + 'y1.Height;' 'end;' '' 'procedure DatosEmpresaOnBeforePrint(Sender: TfrxComponent);' @@ -946,11 +946,44 @@ object RptRemesasCliente: TRptRemesasCliente ' DatosEmpresa.Lines.Add(Cadena);' 'end;' '' + 'procedure Band2OnBeforePrint(Sender: TfrxComponent);' + 'begin' + ' if not Engine.FinalPass then' + ' Set('#39'TotalPaginas'#39', ( + 1));' + '' + ' if Engine.FinalPass then' + ' Set('#39'Pagina'#39', ( + 1));' + 'end;' + '' + 'procedure frxReportOnStartReport(Sender: TfrxComponent);' + 'begin' + ' Set('#39'Pagina'#39', 0);' + ' Set('#39'TotalPaginas'#39', 0);' + 'end;' + '' + 'procedure PageFooter1OnBeforePrint(Sender: TfrxComponent);' + 'begin' + ' if Engine.FinalPass' + ' and ( = )then' + ' begin' + ' eTotal.Visible := True;' + ' vTotal.Visible := True;' + ' Cuadro.Visible := True;' + ' end' + ' else' + ' begin' + ' eTotal.Visible := False;' + ' vTotal.Visible := False;' + ' Cuadro.Visible := False;' + ' end;' + 'end;' + '' 'begin' '' 'end.') ShowProgress = False StoreInDFM = False + OnStartReport = 'frxReportOnStartReport' Left = 169 Top = 16 Datasets = < @@ -962,7 +995,19 @@ object RptRemesasCliente: TRptRemesasCliente DataSet = frxDBDetalles DataSetName = 'frxDBDetalles' end> - Variables = <> + Variables = < + item + Name = ' Paginacion' + Value = Null + end + item + Name = 'Pagina' + Value = Null + end + item + Name = 'TotalPaginas' + Value = Null + end> Style = < item Name = 'Concepto normal' diff --git a/Source/Modulos/Remesas de cliente/Reports/uRptRemesasCliente_Server.pas b/Source/Modulos/Remesas de cliente/Reports/uRptRemesasCliente_Server.pas index 818bad32..08e63430 100644 --- a/Source/Modulos/Remesas de cliente/Reports/uRptRemesasCliente_Server.pas +++ b/Source/Modulos/Remesas de cliente/Reports/uRptRemesasCliente_Server.pas @@ -25,9 +25,9 @@ type frxChartObject1: TfrxChartObject; frxDBCabecera: TfrxDBDataset; frxDBDetalles: TfrxDBDataset; - frxReport: TfrxReport; schReport: TDASchema; DataDictionary: TDADataDictionary; + frxReport: TfrxReport; procedure DataModuleCreate(Sender: TObject); private FConnection: IDAConnection; diff --git a/Source/Modulos/Remesas de cliente/Views/uEditorRemesaCliente.dfm b/Source/Modulos/Remesas de cliente/Views/uEditorRemesaCliente.dfm index 58d72ca8..ce0b2af8 100644 --- a/Source/Modulos/Remesas de cliente/Views/uEditorRemesaCliente.dfm +++ b/Source/Modulos/Remesas de cliente/Views/uEditorRemesaCliente.dfm @@ -212,6 +212,11 @@ inherited fEditorRemesaCliente: TfEditorRemesaCliente Format = ',0.00 '#8364';-,0.00 '#8364 Kind = skSum Column = frViewRecibosRemesaCliente1.cxGridViewIMPORTE_TOTAL + end + item + Format = '0 Recibos' + Kind = skCount + Column = frViewRecibosRemesaCliente1.cxGridViewREFERENCIA end> DataController.Summary.OnAfterSummary = frViewRecibosRemesaCliente1cxGridViewDataControllerSummaryAfterSummary inherited cxGridViewIMPORTE_TOTAL: TcxGridDBColumn diff --git a/Source/Modulos/Remesas de proveedor/Views/uEditorRemesaProveedor.dfm b/Source/Modulos/Remesas de proveedor/Views/uEditorRemesaProveedor.dfm index 4335f069..86217d35 100644 --- a/Source/Modulos/Remesas de proveedor/Views/uEditorRemesaProveedor.dfm +++ b/Source/Modulos/Remesas de proveedor/Views/uEditorRemesaProveedor.dfm @@ -9,13 +9,13 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor Scaled = False OnClose = CustomEditorClose ExplicitWidth = 698 - ExplicitHeight = 638 + ExplicitHeight = 631 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader Width = 690 Caption = 'Remesa de pago' - ExplicitWidth = 676 + ExplicitWidth = 690 inherited Image1: TImage Left = 663 Picture.Data = { @@ -47,7 +47,7 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor end inherited TBXDock: TTBXDock Width = 690 - ExplicitWidth = 676 + ExplicitWidth = 690 inherited tbxMain: TTBXToolbar ExplicitWidth = 488 inherited TBXItem2: TTBXItem @@ -109,13 +109,13 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor Width = 690 Height = 463 MultiLine = True - ExplicitWidth = 676 - ExplicitHeight = 397 + ExplicitWidth = 690 + ExplicitHeight = 463 inherited pagGeneral: TTabSheet ExplicitLeft = 4 ExplicitTop = 24 - ExplicitWidth = 668 - ExplicitHeight = 369 + ExplicitWidth = 682 + ExplicitHeight = 435 inline frViewRecibosRemesaProveedor1: TfrViewRecibosRemesaProveedor Left = 0 Top = 155 @@ -130,27 +130,32 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor ParentFont = False TabOrder = 0 ReadOnly = False - ExplicitTop = 145 - ExplicitWidth = 668 - ExplicitHeight = 224 + ExplicitTop = 155 + ExplicitWidth = 682 + ExplicitHeight = 280 inherited cxGrid: TcxGrid Width = 682 Height = 255 - ExplicitWidth = 668 - ExplicitHeight = 199 + ExplicitWidth = 682 + ExplicitHeight = 255 inherited cxGridView: TcxGridDBTableView DataController.Summary.FooterSummaryItems = < item Format = ',0.00 '#8364';-,0.00 '#8364 Kind = skSum Column = frViewRecibosRemesaProveedor1.cxGridViewIMPORTE_TOTAL + end + item + Format = '0 Recibos' + Kind = skCount + Column = frViewRecibosRemesaProveedor1.cxGridViewREFERENCIA end> DataController.Summary.OnAfterSummary = frViewRecibosRemesaProveedor1cxGridViewDataControllerSummaryAfterSummary end end inherited ToolBar1: TToolBar Width = 682 - ExplicitWidth = 668 + ExplicitWidth = 682 end end inline frViewRemesaProveedor1: TfrViewRemesaProveedor @@ -172,8 +177,8 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor inherited dxLayoutControlRemesaProveedor: TdxLayoutControl Width = 682 Height = 155 - ExplicitWidth = 668 - ExplicitHeight = 145 + ExplicitWidth = 682 + ExplicitHeight = 155 inherited eReferencia: TcxDBTextEdit ExplicitWidth = 164 Width = 164 @@ -203,8 +208,8 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor item Width = 200 end> - ExplicitTop = 519 - ExplicitWidth = 676 + ExplicitTop = 585 + ExplicitWidth = 690 end inline frViewTotales1: TfrViewTotales [4] Left = 0 @@ -220,12 +225,12 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor ParentFont = False TabOrder = 4 ReadOnly = False - ExplicitTop = 473 - ExplicitWidth = 676 + ExplicitTop = 539 + ExplicitWidth = 690 ExplicitHeight = 46 inherited dxLayoutControl1: TdxLayoutControl Width = 690 - ExplicitWidth = 676 + ExplicitWidth = 690 inherited Bevel1: TBevel Left = 92 Top = 91