From a2e3fdd629ae4fc11a01d916e408df1e7afd974d Mon Sep 17 00:00:00 2001 From: roberto Date: Mon, 26 Oct 2015 18:33:00 +0000 Subject: [PATCH] git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@1123 0c75b7a4-871f-7646-8a2f-f78d34cc349f --- Source/Informes/1/InfPresupuestoCliente.fr3 | 2 +- Source/Informes/2/InfPresupuestoCliente.fr3 | 6 +- Source/Informes/3/InfPresupuestoCliente.fr3 | 57 ++++++--- Source/Informes/3/Presupuesto.rdx | Bin 445952 -> 446976 bytes .../uRptWordCertificadoTrabajo_Server.pas | 3 +- .../Reports/uRptWordPresupuestoCliente.pas | 27 ++-- .../Views/uEditorPresupuestoCliente.dfm | 120 +++++++++--------- .../Views/uEditorPresupuestoCliente.pas | 3 - .../Views/uViewDetallesPresupuestoCliente.dfm | 117 +++++++++-------- 9 files changed, 184 insertions(+), 151 deletions(-) diff --git a/Source/Informes/1/InfPresupuestoCliente.fr3 b/Source/Informes/1/InfPresupuestoCliente.fr3 index e2124ff0..1b339b44 100644 --- a/Source/Informes/1/InfPresupuestoCliente.fr3 +++ b/Source/Informes/1/InfPresupuestoCliente.fr3 @@ -1,5 +1,5 @@ - + diff --git a/Source/Informes/2/InfPresupuestoCliente.fr3 b/Source/Informes/2/InfPresupuestoCliente.fr3 index 802e5e0b..458a8379 100644 --- a/Source/Informes/2/InfPresupuestoCliente.fr3 +++ b/Source/Informes/2/InfPresupuestoCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -67,7 +67,7 @@ - + @@ -85,7 +85,7 @@ - + diff --git a/Source/Informes/3/InfPresupuestoCliente.fr3 b/Source/Informes/3/InfPresupuestoCliente.fr3 index 4299b554..1ef25a62 100644 --- a/Source/Informes/3/InfPresupuestoCliente.fr3 +++ b/Source/Informes/3/InfPresupuestoCliente.fr3 @@ -1,9 +1,9 @@ - + - + - + @@ -13,7 +13,7 @@ - + @@ -27,8 +27,33 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -45,48 +70,48 @@ - + - + - + - + - + - + - + - + - + - + diff --git a/Source/Informes/3/Presupuesto.rdx b/Source/Informes/3/Presupuesto.rdx index cb61e2e9a4da5e7e9ecaf1993f3f0f10b13064ba..bdba47ca7e1054a61f8289e070e465239a782c18 100644 GIT binary patch delta 6346 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 GaQwep9JB)f delta 5483 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 LJ>9+odYtip-#cej diff --git a/Source/Modulos/Presupuestos de cliente/Reports/uRptWordCertificadoTrabajo_Server.pas b/Source/Modulos/Presupuestos de cliente/Reports/uRptWordCertificadoTrabajo_Server.pas index 0141b52e..826ab264 100644 --- a/Source/Modulos/Presupuestos de cliente/Reports/uRptWordCertificadoTrabajo_Server.pas +++ b/Source/Modulos/Presupuestos de cliente/Reports/uRptWordCertificadoTrabajo_Server.pas @@ -65,8 +65,6 @@ begin FDocumento := NIL; FImportes := True; FNumCapitulos := 0; - - FPlantilla := DarRutaInformes + rptInforme; end; procedure TRptWordCertificadoTrabajo.DataModuleCreate(Sender: TObject); @@ -195,6 +193,7 @@ begin tbl_Cabecera.Active := True; tbl_Capitulos.Active := True; + FPlantilla := DarRutaInformes + tbl_Cabecera.FieldByName('ID_EMPRESA').AsString + '\' + rptInforme; FCodigoPresupuesto := AID; if RecuperarEmpresa(tbl_Cabecera.FieldByName('ID_EMPRESA').AsInteger, tbl_Empresa) then diff --git a/Source/Modulos/Presupuestos de cliente/Reports/uRptWordPresupuestoCliente.pas b/Source/Modulos/Presupuestos de cliente/Reports/uRptWordPresupuestoCliente.pas index f0d39b60..5fbb10a3 100644 --- a/Source/Modulos/Presupuestos de cliente/Reports/uRptWordPresupuestoCliente.pas +++ b/Source/Modulos/Presupuestos de cliente/Reports/uRptWordPresupuestoCliente.pas @@ -444,24 +444,19 @@ begin with FDocumento, tbl_Cabecera do begin + ReplaceBookmark('CodigoPresupuestoPortada', FieldByName('REFERENCIA').AsString); + ReplaceBookmark('FechaPresupuestoPortada', FieldByName('FECHA_PRESUPUESTO').AsString); + ReplaceBookmark('NombreClientePortada', FieldByName('NOMBRE').AsString); -//Solicitan que Azacan tenga nuevamente portada -// if (tbl_Cabecera.FieldByName('ID_EMPRESA').AsInteger <> 3) then -// begin - ReplaceBookmark('CodigoPresupuestoPortada', FieldByName('REFERENCIA').AsString); - ReplaceBookmark('FechaPresupuestoPortada', FieldByName('FECHA_PRESUPUESTO').AsString); - ReplaceBookmark('NombreClientePortada', FieldByName('NOMBRE').AsString); + if FDocumento.BookmarkExists('DireccionClientePortada') then + ReplaceBookmark('DireccionClientePortada', FieldByName('CALLE').AsString); + if FDocumento.BookmarkExists('PoblacionClientePortada') then + ReplaceBookmark('PoblacionClientePortada', + FieldByName('CODIGO_POSTAL').AsString + ' ' + + FieldByName('POBLACION').AsString + ' ' + FieldByName('PROVINCIA').AsString); - if FDocumento.BookmarkExists('DireccionClientePortada') then - ReplaceBookmark('DireccionClientePortada', FieldByName('CALLE').AsString); - if FDocumento.BookmarkExists('PoblacionClientePortada') then - ReplaceBookmark('PoblacionClientePortada', - FieldByName('CODIGO_POSTAL').AsString + ' ' + - FieldByName('POBLACION').AsString + ' ' + FieldByName('PROVINCIA').AsString); - - if not EsCadenaVacia(FieldByName('PERSONA_CONTACTO').AsString) then - ReplaceBookmark('PersonaContactoClientePortada', 'A la atencin de: ' + FieldByName('PERSONA_CONTACTO').AsString); -// end; + if not EsCadenaVacia(FieldByName('PERSONA_CONTACTO').AsString) then + ReplaceBookmark('PersonaContactoClientePortada', 'A la atencin de: ' + FieldByName('PERSONA_CONTACTO').AsString); Texto := FieldByName('PORTADA').AsString; NombreFichero := DarFicheroTemporal; diff --git a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm index 6aff4e70..0b96c698 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm +++ b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm @@ -214,90 +214,94 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente inherited ToolButton4: TToolButton Left = 278 Top = 0 + Wrap = True ExplicitLeft = 278 ExplicitTop = 0 end inherited ToolButton14: TToolButton - Left = 334 - Top = 0 - Wrap = True - ExplicitLeft = 334 - ExplicitTop = 0 - end - inherited ToolButton9: TToolButton Left = 0 + Wrap = False ExplicitLeft = 0 end inherited FontName: TJvFontComboBox - Left = 145 - ExplicitLeft = 544 - ExplicitTop = 0 - end - inherited UpDown1: TUpDown - Left = 689 - Top = 0 - ExplicitLeft = 689 - ExplicitTop = 0 - end - inherited ToolButton13: TToolButton - Top = 0 - ExplicitTop = 0 - end - inherited ToolButton6: TToolButton - Top = 27 - ExplicitTop = 27 + Left = 65 + Top = 22 + ExplicitTop = 22 end inherited FontSize: TEdit - Top = 27 + Top = 22 Width = 200 - ExplicitTop = 27 + ExplicitTop = 22 ExplicitWidth = 200 end + inherited UpDown1: TUpDown + Left = 345 + Top = 22 + ExplicitLeft = 345 + ExplicitTop = 22 + end + inherited ToolButton13: TToolButton + Left = 362 + Top = 22 + ExplicitLeft = 362 + ExplicitTop = 22 + end + inherited ToolButton6: TToolButton + Left = 370 + Top = 22 + ExplicitLeft = 370 + ExplicitTop = 22 + end inherited ToolButton7: TToolButton - Left = 266 - Top = 27 - ExplicitLeft = 266 - ExplicitTop = 27 - end - inherited ToolButton11: TToolButton - Left = 333 - Top = 27 - ExplicitLeft = 333 - ExplicitTop = 27 - end - inherited ToolButton12: TToolButton - Left = 474 - Top = 27 - Wrap = False - ExplicitLeft = 474 - ExplicitTop = 27 - ExplicitHeight = 22 - end - inherited ToolButton10: TToolButton - Left = 482 - Top = 27 - ExplicitLeft = 482 - ExplicitTop = 27 + Left = 436 + Top = 22 + ExplicitLeft = 436 + ExplicitTop = 22 end inherited ToolButton8: TToolButton - Left = 607 - Top = 27 - ExplicitLeft = 607 - ExplicitTop = 27 + Left = 503 + Top = 22 + ExplicitLeft = 503 + ExplicitTop = 22 + end + inherited ToolButton12: TToolButton + Left = 0 + Top = 22 + Wrap = True + ExplicitLeft = 0 + ExplicitTop = 22 + ExplicitHeight = 27 + end + inherited ToolButton9: TToolButton + Left = 0 + Top = 49 + ExplicitLeft = 0 + ExplicitTop = 49 + end + inherited ToolButton10: TToolButton + Left = 145 + Top = 49 + ExplicitLeft = 145 + ExplicitTop = 49 + end + inherited ToolButton11: TToolButton + Left = 270 + Top = 49 + ExplicitLeft = 270 + ExplicitTop = 49 end end inherited cxGrid: TcxGrid - Top = 77 + Top = 99 Width = 750 - Height = 261 + Height = 239 ExplicitTop = 77 ExplicitWidth = 750 ExplicitHeight = 239 end inherited TBXDock1: TTBXDock - Top = 51 + Top = 73 Width = 750 - ExplicitTop = 73 ExplicitWidth = 750 inherited TBXToolbar1: TTBXToolbar ExplicitWidth = 750 diff --git a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.pas b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.pas index d0d7e751..f1623cfd 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.pas +++ b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.pas @@ -228,9 +228,6 @@ begin raise Exception.Create('No hay ningn presupuesto asignado'); pgPaginas.ActivePage := pagGeneral; - //Para AZACAN NO HAY PORTADA EN PRESUPUESTOS - if (AppFactuGES.EmpresaActiva.ID = 3) then - pagPortada.TabVisible := false; Presupuesto.DataTable.Active := True; end; diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.dfm index 4c2cf356..bfb611fd 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.dfm +++ b/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.dfm @@ -1,29 +1,63 @@ inherited frViewDetallesPresupuestoCliente: TfrViewDetallesPresupuestoCliente inherited ToolBar1: TToolBar - Height = 100 - ExplicitHeight = 100 - inherited ToolButton14: TToolButton + Height = 73 + ExplicitHeight = 73 + inherited ToolButton3: TToolButton Wrap = False end - inherited ToolButton9: TToolButton [5] - Left = 121 + inherited ToolButton4: TToolButton + Left = 278 + Top = 0 + ExplicitLeft = 278 + ExplicitTop = 0 + end + inherited ToolButton14: TToolButton + Left = 334 + Top = 0 + ExplicitLeft = 334 + ExplicitTop = 0 + end + inherited FontName: TJvFontComboBox Top = 22 - ExplicitLeft = 121 ExplicitTop = 22 end - inherited FontName: TJvFontComboBox [6] - Left = 266 + inherited FontSize: TEdit Top = 22 - ExplicitLeft = 266 + Width = 58 ExplicitTop = 22 + ExplicitWidth = 58 end inherited UpDown1: TUpDown - Left = 411 + Left = 203 Top = 22 - ExplicitLeft = 411 + ExplicitLeft = 203 ExplicitTop = 22 end inherited ToolButton13: TToolButton + Left = 220 + Top = 22 + ExplicitLeft = 220 + ExplicitTop = 22 + end + inherited ToolButton6: TToolButton + Left = 228 + Top = 22 + ExplicitLeft = 228 + ExplicitTop = 22 + end + inherited ToolButton7: TToolButton + Left = 294 + Top = 22 + ExplicitLeft = 294 + ExplicitTop = 22 + end + inherited ToolButton8: TToolButton + Left = 361 + Top = 22 + ExplicitLeft = 361 + ExplicitTop = 22 + end + inherited ToolButton12: TToolButton Left = 0 Top = 22 Wrap = True @@ -31,57 +65,35 @@ inherited frViewDetallesPresupuestoCliente: TfrViewDetallesPresupuestoCliente ExplicitTop = 22 ExplicitHeight = 27 end - inherited ToolButton6: TToolButton + inherited ToolButton9: TToolButton Left = 0 Top = 49 ExplicitLeft = 0 ExplicitTop = 49 end - inherited FontSize: TEdit [10] - Left = 66 - Top = 49 - Width = 58 - ExplicitLeft = 66 - ExplicitTop = 49 - ExplicitWidth = 58 - end - inherited ToolButton7: TToolButton [11] - Left = 124 - Top = 49 - ExplicitLeft = 124 - ExplicitTop = 49 - end - inherited ToolButton11: TToolButton [12] - Left = 191 - Top = 49 - ExplicitLeft = 191 - ExplicitTop = 49 - end - inherited ToolButton12: TToolButton [13] - Left = 0 - Top = 49 - Wrap = True - ExplicitLeft = 0 - ExplicitTop = 49 - ExplicitHeight = 27 - end inherited ToolButton10: TToolButton - Left = 0 - Top = 76 - ExplicitLeft = 0 - ExplicitTop = 76 + Left = 145 + Top = 49 + ExplicitLeft = 145 + ExplicitTop = 49 end - inherited ToolButton8: TToolButton [15] - Left = 125 - Top = 76 - ExplicitLeft = 125 - ExplicitTop = 76 + inherited ToolButton11: TToolButton + Left = 270 + Top = 49 + ExplicitLeft = 270 + ExplicitTop = 49 end end inherited cxGrid: TcxGrid - Top = 126 - Height = 178 + Top = 99 + Height = 205 + ExplicitTop = 99 + ExplicitHeight = 205 inherited cxGridView: TcxGridDBTableView + inherited cxGridViewTIPO: TcxGridDBColumn + Visible = False + VisibleForCustomization = False + end inherited cxGridViewREFERENCIA_PROVEEDOR: TcxGridDBColumn DataBinding.FieldName = '' end @@ -94,7 +106,8 @@ inherited frViewDetallesPresupuestoCliente: TfrViewDetallesPresupuestoCliente end end inherited TBXDock1: TTBXDock - Top = 100 + Top = 73 + ExplicitTop = 73 inherited TBXToolbar1: TTBXToolbar object TBXSeparatorItem9: TTBXSeparatorItem end