General -> revisión de los menus que se quedaban activados cuando no había una empresa elegida.

git-svn-id: https://192.168.0.254/svn/Proyectos.Acana_FactuGES2/trunk@377 f4e31baf-9722-1c47-927c-6f952f962d4b

Source/ApplicationBase/uFactuGES_App.pas

@@ -442,7 +442,7 @@ begin
     JsDialog.Content.Add('Selección de empresa');
     JsDialog.Instruction.Text := 'Elija la empresa con la que desea trabajar.';
     JsDialog.DialogOptions := [doCommandLinks, doModal];
-    JsDialog.ButtonBar.Buttons := [cbOk];
+    JsDialog.ButtonBar.Buttons := [cbCancel];
     JsDialog.Width := 600;
 
 

Source/Base/Base.dproj

@@ -58,53 +58,53 @@
     <DelphiCompile Include="Base.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\adortl.dcp" />
-    <DCCReference Include="..\cxIntl6D11.dcp" />
-    <DCCReference Include="..\cxIntlPrintSys3D11.dcp" />
-    <DCCReference Include="..\cxLibraryD11.dcp" />
-    <DCCReference Include="..\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="..\dbrtl.dcp" />
-    <DCCReference Include="..\dclIndyCore.dcp" />
-    <DCCReference Include="..\designide.dcp" />
-    <DCCReference Include="..\dsnap.dcp" />
-    <DCCReference Include="..\dxGDIPlusD11.dcp" />
-    <DCCReference Include="..\dxNavBarD11.dcp" />
-    <DCCReference Include="..\dxThemeD11.dcp" />
-    <DCCReference Include="..\GUISDK_D11.dcp" />
-    <DCCReference Include="..\IndyCore.dcp" />
-    <DCCReference Include="..\IndyProtocols.dcp" />
-    <DCCReference Include="..\IndySystem.dcp" />
-    <DCCReference Include="..\Jcl.dcp" />
-    <DCCReference Include="..\JclVcl.dcp" />
-    <DCCReference Include="..\JSDialog100.dcp" />
-    <DCCReference Include="..\JvCmpD11R.dcp" />
-    <DCCReference Include="..\JvCoreD11R.dcp" />
-    <DCCReference Include="..\JvCtrlsD11R.dcp" />
-    <DCCReference Include="..\JvDlgsD11R.dcp" />
-    <DCCReference Include="..\JvMMD11R.dcp" />
-    <DCCReference Include="..\JvNetD11R.dcp" />
-    <DCCReference Include="..\JvPageCompsD11R.dcp" />
-    <DCCReference Include="..\JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="..\JvSystemD11R.dcp" />
     <DCCReference Include="..\Modulos\Presupuestos de cliente\dxDockingD11.dcp" />
-    <DCCReference Include="..\pckMD5.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\adortl.dcp" />
-    <DCCReference Include="..\pckUCDataConnector.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\cxIntl6D11.dcp" />
-    <DCCReference Include="..\pckUserControl_RT.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\cxIntlPrintSys3D11.dcp" />
-    <DCCReference Include="..\PluginSDK_D10R.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\cxLibraryD11.dcp" />
-    <DCCReference Include="..\PngComponentsD10.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="..\PNG_D10.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\dbrtl.dcp" />
-    <DCCReference Include="..\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\dclIndyCore.dcp" />
-    <DCCReference Include="..\rtl.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\designide.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\dsnap.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\dxGDIPlusD11.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\dxNavBarD11.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\dxThemeD11.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\GUISDK_D11.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\IndyCore.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\IndyProtocols.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\IndySystem.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\Jcl.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\JclVcl.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\JSDialog100.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\JvCmpD11R.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\JvCoreD11R.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\JvCtrlsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\JvDlgsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\JvMMD11R.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\JvNetD11R.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\JvPageCompsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\JvSystemD11R.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\pckMD5.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\pckUCDataConnector.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\pckUserControl_RT.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\PluginSDK_D10R.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\PngComponentsD10.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\PNG_D10.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\rtl.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\TB2k_D10.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\tbx_d10.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\vcl.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\vclactnband.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\vcldb.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\vcljpg.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\VclSmp.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\vclx.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\xmlrtl.dcp" />
     <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
-    <DCCReference Include="..\TB2k_D10.dcp" />
-    <DCCReference Include="..\tbx_d10.dcp" />
-    <DCCReference Include="..\vcl.dcp" />
-    <DCCReference Include="..\vclactnband.dcp" />
-    <DCCReference Include="..\vcldb.dcp" />
-    <DCCReference Include="..\vcljpg.dcp" />
-    <DCCReference Include="..\VclSmp.dcp" />
-    <DCCReference Include="..\vclx.dcp" />
-    <DCCReference Include="..\xmlrtl.dcp" />
     <DCCReference Include="Conexion\uConfigurarConexion.pas">
       <Form>fConfigurarConexion</Form>
       <DesignClass>TForm</DesignClass>

