diff --git a/Source/Cliente/uPantallaPrincipal.dfm b/Source/Cliente/uPantallaPrincipal.dfm
index 8e6ede03..e0e0fb46 100644
--- a/Source/Cliente/uPantallaPrincipal.dfm
+++ b/Source/Cliente/uPantallaPrincipal.dfm
@@ -268,21 +268,21 @@ object fPantallaPrincipal: TfPantallaPrincipal
       OnExecute = actAcercaExecute
     end
     object actMenuCompras: TAction
-      Category = 'Compras'
+      Category = 'Menus'
       Caption = 'Compras'
       OnExecute = actMenuComprasExecute
       OnUpdate = actMenuComprasUpdate
     end
-    object actLogisticaMenu: TAction
-      Category = 'Log'#237'stica'
+    object actMenuLogistica: TAction
+      Category = 'Menus'
       Caption = 'Log'#237'stica'
-      OnExecute = actLogisticaMenuExecute
+      OnExecute = actMenuLogisticaExecute
       OnUpdate = actMenuComprasUpdate
     end
-    object actVentasMenu: TAction
-      Category = 'Ventas'
+    object actMenuVentas: TAction
+      Category = 'Menus'
       Caption = 'Ventas'
-      OnExecute = actVentasMenuExecute
+      OnExecute = actMenuVentasExecute
       OnUpdate = actMenuComprasUpdate
     end
     object actVerPanel: TAction
@@ -297,6 +297,11 @@ object fPantallaPrincipal: TfPantallaPrincipal
       OnExecute = actVerBarraEstadoExecute
       OnUpdate = actVerBarraEstadoUpdate
     end
+    object actMenuEmpresa: TAction
+      Category = 'Menus'
+      Caption = 'Empresa'
+      OnUpdate = actMenuComprasUpdate
+    end
   end
   object ModulesSmallImageList: TPngImageList
     PngImages = <
@@ -609,7 +614,7 @@ object fPantallaPrincipal: TfPantallaPrincipal
     end
     object Logstica1: TMenuItem
       Tag = 3000
-      Action = actLogisticaMenu
+      Action = actMenuLogistica
       object N7: TMenuItem
         Tag = 200
         Caption = '-'
@@ -633,7 +638,7 @@ object fPantallaPrincipal: TfPantallaPrincipal
     end
     object Ventas1: TMenuItem
       Tag = 5000
-      Action = actVentasMenu
+      Action = actMenuVentas
       object N3: TMenuItem
         Tag = 200
         Caption = '-'
diff --git a/Source/Cliente/uPantallaPrincipal.pas b/Source/Cliente/uPantallaPrincipal.pas
index 5a85e8d6..926f6cd3 100644
--- a/Source/Cliente/uPantallaPrincipal.pas
+++ b/Source/Cliente/uPantallaPrincipal.pas
@@ -63,8 +63,8 @@ type
     Compras1: TMenuItem;
     Ventas1: TMenuItem;
     actMenuCompras: TAction;
-    actLogisticaMenu: TAction;
-    actVentasMenu: TAction;
+    actMenuLogistica: TAction;
+    actMenuVentas: TAction;
     Logstica1: TMenuItem;
     pagInicio: TJvNavPanelPage;
     Panel1: TPanel;
@@ -88,6 +88,7 @@ type
     N8: TMenuItem;
     N9: TMenuItem;
     N10: TMenuItem;
+    actMenuEmpresa: TAction;
     procedure FormCreate(Sender: TObject);
     procedure Salir1Click(Sender: TObject);
     procedure actSalirExecute(Sender: TObject);
@@ -99,8 +100,8 @@ type
     procedure ApplicationEventsException(Sender: TObject; E: Exception);
     procedure actMenuComprasExecute(Sender: TObject);
     procedure actMenuComprasUpdate(Sender: TObject);
-    procedure actLogisticaMenuExecute(Sender: TObject);
-    procedure actVentasMenuExecute(Sender: TObject);
+    procedure actMenuLogisticaExecute(Sender: TObject);
+    procedure actMenuVentasExecute(Sender: TObject);
     procedure actActualizacionesExecute(Sender: TObject);
     procedure actVerPanelUpdate(Sender: TObject);
     procedure actVerPanelExecute(Sender: TObject);
@@ -195,7 +196,7 @@ procedure TfPantallaPrincipal.RefrescarUI;
 var
   ATitulo : String;
 begin
-  ATitulo := AppFactuGES.AppName + ' ' + AppFactuGES.AppVersion;
+  ATitulo := AppFactuGES.GetAppFullName;
 
   if Assigned(AppFactuGES.EmpresaActiva) then
     ATitulo := AppFactuGES.EmpresaActiva.NOMBRE + ' - ' + ATitulo;
@@ -232,7 +233,7 @@ begin
   Close;
 end;
 
-procedure TfPantallaPrincipal.actVentasMenuExecute(Sender: TObject);
+procedure TfPantallaPrincipal.actMenuVentasExecute(Sender: TObject);
 begin
   //
 end;
@@ -311,8 +312,10 @@ var
   AListaEmpresas : IBizEmpresa;
   i : Integer;
 begin
