diff --git a/Source/ApplicationBase/uFactuGES_App.pas b/Source/ApplicationBase/uFactuGES_App.pas index d65eb7ba..d21a8ba8 100644 --- a/Source/ApplicationBase/uFactuGES_App.pas +++ b/Source/ApplicationBase/uFactuGES_App.pas @@ -4,7 +4,7 @@ interface uses SysUtils, Classes, Forms, uBizUsuarios, uBizEmpresas, uBizEjercicios, uControllerBase, - uEmpresasController, JclFileUtils, uUsuariosController, uHostManager; + uEmpresasController, uUsuariosController, uHostManager; type TDoLoadModulesEvent = procedure; @@ -86,7 +86,6 @@ type FVAR_IDTIENDA: Integer; FVAR_TIENDA: String; - FAppInfo : TJclFileVersionInfo; FEmpresasController : IEmpresasController; FUsuariosController: IUsuariosController; FEmpresaActiva: IBizEmpresa; @@ -173,9 +172,9 @@ implementation uses Dialogs, uDialogUtils, cxControls, uUsuariosViewRegister, - uEmpresasViewRegister, uEjerciciosController, + uEmpresasViewRegister, uEjerciciosController, uAppInfoUtils, //TEMPORAL - inifiles; + IniFiles; procedure TAppFactuGES.CambiarEjercicio(const AIDEmpresa: Integer); var @@ -245,13 +244,12 @@ begin FUsuariosController := NIL; // Se crea la primera vez que se usa FEmpresasController := NIL; // Se crea la primera vez que se usa - FAppInfo := TJclFileVersionInfo.Create(Application.ExeName); FHostManager := THostManager.Create(NIL); with FHostManager do begin OnAfterLoad := AfterLoadModule; // Ruta por defecto de los módulos - BPLPath := ExtractFilePath(Application.ExeName) + '\'; + BPLPath := ExtractFilePath(Application.ExeName) + PathDelim; end; end; @@ -266,7 +264,6 @@ begin FUsuariosController := NIL; FEmpresasController := NIL; - FreeAndNIL(FAppInfo); inherited; end; @@ -290,12 +287,12 @@ end; function TAppFactuGES.GetAppFullName: String; begin - Result := GetAppName + ' ' + GetAppVersion; + Result := uAppInfoUtils.GetAppFullName; end; function TAppFactuGES.GetAppName: String; begin - Result := FAppInfo.ProductName; + Result := uAppInfoUtils.GetAppName; end; function TAppFactuGES.GetAppSplashForm: IAppSplashForm; @@ -305,7 +302,7 @@ end; function TAppFactuGES.GetAppVersion: String; begin - Result := FAppInfo.ProductVersion; + Result := uAppInfoUtils.GetAppVersion; end; function TAppFactuGES.GetEjercicioActivo: IBizEjercicio; diff --git a/Source/Base/Base.dpk b/Source/Base/Base.dpk index 43493a69..290b4936 100644 Binary files a/Source/Base/Base.dpk and b/Source/Base/Base.dpk differ diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index c7c3b6b4..2a3770d4 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -43,7 +43,35 @@ Delphi.Personality Package -FalseTrueFalseLibreria base de FactuGESTrueFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0 +FalseTrueFalseLibreria base de FactuGESFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + VCL for the Web Design Package for CodeGear RAD Studio CodeGear WebSnap Components CodeGear SOAP Components @@ -58,47 +86,6 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
fConfigurarConexion
@@ -123,10 +110,45 @@
dmBase
TDataModule
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -140,6 +162,13 @@ + + + + + + +