Source/Cliente/uPantallaPrincipal.dfm

@@ -317,6 +317,11 @@ object fPantallaPrincipal: TfPantallaPrincipal
       OnExecute = actMenuInformesExecute
       OnUpdate = actMenuComprasUpdate
     end
+    object actInformacionEmpresa: TAction
+      Caption = 'Informaci'#243'n de empresa'
+      OnExecute = actInformacionEmpresaExecute
+      OnUpdate = actMenuComprasUpdate
+    end
   end
   object ModulesSmallImageList: TPngImageList
     PngImages = <
@@ -643,17 +648,18 @@ object fPantallaPrincipal: TfPantallaPrincipal
       Tag = 1000
       Action = actMenuEmpresa
       object Listadeempresas1_OLD: TMenuItem
+        Tag = 1
         Caption = 'Selecci'#243'n de empresas'
         OnClick = Listadeempresas1_OLDClick
       end
       object N1_OLD: TMenuItem
+        Tag = 2
         Caption = '-'
         Visible = False
       end
       object Informacindeempresa1: TMenuItem
-        Caption = 'Informaci'#243'n de empresa'
+        Tag = 10
-        ImageIndex = 3
+        Action = actInformacionEmpresa
-        OnClick = Informacindeempresa1Click
       end
     end
     object Datos1: TMenuItem

Source/Cliente/uPantallaPrincipal.pas

@@ -95,6 +95,7 @@ type
     actMenuEmpresa: TAction;
     Informes1: TMenuItem;
     actMenuInformes: TAction;
+    actInformacionEmpresa: TAction;
     procedure FormCreate(Sender: TObject);
     procedure Salir1Click(Sender: TObject);
     procedure actSalirExecute(Sender: TObject);
@@ -114,7 +115,6 @@ type
     procedure actVerBarraEstadoUpdate(Sender: TObject);
     procedure actVerBarraEstadoExecute(Sender: TObject);
     procedure Acercade1Click(Sender: TObject);
-    procedure Informacindeempresa1Click(Sender: TObject);
     procedure Usuarios1Click(Sender: TObject);
     procedure Perfiles1Click(Sender: TObject);
     procedure FormShow(Sender: TObject);
@@ -124,6 +124,7 @@ type
     procedure actMenuEmpresaExecute(Sender: TObject);
     procedure actMenuInformesExecute(Sender: TObject);
     procedure Listadeempresas1_OLDClick(Sender: TObject);
+    procedure actInformacionEmpresaExecute(Sender: TObject);
   private
     FContenido : TCustomEditor;
     procedure ShowEmbedded(AEditor : ICustomEditor);
@@ -195,13 +196,14 @@ begin
   InicializarUI;
 
   { Go full screen }
-  WindowState  := wsmaximized;
+  WindowState  := wsMaximized;
-  ClientWidth  := Screen.Width ;
+  {ClientWidth  := Screen.Width ;
-  ClientHeight := Screen.Height;
+  ClientHeight := Screen.Height;}
   Refresh;
 
   //Sacamos la lista de empresas para que el usuario elija con la que va a trabajar
   AppFactuGES.SeleccionarEmpresa;
+  RefrescarUI;
 end;
 
 procedure TfPantallaPrincipal.RefrescarUI;
@@ -316,12 +318,6 @@ begin
   Result := pnlMain;
 end;
 
-procedure TfPantallaPrincipal.Informacindeempresa1Click(Sender: TObject);
-begin
-  if Assigned(AppFactuGES.EmpresaActiva) then
-     AppFactuGES.EmpresasController.Ver(AppFactuGES.EmpresaActiva);
-end;
-
 procedure TfPantallaPrincipal.InicializarUI;
 var
   AListaEmpresas : IBizEmpresa;
@@ -619,4 +615,9 @@ begin
   AppFactuGES.Configurar;
 end;
 
+procedure TfPantallaPrincipal.actInformacionEmpresaExecute(Sender: TObject);
+begin
+  AppFactuGES.EmpresasController.Ver(AppFactuGES.EmpresaActiva);
+end;
+
 end.

Source/Modulos/Comisiones/Plugin/uPluginComisiones.dfm

@@ -67,6 +67,7 @@ object PluginComisiones: TPluginComisiones
       Caption = 'Liquidaciones de comisiones'
       ImageIndex = 0
       OnExecute = actComisionesExecute
+      OnUpdate = actComisionesUpdate
     end
   end
   object MainMenu: TMainMenu

Source/Modulos/Comisiones/Plugin/uPluginComisiones.pas

@@ -21,6 +21,7 @@ type
     Empresas1: TMenuItem;
     Comisiones1: TMenuItem;
     procedure actComisionesExecute(Sender: TObject);
+    procedure actComisionesUpdate(Sender: TObject);
   public
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
@@ -31,7 +32,7 @@ implementation
 {$R *.dfm}
 
 uses
