diff --git a/Build/Build.fbl6 b/Build/Build.fbl6 index 2b8e79a..ac3538d 100644 Binary files a/Build/Build.fbl6 and b/Build/Build.fbl6 differ diff --git a/Output/Debug/Servidor/Informes/3/firma.bat b/Output/Debug/Servidor/Informes/3/firma.bat index 34bd7fd..62fcec1 100644 --- a/Output/Debug/Servidor/Informes/3/firma.bat +++ b/Output/Debug/Servidor/Informes/3/firma.bat @@ -2,18 +2,18 @@ title firmadocumento cls -set LOGFILE=D:\RODAX\FACTUGES\Servidor\Informes\2\log.txt +set LOGFILE=D:\RODAX\FACTUGES\Servidor\Informes\3\log.txt set ARCHIVO=%1 -set city=MADRID +set city=FUENLABRADA set province=MADRID -set postalcode=28002 +set postalcode=28946 set PositionOnPageLowerLeftX=420 set PositionOnPageLowerLeftY=140 set PositionOnPageUpperRightX=570 set PositionOnPageUpperRigthY=210 set signaturePage=-1 -set signatureRubricImage="D:\RODAX\FACTUGES\Servidor\Informes\2\sello.jpg" +set signatureRubricImage="D:\RODAX\FACTUGES\Servidor\Informes\3\sello3.jpg" set layer2text="Firmado digitalmente por $$ORGANIZATION$$ Fecha: $$SIGNDATE=dd/MM/yyyy$$" SET l2FontColor=black SET l2FontSize=7 @@ -29,11 +29,11 @@ set "includeOnlySignningCertificate=true" REM Siempre creará una revisión al firmar. Requiere que el documento cumpla PDF 1.7 (ISO 32000-1:2008) REM "alwaysCreateRevision=true" -REM set "CONFIG=signatureProductionCity=MADRID\nsignatureProductionProvince=MADRID\nsignatureProductionPostalCode=28053\nsignatureProductionCountry=ESPAÑA\nsignaturePage3=%signaturePage3%\nPositionOnPageLowerLeftX=%PositionOnPageLowerLeftX%\nPositionPageLowerLeftY=%PositionPageLowerLeftY%\nPositionOnPageUpperRightX=%PositionOnPageUpperRightX%\nPositionOnPageUpperRigthY=%PositionOnPageUpperRigthY%\nsignatureRubricImage=%signatureRubricImage%\nlayer2text=%layer2text=%" +REM set "CONFIG=signatureProductionCity=MADRID\nsignatureProductionProvince=MADRID\nsignatureProductionPostalCode=28053\nsignatureProductionCountry=ESPAÑA\nsignaturePage3=%signaturePage3%\nPositionOnPageLowerLeftX=%PositionOnPageLowerLeftX%\nPositionPageLowerLeftY=%PositionPageLowerLeftY%\nPositionOnPageUpperRightX=%PositionOnPageUpperRightX%\nPositionOnPageUpperRigthY=%PositionOnPageUpperRigthY%\nlayer2text=%layer2text=%" REM \nsignaturePage=%signaturePage% -set "CONFIG=headless=%headless%\nlayer2Text=%layer2text%\nsignatureProductionCity=%city%\nsignatureProductionProvince=%province%\nsignatureProductionPostalCode=%postalcode%\nsignatureProductionCountry=ESPAÑA\nsignaturePositionOnPageLowerLeftX=%PositionOnPageLowerLeftX%\nsignaturePositionOnPageLowerLeftY=%PositionOnPageLowerLeftY%\nsignaturePositionOnPageUpperRightX=%PositionOnPageUpperRightX%\nsignaturePositionOnPageUpperRightY=%PositionOnPageUpperRigthY%\nsignaturePage=-1\nsignatureRubricImage=%signatureRubricImage%\nincludeOnlySignningCertificate=true\nownerPassword=uecko24" +set "CONFIG=headless=%headless%\nlayer2Text=%layer2text%\nsignatureProductionCity=%city%\nsignatureProductionProvince=%province%\nsignatureProductionPostalCode=%postalcode%\nsignatureProductionCountry=ESPAÑA\nsignaturePositionOnPageLowerLeftX=%PositionOnPageLowerLeftX%\nsignaturePositionOnPageLowerLeftY=%PositionOnPageLowerLeftY%\nsignaturePositionOnPageUpperRightX=%PositionOnPageUpperRightX%\nsignaturePositionOnPageUpperRightY=%PositionOnPageUpperRigthY%\nsignaturePage=-1\nincludeOnlySignningCertificate=true\nownerPassword=uecko24" REM echo %CONFIG% > %LOGFILE% @@ -41,5 +41,8 @@ call :FIRMA >> %LOGFILE% exit /b :FIRMA -"C:\Program Files (x86)\AutoFirma\AutoFirma\AutoFirmaCommandLine.exe" sign -i %ARCHIVO% -o %ARCHIVO% -store pkcs12:"D:\DATOS2\FINANZAS\CERTIFICADOS\graden.pfx" -password %PASSGRADEN% -filter subject.contains:806465 -config %CONFIG% +"C:\Program Files (x86)\AutoFirma\AutoFirma\AutoFirmaCommandLine.exe" sign -i %ARCHIVO% -o %ARCHIVO% -store pkcs12:"D:\DATOS2\FINANZAS\00 HORSAN\CERTIFICADOS\HORSANMONTEBLANCO.pfx" -password %PASSHORSAN% -filter subject.contains:75674275 -config %CONFIG% + + + diff --git a/Source/ApplicationBase/ApplicationBase.dproj b/Source/ApplicationBase/ApplicationBase.dproj index 5c69c66..234a2f2 100644 --- a/Source/ApplicationBase/ApplicationBase.dproj +++ b/Source/ApplicationBase/ApplicationBase.dproj @@ -46,6 +46,18 @@ Package FalseTrueFalseFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0 + + + + + + + + + + + + RemObjects Data Abstract - SQLite Driver Microsoft Office 2000 Sample Automation Server Wrapper Components Microsoft Office XP Sample Automation Server Wrapper Components @@ -56,43 +68,43 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Source/ApplicationBase/uFactuGES_App.pas b/Source/ApplicationBase/uFactuGES_App.pas index 2fba29b..4f5954d 100644 --- a/Source/ApplicationBase/uFactuGES_App.pas +++ b/Source/ApplicationBase/uFactuGES_App.pas @@ -9,7 +9,12 @@ uses const CTE_PERFIL_ADMINISTRADOR = 3; - CTE_PERFIL_GERENCIA = 2; + + CTE_PERFIL_GERENCIA_INI = 200; + CTE_PERFIL_GERENCIA_FIN = 209; + CTE_PERFIL_GERENCIA_ARTICULOS = 205; + CTE_TARIFAS_DE_GERENCIA: array[0..1] of string = ('TODOS', 'TARIFA'); + CTE_PERFIL_VENDEDOR_GRADEN_UECKO2 = 12; CTE_PERFIL_COMPRAS = 8; diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index a75ef83..8b5c8b4 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -51,6 +51,13 @@ + + + + + + + VCL for the Web Design Package for CodeGear RAD Studio CodeGear WebSnap Components CodeGear SOAP Components @@ -65,55 +72,55 @@ MainSource + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
fConfigurarConexion
TForm diff --git a/Source/Base/Utiles/uStringsUtils.pas b/Source/Base/Utiles/uStringsUtils.pas index 511dce1..8b60ab3 100644 --- a/Source/Base/Utiles/uStringsUtils.pas +++ b/Source/Base/Utiles/uStringsUtils.pas @@ -18,12 +18,29 @@ function calcularLetraNIF(numeroDNI : integer): string; function comprobarLetraNIF(nif: string): boolean; function validarCIF(Cif: string) : boolean; function CadLimpiaCar(NIF: String): String; +function ContainsAnyText(const AText: string; const AValues: array of string): Boolean; implementation uses - Variants, SysUtils; + StrUtils, Variants, SysUtils; + +{ Comprueba que el texto dado no contenga alguno de los strings del array dado } +function ContainsAnyText(const AText: string; const AValues: array of string): Boolean; +var + S: string; +begin + Result := False; + for S in AValues do + begin + if ContainsText(AText, S) then + begin + Result := True; + Exit; + end; + end; +end; { Convierte una cadena con items separados con un delimitador en un TString } procedure StringToStrings(Source:string; Delimiter:char; Target:TStrings); diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index 46b942c..9678439 100644 --- a/Source/Cliente/FactuGES.dproj +++ b/Source/Cliente/FactuGES.dproj @@ -52,7 +52,7 @@ Delphi.Personality VCLApplication -FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse5000FalseFalseFalseFalseFalse30821252Rodax Software S.L.5.0.0.0FactuGESFactuGES5.0.0.0 +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse5510FalseFalseFalseFalseFalse30821252Rodax Software S.L.5.5.1.0FactuGESFactuGES5.5.1.0 File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found FactuGES.dprFalse diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index d696021..ce0eef2 100644 Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ diff --git a/Source/Cliente/uPantallaPrincipal.pas b/Source/Cliente/uPantallaPrincipal.pas index 7f87f1e..e673e99 100644 --- a/Source/Cliente/uPantallaPrincipal.pas +++ b/Source/Cliente/uPantallaPrincipal.pas @@ -251,8 +251,10 @@ begin end; //El usuario GERENCIA) - if (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_GERENCIA) - or (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_ADMINISTRADOR) then + if (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_ADMINISTRADOR) + or ((AppFactuGES.UsuarioActivo.ID_PERFIL >= CTE_PERFIL_GERENCIA_INI) + and (AppFactuGES.UsuarioActivo.ID_PERFIL <= CTE_PERFIL_GERENCIA_FIN)) then + //Los usuarios SOLO PRESUPUESTOS verán solo clientes y presupuestos de la empresa asignada o todas begin //Esta condición tiene que ser dinámica ya que solo será visible en la empresa abeto ya que en graden no tiene sentido //se mete en RefrescarUI @@ -298,8 +300,9 @@ begin //AQUI MENUS DINAMICOS SEGUN EMPRESA Y PERFIL actMenuLogistica.Visible := (AppFactuGES.EmpresaActiva.ID = CTE_EMPRESA_ABETO) and ((AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_COMPRAS) - or (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_GERENCIA) - or (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_ADMINISTRADOR)); + or (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_ADMINISTRADOR)) + or ((AppFactuGES.UsuarioActivo.ID_PERFIL >= CTE_PERFIL_GERENCIA_INI) + and (AppFactuGES.UsuarioActivo.ID_PERFIL <= CTE_PERFIL_GERENCIA_FIN)); actMenuLogistica.Enabled := actMenuLogistica.Visible; end; diff --git a/Source/Informes/1/InfPedidoProveedor.fr3 b/Source/Informes/1/InfPedidoProveedor.fr3 index 679b792..ddf14f7 100644 --- a/Source/Informes/1/InfPedidoProveedor.fr3 +++ b/Source/Informes/1/InfPedidoProveedor.fr3 @@ -1,5 +1,5 @@ - + @@ -31,14 +31,14 @@ - + - - - + + + diff --git a/Source/Informes/10/InfContratoCliente.fr3 b/Source/Informes/10/InfContratoCliente.fr3 index 09714bf..27b94c9 100644 --- a/Source/Informes/10/InfContratoCliente.fr3 +++ b/Source/Informes/10/InfContratoCliente.fr3 @@ -1,9 +1,9 @@ - + - + @@ -13,7 +13,7 @@ - + @@ -80,7 +80,7 @@ - + diff --git a/Source/Informes/10/en/InfContratoCliente.fr3 b/Source/Informes/10/en/InfContratoCliente.fr3 index a4387b7..64dd4e4 100644 --- a/Source/Informes/10/en/InfContratoCliente.fr3 +++ b/Source/Informes/10/en/InfContratoCliente.fr3 @@ -1,9 +1,9 @@ - + - + @@ -13,7 +13,7 @@ - + @@ -80,7 +80,7 @@ - + diff --git a/Source/Informes/3/InfFacturaCliente.fr3 b/Source/Informes/3/InfFacturaCliente.fr3 index 781b7c1..c22599c 100644 --- a/Source/Informes/3/InfFacturaCliente.fr3 +++ b/Source/Informes/3/InfFacturaCliente.fr3 @@ -1,21 +1,21 @@ - + - - + + - - - - - - + + + + + + @@ -23,23 +23,23 @@ - + - + - + - + - + - + - - + + - - + + @@ -49,18 +49,18 @@ - - - + + + - - - + + + diff --git a/Source/Informes/3/firma.bat b/Source/Informes/3/firma.bat index 2a713e7..46e1d61 100644 --- a/Source/Informes/3/firma.bat +++ b/Source/Informes/3/firma.bat @@ -2,18 +2,18 @@ title firmadocumento cls -set LOGFILE=D:\RODAX\FACTUGES\Servidor\Informes\2\log.txt +set LOGFILE=D:\RODAX\FACTUGES\Servidor\Informes\3\log.txt set ARCHIVO=%1 -set city=MADRID +set city=FUENLABRADA set province=MADRID -set postalcode=28002 +set postalcode=28946 set PositionOnPageLowerLeftX=420 set PositionOnPageLowerLeftY=140 set PositionOnPageUpperRightX=570 set PositionOnPageUpperRigthY=210 set signaturePage=-1 -set signatureRubricImage="D:\RODAX\FACTUGES\Servidor\Informes\2\sello.jpg" +set signatureRubricImage="D:\RODAX\FACTUGES\Servidor\Informes\3\sello3.jpg" set layer2text="Firmado digitalmente por $$ORGANIZATION$$ Fecha: $$SIGNDATE=dd/MM/yyyy$$" SET l2FontColor=black SET l2FontSize=7 @@ -29,11 +29,11 @@ set "includeOnlySignningCertificate=true" REM Siempre creará una revisión al firmar. Requiere que el documento cumpla PDF 1.7 (ISO 32000-1:2008) REM "alwaysCreateRevision=true" -REM set "CONFIG=signatureProductionCity=MADRID\nsignatureProductionProvince=MADRID\nsignatureProductionPostalCode=28053\nsignatureProductionCountry=ESPAÑA\nsignaturePage3=%signaturePage3%\nPositionOnPageLowerLeftX=%PositionOnPageLowerLeftX%\nPositionPageLowerLeftY=%PositionPageLowerLeftY%\nPositionOnPageUpperRightX=%PositionOnPageUpperRightX%\nPositionOnPageUpperRigthY=%PositionOnPageUpperRigthY%\nsignatureRubricImage=%signatureRubricImage%\nlayer2text=%layer2text=%" +REM set "CONFIG=signatureProductionCity=MADRID\nsignatureProductionProvince=MADRID\nsignatureProductionPostalCode=28053\nsignatureProductionCountry=ESPAÑA\nsignaturePage3=%signaturePage3%\nPositionOnPageLowerLeftX=%PositionOnPageLowerLeftX%\nPositionPageLowerLeftY=%PositionPageLowerLeftY%\nPositionOnPageUpperRightX=%PositionOnPageUpperRightX%\nPositionOnPageUpperRigthY=%PositionOnPageUpperRigthY%\nlayer2text=%layer2text=%" REM \nsignaturePage=%signaturePage% -set "CONFIG=headless=%headless%\nlayer2Text=%layer2text%\nsignatureProductionCity=%city%\nsignatureProductionProvince=%province%\nsignatureProductionPostalCode=%postalcode%\nsignatureProductionCountry=ESPAÑA\nsignaturePositionOnPageLowerLeftX=%PositionOnPageLowerLeftX%\nsignaturePositionOnPageLowerLeftY=%PositionOnPageLowerLeftY%\nsignaturePositionOnPageUpperRightX=%PositionOnPageUpperRightX%\nsignaturePositionOnPageUpperRightY=%PositionOnPageUpperRigthY%\nsignaturePage=-1\nsignatureRubricImage=%signatureRubricImage%\nincludeOnlySignningCertificate=true\nownerPassword=uecko24" +set "CONFIG=headless=%headless%\nlayer2Text=%layer2text%\nsignatureProductionCity=%city%\nsignatureProductionProvince=%province%\nsignatureProductionPostalCode=%postalcode%\nsignatureProductionCountry=ESPAÑA\nsignaturePositionOnPageLowerLeftX=%PositionOnPageLowerLeftX%\nsignaturePositionOnPageLowerLeftY=%PositionOnPageLowerLeftY%\nsignaturePositionOnPageUpperRightX=%PositionOnPageUpperRightX%\nsignaturePositionOnPageUpperRightY=%PositionOnPageUpperRigthY%\nsignaturePage=-1\nincludeOnlySignningCertificate=true\nownerPassword=uecko24" REM echo %CONFIG% > %LOGFILE% @@ -41,5 +41,8 @@ call :FIRMA >> %LOGFILE% exit /b :FIRMA -"C:\Program Files (x86)\AutoFirma\AutoFirma\AutoFirmaCommandLine.exe" sign -i %ARCHIVO% -o %ARCHIVO% -store pkcs12:"D:\DATOS2\FINANZAS\CERTIFICADOS\graden.pfx" -password %PASSGRADEN% -filter subject.contains:806465 -config %CONFIG% +"C:\Program Files (x86)\AutoFirma\AutoFirma\AutoFirmaCommandLine.exe" sign -i %ARCHIVO% -o %ARCHIVO% -store pkcs12:"D:\DATOS2\FINANZAS\00 HORSAN\CERTIFICADOS\HORSANMONTEBLANCO.pfx" -password %PASSHORSAN% -filter subject.contains:75674275 -config %CONFIG% + + + diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesClienteReport.dfm b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesClienteReport.dfm index ac201f1..b9c760b 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesClienteReport.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesClienteReport.dfm @@ -1,12 +1,19 @@ inherited fEditorAlbaranesClientePreview: TfEditorAlbaranesClientePreview Caption = 'Previsualizar el albar'#225'n de cliente' - ExplicitWidth = 660 - ExplicitHeight = 494 + ExplicitWidth = 962 + ExplicitHeight = 547 PixelsPerInch = 96 TextHeight = 13 - inherited frxReport1: TfrxReport - Datasets = <> - Variables = <> - Style = <> + inherited JvNavPanelHeader: TJvNavPanelHeader + ExplicitTop = 78 + end + inherited frxPDFExport1: TfrxPDFExport + ShowDialog = False + ShowProgress = False + EmbeddedFonts = True + HTMLTags = True + Author = 'FactuGES' + Subject = 'FactuGES' + Creator = 'FactuGES' end end diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesClienteReport.pas b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesClienteReport.pas index a86c9b1..88b56fb 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesClienteReport.pas +++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesClienteReport.pas @@ -12,7 +12,7 @@ uses ExtCtrls, JvExControls, JvComponent, JvNavigationPane, uIEditorAlbaranesClientePreview, JvExComCtrls, JvStatusBar, frxDMPExport, frxGradient, frxChBox, frxCross, frxRich, frxOLE, frxBarcode, JvAppStorage, JvAppRegistryStorage, - JvComponentBase; + JvComponentBase, frxExportText, frxExportRTF, frxExportMail, frxExportXLS; type TfEditorAlbaranesClientePreview = class(TfEditorPreview, IEditorAlbaranesClientePreview) diff --git a/Source/Modulos/Albaranes de proveedor/Controller/AlbaranesProveedor_controller.dpk b/Source/Modulos/Albaranes de proveedor/Controller/AlbaranesProveedor_controller.dpk index fd15b33..0f61548 100644 Binary files a/Source/Modulos/Albaranes de proveedor/Controller/AlbaranesProveedor_controller.dpk and b/Source/Modulos/Albaranes de proveedor/Controller/AlbaranesProveedor_controller.dpk differ diff --git a/Source/Modulos/Albaranes de proveedor/Controller/AlbaranesProveedor_controller.dproj b/Source/Modulos/Albaranes de proveedor/Controller/AlbaranesProveedor_controller.dproj index 42ff8b8..c3f7558 100644 --- a/Source/Modulos/Albaranes de proveedor/Controller/AlbaranesProveedor_controller.dproj +++ b/Source/Modulos/Albaranes de proveedor/Controller/AlbaranesProveedor_controller.dproj @@ -49,31 +49,35 @@ MainSource - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - @@ -82,6 +86,7 @@ +