From bc3d67cd04f9e9f4062291eeac1c1bc579cbaaf2 Mon Sep 17 00:00:00 2001 From: roberto Date: Thu, 10 Oct 2019 14:16:25 +0000 Subject: [PATCH] =?UTF-8?q?Se=20a=C3=B1ade=20p=C3=A1gina=20en=20presupuest?= =?UTF-8?q?os=20para=20LOPDGR?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://192.168.0.254/svn/Proyectos.AlonsoYSal_FactuGES/trunk@46 9a1d36f3-7752-2d40-8ccb-50eb49674c68 --- BD/BASEDATOS.FDB | Bin 23820288 -> 23820288 bytes Cliente/FactuGES.dof | 6 +- Cliente/FactuGES.res | Bin 172184 -> 172184 bytes .../Servidor/srvFacturasCliente_Impl.dfm | 96 +++++++++++------- .../Servidor/srvFacturasCliente_Impl.pas | 2 +- .../Reglas/uBizPresupuestosCliente.pas | 5 +- .../Servidor/srvPresupuestos_Impl.pas | 2 +- Output/Servidor/Informes/InfAlbaran.fr3 | 6 +- .../Servidor/Informes/InfFacturaCliente.fr3 | 6 +- Output/Servidor/Informes/InfIncidencia.fr3 | 6 +- Output/Servidor/Informes/InfPresupuesto.fr3 | 20 +++- Output/Servidor/Informes/InfRecibo.fr3 | 44 ++++---- Servidor/FactuGES_Server.dof | 6 +- Servidor/FactuGES_Server.res | Bin 23472 -> 23472 bytes 14 files changed, 119 insertions(+), 80 deletions(-) diff --git a/BD/BASEDATOS.FDB b/BD/BASEDATOS.FDB index fce8054835b813f61a12a567f5515999763402f5..81f8dcde378c697b286a0803dcf24a42404b25f2 100644 GIT binary patch delta 2974 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 bJdqF3F+MEMn<>i2vDQqnb0)6Sr{@0`l9HfD diff --git a/Cliente/FactuGES.dof b/Cliente/FactuGES.dof index bc1c128..dc88775 100644 --- a/Cliente/FactuGES.dof +++ b/Cliente/FactuGES.dof @@ -114,7 +114,7 @@ IncludeVerInfo=1 AutoIncBuild=0 MajorVer=1 MinorVer=6 -Release=4 +Release=5 Build=0 Debug=0 PreRelease=0 @@ -126,13 +126,13 @@ CodePage=1252 [Version Info Keys] CompanyName=Rodax Software S.L. FileDescription= -FileVersion=1.6.4.0 +FileVersion=1.6.5.0 InternalName=FactuGES LegalCopyright= LegalTrademarks= OriginalFilename= ProductName=FactuGES -ProductVersion=1.6.4.0 +ProductVersion=1.6.5.0 Comments= [Excluded Packages] C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\cxLibraryVCLD7.bpl=Express Cross Platform Library (VCL Edition) by Developer Express Inc. diff --git a/Cliente/FactuGES.res b/Cliente/FactuGES.res index d5ebab71ee6455606e6a8f0c5f41d295057bb01a..bf08909e8d5d5e62dec7896a76c8152d95ecdc3a 100644 GIT binary patch delta 43 zcmbPnkZZ<4u7(!IElgtbI9VCk7#JBC7+9yv&tv+^Xu4f=K9e*fqv>?R1x)Dx47m$o delta 43 zcmbPnkZZ<4u7(!IElgtbI9V9j7#JBC7+9vu&tv+^XtG^&K9e*fqser`1x)Dx408)z diff --git a/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm b/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm index bf99416..6b1e436 100644 --- a/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm +++ b/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm @@ -1774,14 +1774,27 @@ object srvFacturasCliente: TsrvFacturasCliente ReportOptions.CreateDate = 37871.995398692100000000 ReportOptions.Description.Strings = ( 'Demonstrates how to create simple list report.') - ReportOptions.LastChange = 39275.443804247680000000 + ReportOptions.LastChange = 43748.663813726850000000 ReportOptions.VersionBuild = '1' ReportOptions.VersionMajor = '12' ReportOptions.VersionMinor = '13' ReportOptions.VersionRelease = '1' ScriptLanguage = 'PascalScript' ScriptText.Strings = ( + 'procedure PresupuestoRelOnBeforePrint(Sender: TfrxComponent);' + 'begin' + ' PresupuestoRel.Lines.Clear;' + ' if = '#39#39' then' + ' PresupuestoRel.Lines.Add('#39'-'#39')' + ' else' + + ' PresupuestoRel.Lines.Add();' + 'end;' + '' 'procedure DatosClienteOnBeforePrint(Sender: TfrxComponent);' + 'var' + ' cadenaAux: String;' 'begin' ' DatosCliente.Lines.Clear;' ' DatosCliente.Lines.Add();' @@ -1791,6 +1804,39 @@ object srvFacturasCliente: TsrvFacturasCliente ' DatosCliente.Lines.Add( + );' + '' + ' CadenaAux := '#39#39';' + ' if <> '#39#39' then' + ' if CadenaAux = '#39#39' then' + + ' CadenaAux := CadenaAux + '#39'Telf:'#39' + ' + ' else' + + ' CadenaAux := CadenaAux + '#39' / '#39' + ;' + '' + ' if <> '#39#39' then' + ' if CadenaAux = '#39#39' then' + + ' CadenaAux := CadenaAux + '#39'Telf:'#39' + ' + ' else' + + ' CadenaAux := CadenaAux + '#39' / '#39' + ;' + '' + ' if <> '#39#39' then' + ' if CadenaAux = '#39#39' then' + + ' CadenaAux := CadenaAux + '#39'Telf:'#39' + ' + ' else' + + ' CadenaAux := CadenaAux + '#39' / '#39' + ' + + ';' + '' + ' DatosCliente.Lines.Add(CadenaAux);' 'end;' '' 'procedure BandaDetallesOnBeforePrint(Sender: TfrxComponent);' @@ -1820,45 +1866,21 @@ object srvFacturasCliente: TsrvFacturasCliente 'procedure ReportSummary1OnBeforePrint(Sender: TfrxComponent);' 'begin' - '// Engine.CurY := Engine.CurY + Engine.FreeSpace - ReportS' + - 'ummary1.Height + 20;' + ' Engine.CurY := Engine.CurY + Engine.FreeSpace - ReportSum' + + 'mary1.Height - 1;' 'end;' '' - 'procedure Band3OnBeforePrint(Sender: TfrxComponent);' + 'procedure MemoCampo3OnBeforePrint(Sender: TfrxComponent);' 'begin' - '' - ' if ( = ) then' - ' begin' - ' shape6.Visible := True;' - ' memo14.Visible := True;' - ' memo35.Visible := True;' - ' memo36.Visible := True;' - ' memo37.Visible := True;' - ' memo38.Visible := True;' - ' memo39.Visible := True;' - ' memo40.Visible := True;' - ' memo41.Visible := True;' - ' memo42.Visible := True;' - ' memo43.Visible := True;' - ' memo44.Visible := True;' - ' memo45.Visible := True;' - ' end' - ' else' - ' begin' - ' shape6.Visible := False;' - ' shape6.Visible := False;' - ' memo14.Visible := False;' - ' memo35.Visible := False;' - ' memo36.Visible := False;' - ' memo37.Visible := False;' - ' memo38.Visible := False;' - ' memo39.Visible := False;' - ' memo40.Visible := False;' - ' memo41.Visible := False;' - ' memo42.Visible := False;' - ' memo43.Visible := False;' - ' memo44.Visible := False;' - ' memo45.Visible := False;' + ' case of' + ' '#39'S'#39': begin' + ' MemoCampo3.Visible := True;' + ' MemoCampo4.Visible := True;' + ' end;' + ' '#39'N'#39': begin' + ' MemoCampo3.Visible := False;' + ' MemoCampo4.Visible := False;' + ' end;' ' end;' 'end;' '' diff --git a/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.pas b/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.pas index 1bc57da..e12f0e7 100644 --- a/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.pas +++ b/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.pas @@ -38,9 +38,9 @@ type frxDotMatrixExport1: TfrxDotMatrixExport; frxDialogControls1: TfrxDialogControls; DABINAdapter: TDABINAdapter; - frxReport1: TfrxReport; bpFacturasCliente: TDABusinessProcessor; schFacturasCliente: TDASchema; + frxReport1: TfrxReport; private protected { IsrvFacturasCliente methods } diff --git a/Modulos/Presupuestos/Reglas/uBizPresupuestosCliente.pas b/Modulos/Presupuestos/Reglas/uBizPresupuestosCliente.pas index ec6a39b..1109579 100644 --- a/Modulos/Presupuestos/Reglas/uBizPresupuestosCliente.pas +++ b/Modulos/Presupuestos/Reglas/uBizPresupuestosCliente.pas @@ -161,7 +161,10 @@ begin if not Assigned(APresupuesto.Cliente) or (APresupuesto.Cliente.DataTable.IsEmpty) then - raise Exception.Create('Debe indicar el cliente de este presupuesto'); + raise Exception.Create('Debe indicar el cliente de este presupuesto') + else + if (APresupuesto.Cliente.DataTable.FieldByName('NIFCIF').IsNull) then + raise Exception.Create('Debe indicar el DNI del cliente para cumplir LOPD'); if (FloatToStr(APresupuesto.FECHADECISION) <> '0') and diff --git a/Modulos/Presupuestos/Servidor/srvPresupuestos_Impl.pas b/Modulos/Presupuestos/Servidor/srvPresupuestos_Impl.pas index d300241..f549fbc 100644 --- a/Modulos/Presupuestos/Servidor/srvPresupuestos_Impl.pas +++ b/Modulos/Presupuestos/Servidor/srvPresupuestos_Impl.pas @@ -30,8 +30,8 @@ type tbl_Presupuesto: TDACDSDataTable; tbl_DetallesPresupuesto: TDACDSDataTable; DABINAdapter: TDABINAdapter; - frxReport1: TfrxReport; schPresupuestos: TDASchema; + frxReport1: TfrxReport; procedure DARemoteServiceActivate(const aClientID: TGUID; aSession: TROSession; const aMessage: IROMessage); private diff --git a/Output/Servidor/Informes/InfAlbaran.fr3 b/Output/Servidor/Informes/InfAlbaran.fr3 index 9ea0348..a10515b 100644 --- a/Output/Servidor/Informes/InfAlbaran.fr3 +++ b/Output/Servidor/Informes/InfAlbaran.fr3 @@ -1,5 +1,5 @@ - + @@ -28,7 +28,7 @@ - + @@ -36,7 +36,7 @@ - + diff --git a/Output/Servidor/Informes/InfFacturaCliente.fr3 b/Output/Servidor/Informes/InfFacturaCliente.fr3 index 25fd029..c430548 100644 --- a/Output/Servidor/Informes/InfFacturaCliente.fr3 +++ b/Output/Servidor/Informes/InfFacturaCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -27,7 +27,7 @@ - + @@ -51,7 +51,7 @@ - + diff --git a/Output/Servidor/Informes/InfIncidencia.fr3 b/Output/Servidor/Informes/InfIncidencia.fr3 index b331dae..c5ae81b 100644 --- a/Output/Servidor/Informes/InfIncidencia.fr3 +++ b/Output/Servidor/Informes/InfIncidencia.fr3 @@ -1,5 +1,5 @@ - + @@ -28,7 +28,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/Output/Servidor/Informes/InfPresupuesto.fr3 b/Output/Servidor/Informes/InfPresupuesto.fr3 index 643f999..90a2a64 100644 --- a/Output/Servidor/Informes/InfPresupuesto.fr3 +++ b/Output/Servidor/Informes/InfPresupuesto.fr3 @@ -1,5 +1,5 @@ - + @@ -32,7 +32,7 @@ - + @@ -44,7 +44,7 @@ - + @@ -69,4 +69,18 @@ + + + + + + + + + + + + + + diff --git a/Output/Servidor/Informes/InfRecibo.fr3 b/Output/Servidor/Informes/InfRecibo.fr3 index 01ea6ab..e033427 100644 --- a/Output/Servidor/Informes/InfRecibo.fr3 +++ b/Output/Servidor/Informes/InfRecibo.fr3 @@ -1,5 +1,5 @@ - + @@ -20,30 +20,30 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - + + + + + diff --git a/Servidor/FactuGES_Server.dof b/Servidor/FactuGES_Server.dof index 0e3d670..30de0f5 100644 --- a/Servidor/FactuGES_Server.dof +++ b/Servidor/FactuGES_Server.dof @@ -114,7 +114,7 @@ IncludeVerInfo=1 AutoIncBuild=0 MajorVer=1 MinorVer=6 -Release=3 +Release=5 Build=0 Debug=0 PreRelease=0 @@ -126,13 +126,13 @@ CodePage=1252 [Version Info Keys] CompanyName=Rodax Software S.L. FileDescription= -FileVersion=1.6.3.0 +FileVersion=1.6.5.0 InternalName= LegalCopyright= LegalTrademarks= OriginalFilename= ProductName=FactuGES Server -ProductVersion=1.6.3.0 +ProductVersion=1.6.5.0 Comments= [Excluded Packages] C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\cxLibraryVCLD7.bpl=Express Cross Platform Library (VCL Edition) by Developer Express Inc. diff --git a/Servidor/FactuGES_Server.res b/Servidor/FactuGES_Server.res index 048c4b4d72b8ec71ec042a64776cb0ab39ebc0d3..a85e4dd5d5bd4e0b214c7e0a2c1a628feea30d5b 100644 GIT binary patch delta 36 qcmdn6opA#Y8AWokGO#f)GB7Z(PPUHx%4oXTFiM<}(R8wBbUFaLr3s<{ delta 36 qcmdn6opA#Y8AWn3Gq5o*GB7YOPqvQy%4odVFiM<}(Ri|FbUFaLD+!ta