-  Forms, Dialogs, SysUtils,
+  Forms, Dialogs, SysUtils, uFactuGES_App,
   uComisionesController, uBizComisiones, uComisionesViewRegister;
 
 function GetModule : TModuleController;
@@ -52,6 +53,11 @@ begin
   AComisionesController.VerTodos(AComisiones);
 end;
 
+procedure TPluginComisiones.actComisionesUpdate(Sender: TObject);
+begin
+  (Sender as TAction).Enabled := Assigned(AppFactuGES.EmpresaActiva)
+end;
+
 constructor TPluginComisiones.Create(AOwner: TComponent);
 begin
   inherited;

Source/Modulos/Contactos/Plugin/uPluginContactos.dfm

@@ -282,6 +282,7 @@ object PluginContactos: TPluginContactos
       Caption = 'Vendedores'
       ImageIndex = 2
       OnExecute = actVendedoresExecute
+      OnUpdate = actVendedoresUpdate
     end
     object actGruposCliente: TAction
       Caption = 'Grupos de cliente'

Source/Modulos/Contactos/Plugin/uPluginContactos.pas

@@ -40,6 +40,7 @@ type
     procedure actProcedenciasClienteExecute(Sender: TObject);
     function GetVistaConfiguracion : TClass;
     function GetEtiquetaConfiguracion : String;
+    procedure actVendedoresUpdate(Sender: TObject);
   public
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
@@ -54,7 +55,8 @@ uses
   uClientesController, uProveedoresController, uVendedoresController,
   uGruposClienteController, uProcedenciasClienteController, uBizGruposCliente,
   uGruposProveedorController, uBizGruposProveedor, uBizProcedenciasCliente,
-  uContactosViewRegister, uBizContactos, uViewConfiguracionContactos;
+  uContactosViewRegister, uBizContactos, uViewConfiguracionContactos,
+  uFactuGES_App;
 
 function GetModule : TModuleController;
 begin
@@ -132,6 +134,11 @@ begin
   AVendedoresController.VerTodos(AVendedores);
 end;
 
+procedure TPluginContactos.actVendedoresUpdate(Sender: TObject);
+begin
+  (Sender as TAction).Enabled := Assigned(AppFactuGES.EmpresaActiva)
+end;
+
 constructor TPluginContactos.Create(AOwner: TComponent);
 begin
   inherited;

Source/Modulos/Referencias/Plugin/uPluginReferencias.dfm

@@ -26,6 +26,7 @@ object PluginReferencias: TPluginReferencias
       Caption = 'Referencias'
       ImageIndex = 0
       OnExecute = actReferenciasExecute
+      OnUpdate = actReferenciasUpdate
     end
   end
   object MainMenu: TMainMenu

Source/Modulos/Referencias/Plugin/uPluginReferencias.pas

@@ -22,6 +22,7 @@ type
     Referencias1: TMenuItem;
     N1: TMenuItem;
     procedure actReferenciasExecute(Sender: TObject);
+    procedure actReferenciasUpdate(Sender: TObject);
   public
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
@@ -32,7 +33,7 @@ implementation
 {$R *.dfm}
 
 uses
-  Forms, Dialogs, SysUtils,
+  Forms, Dialogs, SysUtils, uFactuGEs_App,
   uReferenciasController, uBizReferencias, uReferenciasViewRegister;
 
 function GetModule : TModuleController;
@@ -53,6 +54,11 @@ begin
   AReferenciasController.VerTodos(AReferencias);
 end;
 
+procedure TPluginReferencias.actReferenciasUpdate(Sender: TObject);
+begin
+  (Sender as TAction).Enabled := Assigned(AppFactuGES.EmpresaActiva)
+end;
+
 constructor TPluginReferencias.Create(AOwner: TComponent);
 begin
   inherited;

Source/Servidor/FactuGES_Server.dproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
@@ -29,6 +29,7 @@
     <Borland.ProjectType />
     <BorlandProject>
 <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">2</VersionInfo><VersionInfo Name="Release">6</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">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.2.7.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES (Servidor)</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.2.7.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">miércoles, 10 de diciembre de 2008 12:35</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+      
       <Excluded_Packages Name="C:\Archivos de programa\RemObjects Software\Pascal Script\Dcu\D10\PascalScript_RO_D10.bpl">RemObjects Pascal Script - RemObjects SDK 3.0 Integration</Excluded_Packages>
     </Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
   </ProjectExtensions>

Source/Servidor/FactuGES_Server.rc

@@ -16,7 +16,7 @@ BEGIN
               VALUE "FileVersion", "2.2.6.0\0"
               VALUE "ProductName", "FactuGES (Servidor)\0"
               VALUE "ProductVersion", "2.2.6.0\0"
-              VALUE "CompileDate", "viernes, 19 de diciembre de 2008 11:55\0"
+              VALUE "CompileDate", "lunes, 22 de diciembre de 2008 18:12\0"
          END
     END
     BLOCK "VarFileInfo"