-  for i := 0 to AppFactuGES.ModuleManager.ModulesCount - 1 do
-    MainMenuController.RegisterModule(AppFactuGES.ModuleManager.Modules[i]);
+  ShowHourglassCursor;  
+  try
+	for i := 0 to AppFactuGES.ModuleManager.ModulesCount - 1 do
+       MainMenuController.RegisterModule(AppFactuGES.ModuleManager.Modules[i]);
 
   MainMenuController.SortMenuByTag;
   MainMenuController.InitMainMenu;
@@ -343,6 +346,9 @@ begin
   end;
 
   RefrescarUI;
+  finally
+     HideHourglassCursor;
+  end;
 end;
 
 
@@ -356,7 +362,7 @@ begin
   (Sender as TAction).Enabled := Assigned(AppFactuGES.EmpresaActiva);
 end;
 
-procedure TfPantallaPrincipal.actLogisticaMenuExecute(Sender: TObject);
+procedure TfPantallaPrincipal.actMenuLogisticaExecute(Sender: TObject);
 begin
   //
 end;
diff --git a/Source/Modulos/Referencias/Controller/Referencias_controller.dpk b/Source/Modulos/Referencias/Controller/Referencias_controller.dpk
index a14a98d7..74c3a70a 100644
Binary files a/Source/Modulos/Referencias/Controller/Referencias_controller.dpk and b/Source/Modulos/Referencias/Controller/Referencias_controller.dpk differ
diff --git a/Source/Modulos/Referencias/Controller/Referencias_controller.dproj b/Source/Modulos/Referencias/Controller/Referencias_controller.dproj
index 475f5e72..99ed94bc 100644
--- a/Source/Modulos/Referencias/Controller/Referencias_controller.dproj
+++ b/Source/Modulos/Referencias/Controller/Referencias_controller.dproj
@@ -40,21 +40,35 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>Package</Borland.ProjectType>
     <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>
   <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
   <ItemGroup>
     <DelphiCompile Include="Referencias_controller.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\..\Lib\Base.dcp" />
-    <DCCReference Include="..\..\Lib\Referencias_data.dcp" />
-    <DCCReference Include="..\..\Lib\Referencias_model.dcp" />
+    <DCCReference Include="..\..\..\Servidor\ApplicaReferencias_data.dcp" />
+    <DCCReference Include="..\..\..\Servidor\ApplicationBaReferencias_data.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="View\uIEditorReferencias.pas" />
   </ItemGroup>
 </Project>
-
 <!-- EurekaLog First Line
 [Exception Log]
 EurekaLog Version=6011
diff --git a/Source/Modulos/Referencias/Controller/Referencias_controller.res b/Source/Modulos/Referencias/Controller/Referencias_controller.res
index 8b251f31..1641339f 100644
Binary files a/Source/Modulos/Referencias/Controller/Referencias_controller.res and b/Source/Modulos/Referencias/Controller/Referencias_controller.res differ
diff --git a/Source/Modulos/Referencias/Controller/uReferenciasController.pas b/Source/Modulos/Referencias/Controller/uReferenciasController.pas
index 39023e14..eb550bdf 100644
--- a/Source/Modulos/Referencias/Controller/uReferenciasController.pas
+++ b/Source/Modulos/Referencias/Controller/uReferenciasController.pas
@@ -24,7 +24,7 @@ type
 
     function ValidarReferencia(AReferencia: IBizReferencia): Boolean;
     procedure AsignarDataModule;
-
+    procedure FiltrarEmpresa(AReferencias: IBizReferencia);
   public
     constructor Create; override;
     destructor Destroy; override;
@@ -39,7 +39,7 @@ implementation
 
 uses
   cxControls, DB, uEditorRegistryUtils, schReferenciasClient_Intf,
-  uIEditorReferencias, uDataModuleReferencias,
+  uIEditorReferencias, uDataModuleReferencias, uFactuGES_App,
   uDAInterfaces, uDataTableUtils, uDialogUtils,
   uDateUtils, uROTypes, DateUtils, Controls, Windows;
 
@@ -53,6 +53,28 @@ end;
 function TReferenciasController.BuscarTodos: IBizReferencia;
 begin
   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;
 
 constructor TReferenciasController.Create;
diff --git a/Source/Modulos/Referencias/Views/uEditorReferencias.pas b/Source/Modulos/Referencias/Views/uEditorReferencias.pas
index e39fd1e2..b976ff68 100644
--- a/Source/Modulos/Referencias/Views/uEditorReferencias.pas
+++ b/Source/Modulos/Referencias/Views/uEditorReferencias.pas
@@ -163,11 +163,7 @@ begin
      FReferencias.DataTable.Active := true;
 
   ListaReferencias.SetFocus;
-{
-  EnableScrollBar(ListaReferencias.Handle,SB_HORZ,ESB_DISABLE_BOTH);
-  ShowScrollBar(ListaReferencias.Handle,SB_HORZ,false);
-  EnableScrollBar(ListaReferencias.Handle,SB_VERT,ESB_DISABLE_BOTH);
-}  
+  ListaReferenciasView.DataController.GotoFirst;
 end;
 
 end.