From 5f7e9ada777d43c3461a311758f6182d51bc274e Mon Sep 17 00:00:00 2001 From: david Date: Wed, 14 May 2008 14:38:09 +0000 Subject: [PATCH] Limpieza de mensajes de warning. git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@371 0c75b7a4-871f-7646-8a2f-f78d34cc349f --- Source/ApplicationBase/ApplicationBase.res | Bin 4748 -> 384 bytes .../Controller/uEmpresasController.pas | 6 +- .../Controller/uUsuariosController.pas | 23 ++-- Source/Base/Base.dproj | 102 +++++++++--------- Source/Base/Base.res | Bin 4748 -> 384 bytes Source/Base/Utiles/uCalculosUtils.pas | 12 +-- Source/Base/Utiles/uDataTableUtils.pas | 2 + Source/GUIBase/GUIBase.dpk | 25 ++++- Source/GUIBase/GUIBase.dproj | 55 +++++++--- Source/GUIBase/uViewFiltroBase.dfm | 13 +++ Source/GUIBase/uViewFiltroBase.pas | 8 +- Source/GUIBase/uViewGrid.dfm | 62 +++++++---- Source/GUIBase/uViewGrid.pas | 8 +- Source/GUIBase/uViewGridBase.pas | 6 +- Source/Servidor/FactuGES_Server.RES | Bin 23196 -> 23196 bytes Source/Servidor/FactuGES_Server.rc | 2 +- 16 files changed, 203 insertions(+), 121 deletions(-) diff --git a/Source/ApplicationBase/ApplicationBase.res b/Source/ApplicationBase/ApplicationBase.res index 1641339fcc482e7e3492d1b45813a86619622c33..8b251f312bcccec5485024f6fe8d80e1cdf25746 100644 GIT binary patch delta 11 ScmeBCZD5|Duvteife`=|>;pCc literal 4748 zcmbW5&ub)A5XUPdpe&2#;C*uNAUVhgd+&(4um@dnom`vXF9g}ZuHJ;se=<3UNdFJg zbCw+UD9j$byGIXV`~6hC>h4S?F|k9X-j90q{Z_qtZ<;nUJCO8!h?p${kR>3GhM`oH*q zk=UsjOCIgA_4!`B+Gb&`I84R)bT4dy-BQV<-SyFz?R8ILEQ(+JB$u{sEXE@j@B*7W zT;iZH#|OJ<&DO$RCkM6VbK3(B(k{nbdv1lpc;E$xz9as|v3uE1V{hw2w~g3eD0an7 z{BT%G%irdMe*|oDJmgvJaA2`9B<6Xi*?M~Q;)@Sbfwf3uf zVaWkbUjU=;sL{BlYemIZXv%qZ{SZw{-TCU+;!nH6KDDIJumU+9{E0zXW4>7T)y|>$DQlv zRJe?TjSp{c!DqeayAnSMTtZZT;>LN7J0Rls+5m@q)MbyB*eL%Eu@(+$Cw}Pd@q7N| z%Q0*AHpCP^b9v`@jx-l_FD>khpW2W8(OU2&V5TrnoAY-m_hlcV?zq3;7{2gF{J#Hc z6R+o~mVenX?>@W0@_DVzyOFs(5464CY{!q9ChoF#_*eXi@4gFuV8?vhl=_w5$iKL0 zEV0nMBcN08xtRmsgJrqjh@s#|{?*ssnsG)mH*wa6{efF0JFWHok@kA5%b661{B38= zCcgJ|*ZFTpV$8<-&+AWpa)Q8*`wL&hMeNQ^v6I7$HSdLZhZ^&+6<@Uw_Zsml9^v3W zVvPDBKHh;i=RU4J_ta3E;)Mn>Y+L zKLZ0UQ+*km9FO-b?U4gmn-62iwzH6&*duKGo~aUV)bYDla8wWZ9+^7p-F<8lP@i!m z@vhbD_${F}h>^T;C(?(b*OJDk?{dEXB?nuehoON3HAb!7Mr7-ls!84-5V-jJugbu<_$}mU=Yd9!?TOX;|B-#B)+0x#9q*yqJiqS!`49d=7ztk$O+9=1i;?K_|J<8T z?0b7=-`Z3A#vV$4XJ5(lQ~TOZHUFdA%oWvK5zg&_IKXIbughQBA8XAsd#=@|TFLXC zy(^m((;DnQmDQKatmw!@c`| G?EMQ&4NnpP diff --git a/Source/ApplicationBase/Empresas/Controller/uEmpresasController.pas b/Source/ApplicationBase/Empresas/Controller/uEmpresasController.pas index 662e8c76..fb39abe5 100644 --- a/Source/ApplicationBase/Empresas/Controller/uEmpresasController.pas +++ b/Source/ApplicationBase/Empresas/Controller/uEmpresasController.pas @@ -29,7 +29,7 @@ type FDataModule : IDataModuleEmpresas; function ValidarEmpresa(AEmpresa : IBizEmpresa): Boolean; virtual; public - constructor Create; virtual; + constructor Create; override; destructor Destroy; override; function Eliminar(const ID : Integer): Boolean; overload; @@ -99,8 +99,6 @@ end; function TEmpresasController.Eliminar(AEmpresa: IBizEmpresa): Boolean; begin - Result := False; - if not Assigned(AEmpresa) then raise Exception.Create ('Empresa no asignada'); @@ -181,8 +179,6 @@ end; function TEmpresasController.ValidarEmpresa(AEmpresa: IBizEmpresa): Boolean; begin - Result := False; - if not Assigned(AEmpresa) then raise Exception.Create ('Empresa no asignada'); diff --git a/Source/ApplicationBase/Usuarios/Controller/uUsuariosController.pas b/Source/ApplicationBase/Usuarios/Controller/uUsuariosController.pas index f0ccde38..565ad3e9 100644 --- a/Source/ApplicationBase/Usuarios/Controller/uUsuariosController.pas +++ b/Source/ApplicationBase/Usuarios/Controller/uUsuariosController.pas @@ -117,7 +117,7 @@ type function GetUsarPasswordsSeguras: Boolean; procedure SetUsarPasswordsSeguras(const Value: Boolean); public - constructor Create; virtual; + constructor Create; override; destructor Destroy; override; procedure Logoff; @@ -305,6 +305,7 @@ var AUser : IBizUsuario; AEditorCambiar : TfEditorCambiarPassword; begin + Result := False; AUser := FDataModule.GetUsuario(AIDUser); if Assigned(AUser) then begin @@ -362,7 +363,6 @@ end; function TUsuariosController.DarListaPerfilesUsuario: TStringList; var APerfilesUsuario: IBizPerfilUsuario; - i : integer; begin APerfilesUsuario := FDataModule.GetPerfiles; APerfilesUsuario.DataTable.Active := True; @@ -386,7 +386,6 @@ end; function TUsuariosController.DarListaUsuarios: TStringList; var AUsuarios: IBizUsuario; - i : integer; begin AUsuarios := FDataModule.GetUsuarios; AUsuarios.DataTable.Active := True; @@ -467,6 +466,8 @@ end; function TUsuariosController.EliminarUsuario(AUser: IBizUsuario): Boolean; begin + Result := False; + if not Assigned(AUser) then raise Exception.Create('No hay usuario asignado (EliminarUsuario)'); @@ -489,6 +490,8 @@ begin case FUserControl.Criptografia of cPadrao: Result := ucStandard; cMD5: Result := ucMD5; + else + Result := ucStandard; end; end; @@ -515,8 +518,6 @@ end; function TUsuariosController.GuardarPerfil(APerfil: IBizPerfilUsuario): Boolean; begin - Result := False; - if not Assigned(APerfil) then raise Exception.Create('No hay perfil asignado (GuardarPerfil)'); @@ -528,8 +529,6 @@ end; function TUsuariosController.GuardarUsuario(AUser: IBizUsuario): Boolean; begin - Result := False; - if not Assigned(AUser) then raise Exception.Create('No hay usuario asignado (GuardarUsuario)'); @@ -544,8 +543,6 @@ function TUsuariosController.HayUsuarioConPerfil( var TempDS: TDataset; begin - Result := False; - try TempDS := FUserControl.DataConnector.UCGetSQLDataset('Select ' + FUserControl.TableUsers.FieldUserID + ' as IdUser from ' + FUserControl.TableUsers.TableName + @@ -713,8 +710,6 @@ end; function TUsuariosController.ValidarPerfil(APerfil: IBizPerfilUsuario): Boolean; begin - Result := False; - if not Assigned(APerfil) then raise Exception.Create ('Perfil no asignado (ValidarPerfil)'); @@ -729,8 +724,6 @@ end; function TUsuariosController.ValidarUsuario(AUser: IBizUsuario): Boolean; begin - Result := False; - if not Assigned(AUser) then raise Exception.Create ('Usuario no asignado (ValidarUsuario)'); @@ -895,8 +888,8 @@ begin end; procedure TUsuariosController.FiltrarEmpresa(AUsuario: IBizUsuario); -var - Condicion: TDAWhereExpression; +{var + Condicion: TDAWhereExpression;} begin // AQUI HAY QUE TENER EN CUENTA QUE UN USUARIO PUEDE QUE NO TENGA ACCESO diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index 0f6384ce..4cbe355e 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -53,57 +53,57 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fConfigurarConexion
diff --git a/Source/Base/Base.res b/Source/Base/Base.res index 1641339fcc482e7e3492d1b45813a86619622c33..8b251f312bcccec5485024f6fe8d80e1cdf25746 100644 GIT binary patch delta 11 ScmeBCZD5|Duvteife`=|>;pCc literal 4748 zcmbW5&ub)A5XUPdpe&2#;C*uNAUVhgd+&(4um@dnom`vXF9g}ZuHJ;se=<3UNdFJg zbCw+UD9j$byGIXV`~6hC>h4S?F|k9X-j90q{Z_qtZ<;nUJCO8!h?p${kR>3GhM`oH*q zk=UsjOCIgA_4!`B+Gb&`I84R)bT4dy-BQV<-SyFz?R8ILEQ(+JB$u{sEXE@j@B*7W zT;iZH#|OJ<&DO$RCkM6VbK3(B(k{nbdv1lpc;E$xz9as|v3uE1V{hw2w~g3eD0an7 z{BT%G%irdMe*|oDJmgvJaA2`9B<6Xi*?M~Q;)@Sbfwf3uf zVaWkbUjU=;sL{BlYemIZXv%qZ{SZw{-TCU+;!nH6KDDIJumU+9{E0zXW4>7T)y|>$DQlv zRJe?TjSp{c!DqeayAnSMTtZZT;>LN7J0Rls+5m@q)MbyB*eL%Eu@(+$Cw}Pd@q7N| z%Q0*AHpCP^b9v`@jx-l_FD>khpW2W8(OU2&V5TrnoAY-m_hlcV?zq3;7{2gF{J#Hc z6R+o~mVenX?>@W0@_DVzyOFs(5464CY{!q9ChoF#_*eXi@4gFuV8?vhl=_w5$iKL0 zEV0nMBcN08xtRmsgJrqjh@s#|{?*ssnsG)mH*wa6{efF0JFWHok@kA5%b661{B38= zCcgJ|*ZFTpV$8<-&+AWpa)Q8*`wL&hMeNQ^v6I7$HSdLZhZ^&+6<@Uw_Zsml9^v3W zVvPDBKHh;i=RU4J_ta3E;)Mn>Y+L zKLZ0UQ+*km9FO-b?U4gmn-62iwzH6&*duKGo~aUV)bYDla8wWZ9+^7p-F<8lP@i!m z@vhbD_${F}h>^T;C(?(b*OJDk?{dEXB?nuehoON3HAb!7Mr7-ls!84-5V-jJugbu<_$}mU=Yd9!?TOX;|B-#B)+0x#9q*yqJiqS!`49d=7ztk$O+9=1i;?K_|J<8T z?0b7=-`Z3A#vV$4XJ5(lQ~TOZHUFdA%oWvK5zg&_IKXIbughQBA8XAsd#=@|TFLXC zy(^m((;DnQmDQKatmw!@c`| G?EMQ&4NnpP diff --git a/Source/Base/Utiles/uCalculosUtils.pas b/Source/Base/Utiles/uCalculosUtils.pas index 5b9e1dae..483327b3 100644 --- a/Source/Base/Utiles/uCalculosUtils.pas +++ b/Source/Base/Utiles/uCalculosUtils.pas @@ -33,8 +33,6 @@ function CalcularLineaConcepto (const ADataTable : TDADataTable): Double; var ImporteTotal : Double; begin - ImporteTotal := 0; - with ADataTable do begin if (VarIsNull(FieldByName(CAMPO_DESCUENTO).AsVariant)) then @@ -75,11 +73,13 @@ var begin - try - ABookmark := ADetalles.DataTable.GetBookMark; - ADetalles.DataTable.DisableControls; - ADetalles.DataTable.DisableEventHandlers; + ImporteUnidad := 0; + ImporteSobrante := 0; + ABookmark := ADetalles.DataTable.GetBookMark; + ADetalles.DataTable.DisableControls; + ADetalles.DataTable.DisableEventHandlers; + try ADetalles.DataTable.First; Unidades := 0; while not ADetalles.DataTable.eof do diff --git a/Source/Base/Utiles/uDataTableUtils.pas b/Source/Base/Utiles/uDataTableUtils.pas index 2d4a816a..17248414 100644 --- a/Source/Base/Utiles/uDataTableUtils.pas +++ b/Source/Base/Utiles/uDataTableUtils.pas @@ -524,6 +524,8 @@ begin if not ATarget.Active then ATarget.Open; + ADetailFields := Nil; + // żATarget es una tabla detalle? if Assigned(ATarget.MasterSource) then begin diff --git a/Source/GUIBase/GUIBase.dpk b/Source/GUIBase/GUIBase.dpk index f2838c37..182a7139 100644 --- a/Source/GUIBase/GUIBase.dpk +++ b/Source/GUIBase/GUIBase.dpk @@ -41,7 +41,30 @@ requires dxLayoutControlD11, dxPScxCommonD11, dxPsPrVwAdvD11, - dxPScxGrid6LnkD11; + dxPScxGrid6LnkD11, + dxSkinscxPCPainterD11, + dxSkinsCoreD11, + dxSkinsdxLCPainterD11, + dxSkinOffice2007BlackD11, + dxSkinBlackD11, + dxSkinBlueD11, + dxSkinCaramelD11, + dxSkinCoffeeD11, + dxSkinGlassOceansD11, + dxSkiniMaginaryD11, + dxSkinLilianD11, + dxSkinLiquidSkyD11, + dxSkinLondonLiquidSkyD11, + dxSkinMcSkinD11, + dxSkinMoneyTwinsD11, + dxSkinOffice2007BlueD11, + dxSkinOffice2007GreenD11, + dxSkinOffice2007PinkD11, + dxSkinOffice2007SilverD11, + dxSkinSilverD11, + dxSkinStardustD11, + dxSkinValentineD11, + dxSkinXmas2008BlueD11; contains uEditorBase in 'uEditorBase.pas' {fEditorBase: TCustomEditor}, diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj index 163d1d12..3232a732 100644 --- a/Source/GUIBase/GUIBase.dproj +++ b/Source/GUIBase/GUIBase.dproj @@ -58,22 +58,43 @@ MainSource - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fDialogBase
 @@ -164,6 +185,8 @@
frViewTotales
TFrame + +