diff --git a/Factuges.dof b/Factuges.dof index 2872d7d..176acba 100644 --- a/Factuges.dof +++ b/Factuges.dof @@ -113,7 +113,7 @@ RootDir=C:\Archivos de programa\Borland\Delphi7\Bin\ IncludeVerInfo=1 AutoIncBuild=0 MajorVer=3 -MinorVer=1 +MinorVer=2 Release=0 Build=0 Debug=0 @@ -126,7 +126,7 @@ CodePage=1252 [Version Info Keys] CompanyName= FileDescription= -FileVersion=3.1.0.0 +FileVersion=3.2.0.0 InternalName= LegalCopyright= LegalTrademarks= diff --git a/Factuges.res b/Factuges.res index d2663e7..22a0dde 100644 Binary files a/Factuges.res and b/Factuges.res differ diff --git a/Informes/InformeBase.pas b/Informes/InformeBase.pas index 7d5f6db..b44f5e8 100644 --- a/Informes/InformeBase.pas +++ b/Informes/InformeBase.pas @@ -36,12 +36,12 @@ type frIBXComponents1: TfrIBXComponents; private FPreview : TfrPreview; - function DarTextoDireccion(Index : Integer) : String; - function DarTextoTelefonos(Index : Integer) : String; protected FBaseDatos : TIBDatabase; FTransaccion : TIBTransaction; FNombreInforme : String; + function DarTextoDireccion(Index : Integer) : String; + function DarTextoTelefonos(Index : Integer) : String; procedure CargarInforme; procedure CrearVariables; virtual; procedure PrepararConsultas; virtual; abstract; diff --git a/Informes/InformePresupuestoCliente.pas b/Informes/InformePresupuestoCliente.pas index 4aeacc6..a7242f2 100644 --- a/Informes/InformePresupuestoCliente.pas +++ b/Informes/InformePresupuestoCliente.pas @@ -26,6 +26,7 @@ type FEntidad: TRdxEntidad; procedure SetEntidad(const Value: TRdxEntidad); protected + procedure RellenarCabecera(Band: TfrBand); override; procedure PrepararConsultas; override; procedure PrepararInforme; override; public @@ -149,6 +150,59 @@ begin FReport.Pages.Pages[1].Visible := False; end; +procedure TdmInformePresupuestoCliente.RellenarCabecera(Band: TfrBand); +var + iCont : Integer; + iDir : Integer; + Objeto : TfrView; + ObjetoAux : TfrView; + CadenaAux : String; +begin + //Se sobre escribe para que no se imprima el cif en los presupuestos + with Band do + begin + for iCont := 0 to Objects.Count - 1 do + begin + Objeto := Objects[iCont]; + if ((Objeto is TfrMemoView) and (Pos('DatosEmpresa', Objeto.Name) > 0)) then + begin + with (Objeto as TfrMemoView) do + begin + Font.Name := 'Arial'; + Prop['LINESPACING'] := 1; + Prop['GAPX'] := 2; + Prop['GAPY'] := 0; + Memo.Clear; + for iDir := 0 to (EmpresaActiva.Direcciones.Count - 1) do + begin + Memo.Add(DarTextoDireccion(iDir)); + Memo.Add(DarTextoTelefonos(iDir)); + Memo.Add(#151 + #151); + end; + CadenaAux := ''; + if not EsCadenaVacia(EmpresaActiva.Web) then + CadenaAux := EmpresaActiva.Web; + if not EsCadenaVacia(EmpresaActiva.Correo) then + begin + if not EsCadenaVacia(CadenaAux) then + CadenaAux := CadenaAux + ' · '; + CadenaAux := CadenaAux + EmpresaActiva.Correo; + end; + Memo.Add(CadenaAux); + end; + end; + + if ((Objeto is TfrPictureView) and (Pos('Logotipo', Objeto.Name) > 0)) then + begin + with (Objeto as TfrPictureView), EmpresaActiva do + begin + Picture.Assign(EmpresaActiva.Logotipo); + end; + end; + end; + end; +end; + procedure TdmInformePresupuestoCliente.SetEntidad( const Value: TRdxEntidad); begin diff --git a/Temp/Factuges.exe b/Temp/Factuges.exe index a0f2ec7..dc39f60 100644 Binary files a/Temp/Factuges.exe and b/Temp/Factuges.exe differ