Repaso a funcionamiento en multiempresa.

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@666 0c75b7a4-871f-7646-8a2f-f78d34cc349f
This commit is contained in:
David Arranz 2008-10-07 15:20:08 +00:00
parent 8b6a55d9ad
commit 4075f27221
7 changed files with 73 additions and 30 deletions

View File

@ -268,21 +268,21 @@ object fPantallaPrincipal: TfPantallaPrincipal
OnExecute = actAcercaExecute OnExecute = actAcercaExecute
end end
object actMenuCompras: TAction object actMenuCompras: TAction
Category = 'Compras' Category = 'Menus'
Caption = 'Compras' Caption = 'Compras'
OnExecute = actMenuComprasExecute OnExecute = actMenuComprasExecute
OnUpdate = actMenuComprasUpdate OnUpdate = actMenuComprasUpdate
end end
object actLogisticaMenu: TAction object actMenuLogistica: TAction
Category = 'Log'#237'stica' Category = 'Menus'
Caption = 'Log'#237'stica' Caption = 'Log'#237'stica'
OnExecute = actLogisticaMenuExecute OnExecute = actMenuLogisticaExecute
OnUpdate = actMenuComprasUpdate OnUpdate = actMenuComprasUpdate
end end
object actVentasMenu: TAction object actMenuVentas: TAction
Category = 'Ventas' Category = 'Menus'
Caption = 'Ventas' Caption = 'Ventas'
OnExecute = actVentasMenuExecute OnExecute = actMenuVentasExecute
OnUpdate = actMenuComprasUpdate OnUpdate = actMenuComprasUpdate
end end
object actVerPanel: TAction object actVerPanel: TAction
@ -297,6 +297,11 @@ object fPantallaPrincipal: TfPantallaPrincipal
OnExecute = actVerBarraEstadoExecute OnExecute = actVerBarraEstadoExecute
OnUpdate = actVerBarraEstadoUpdate OnUpdate = actVerBarraEstadoUpdate
end end
object actMenuEmpresa: TAction
Category = 'Menus'
Caption = 'Empresa'
OnUpdate = actMenuComprasUpdate
end
end end
object ModulesSmallImageList: TPngImageList object ModulesSmallImageList: TPngImageList
PngImages = < PngImages = <
@ -609,7 +614,7 @@ object fPantallaPrincipal: TfPantallaPrincipal
end end
object Logstica1: TMenuItem object Logstica1: TMenuItem
Tag = 3000 Tag = 3000
Action = actLogisticaMenu Action = actMenuLogistica
object N7: TMenuItem object N7: TMenuItem
Tag = 200 Tag = 200
Caption = '-' Caption = '-'
@ -633,7 +638,7 @@ object fPantallaPrincipal: TfPantallaPrincipal
end end
object Ventas1: TMenuItem object Ventas1: TMenuItem
Tag = 5000 Tag = 5000
Action = actVentasMenu Action = actMenuVentas
object N3: TMenuItem object N3: TMenuItem
Tag = 200 Tag = 200
Caption = '-' Caption = '-'

View File

@ -63,8 +63,8 @@ type
Compras1: TMenuItem; Compras1: TMenuItem;
Ventas1: TMenuItem; Ventas1: TMenuItem;
actMenuCompras: TAction; actMenuCompras: TAction;
actLogisticaMenu: TAction; actMenuLogistica: TAction;
actVentasMenu: TAction; actMenuVentas: TAction;
Logstica1: TMenuItem; Logstica1: TMenuItem;
pagInicio: TJvNavPanelPage; pagInicio: TJvNavPanelPage;
Panel1: TPanel; Panel1: TPanel;
@ -88,6 +88,7 @@ type
N8: TMenuItem; N8: TMenuItem;
N9: TMenuItem; N9: TMenuItem;
N10: TMenuItem; N10: TMenuItem;
actMenuEmpresa: TAction;
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
procedure Salir1Click(Sender: TObject); procedure Salir1Click(Sender: TObject);
procedure actSalirExecute(Sender: TObject); procedure actSalirExecute(Sender: TObject);
@ -99,8 +100,8 @@ type
procedure ApplicationEventsException(Sender: TObject; E: Exception); procedure ApplicationEventsException(Sender: TObject; E: Exception);
procedure actMenuComprasExecute(Sender: TObject); procedure actMenuComprasExecute(Sender: TObject);
procedure actMenuComprasUpdate(Sender: TObject); procedure actMenuComprasUpdate(Sender: TObject);
procedure actLogisticaMenuExecute(Sender: TObject); procedure actMenuLogisticaExecute(Sender: TObject);
procedure actVentasMenuExecute(Sender: TObject); procedure actMenuVentasExecute(Sender: TObject);
procedure actActualizacionesExecute(Sender: TObject); procedure actActualizacionesExecute(Sender: TObject);
procedure actVerPanelUpdate(Sender: TObject); procedure actVerPanelUpdate(Sender: TObject);
procedure actVerPanelExecute(Sender: TObject); procedure actVerPanelExecute(Sender: TObject);
@ -195,7 +196,7 @@ procedure TfPantallaPrincipal.RefrescarUI;
var var
ATitulo : String; ATitulo : String;
begin begin
ATitulo := AppFactuGES.AppName + ' ' + AppFactuGES.AppVersion; ATitulo := AppFactuGES.GetAppFullName;
if Assigned(AppFactuGES.EmpresaActiva) then if Assigned(AppFactuGES.EmpresaActiva) then
ATitulo := AppFactuGES.EmpresaActiva.NOMBRE + ' - ' + ATitulo; ATitulo := AppFactuGES.EmpresaActiva.NOMBRE + ' - ' + ATitulo;
@ -232,7 +233,7 @@ begin
Close; Close;
end; end;
procedure TfPantallaPrincipal.actVentasMenuExecute(Sender: TObject); procedure TfPantallaPrincipal.actMenuVentasExecute(Sender: TObject);
begin begin
// //
end; end;
@ -311,8 +312,10 @@ var
AListaEmpresas : IBizEmpresa; AListaEmpresas : IBizEmpresa;
i : Integer; i : Integer;
begin begin
for i := 0 to AppFactuGES.ModuleManager.ModulesCount - 1 do ShowHourglassCursor;
MainMenuController.RegisterModule(AppFactuGES.ModuleManager.Modules[i]); try
for i := 0 to AppFactuGES.ModuleManager.ModulesCount - 1 do
MainMenuController.RegisterModule(AppFactuGES.ModuleManager.Modules[i]);
MainMenuController.SortMenuByTag; MainMenuController.SortMenuByTag;
MainMenuController.InitMainMenu; MainMenuController.InitMainMenu;
@ -343,6 +346,9 @@ begin
end; end;
RefrescarUI; RefrescarUI;
finally
HideHourglassCursor;
end;
end; end;
@ -356,7 +362,7 @@ begin
(Sender as TAction).Enabled := Assigned(AppFactuGES.EmpresaActiva); (Sender as TAction).Enabled := Assigned(AppFactuGES.EmpresaActiva);
end; end;
procedure TfPantallaPrincipal.actLogisticaMenuExecute(Sender: TObject); procedure TfPantallaPrincipal.actMenuLogisticaExecute(Sender: TObject);
begin begin
// //
end; end;

View File

@ -40,21 +40,35 @@
<Borland.Personality>Delphi.Personality</Borland.Personality> <Borland.Personality>Delphi.Personality</Borland.Personality>
<Borland.ProjectType>Package</Borland.ProjectType> <Borland.ProjectType>Package</Borland.ProjectType>
<BorlandProject> <BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">True</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">Referencias_controller.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">Referencias_controller.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
</ProjectExtensions> </ProjectExtensions>
<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" /> <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
<ItemGroup> <ItemGroup>
<DelphiCompile Include="Referencias_controller.dpk"> <DelphiCompile Include="Referencias_controller.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="..\..\Lib\Base.dcp" /> <DCCReference Include="..\..\..\Servidor\ApplicaReferencias_data.dcp" />
<DCCReference Include="..\..\Lib\Referencias_data.dcp" /> <DCCReference Include="..\..\..\Servidor\ApplicationBaReferencias_data.dcp" />
<DCCReference Include="..\..\Lib\Referencias_model.dcp" /> <DCCReference Include="..\..\..\Servidor\ApplicationBaseReferencias_data.dcp" />
<DCCReference Include="..\..\..\Servidor\ApplicationBasReferencias_data.dcp" />
<DCCReference Include="..\..\..\Servidor\ApplicationBReferencias_data.dcp" />
<DCCReference Include="..\..\..\Servidor\ApplicationReferencias_data.dcp" />
<DCCReference Include="..\..\..\Servidor\ApplicatioReferencias_data.dcp" />
<DCCReference Include="..\..\..\Servidor\ApplicatiReferencias_data.dcp" />
<DCCReference Include="..\..\..\Servidor\ApplicatReferencias_data.dcp" />
<DCCReference Include="..\..\..\Servidor\ApplicReferencias_data.dcp" />
<DCCReference Include="..\..\..\Servidor\AppliReferencias_data.dcp" />
<DCCReference Include="..\..\..\Servidor\ApplReferencias_data.dcp" />
<DCCReference Include="..\..\..\Servidor\AppReferencias_data.dcp" />
<DCCReference Include="..\..\..\Servidor\ApReferencias_data.dcp" />
<DCCReference Include="..\..\..\Servidor\AReferencias_data.dcp" />
<DCCReference Include="..\..\..\Servidor\Base.dcp" />
<DCCReference Include="..\..\..\Servidor\Referencias_data.dcp" />
<DCCReference Include="..\..\..\Servidor\Referencias_model.dcp" />
<DCCReference Include="uReferenciasController.pas" /> <DCCReference Include="uReferenciasController.pas" />
<DCCReference Include="View\uIEditorReferencias.pas" /> <DCCReference Include="View\uIEditorReferencias.pas" />
</ItemGroup> </ItemGroup>
</Project> </Project>
<!-- EurekaLog First Line <!-- EurekaLog First Line
[Exception Log] [Exception Log]
EurekaLog Version=6011 EurekaLog Version=6011

View File

@ -24,7 +24,7 @@ type
function ValidarReferencia(AReferencia: IBizReferencia): Boolean; function ValidarReferencia(AReferencia: IBizReferencia): Boolean;
procedure AsignarDataModule; procedure AsignarDataModule;
procedure FiltrarEmpresa(AReferencias: IBizReferencia);
public public
constructor Create; override; constructor Create; override;
destructor Destroy; override; destructor Destroy; override;
@ -39,7 +39,7 @@ implementation
uses uses
cxControls, DB, uEditorRegistryUtils, schReferenciasClient_Intf, cxControls, DB, uEditorRegistryUtils, schReferenciasClient_Intf,
uIEditorReferencias, uDataModuleReferencias, uIEditorReferencias, uDataModuleReferencias, uFactuGES_App,
uDAInterfaces, uDataTableUtils, uDialogUtils, uDAInterfaces, uDataTableUtils, uDialogUtils,
uDateUtils, uROTypes, DateUtils, Controls, Windows; uDateUtils, uROTypes, DateUtils, Controls, Windows;
@ -53,6 +53,28 @@ end;
function TReferenciasController.BuscarTodos: IBizReferencia; function TReferenciasController.BuscarTodos: IBizReferencia;
begin begin
Result := FDataModule.GetItems; Result := FDataModule.GetItems;
FiltrarEmpresa(Result);
end;
procedure TReferenciasController.FiltrarEmpresa(AReferencias: IBizReferencia);
var
Condicion: TDAWhereExpression;
begin
if AReferencias.DataTable.Active then
AReferencias.DataTable.Active := False;
// Filtrar las facturas actuales por empresa
with AReferencias.DataTable.DynamicWhere do
begin
// (ID_EMPRESA >= ID)
Condicion := NewBinaryExpression(NewField('', fld_ReferenciasID_EMPRESA),
NewConstant(AppFactuGES.EmpresaActiva.ID, datInteger), dboEqual);
if IsEmpty then
Expression := Condicion
else
Expression := NewBinaryExpression(Expression, Condicion, dboAnd);
end;
end; end;
constructor TReferenciasController.Create; constructor TReferenciasController.Create;

View File

@ -163,11 +163,7 @@ begin
FReferencias.DataTable.Active := true; FReferencias.DataTable.Active := true;
ListaReferencias.SetFocus; ListaReferencias.SetFocus;
{ ListaReferenciasView.DataController.GotoFirst;
EnableScrollBar(ListaReferencias.Handle,SB_HORZ,ESB_DISABLE_BOTH);
ShowScrollBar(ListaReferencias.Handle,SB_HORZ,false);
EnableScrollBar(ListaReferencias.Handle,SB_VERT,ESB_DISABLE_BOTH);
}
end; end;
end. end.